listThreadPoolId() {
return new ArrayList<>(EXECUTOR_MAP.keySet());
@@ -128,11 +128,10 @@ public class GlobalThreadPoolManage {
/**
* Get the number of dynamic thread pools.
- *
- * The data may be inaccurate when the project is initially
+ *
The data may be inaccurate when the project is initially
* launched because registration is done asynchronously.
*
- * @return
+ * @return thread-pool num
*/
public static Integer getThreadPoolNum() {
return listThreadPoolId().size();
diff --git a/hippo4j-server/hippo4j-bootstrap/src/main/resources/application-h2.properties b/hippo4j-server/hippo4j-bootstrap/src/main/resources/application-h2.properties
index b4bdea1c..67d0d7f8 100644
--- a/hippo4j-server/hippo4j-bootstrap/src/main/resources/application-h2.properties
+++ b/hippo4j-server/hippo4j-bootstrap/src/main/resources/application-h2.properties
@@ -4,6 +4,6 @@ hippo4j.database.init_enable=true
hippo4j.database.init_script=sql-script/h2/hippo4j_manager.sql
spring.datasource.driver-class-name=org.h2.Driver
-spring.datasource.url=jdbc:h2:file:{your storage address}/h2_hippo4j_test_file;DB_CLOSE_DELAY=-1;DATABASE_TO_UPPER=false;MODE=MYSQL;
+spring.datasource.url=jdbc:h2:file:${HOME:${HOMEDRIVE}${HOMEPATH}}/h2_hippo4j_test_file;DB_CLOSE_DELAY=-1;DATABASE_TO_UPPER=false;MODE=MYSQL;
spring.datasource.username=sa
spring.datasource.password=sa
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 8d20fc64..b5d667a0 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
@@ -109,7 +109,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);
diff --git a/hippo4j-server/hippo4j-config/src/test/java/cn/hippo4j/config/event/LocalDataChangeEventTest.java b/hippo4j-server/hippo4j-config/src/test/java/cn/hippo4j/config/event/LocalDataChangeEventTest.java
new file mode 100644
index 00000000..dede0223
--- /dev/null
+++ b/hippo4j-server/hippo4j-config/src/test/java/cn/hippo4j/config/event/LocalDataChangeEventTest.java
@@ -0,0 +1,32 @@
+/*
+ * 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 cn.hippo4j.common.toolkit.Assert;
+import cn.hippo4j.common.toolkit.StringUtil;
+import org.junit.Test;
+
+public final class LocalDataChangeEventTest {
+
+ @Test
+ public void assertGetSingleton() {
+ LocalDataChangeEvent localDataChangeEvent = new LocalDataChangeEvent("groupKey", "identify");
+ Assert.isTrue(StringUtil.isNotEmpty(localDataChangeEvent.groupKey));
+ Assert.isTrue(StringUtil.isNotEmpty(localDataChangeEvent.identify));
+ }
+}
diff --git a/hippo4j-spring-boot/hippo4j-config-spring-boot-starter/src/main/java/cn/hippo4j/config/springboot/starter/refresher/event/DynamicThreadPoolRefreshListener.java b/hippo4j-spring-boot/hippo4j-config-spring-boot-starter/src/main/java/cn/hippo4j/config/springboot/starter/refresher/event/DynamicThreadPoolRefreshListener.java
index f2569c7e..8f1e4a3b 100644
--- a/hippo4j-spring-boot/hippo4j-config-spring-boot-starter/src/main/java/cn/hippo4j/config/springboot/starter/refresher/event/DynamicThreadPoolRefreshListener.java
+++ b/hippo4j-spring-boot/hippo4j-config-spring-boot-starter/src/main/java/cn/hippo4j/config/springboot/starter/refresher/event/DynamicThreadPoolRefreshListener.java
@@ -102,10 +102,18 @@ public class DynamicThreadPoolRefreshListener extends AbstractRefreshListener Optional.ofNullable(configProperties.getDefaultExecutor()).map(each -> each.getAlarm()).orElse(true));
+ .orElseGet(() -> Optional.ofNullable(configProperties.getDefaultExecutor()).map(ExecutorProperties::getAlarm).orElse(true));
int activeAlarm = Optional.ofNullable(executorProperties.getActiveAlarm())
- .orElseGet(() -> Optional.ofNullable(configProperties.getDefaultExecutor()).map(each -> each.getActiveAlarm()).orElse(80));
+ .orElseGet(() -> Optional.ofNullable(configProperties.getDefaultExecutor()).map(ExecutorProperties::getActiveAlarm).orElse(80));
int capacityAlarm = Optional.ofNullable(executorProperties.getCapacityAlarm())
- .orElseGet(() -> Optional.ofNullable(configProperties.getDefaultExecutor()).map(each -> each.getCapacityAlarm()).orElse(80));
+ .orElseGet(() -> Optional.ofNullable(configProperties.getDefaultExecutor()).map(ExecutorProperties::getCapacityAlarm).orElse(80));
int interval = Optional.ofNullable(notify)
- .map(each -> each.getInterval())
- .orElseGet(() -> Optional.ofNullable(configProperties.getDefaultExecutor()).map(each -> each.getNotify()).map(each -> each.getInterval()).orElse(5));
+ .map(DynamicThreadPoolNotifyProperties::getInterval)
+ .orElseGet(() -> Optional.ofNullable(configProperties.getDefaultExecutor()).map(ExecutorProperties::getNotify).map(DynamicThreadPoolNotifyProperties::getInterval).orElse(5));
String receive = Optional.ofNullable(notify)
- .map(each -> each.getReceives())
- .orElseGet(() -> Optional.ofNullable(configProperties.getDefaultExecutor()).map(each -> each.getNotify()).map(each -> each.getReceives()).orElse(""));
+ .map(DynamicThreadPoolNotifyProperties::getReceives)
+ .orElseGet(() -> Optional.ofNullable(configProperties.getDefaultExecutor()).map(ExecutorProperties::getNotify).map(DynamicThreadPoolNotifyProperties::getReceives).orElse(""));
ThreadPoolNotifyAlarm threadPoolNotifyAlarm = new ThreadPoolNotifyAlarm(isAlarm, activeAlarm, capacityAlarm);
threadPoolNotifyAlarm.setInterval(interval);
threadPoolNotifyAlarm.setReceives(receive);
diff --git a/hippo4j-spring-boot/hippo4j-spring-boot-starter/src/main/java/cn/hippo4j/springboot/starter/core/DynamicThreadPoolSubscribeConfig.java b/hippo4j-spring-boot/hippo4j-spring-boot-starter/src/main/java/cn/hippo4j/springboot/starter/core/DynamicThreadPoolSubscribeConfig.java
index 6e57b6f4..5a087427 100644
--- a/hippo4j-spring-boot/hippo4j-spring-boot-starter/src/main/java/cn/hippo4j/springboot/starter/core/DynamicThreadPoolSubscribeConfig.java
+++ b/hippo4j-spring-boot/hippo4j-spring-boot-starter/src/main/java/cn/hippo4j/springboot/starter/core/DynamicThreadPoolSubscribeConfig.java
@@ -53,7 +53,7 @@ public class DynamicThreadPoolSubscribeConfig {
.build();
public void subscribeConfig(String threadPoolId) {
- subscribeConfig(threadPoolId, config -> threadPoolDynamicRefresh.dynamicRefresh(config));
+ subscribeConfig(threadPoolId, threadPoolDynamicRefresh::dynamicRefresh);
}
public void subscribeConfig(String threadPoolId, ThreadPoolSubscribeCallback threadPoolSubscribeCallback) {
diff --git a/hippo4j-spring-boot/hippo4j-spring-boot-starter/src/main/java/cn/hippo4j/springboot/starter/support/DynamicThreadPoolPostProcessor.java b/hippo4j-spring-boot/hippo4j-spring-boot-starter/src/main/java/cn/hippo4j/springboot/starter/support/DynamicThreadPoolPostProcessor.java
index d0105a68..82339e31 100644
--- a/hippo4j-spring-boot/hippo4j-spring-boot-starter/src/main/java/cn/hippo4j/springboot/starter/support/DynamicThreadPoolPostProcessor.java
+++ b/hippo4j-spring-boot/hippo4j-spring-boot-starter/src/main/java/cn/hippo4j/springboot/starter/support/DynamicThreadPoolPostProcessor.java
@@ -131,7 +131,6 @@ public final class DynamicThreadPoolPostProcessor implements BeanPostProcessor {
queryStrMap.put(TP_ID, threadPoolId);
queryStrMap.put(ITEM_ID, properties.getItemId());
queryStrMap.put(NAMESPACE, properties.getNamespace());
- boolean isSubscribe = false;
ThreadPoolExecutor newDynamicThreadPoolExecutor = null;
ThreadPoolParameterInfo threadPoolParameterInfo = new ThreadPoolParameterInfo();
try {
@@ -168,7 +167,6 @@ public final class DynamicThreadPoolPostProcessor implements BeanPostProcessor {
((DynamicThreadPoolExecutor) newDynamicThreadPoolExecutor).setExecuteTimeOut(executeTimeOut);
}
dynamicThreadPoolWrapper.setExecutor(newDynamicThreadPoolExecutor);
- isSubscribe = true;
}
} else {
// DynamicThreadPool configuration undefined in server
@@ -198,8 +196,6 @@ public final class DynamicThreadPoolPostProcessor implements BeanPostProcessor {
if (Objects.isNull(executor)) {
dynamicThreadPoolWrapper.setExecutor(CommonDynamicThreadPool.getInstance(threadPoolId));
}
- // Set whether to subscribe to the remote thread pool configuration.
- dynamicThreadPoolWrapper.setSubscribeFlag(isSubscribe);
}
GlobalThreadPoolManage.register(dynamicThreadPoolWrapper.getThreadPoolId(), threadPoolParameterInfo, dynamicThreadPoolWrapper);
return newDynamicThreadPoolExecutor;
diff --git a/lombok.config b/lombok.config
new file mode 100644
index 00000000..6bdcc5ab
--- /dev/null
+++ b/lombok.config
@@ -0,0 +1,20 @@
+#
+# 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.
+#
+
+# this config is to ignore lombok code in jacoco
+config.stopBubbling = true
+lombok.addLombokGeneratedAnnotation = true
diff --git a/pom.xml b/pom.xml
index a0ecc5dc..2973722a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -80,8 +80,10 @@
true
false
true
+ true
false
UTF-8
+ 0.8.8
UTF-8
UTF-8
3.6.1
@@ -334,6 +336,28 @@
+
+ org.jacoco
+ jacoco-maven-plugin
+ ${jacoco-maven-plugin.version}
+
+ ${skip.jacoco.plugin}
+
+
+
+
+ prepare-agent
+
+
+
+ report
+
+ report
+
+ test
+
+
+
+