diff --git a/hippo4j-adapter/hippo4j-adapter-kafka/src/main/java/cn/hippo4j/adapter/kafka/KafkaThreadPoolAdapter.java b/hippo4j-adapter/hippo4j-adapter-kafka/src/main/java/cn/hippo4j/adapter/kafka/KafkaThreadPoolAdapter.java index 21e417ac..1a2be842 100644 --- a/hippo4j-adapter/hippo4j-adapter-kafka/src/main/java/cn/hippo4j/adapter/kafka/KafkaThreadPoolAdapter.java +++ b/hippo4j-adapter/hippo4j-adapter-kafka/src/main/java/cn/hippo4j/adapter/kafka/KafkaThreadPoolAdapter.java @@ -151,8 +151,8 @@ public class KafkaThreadPoolAdapter implements ThreadPoolAdapter, ApplicationLis ContainerProperties containerProperties = concurrentContainer.getContainerProperties(); TopicPartitionOffset[] topicPartitions = containerProperties.getTopicPartitions(); if (topicPartitions != null && concurrency > topicPartitions.length) { - log.warn("[{}] Kafka consuming thread pool not support modify. " + - "When specific partitions are provided, the concurrency must be less than or " + log.warn("[{}] Kafka consuming thread pool not support modify. " + + "When specific partitions are provided, the concurrency must be less than or " + "equal to the number of partitions;", threadPoolKey); return false; } diff --git a/hippo4j-agent/hippo4j-agent-core/src/main/java/cn/hippo4j/agent/core/conf/Config.java b/hippo4j-agent/hippo4j-agent-core/src/main/java/cn/hippo4j/agent/core/conf/Config.java index 22ab1f3b..04fc9251 100755 --- a/hippo4j-agent/hippo4j-agent-core/src/main/java/cn/hippo4j/agent/core/conf/Config.java +++ b/hippo4j-agent/hippo4j-agent-core/src/main/java/cn/hippo4j/agent/core/conf/Config.java @@ -370,6 +370,7 @@ public class Config { } public static class Apollo { + public static class App { public static String ID; diff --git a/hippo4j-agent/hippo4j-agent-core/src/main/java/cn/hippo4j/agent/core/conf/dynamic/AgentConfigChangeWatcher.java b/hippo4j-agent/hippo4j-agent-core/src/main/java/cn/hippo4j/agent/core/conf/dynamic/AgentConfigChangeWatcher.java index 66bc294b..e896584d 100644 --- a/hippo4j-agent/hippo4j-agent-core/src/main/java/cn/hippo4j/agent/core/conf/dynamic/AgentConfigChangeWatcher.java +++ b/hippo4j-agent/hippo4j-agent-core/src/main/java/cn/hippo4j/agent/core/conf/dynamic/AgentConfigChangeWatcher.java @@ -44,9 +44,9 @@ public abstract class AgentConfigChangeWatcher { @Override public String toString() { - return "AgentConfigChangeWatcher{" + - "propertyKey='" + propertyKey + '\'' + - '}'; + return "AgentConfigChangeWatcher{" + + "propertyKey='" + propertyKey + '\'' + + '}'; } @Getter diff --git a/hippo4j-agent/hippo4j-agent-core/src/main/java/cn/hippo4j/agent/core/util/ReflectUtil.java b/hippo4j-agent/hippo4j-agent-core/src/main/java/cn/hippo4j/agent/core/util/ReflectUtil.java index 3a59b535..9a7cc2d1 100644 --- a/hippo4j-agent/hippo4j-agent-core/src/main/java/cn/hippo4j/agent/core/util/ReflectUtil.java +++ b/hippo4j-agent/hippo4j-agent-core/src/main/java/cn/hippo4j/agent/core/util/ReflectUtil.java @@ -33,8 +33,8 @@ public class ReflectUtil { Field[] fields = clazz.getFields(); List result = new ArrayList<>(); for (Field field : fields) { - if (field.getType().isAssignableFrom(declaredType) && - Modifier.isStatic(field.getModifiers())) { + if (field.getType().isAssignableFrom(declaredType) + && Modifier.isStatic(field.getModifiers())) { result.add(field); } } diff --git a/hippo4j-agent/hippo4j-agent-plugin/spring-plugins/spring-boot-1.x-plugin/src/main/java/cn/hippo4j/agent/plugin/spring/boot/v1/ApolloSpringBootProperties.java b/hippo4j-agent/hippo4j-agent-plugin/spring-plugins/spring-boot-1.x-plugin/src/main/java/cn/hippo4j/agent/plugin/spring/boot/v1/ApolloSpringBootProperties.java index 1bf70dc3..f7b7a128 100644 --- a/hippo4j-agent/hippo4j-agent-plugin/spring-plugins/spring-boot-1.x-plugin/src/main/java/cn/hippo4j/agent/plugin/spring/boot/v1/ApolloSpringBootProperties.java +++ b/hippo4j-agent/hippo4j-agent-plugin/spring-plugins/spring-boot-1.x-plugin/src/main/java/cn/hippo4j/agent/plugin/spring/boot/v1/ApolloSpringBootProperties.java @@ -24,7 +24,6 @@ import java.util.List; public class ApolloSpringBootProperties { - public static class Spring { public static class Dynamic { diff --git a/hippo4j-common/src/main/java/cn/hippo4j/common/extension/config/ExtensionRegisterBootstrap.java b/hippo4j-common/src/main/java/cn/hippo4j/common/extension/config/ExtensionRegisterBootstrap.java index dc182945..d1ee6baf 100644 --- a/hippo4j-common/src/main/java/cn/hippo4j/common/extension/config/ExtensionRegisterBootstrap.java +++ b/hippo4j-common/src/main/java/cn/hippo4j/common/extension/config/ExtensionRegisterBootstrap.java @@ -50,8 +50,8 @@ public class ExtensionRegisterBootstrap implements ApplicationContextAware, Appl } private boolean filterClass(String beanName, Object bean) { - return bean.getClass().isAssignableFrom(IExtension.class) || - ScopedProxyUtils.isScopedTarget(beanName) || - !(bean instanceof IExtension); + return bean.getClass().isAssignableFrom(IExtension.class) + || ScopedProxyUtils.isScopedTarget(beanName) + || !(bean instanceof IExtension); } } diff --git a/hippo4j-common/src/main/java/cn/hippo4j/common/toolkit/IdUtil.java b/hippo4j-common/src/main/java/cn/hippo4j/common/toolkit/IdUtil.java index 26fad185..60300777 100644 --- a/hippo4j-common/src/main/java/cn/hippo4j/common/toolkit/IdUtil.java +++ b/hippo4j-common/src/main/java/cn/hippo4j/common/toolkit/IdUtil.java @@ -74,17 +74,17 @@ public class IdUtil { long mostSigBits = uuid.getMostSignificantBits(); long leastSigBits = uuid.getLeastSignificantBits(); if (isSimple) { - return (digits(mostSigBits >> 32, 8) + - digits(mostSigBits >> 16, 4) + - digits(mostSigBits, 4) + - digits(leastSigBits >> 48, 4) + - digits(leastSigBits, 12)); + return (digits(mostSigBits >> 32, 8) + + digits(mostSigBits >> 16, 4) + + digits(mostSigBits, 4) + + digits(leastSigBits >> 48, 4) + + digits(leastSigBits, 12)); } else { - return (digits(mostSigBits >> 32, 8) + "-" + - digits(mostSigBits >> 16, 4) + "-" + - digits(mostSigBits, 4) + "-" + - digits(leastSigBits >> 48, 4) + "-" + - digits(leastSigBits, 12)); + return (digits(mostSigBits >> 32, 8) + "-" + + digits(mostSigBits >> 16, 4) + "-" + + digits(mostSigBits, 4) + "-" + + digits(leastSigBits >> 48, 4) + "-" + + digits(leastSigBits, 12)); } } diff --git a/hippo4j-common/src/main/java/cn/hippo4j/common/toolkit/ReflectUtil.java b/hippo4j-common/src/main/java/cn/hippo4j/common/toolkit/ReflectUtil.java index 317740ba..6f6c2efe 100644 --- a/hippo4j-common/src/main/java/cn/hippo4j/common/toolkit/ReflectUtil.java +++ b/hippo4j-common/src/main/java/cn/hippo4j/common/toolkit/ReflectUtil.java @@ -299,8 +299,8 @@ public class ReflectUtil { public static Field findField(Object obj, String filedName, String fieldType) { Field[] fields = ReflectUtil.getFields(obj.getClass()); for (Field field : fields) { - if (field.getName().contains(filedName) && - (field.getType().getName().contains(fieldType))) { + if (field.getName().contains(filedName) + && (field.getType().getName().contains(fieldType))) { return field; } } diff --git a/hippo4j-core/src/main/java/cn/hippo4j/core/executor/support/AbstractDynamicExecutorSupport.java b/hippo4j-core/src/main/java/cn/hippo4j/core/executor/support/AbstractDynamicExecutorSupport.java index d8f80c74..91de8469 100644 --- a/hippo4j-core/src/main/java/cn/hippo4j/core/executor/support/AbstractDynamicExecutorSupport.java +++ b/hippo4j-core/src/main/java/cn/hippo4j/core/executor/support/AbstractDynamicExecutorSupport.java @@ -161,14 +161,14 @@ public abstract class AbstractDynamicExecutorSupport extends ThreadPoolExecutor try { if (!executor.awaitTermination(this.awaitTerminationMillis, TimeUnit.MILLISECONDS)) { if (log.isWarnEnabled()) { - log.warn("Timed out while waiting for executor" + - (this.threadPoolId != null ? " '" + this.threadPoolId + "'" : "") + " to terminate."); + log.warn("Timed out while waiting for executor" + + (this.threadPoolId != null ? " '" + this.threadPoolId + "'" : "") + " to terminate."); } } } catch (InterruptedException ex) { if (log.isWarnEnabled()) { - log.warn("Interrupted while waiting for executor" + - (this.threadPoolId != null ? " '" + this.threadPoolId + "'" : "") + " to terminate."); + log.warn("Interrupted while waiting for executor" + + (this.threadPoolId != null ? " '" + this.threadPoolId + "'" : "") + " to terminate."); } Thread.currentThread().interrupt(); } diff --git a/hippo4j-core/src/main/java/cn/hippo4j/core/handler/DynamicThreadPoolBannerHandler.java b/hippo4j-core/src/main/java/cn/hippo4j/core/handler/DynamicThreadPoolBannerHandler.java index 491499a3..0704c93e 100644 --- a/hippo4j-core/src/main/java/cn/hippo4j/core/handler/DynamicThreadPoolBannerHandler.java +++ b/hippo4j-core/src/main/java/cn/hippo4j/core/handler/DynamicThreadPoolBannerHandler.java @@ -58,12 +58,12 @@ public class DynamicThreadPoolBannerHandler implements InitializingBean { * Print banner. */ private void printBanner() { - String banner = " __ __ ___ ___ __ \n" + - " | |--.|__|.-----..-----..-----.| | | |__|\n" + - " | || || _ || _ || _ || | | | |\n" + - " |__|__||__|| __|| __||_____||____ | | |\n" + - " |__| |__| |: ||___|\n" + - " `---' \n"; + String banner = " __ __ ___ ___ __ \n" + + " | |--.|__|.-----..-----..-----.| | | |__|\n" + + " | || || _ || _ || _ || | | | |\n" + + " |__|__||__|| __|| __||_____||____ | | |\n" + + " |__| |__| |: ||___|\n" + + " `---' \n"; if (Boolean.TRUE.equals(properties.getBanner())) { String bannerVersion = StringUtil.isNotEmpty(version) ? " (v" + version + ")" : "no version."; StringBuilder padding = new StringBuilder(); diff --git a/hippo4j-rpc/src/main/java/cn/hippo4j/rpc/handler/HandlerManager.java b/hippo4j-rpc/src/main/java/cn/hippo4j/rpc/handler/HandlerManager.java index 1e6d5f94..18460ac3 100644 --- a/hippo4j-rpc/src/main/java/cn/hippo4j/rpc/handler/HandlerManager.java +++ b/hippo4j-rpc/src/main/java/cn/hippo4j/rpc/handler/HandlerManager.java @@ -66,9 +66,9 @@ public interface HandlerManager { boolean b = cls.isAnnotationPresent(ChannelHandler.Sharable.class) || HandlerManager.class.isAssignableFrom(cls); if (!b) { - throw new IllegalException("Join the execution of the handler must add io.netty.channel.ChannelHandler." + - "Sharable annotations, Please for the handler class " + cls.getName() + " add io.netty.channel." + - "ChannelHandler.Sharable annotation"); + throw new IllegalException("Join the execution of the handler must add io.netty.channel.ChannelHandler." + + "Sharable annotations, Please for the handler class " + cls.getName() + " add io.netty.channel." + + "ChannelHandler.Sharable annotation"); } return new HandlerEntity<>(order, handler, name); } diff --git a/hippo4j-server/hippo4j-config/src/main/java/cn/hippo4j/config/mapper/HisRunDataMapper.java b/hippo4j-server/hippo4j-config/src/main/java/cn/hippo4j/config/mapper/HisRunDataMapper.java index 7918828a..8405f529 100644 --- a/hippo4j-server/hippo4j-config/src/main/java/cn/hippo4j/config/mapper/HisRunDataMapper.java +++ b/hippo4j-server/hippo4j-config/src/main/java/cn/hippo4j/config/mapper/HisRunDataMapper.java @@ -39,13 +39,13 @@ public interface HisRunDataMapper extends BaseMapper { * @param endTime * @return */ - @Select("SELECT " + - "tenant_id, item_id, tp_id, max(completed_task_count) as max_completed_task_count " + - "FROM his_run_data " + - "where timestamp between #{startTime} and #{endTime} " + - "group by tenant_id, item_id, tp_id " + - "order by max_completed_task_count desc " + - "limit 8") + @Select("SELECT " + + "tenant_id, item_id, tp_id, max(completed_task_count) as max_completed_task_count " + + "FROM his_run_data " + + "where timestamp between #{startTime} and #{endTime} " + + "group by tenant_id, item_id, tp_id " + + "order by max_completed_task_count desc " + + "limit 8") List queryThreadPoolTaskSumRanking(@Param("startTime") Long startTime, @Param("endTime") Long endTime); /** @@ -55,13 +55,13 @@ public interface HisRunDataMapper extends BaseMapper { * @param endTime * @return */ - @Select("SELECT " + - "tenant_id, item_id, tp_id, max(queue_size) as max_queue_size, max(reject_count) as max_reject_count, max(completed_task_count) as max_completed_task_count " + - "FROM his_run_data " + - "where timestamp between #{startTime} and #{endTime} " + - "group by tenant_id, item_id, tp_id " + - "order by max_completed_task_count desc " + - "limit 4") + @Select("SELECT " + + "tenant_id, item_id, tp_id, max(queue_size) as max_queue_size, max(reject_count) as max_reject_count, max(completed_task_count) as max_completed_task_count " + + "FROM his_run_data " + + "where timestamp between #{startTime} and #{endTime} " + + "group by tenant_id, item_id, tp_id " + + "order by max_completed_task_count desc " + + "limit 4") List queryThreadPoolMaxRanking(@Param("startTime") Long startTime, @Param("endTime") Long endTime); @Data