diff --git a/hippo4j-message/src/main/java/cn/hippo4j/message/platform/base/AbstractRobotSendMessageHandler.java b/hippo4j-message/src/main/java/cn/hippo4j/message/platform/base/AbstractRobotSendMessageHandler.java index 209c2db9..f8acca94 100644 --- a/hippo4j-message/src/main/java/cn/hippo4j/message/platform/base/AbstractRobotSendMessageHandler.java +++ b/hippo4j-message/src/main/java/cn/hippo4j/message/platform/base/AbstractRobotSendMessageHandler.java @@ -72,7 +72,7 @@ public abstract class AbstractRobotSendMessageHandler implements SendMessageHand } else { replaceTxt = ""; } - alarmContentTxt = StringUtil.replace(alarmContentTxt, "${timout-content}", replaceTxt); + alarmContentTxt = StringUtil.replace(alarmContentTxt, "${timeout-content}", replaceTxt); String text = String.format( alarmContentTxt, alarmNotifyRequest.getActive(), diff --git a/hippo4j-message/src/main/java/cn/hippo4j/message/service/AlarmControlHandler.java b/hippo4j-message/src/main/java/cn/hippo4j/message/service/AlarmControlHandler.java index ea86e0f2..4d94b6bc 100644 --- a/hippo4j-message/src/main/java/cn/hippo4j/message/service/AlarmControlHandler.java +++ b/hippo4j-message/src/main/java/cn/hippo4j/message/service/AlarmControlHandler.java @@ -18,7 +18,6 @@ package cn.hippo4j.message.service; import cn.hippo4j.common.constant.Constants; -import cn.hippo4j.common.toolkit.IdUtil; import cn.hippo4j.common.toolkit.StringUtil; import cn.hippo4j.message.dto.AlarmControlDTO; import com.github.benmanes.caffeine.cache.Cache; @@ -58,8 +57,7 @@ public class AlarmControlHandler { try { pkId = cache.getIfPresent(alarmControl.getTypeEnum().name()); if (StringUtil.isBlank(pkId)) { - // Val meaningless. - cache.put(alarmControl.getTypeEnum().name(), IdUtil.simpleUUID()); + cache.put(alarmControl.getTypeEnum().name(), "-"); return true; } } finally { diff --git a/hippo4j-message/src/main/resources/message/robot/dynamic-thread-pool/ding-alarm.txt b/hippo4j-message/src/main/resources/message/robot/dynamic-thread-pool/ding-alarm.txt index 7fda29d7..094e4505 100644 --- a/hippo4j-message/src/main/resources/message/robot/dynamic-thread-pool/ding-alarm.txt +++ b/hippo4j-message/src/main/resources/message/robot/dynamic-thread-pool/ding-alarm.txt @@ -34,7 +34,7 @@ --- - ${timout-content} + ${timeout-content} 拒绝策略：%s diff --git a/hippo4j-message/src/main/resources/message/robot/dynamic-thread-pool/wechat-alarm.txt b/hippo4j-message/src/main/resources/message/robot/dynamic-thread-pool/wechat-alarm.txt index 00dd33b2..1e1aa9c4 100644 --- a/hippo4j-message/src/main/resources/message/robot/dynamic-thread-pool/wechat-alarm.txt +++ b/hippo4j-message/src/main/resources/message/robot/dynamic-thread-pool/wechat-alarm.txt @@ -14,7 +14,7 @@ > 队列元素个数：%s > 队列剩余个数：%s > 拒绝策略：%s -> 拒绝策略执行次数：%s ${timout-content} +> 拒绝策略执行次数：%s ${timeout-content} > OWNER：<@%s> > 提示：%d 分钟内此线程池不会重复告警（可配置） diff --git a/hippo4j-monitor/hippo4j-monitor-base/src/main/java/cn/hippo4j/monitor/base/AbstractDynamicThreadPoolMonitor.java b/hippo4j-monitor/hippo4j-monitor-base/src/main/java/cn/hippo4j/monitor/base/AbstractDynamicThreadPoolMonitor.java index 81943cbd..2e8a77ac 100644 --- a/hippo4j-monitor/hippo4j-monitor-base/src/main/java/cn/hippo4j/monitor/base/AbstractDynamicThreadPoolMonitor.java +++ b/hippo4j-monitor/hippo4j-monitor-base/src/main/java/cn/hippo4j/monitor/base/AbstractDynamicThreadPoolMonitor.java @@ -42,9 +42,6 @@ public abstract class AbstractDynamicThreadPoolMonitor implements DynamicThreadP @Override public void collect() { List listDynamicThreadPoolId = GlobalThreadPoolManage.listThreadPoolId(); - for (String each : listDynamicThreadPoolId) { - ThreadPoolRunStateInfo poolRunState = threadPoolRunStateHandler.getPoolRunState(each); - execute(poolRunState); - } + listDynamicThreadPoolId.forEach(each -> execute(threadPoolRunStateHandler.getPoolRunState(each))); } } diff --git a/hippo4j-monitor/hippo4j-monitor-base/src/main/java/cn/hippo4j/monitor/base/AdapterThreadPoolMonitor.java b/hippo4j-monitor/hippo4j-monitor-base/src/main/java/cn/hippo4j/monitor/base/AdapterThreadPoolMonitor.java index cebdc7e2..520b4ffd 100644 --- a/hippo4j-monitor/hippo4j-monitor-base/src/main/java/cn/hippo4j/monitor/base/AdapterThreadPoolMonitor.java +++ b/hippo4j-monitor/hippo4j-monitor-base/src/main/java/cn/hippo4j/monitor/base/AdapterThreadPoolMonitor.java @@ -21,5 +21,4 @@ package cn.hippo4j.monitor.base; * Adapter thread-pool monitor. */ public interface AdapterThreadPoolMonitor extends ThreadPoolMonitor { - } diff --git a/hippo4j-monitor/hippo4j-monitor-base/src/main/java/cn/hippo4j/monitor/base/DynamicThreadPoolMonitor.java b/hippo4j-monitor/hippo4j-monitor-base/src/main/java/cn/hippo4j/monitor/base/DynamicThreadPoolMonitor.java index e3135db4..7e8c7452 100644 --- a/hippo4j-monitor/hippo4j-monitor-base/src/main/java/cn/hippo4j/monitor/base/DynamicThreadPoolMonitor.java +++ b/hippo4j-monitor/hippo4j-monitor-base/src/main/java/cn/hippo4j/monitor/base/DynamicThreadPoolMonitor.java @@ -21,5 +21,4 @@ package cn.hippo4j.monitor.base; * Dynamic thread-pool monitor. */ public interface DynamicThreadPoolMonitor extends ThreadPoolMonitor { - } diff --git a/hippo4j-monitor/hippo4j-monitor-base/src/main/java/cn/hippo4j/monitor/base/WebThreadPoolMonitor.java b/hippo4j-monitor/hippo4j-monitor-base/src/main/java/cn/hippo4j/monitor/base/WebThreadPoolMonitor.java index 333c0dbd..75b40fb7 100644 --- a/hippo4j-monitor/hippo4j-monitor-base/src/main/java/cn/hippo4j/monitor/base/WebThreadPoolMonitor.java +++ b/hippo4j-monitor/hippo4j-monitor-base/src/main/java/cn/hippo4j/monitor/base/WebThreadPoolMonitor.java @@ -21,5 +21,4 @@ package cn.hippo4j.monitor.base; * Web thread-pool monitor. */ public interface WebThreadPoolMonitor extends ThreadPoolMonitor { - } diff --git a/hippo4j-monitor/hippo4j-monitor-micrometer/src/main/java/cn/hippo4j/monitor/micrometer/AdapterThreadPoolMicrometerMonitorHandler.java b/hippo4j-monitor/hippo4j-monitor-micrometer/src/main/java/cn/hippo4j/monitor/micrometer/AdapterThreadPoolMicrometerMonitorHandler.java index 697ca2cf..0db66c68 100644 --- a/hippo4j-monitor/hippo4j-monitor-micrometer/src/main/java/cn/hippo4j/monitor/micrometer/AdapterThreadPoolMicrometerMonitorHandler.java +++ b/hippo4j-monitor/hippo4j-monitor-micrometer/src/main/java/cn/hippo4j/monitor/micrometer/AdapterThreadPoolMicrometerMonitorHandler.java @@ -46,10 +46,10 @@ public class AdapterThreadPoolMicrometerMonitorHandler extends AbstractAdapterTh @Override protected void execute(ThreadPoolAdapterState threadPoolAdapterState) { ThreadPoolAdapterState stateInfo = RUN_STATE_CACHE.get(threadPoolAdapterState.getThreadPoolKey()); - if (stateInfo == null) { - RUN_STATE_CACHE.put(threadPoolAdapterState.getThreadPoolKey(), threadPoolAdapterState); - } else { + if (stateInfo != null) { BeanUtil.convert(threadPoolAdapterState, stateInfo); + } else { + RUN_STATE_CACHE.put(threadPoolAdapterState.getThreadPoolKey(), threadPoolAdapterState); } Environment environment = ApplicationContextHolder.getInstance().getEnvironment(); String applicationName = environment.getProperty("spring.application.name", "application"); diff --git a/hippo4j-monitor/hippo4j-monitor-micrometer/src/main/java/cn/hippo4j/monitor/micrometer/DynamicThreadPoolMicrometerMonitorHandler.java b/hippo4j-monitor/hippo4j-monitor-micrometer/src/main/java/cn/hippo4j/monitor/micrometer/DynamicThreadPoolMicrometerMonitorHandler.java index 5b2cc068..f9c9f1d8 100644 --- a/hippo4j-monitor/hippo4j-monitor-micrometer/src/main/java/cn/hippo4j/monitor/micrometer/DynamicThreadPoolMicrometerMonitorHandler.java +++ b/hippo4j-monitor/hippo4j-monitor-micrometer/src/main/java/cn/hippo4j/monitor/micrometer/DynamicThreadPoolMicrometerMonitorHandler.java @@ -46,10 +46,10 @@ public class DynamicThreadPoolMicrometerMonitorHandler extends AbstractDynamicTh @Override protected void execute(ThreadPoolRunStateInfo poolRunStateInfo) { ThreadPoolRunStateInfo stateInfo = RUN_STATE_CACHE.get(poolRunStateInfo.getTpId()); - if (stateInfo == null) { - RUN_STATE_CACHE.put(poolRunStateInfo.getTpId(), poolRunStateInfo); - } else { + if (stateInfo != null) { BeanUtil.convert(poolRunStateInfo, stateInfo); + } else { + RUN_STATE_CACHE.put(poolRunStateInfo.getTpId(), poolRunStateInfo); } Environment environment = ApplicationContextHolder.getInstance().getEnvironment(); String applicationName = environment.getProperty("spring.application.name", "application"); diff --git a/hippo4j-monitor/hippo4j-monitor-micrometer/src/main/java/cn/hippo4j/monitor/micrometer/WebThreadPoolMicrometerMonitorHandler.java b/hippo4j-monitor/hippo4j-monitor-micrometer/src/main/java/cn/hippo4j/monitor/micrometer/WebThreadPoolMicrometerMonitorHandler.java index e7042a04..3c0795d9 100644 --- a/hippo4j-monitor/hippo4j-monitor-micrometer/src/main/java/cn/hippo4j/monitor/micrometer/WebThreadPoolMicrometerMonitorHandler.java +++ b/hippo4j-monitor/hippo4j-monitor-micrometer/src/main/java/cn/hippo4j/monitor/micrometer/WebThreadPoolMicrometerMonitorHandler.java @@ -46,10 +46,10 @@ public class WebThreadPoolMicrometerMonitorHandler extends AbstractWebThreadPool Environment environment = ApplicationContextHolder.getInstance().getEnvironment(); String applicationName = environment.getProperty("spring.application.name", "application"); ThreadPoolRunStateInfo stateInfo = RUN_STATE_CACHE.get(applicationName); - if (stateInfo == null) { - RUN_STATE_CACHE.put(applicationName, webThreadPoolRunStateInfo); - } else { + if (stateInfo != null) { BeanUtil.convert(webThreadPoolRunStateInfo, stateInfo); + } else { + RUN_STATE_CACHE.put(applicationName, webThreadPoolRunStateInfo); } Iterable tags = CollectionUtil.newArrayList(Tag.of(APPLICATION_NAME_TAG, applicationName)); Metrics.gauge(metricName("current.load"), tags, webThreadPoolRunStateInfo, ThreadPoolRunStateInfo::getSimpleCurrentLoad); diff --git a/hippo4j-server/hippo4j-auth/src/main/java/cn/hippo4j/auth/config/FilterConfig.java b/hippo4j-server/hippo4j-auth/src/main/java/cn/hippo4j/auth/config/FilterConfig.java index 76aa3602..ae53a759 100644 --- a/hippo4j-server/hippo4j-auth/src/main/java/cn/hippo4j/auth/config/FilterConfig.java +++ b/hippo4j-server/hippo4j-auth/src/main/java/cn/hippo4j/auth/config/FilterConfig.java @@ -23,7 +23,7 @@ import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; /** - * + * Filter config. */ @Configuration public class FilterConfig { diff --git a/hippo4j-server/hippo4j-auth/src/main/java/cn/hippo4j/auth/filter/JWTAuthorizationFilter.java b/hippo4j-server/hippo4j-auth/src/main/java/cn/hippo4j/auth/filter/JWTAuthorizationFilter.java index 3b6cf69e..78f3bee5 100644 --- a/hippo4j-server/hippo4j-auth/src/main/java/cn/hippo4j/auth/filter/JWTAuthorizationFilter.java +++ b/hippo4j-server/hippo4j-auth/src/main/java/cn/hippo4j/auth/filter/JWTAuthorizationFilter.java @@ -68,14 +68,12 @@ public class JWTAuthorizationFilter extends BasicAuthenticationFilter { chain.doFilter(request, response); return; } - // If there is no Authorization information in the request header, it will be released directly. String tokenHeader = request.getHeader(JwtTokenUtil.TOKEN_HEADER); if (tokenHeader == null || !tokenHeader.startsWith(JwtTokenUtil.TOKEN_PREFIX)) { chain.doFilter(request, response); return; } - // If there is a Token in the request header, it is parsed and the authentication information is set. try { SecurityContextHolder.getContext().setAuthentication(getAuthentication(tokenHeader)); diff --git a/hippo4j-server/hippo4j-auth/src/main/java/cn/hippo4j/auth/security/JwtTokenManager.java b/hippo4j-server/hippo4j-auth/src/main/java/cn/hippo4j/auth/security/JwtTokenManager.java index 17f52aaa..2abd58d6 100644 --- a/hippo4j-server/hippo4j-auth/src/main/java/cn/hippo4j/auth/security/JwtTokenManager.java +++ b/hippo4j-server/hippo4j-auth/src/main/java/cn/hippo4j/auth/security/JwtTokenManager.java @@ -41,15 +41,30 @@ import static cn.hippo4j.common.constant.Constants.AUTHORITIES_KEY; @Component public class JwtTokenManager { + /** + * Create token. + * + * @param userName user-name + * @return new token + */ public String createToken(String userName) { long now = System.currentTimeMillis(); Date validity; validity = new Date(now + TOKEN_VALIDITY_IN_SECONDS * 1000L); Claims claims = Jwts.claims().setSubject(userName); - return Jwts.builder().setClaims(claims).setExpiration(validity) - .signWith(SignatureAlgorithm.HS512, SECRET).compact(); + String token = Jwts.builder() + .setClaims(claims) + .setExpiration(validity) + .signWith(SignatureAlgorithm.HS512, SECRET) + .compact(); + return token; } + /** + * Validate token. + * + * @param token token + */ public void validateToken(String token) { Jwts.parser().setSigningKey(SECRET).parseClaimsJws(token); } diff --git a/hippo4j-server/hippo4j-auth/src/main/java/cn/hippo4j/auth/service/impl/UserServiceImpl.java b/hippo4j-server/hippo4j-auth/src/main/java/cn/hippo4j/auth/service/impl/UserServiceImpl.java index b500fa06..c2cf1988 100644 --- a/hippo4j-server/hippo4j-auth/src/main/java/cn/hippo4j/auth/service/impl/UserServiceImpl.java +++ b/hippo4j-server/hippo4j-auth/src/main/java/cn/hippo4j/auth/service/impl/UserServiceImpl.java @@ -22,7 +22,6 @@ import cn.hippo4j.auth.model.UserInfo; import cn.hippo4j.auth.model.biz.user.UserQueryPageReqDTO; import cn.hippo4j.auth.model.biz.user.UserReqDTO; import cn.hippo4j.auth.model.biz.user.UserRespDTO; -import cn.hippo4j.auth.service.RoleService; import cn.hippo4j.auth.service.UserService; import cn.hippo4j.common.toolkit.BeanUtil; import cn.hippo4j.common.toolkit.StringUtil; @@ -49,8 +48,6 @@ public class UserServiceImpl implements UserService { private final UserMapper userMapper; - private final RoleService roleService; - private final BCryptPasswordEncoder bCryptPasswordEncoder; @Override diff --git a/hippo4j-server/hippo4j-auth/src/main/java/cn/hippo4j/auth/toolkit/JwtTokenUtil.java b/hippo4j-server/hippo4j-auth/src/main/java/cn/hippo4j/auth/toolkit/JwtTokenUtil.java index c78af646..40a831c0 100644 --- a/hippo4j-server/hippo4j-auth/src/main/java/cn/hippo4j/auth/toolkit/JwtTokenUtil.java +++ b/hippo4j-server/hippo4j-auth/src/main/java/cn/hippo4j/auth/toolkit/JwtTokenUtil.java @@ -36,9 +36,11 @@ import static cn.hippo4j.common.constant.Constants.MAP_INITIAL_CAPACITY; public class JwtTokenUtil { public static final String TOKEN_HEADER = "Authorization"; + public static final String TOKEN_PREFIX = "Bearer "; public static final String SECRET = "SecretKey039245678901232039487623456783092349288901402967890140939827"; + public static final String ISS = "admin"; /** diff --git a/hippo4j-server/hippo4j-auth/src/main/java/cn/hippo4j/auth/toolkit/ReturnT.java b/hippo4j-server/hippo4j-auth/src/main/java/cn/hippo4j/auth/toolkit/ReturnT.java index ccc1ab1c..47743239 100644 --- a/hippo4j-server/hippo4j-auth/src/main/java/cn/hippo4j/auth/toolkit/ReturnT.java +++ b/hippo4j-server/hippo4j-auth/src/main/java/cn/hippo4j/auth/toolkit/ReturnT.java @@ -32,13 +32,17 @@ public class ReturnT implements Serializable { public static final long serialVersionUID = 42L; public static final int SUCCESS_CODE = 200; + public static final int FAIL_CODE = 500; public static final ReturnT SUCCESS = new ReturnT<>(null); + public static final ReturnT FAIL = new ReturnT<>(FAIL_CODE, null); private int code; + private String msg; + private T content; public ReturnT(int code, String msg) { diff --git a/hippo4j-server/hippo4j-config/src/main/java/cn/hippo4j/config/event/ConfigDataChangeEvent.java b/hippo4j-server/hippo4j-config/src/main/java/cn/hippo4j/config/event/ConfigDataChangeEvent.java deleted file mode 100644 index 0c3cd1e1..00000000 --- a/hippo4j-server/hippo4j-config/src/main/java/cn/hippo4j/config/event/ConfigDataChangeEvent.java +++ /dev/null @@ -1,44 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package cn.hippo4j.config.event; - -import org.springframework.util.StringUtils; - -/** - * Config data change event. - */ -public class ConfigDataChangeEvent extends AbstractEvent { - - public final String tenantId; - - public final String itemId; - - public final String tpId; - - public final long lastModifiedTs; - - public ConfigDataChangeEvent(String tenantId, String itemId, String tpId, Long gmtModified) { - if (StringUtils.isEmpty(tenantId) || StringUtils.isEmpty(itemId) || StringUtils.isEmpty(tpId)) { - throw new IllegalArgumentException("DataId is null or group is null"); - } - this.tenantId = tenantId; - this.itemId = itemId; - this.tpId = tpId; - this.lastModifiedTs = gmtModified; - } -} diff --git a/hippo4j-server/hippo4j-config/src/main/java/cn/hippo4j/config/monitor/AbstractMonitorDataExecuteStrategy.java b/hippo4j-server/hippo4j-config/src/main/java/cn/hippo4j/config/monitor/AbstractMonitorDataExecuteStrategy.java index ae0dc032..78d89bcf 100644 --- a/hippo4j-server/hippo4j-config/src/main/java/cn/hippo4j/config/monitor/AbstractMonitorDataExecuteStrategy.java +++ b/hippo4j-server/hippo4j-config/src/main/java/cn/hippo4j/config/monitor/AbstractMonitorDataExecuteStrategy.java @@ -27,14 +27,14 @@ public abstract class AbstractMonitorDataExecuteStrategy { /** * Mark. * - * @return + * @return mark */ public abstract String mark(); /** * Execute. * - * @param message + * @param message message */ public abstract void execute(T message); } diff --git a/hippo4j-server/hippo4j-config/src/main/java/cn/hippo4j/config/monitor/QueryMonitorExecuteChoose.java b/hippo4j-server/hippo4j-config/src/main/java/cn/hippo4j/config/monitor/QueryMonitorExecuteChoose.java index 2dfd9a6b..525ee8ee 100644 --- a/hippo4j-server/hippo4j-config/src/main/java/cn/hippo4j/config/monitor/QueryMonitorExecuteChoose.java +++ b/hippo4j-server/hippo4j-config/src/main/java/cn/hippo4j/config/monitor/QueryMonitorExecuteChoose.java @@ -33,7 +33,7 @@ import java.util.Map; public class QueryMonitorExecuteChoose implements CommandLineRunner { /** - * Storage monitoring data execution container. + * Storage monitoring data execution container */ private Map monitorDataExecuteStrategyChooseMap = new HashMap<>(); diff --git a/hippo4j-server/hippo4j-config/src/main/java/cn/hippo4j/config/notify/DefaultPublisher.java b/hippo4j-server/hippo4j-config/src/main/java/cn/hippo4j/config/notify/DefaultPublisher.java index 7b8f67e6..c43fb591 100644 --- a/hippo4j-server/hippo4j-config/src/main/java/cn/hippo4j/config/notify/DefaultPublisher.java +++ b/hippo4j-server/hippo4j-config/src/main/java/cn/hippo4j/config/notify/DefaultPublisher.java @@ -63,7 +63,6 @@ public class DefaultPublisher extends Thread implements EventPublisher { @Override public synchronized void start() { if (!initialized) { - // start just called once super.start(); if (queueMaxSize == -1) { queueMaxSize = NotifyCenter.ringBufferSize; @@ -80,7 +79,7 @@ public class DefaultPublisher extends Thread implements EventPublisher { private void openEventHandler() { try { int waitTimes = 60; - for (;;) { + for (; ; ) { if (shutdown || hasSubscriber() || waitTimes <= 0) { break; } @@ -91,7 +90,7 @@ public class DefaultPublisher extends Thread implements EventPublisher { } waitTimes--; } - for (;;) { + for (; ; ) { if (shutdown) { break; } @@ -100,7 +99,7 @@ public class DefaultPublisher extends Thread implements EventPublisher { UPDATER.compareAndSet(this, lastEventSequence, Math.max(lastEventSequence, event.sequence())); } } catch (Throwable ex) { - log.error("Event listener exception: {}", ex); + log.error("Event listener exception.", ex); } } @@ -123,9 +122,7 @@ public class DefaultPublisher extends Thread implements EventPublisher { @Override public void notifySubscriber(AbstractSubscriber subscriber, AbstractEvent event) { final Runnable job = () -> subscriber.onEvent(event); - final Executor executor = subscriber.executor(); - if (executor != null) { executor.execute(job); } else { diff --git a/hippo4j-server/hippo4j-config/src/main/java/cn/hippo4j/config/notify/EventPublisher.java b/hippo4j-server/hippo4j-config/src/main/java/cn/hippo4j/config/notify/EventPublisher.java index 858b30f2..1a726308 100644 --- a/hippo4j-server/hippo4j-config/src/main/java/cn/hippo4j/config/notify/EventPublisher.java +++ b/hippo4j-server/hippo4j-config/src/main/java/cn/hippo4j/config/notify/EventPublisher.java @@ -28,31 +28,31 @@ public interface EventPublisher { /** * Init. * - * @param type - * @param bufferSize + * @param type type + * @param bufferSize buffer size */ void init(Class type, int bufferSize); /** * Add subscriber. * - * @param subscriber + * @param subscriber subscriber */ void addSubscriber(AbstractSubscriber subscriber); /** * Publish. * - * @param event - * @return + * @param event event + * @return publish result */ boolean publish(AbstractEvent event); /** * Notify subscriber. * - * @param subscriber - * @param event + * @param subscriber subscriber + * @param event event */ void notifySubscriber(AbstractSubscriber subscriber, AbstractEvent event); } diff --git a/hippo4j-server/hippo4j-config/src/main/java/cn/hippo4j/config/notify/NotifyCenter.java b/hippo4j-server/hippo4j-config/src/main/java/cn/hippo4j/config/notify/NotifyCenter.java index 0fce3453..78101e86 100644 --- a/hippo4j-server/hippo4j-config/src/main/java/cn/hippo4j/config/notify/NotifyCenter.java +++ b/hippo4j-server/hippo4j-config/src/main/java/cn/hippo4j/config/notify/NotifyCenter.java @@ -43,11 +43,9 @@ public class NotifyCenter { private DefaultSharePublisher sharePublisher; - private static Class clazz = null; - private static EventPublisher eventPublisher = new DefaultPublisher(); - private static BiFunction, Integer, EventPublisher> publisherFactory = null; + private static BiFunction, Integer, EventPublisher> publisherFactory; private final Map publisherMap = new ConcurrentHashMap(16); diff --git a/hippo4j-server/hippo4j-config/src/main/java/cn/hippo4j/config/notify/listener/AbstractSubscriber.java b/hippo4j-server/hippo4j-config/src/main/java/cn/hippo4j/config/notify/listener/AbstractSubscriber.java index 16357b47..50705b97 100644 --- a/hippo4j-server/hippo4j-config/src/main/java/cn/hippo4j/config/notify/listener/AbstractSubscriber.java +++ b/hippo4j-server/hippo4j-config/src/main/java/cn/hippo4j/config/notify/listener/AbstractSubscriber.java @@ -40,6 +40,11 @@ public abstract class AbstractSubscriber { */ public abstract Class subscribeType(); + /** + * Executor. + * + * @return executor + */ public Executor executor() { return null; } diff --git a/hippo4j-server/hippo4j-config/src/main/java/cn/hippo4j/config/service/ConfigChangePublisher.java b/hippo4j-server/hippo4j-config/src/main/java/cn/hippo4j/config/service/ConfigChangePublisher.java index 084c8925..7ae44a12 100644 --- a/hippo4j-server/hippo4j-config/src/main/java/cn/hippo4j/config/service/ConfigChangePublisher.java +++ b/hippo4j-server/hippo4j-config/src/main/java/cn/hippo4j/config/service/ConfigChangePublisher.java @@ -28,7 +28,7 @@ public class ConfigChangePublisher { /** * Notify configChange. * - * @param event + * @param event event */ public static void notifyConfigChange(LocalDataChangeEvent event) { NotifyCenter.publishEvent(event); diff --git a/hippo4j-server/hippo4j-config/src/main/java/cn/hippo4j/config/service/LongPollingService.java b/hippo4j-server/hippo4j-config/src/main/java/cn/hippo4j/config/service/LongPollingService.java index b5d667a0..7a96832e 100644 --- a/hippo4j-server/hippo4j-config/src/main/java/cn/hippo4j/config/service/LongPollingService.java +++ b/hippo4j-server/hippo4j-config/src/main/java/cn/hippo4j/config/service/LongPollingService.java @@ -68,13 +68,9 @@ public class LongPollingService { @Override public void onEvent(AbstractEvent event) { - if (isFixedPolling()) { - // Ignore. - } else { - if (event instanceof LocalDataChangeEvent) { - LocalDataChangeEvent evt = (LocalDataChangeEvent) event; - ConfigExecutor.executeLongPolling(new DataChangeTask(evt.identify, evt.groupKey)); - } + if (!isFixedPolling() && event instanceof LocalDataChangeEvent) { + LocalDataChangeEvent evt = (LocalDataChangeEvent) event; + ConfigExecutor.executeLongPolling(new DataChangeTask(evt.identify, evt.groupKey)); } } @@ -109,7 +105,7 @@ public class LongPollingService { @Override public void run() { try { - for (Iterator iter = allSubs.iterator(); iter.hasNext();) { + for (Iterator iter = allSubs.iterator(); iter.hasNext(); ) { ClientLongPolling clientSub = iter.next(); String identity = groupKey + GROUP_KEY_DELIMITER + identify; List parseMapForFilter = CollectionUtil.newArrayList(identity); @@ -300,11 +296,11 @@ public class LongPollingService { /** * Is support long polling. * - * @param req + * @param request * @return */ - public static boolean isSupportLongPolling(HttpServletRequest req) { - return null != req.getHeader(LONG_POLLING_HEADER); + public static boolean isSupportLongPolling(HttpServletRequest request) { + return request.getHeader(LONG_POLLING_HEADER) != null; } /** diff --git a/hippo4j-server/hippo4j-config/src/main/java/cn/hippo4j/config/verify/ConfigModificationVerifyServiceChoose.java b/hippo4j-server/hippo4j-config/src/main/java/cn/hippo4j/config/verify/ConfigModificationVerifyServiceChoose.java index 98769559..2eb72589 100644 --- a/hippo4j-server/hippo4j-config/src/main/java/cn/hippo4j/config/verify/ConfigModificationVerifyServiceChoose.java +++ b/hippo4j-server/hippo4j-config/src/main/java/cn/hippo4j/config/verify/ConfigModificationVerifyServiceChoose.java @@ -33,7 +33,7 @@ import java.util.Map; public class ConfigModificationVerifyServiceChoose implements CommandLineRunner { /** - * Storage config change verify service container. + * Storage config change verify service container */ private Map configChangeVerifyServiceChooseMap = new HashMap<>(); @@ -44,8 +44,7 @@ public class ConfigModificationVerifyServiceChoose implements CommandLineRunner * @return */ public ConfigModificationVerifyService choose(Integer type) { - ConfigModificationVerifyService verifyService = configChangeVerifyServiceChooseMap.get(type); - return verifyService; + return configChangeVerifyServiceChooseMap.get(type); } @Override diff --git a/hippo4j-server/hippo4j-discovery/src/main/java/cn/hippo4j/discovery/core/Lease.java b/hippo4j-server/hippo4j-discovery/src/main/java/cn/hippo4j/discovery/core/Lease.java index e604760b..ea76264a 100644 --- a/hippo4j-server/hippo4j-discovery/src/main/java/cn/hippo4j/discovery/core/Lease.java +++ b/hippo4j-server/hippo4j-discovery/src/main/java/cn/hippo4j/discovery/core/Lease.java @@ -17,32 +17,19 @@ package cn.hippo4j.discovery.core; +import lombok.Getter; + /** * Lease. */ public class Lease { - enum Action { - /** - * REGISTER - */ - REGISTER, - - /** - * CANCEL - */ - CANCEL, - - /** - * RENEW - */ - RENEW - } - private T holder; + @Getter private long evictionTimestamp; + @Getter private long registrationTimestamp; private long serviceUpTimestamp; @@ -50,6 +37,7 @@ public class Lease { /** * Make it volatile so that the expiration task would see this quicker */ + @Getter private volatile long lastUpdateTimestamp; private long duration; @@ -91,18 +79,6 @@ public class Lease { return (evictionTimestamp > 0 || System.currentTimeMillis() > (lastUpdateTimestamp + additionalLeaseMs)); } - public long getRegistrationTimestamp() { - return registrationTimestamp; - } - - public long getLastRenewalTimestamp() { - return lastUpdateTimestamp; - } - - public long getEvictionTimestamp() { - return evictionTimestamp; - } - public long getServiceUpTimestamp() { return serviceUpTimestamp; }