From 00440506c2feae80cd33a6c2e090c5365a39fa32 Mon Sep 17 00:00:00 2001 From: "chen.ma" Date: Wed, 5 Oct 2022 14:35:25 +0800 Subject: [PATCH 1/3] Fix ci errors --- .../hippo4j/auth/filter/JWTAuthorizationFilter.java | 2 +- .../ResizableCapacityLinkedBlockingQueue.java | 12 ++++++------ .../common/spi/DynamicThreadPoolServiceLoader.java | 2 +- .../cn/hippo4j/common/toolkit/ByteConvertUtil.java | 4 ++-- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/hippo4j-auth/src/main/java/cn/hippo4j/auth/filter/JWTAuthorizationFilter.java b/hippo4j-auth/src/main/java/cn/hippo4j/auth/filter/JWTAuthorizationFilter.java index 5f46ffe9..7ec3c66b 100644 --- a/hippo4j-auth/src/main/java/cn/hippo4j/auth/filter/JWTAuthorizationFilter.java +++ b/hippo4j-auth/src/main/java/cn/hippo4j/auth/filter/JWTAuthorizationFilter.java @@ -85,7 +85,7 @@ public class JWTAuthorizationFilter extends BasicAuthenticationFilter { String resultStatus = "-1"; if (ex instanceof ServiceException) { ServiceException serviceException = (ServiceException) ex; - resultStatus = serviceException.errorCode.getCode(); + resultStatus = serviceException.getErrorCode().getCode(); } response.getWriter().write(JSONUtil.toJSONString(Results.failure(resultStatus, ex.getMessage()))); response.getWriter().flush(); diff --git a/hippo4j-common/src/main/java/cn/hippo4j/common/executor/support/ResizableCapacityLinkedBlockingQueue.java b/hippo4j-common/src/main/java/cn/hippo4j/common/executor/support/ResizableCapacityLinkedBlockingQueue.java index 17034dc4..2df8b54d 100644 --- a/hippo4j-common/src/main/java/cn/hippo4j/common/executor/support/ResizableCapacityLinkedBlockingQueue.java +++ b/hippo4j-common/src/main/java/cn/hippo4j/common/executor/support/ResizableCapacityLinkedBlockingQueue.java @@ -65,8 +65,8 @@ import java.util.concurrent.locks.ReentrantLock; **/ public class ResizableCapacityLinkedBlockingQueue extends AbstractQueue implements - BlockingQueue, - java.io.Serializable { + BlockingQueue, + java.io.Serializable { private static final long serialVersionUID = -6903933977591709194L; @@ -233,7 +233,7 @@ public class ResizableCapacityLinkedBlockingQueue extends AbstractQueue */ public ResizableCapacityLinkedBlockingQueue(Collection c) { this(Integer.MAX_VALUE); - for (Iterator it = c.iterator(); it.hasNext(); ) { + for (Iterator it = c.iterator(); it.hasNext();) { add(it.next()); } } @@ -357,7 +357,7 @@ public class ResizableCapacityLinkedBlockingQueue extends AbstractQueue final AtomicInteger count = this.count; putLock.lockInterruptibly(); try { - for (; ; ) { + for (;;) { if (count.get() < capacity) { insert(o); c = count.getAndIncrement(); @@ -463,7 +463,7 @@ public class ResizableCapacityLinkedBlockingQueue extends AbstractQueue final ReentrantLock takeLock = this.takeLock; takeLock.lockInterruptibly(); try { - for (; ; ) { + for (;;) { if (count.get() > 0) { x = extract(); c = count.getAndDecrement(); @@ -832,7 +832,7 @@ public class ResizableCapacityLinkedBlockingQueue extends AbstractQueue last = head = new Node(null); // Read in all elements and place in queue - for (; ; ) { + for (;;) { @SuppressWarnings("unchecked") E item = (E) s.readObject(); if (item == null) { diff --git a/hippo4j-common/src/main/java/cn/hippo4j/common/spi/DynamicThreadPoolServiceLoader.java b/hippo4j-common/src/main/java/cn/hippo4j/common/spi/DynamicThreadPoolServiceLoader.java index b80b246f..ecfdbacd 100644 --- a/hippo4j-common/src/main/java/cn/hippo4j/common/spi/DynamicThreadPoolServiceLoader.java +++ b/hippo4j-common/src/main/java/cn/hippo4j/common/spi/DynamicThreadPoolServiceLoader.java @@ -91,7 +91,7 @@ public class DynamicThreadPoolServiceLoader { try { return clazz.getDeclaredConstructor().newInstance(); } catch (InstantiationException | IllegalAccessException | InvocationTargetException - | NoSuchMethodException e) { + | NoSuchMethodException e) { throw new ServiceLoaderInstantiationException(clazz, e); } } diff --git a/hippo4j-common/src/main/java/cn/hippo4j/common/toolkit/ByteConvertUtil.java b/hippo4j-common/src/main/java/cn/hippo4j/common/toolkit/ByteConvertUtil.java index d1d30bf2..995209de 100644 --- a/hippo4j-common/src/main/java/cn/hippo4j/common/toolkit/ByteConvertUtil.java +++ b/hippo4j-common/src/main/java/cn/hippo4j/common/toolkit/ByteConvertUtil.java @@ -25,9 +25,9 @@ import java.text.DecimalFormat; public class ByteConvertUtil { public static final int KB_SIZE = 2 << 9; - + public static final int MB_SIZE = 2 << 19; - + public static final int GB_SIZE = 2 << 29; public static String getPrintSize(long size) { From eaf0fa16a75bacd03e8b38520c7fa6c24a199952 Mon Sep 17 00:00:00 2001 From: "chen.ma" Date: Wed, 5 Oct 2022 17:36:29 +0800 Subject: [PATCH 2/3] Add code checking tool maven-checkstyle-plugin (#755) --- dev-support/hippo4j_checkstyle.xml | 130 ++++++++++++++++++ .../hippo4j_checkstyle_suppression.xml | 28 ++++ pom.xml | 61 ++++---- 3 files changed, 185 insertions(+), 34 deletions(-) create mode 100644 dev-support/hippo4j_checkstyle.xml create mode 100644 dev-support/hippo4j_checkstyle_suppression.xml diff --git a/dev-support/hippo4j_checkstyle.xml b/dev-support/hippo4j_checkstyle.xml new file mode 100644 index 00000000..c45a921f --- /dev/null +++ b/dev-support/hippo4j_checkstyle.xml @@ -0,0 +1,130 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/dev-support/hippo4j_checkstyle_suppression.xml b/dev-support/hippo4j_checkstyle_suppression.xml new file mode 100644 index 00000000..ab55dae0 --- /dev/null +++ b/dev-support/hippo4j_checkstyle_suppression.xml @@ -0,0 +1,28 @@ + + + + + + + + + + + diff --git a/pom.xml b/pom.xml index 66f1ba0b..0ab7d6c6 100644 --- a/pom.xml +++ b/pom.xml @@ -7,6 +7,7 @@ ${revision} pom ${project.artifactId} + https://github.com/opengoofy/hippo4j Dynamic observable thread pool framework @@ -60,6 +61,7 @@ 1.8 true false + true false UTF-8 UTF-8 @@ -70,6 +72,7 @@ 3.0.2 3.0 2.22.1 + 3.1.0 @@ -81,104 +84,87 @@ pom import - com.squareup.okhttp3 okhttp ${okhttp3.version} - cn.hutool hutool-all ${hutool-all.version} - org.apache.commons commons-lang3 ${commons-lang3.version} - cn.hippo4j hippo4j-message ${revision} - cn.hippo4j hippo4j-core ${revision} - cn.hippo4j hippo4j-adapter-base ${revision} - com.baomidou mybatis-plus-boot-starter ${mybatis-plus.version} - com.github.dozermapper dozer-core ${dozer.version} - com.google.guava guava ${guava.version} - com.aliyun alibaba-dingtalk-service-sdk ${dingtalk-sdk.version} - com.alibaba transmittable-thread-local ${transmittable-thread-local.version} - org.hibernate.validator hibernate-validator ${hibernate-validator.version} - org.slf4j slf4j-api ${slf4j-api.version} - ch.qos.logback logback-core ${logback.version} - ch.qos.logback logback-classic ${logback.version} - org.springframework.boot spring-boot-starter-json ${spring-boot.version} compile - io.netty netty-all @@ -297,21 +283,6 @@ ${maven.multiModuleProjectDirectory}/dev-support/license-header - - - UTF-8 - 4 - true - false - true - true - false - false - custom_1 - false - false - - @@ -322,11 +293,33 @@ + + org.apache.maven.plugins + maven-checkstyle-plugin + ${maven-checkstyle-plugin.version} + + ${maven.multiModuleProjectDirectory}/dev-support/hippo4j_checkstyle.xml + ${maven.multiModuleProjectDirectory}/dev-support/hippo4j_checkstyle_suppression.xml + + false + true + UTF-8 + ${skip.checkstyle.check} + error + + + + validate + validate + + checkstyle + + + + - https://github.com/opengoofy/hippo4j - The Apache Software License, Version 2.0 From b5810ce296a8bd649496c191d2cf0ac59ecdfc2a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=B0=8F=E9=A9=AC=E5=93=A5?= Date: Wed, 5 Oct 2022 17:42:20 +0800 Subject: [PATCH 3/3] Update README.md --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 1190e364..2084e0da 100644 --- a/README.md +++ b/README.md @@ -28,7 +28,7 @@ Hippo-4J 通过对 JDK 线程池增强，以及扩展三方框架底层线程池 提供以下功能支持： -- 全局管控 - 管理应用线程池实例； +- 全局管控 - 管理应用线程池实例。 - 动态变更 - 应用运行时动态变更线程池参数，包括不限于：核心、最大线程数、阻塞队列容量、拒绝策略等。 - 通知报警 - 内置四种报警通知策略，线程池活跃度、容量水位、拒绝策略以及任务执行时间超长。 @@ -36,7 +36,7 @@ Hippo-4J 通过对 JDK 线程池增强，以及扩展三方框架底层线程池 - 功能扩展 - 支持线程池任务传递上下文；项目关闭时，支持等待线程池在指定时间内完成任务。 - 多种模式 - 内置两种使用模式：[依赖配置中心](https://hippo4j.cn/docs/user_docs/getting_started/config/hippo4j-config-start) 和 [无中间件依赖](https://hippo4j.cn/docs/user_docs/getting_started/server/hippo4j-server-start)。 - 容器管理 - Tomcat、Jetty、Undertow 容器线程池运行时查看和线程数变更。 -- 中间件适配 - Dubbo、Hystrix、RocketMQ、RabbitMQ 等消费线程池运行时数据查看和线程数变更。 +- 中间件适配 - Dubbo、Hystrix、Polaris、RabbitMQ、RocketMQ 等消费线程池运行时数据查看和线程数变更。 ## 快速开始