From 47395354a42ecc7cd4c7ac03d8a5e7f565169433 Mon Sep 17 00:00:00 2001
From: furao <furao@didiglobal.com>
Date: Mon, 11 Sep 2023 21:25:17 +0800
Subject: [PATCH] merge & fix errors

---
 .../threadpool/dynamic/api/BootstrapPropertiesInterface.java    | 2 +-
 .../starter/web/undertow/UndertowWebThreadPoolHandler1x.java    | 2 +-
 .../web/undertow/DefaultUndertowWebThreadPoolHandler.java       | 2 +-
 .../web/undertow/UndertowWebThreadPoolHandlerSupport.java       | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/kernel/dynamic/api/src/main/java/cn/hippo4j/threadpool/dynamic/api/BootstrapPropertiesInterface.java b/kernel/dynamic/api/src/main/java/cn/hippo4j/threadpool/dynamic/api/BootstrapPropertiesInterface.java
index 2f47e414..110c3f5e 100644
--- a/kernel/dynamic/api/src/main/java/cn/hippo4j/threadpool/dynamic/api/BootstrapPropertiesInterface.java
+++ b/kernel/dynamic/api/src/main/java/cn/hippo4j/threadpool/dynamic/api/BootstrapPropertiesInterface.java
@@ -90,7 +90,7 @@ public interface BootstrapPropertiesInterface {
     /**
      * Get apollo.
      */
-    default  Map<String, String> getApollo(){
+    default Map<String, String> getApollo() {
         return null;
     }
 
diff --git a/starters/threadpool/config-spring-boot-1x/src/main/java/cn/hippo4j/config/springboot1x/starter/web/undertow/UndertowWebThreadPoolHandler1x.java b/starters/threadpool/config-spring-boot-1x/src/main/java/cn/hippo4j/config/springboot1x/starter/web/undertow/UndertowWebThreadPoolHandler1x.java
index b6b74ad0..4d10a79d 100644
--- a/starters/threadpool/config-spring-boot-1x/src/main/java/cn/hippo4j/config/springboot1x/starter/web/undertow/UndertowWebThreadPoolHandler1x.java
+++ b/starters/threadpool/config-spring-boot-1x/src/main/java/cn/hippo4j/config/springboot1x/starter/web/undertow/UndertowWebThreadPoolHandler1x.java
@@ -18,8 +18,8 @@
 package cn.hippo4j.config.springboot1x.starter.web.undertow;
 
 import cn.hippo4j.adapter.web.undertow.UndertowWebThreadPoolHandlerSupport;
+import cn.hippo4j.common.support.AbstractThreadPoolRuntime;
 import cn.hippo4j.config.springboot1x.starter.web.AbstractWebThreadPoolService1x;
-import cn.hippo4j.core.executor.state.AbstractThreadPoolRuntime;
 import io.undertow.Undertow;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.boot.context.embedded.undertow.UndertowEmbeddedServletContainer;
diff --git a/threadpool/adapter/web/src/main/java/cn/hippo4j/adapter/web/undertow/DefaultUndertowWebThreadPoolHandler.java b/threadpool/adapter/web/src/main/java/cn/hippo4j/adapter/web/undertow/DefaultUndertowWebThreadPoolHandler.java
index 9e607b51..78fe89da 100644
--- a/threadpool/adapter/web/src/main/java/cn/hippo4j/adapter/web/undertow/DefaultUndertowWebThreadPoolHandler.java
+++ b/threadpool/adapter/web/src/main/java/cn/hippo4j/adapter/web/undertow/DefaultUndertowWebThreadPoolHandler.java
@@ -17,12 +17,12 @@
 
 package cn.hippo4j.adapter.web.undertow;
 
-import cn.hippo4j.core.executor.state.AbstractThreadPoolRuntime;
 import java.lang.reflect.Field;
 import java.util.Objects;
 import java.util.concurrent.Executor;
 
 import cn.hippo4j.adapter.web.DefaultAbstractWebThreadPoolService;
+import cn.hippo4j.common.support.AbstractThreadPoolRuntime;
 import io.undertow.Undertow;
 import lombok.extern.slf4j.Slf4j;
 
diff --git a/threadpool/adapter/web/src/main/java/cn/hippo4j/adapter/web/undertow/UndertowWebThreadPoolHandlerSupport.java b/threadpool/adapter/web/src/main/java/cn/hippo4j/adapter/web/undertow/UndertowWebThreadPoolHandlerSupport.java
index 31c533f7..7fdf5c14 100644
--- a/threadpool/adapter/web/src/main/java/cn/hippo4j/adapter/web/undertow/UndertowWebThreadPoolHandlerSupport.java
+++ b/threadpool/adapter/web/src/main/java/cn/hippo4j/adapter/web/undertow/UndertowWebThreadPoolHandlerSupport.java
@@ -24,10 +24,10 @@ import cn.hippo4j.common.model.ThreadPoolBaseInfo;
 import cn.hippo4j.common.model.ThreadPoolParameter;
 import cn.hippo4j.common.model.ThreadPoolParameterInfo;
 import cn.hippo4j.common.model.ThreadPoolRunStateInfo;
+import cn.hippo4j.common.support.AbstractThreadPoolRuntime;
 import cn.hippo4j.common.toolkit.CalculateUtil;
 import cn.hippo4j.common.toolkit.ReflectUtil;
 import cn.hippo4j.core.executor.DynamicThreadPoolExecutor;
-import cn.hippo4j.core.executor.state.AbstractThreadPoolRuntime;
 import lombok.extern.slf4j.Slf4j;
 import org.jboss.threads.EnhancedQueueExecutor;
 import org.springframework.util.ReflectionUtils;