From bfbc13b9733079c4091ab363721e6072f19d4dc1 Mon Sep 17 00:00:00 2001 From: yanrongzhen Date: Fri, 24 Mar 2023 16:59:22 +0800 Subject: [PATCH] fix: remove 'isContainerStarted' conditional logic. --- .../web/DefaultAbstractWebThreadPoolService.java | 13 ------------- .../hippo4j/adapter/web/WebThreadPoolService.java | 5 ----- .../starter/web/AbstractWebThreadPoolService1x.java | 12 ------------ .../refresher/event/WebExecutorRefreshListener.java | 3 +-- 4 files changed, 1 insertion(+), 32 deletions(-) diff --git a/hippo4j-adapter/hippo4j-adapter-web/src/main/java/cn/hippo4j/adapter/web/DefaultAbstractWebThreadPoolService.java b/hippo4j-adapter/hippo4j-adapter-web/src/main/java/cn/hippo4j/adapter/web/DefaultAbstractWebThreadPoolService.java index 05c32866..e519c5b6 100644 --- a/hippo4j-adapter/hippo4j-adapter-web/src/main/java/cn/hippo4j/adapter/web/DefaultAbstractWebThreadPoolService.java +++ b/hippo4j-adapter/hippo4j-adapter-web/src/main/java/cn/hippo4j/adapter/web/DefaultAbstractWebThreadPoolService.java @@ -59,19 +59,6 @@ public abstract class DefaultAbstractWebThreadPoolService extends AbstractWebThr return getWebServer().getPort(); } - @Override - public boolean isContainerStarted() { - try { - WebServer container = getWebServer(); - Field field = ReflectionUtils.findField(WebServer.class, STARTED_FIELD_NAME); - ReflectionUtils.makeAccessible(field); - return (boolean) ReflectionUtils.getField(field, container); - } catch (Throwable th) { - log.error("Failed to get isStarted flag.", th); - return false; - } - } - /** * Get the thread pool object of the current web container based on the WebServer. * @param webServer current Web-Server. diff --git a/hippo4j-adapter/hippo4j-adapter-web/src/main/java/cn/hippo4j/adapter/web/WebThreadPoolService.java b/hippo4j-adapter/hippo4j-adapter-web/src/main/java/cn/hippo4j/adapter/web/WebThreadPoolService.java index f8cfccb8..082c890f 100644 --- a/hippo4j-adapter/hippo4j-adapter-web/src/main/java/cn/hippo4j/adapter/web/WebThreadPoolService.java +++ b/hippo4j-adapter/hippo4j-adapter-web/src/main/java/cn/hippo4j/adapter/web/WebThreadPoolService.java @@ -30,11 +30,6 @@ import java.util.concurrent.Executor; */ public interface WebThreadPoolService { - /** - * Determine if the web container has started. - */ - boolean isContainerStarted(); - /** * Get web thread pool. * diff --git a/hippo4j-spring-boot/hippo4j-config-spring-boot-1x-starter/src/main/java/cn/hippo4j/config/springboot1x/starter/web/AbstractWebThreadPoolService1x.java b/hippo4j-spring-boot/hippo4j-config-spring-boot-1x-starter/src/main/java/cn/hippo4j/config/springboot1x/starter/web/AbstractWebThreadPoolService1x.java index d3d5c8ab..148a5deb 100644 --- a/hippo4j-spring-boot/hippo4j-config-spring-boot-1x-starter/src/main/java/cn/hippo4j/config/springboot1x/starter/web/AbstractWebThreadPoolService1x.java +++ b/hippo4j-spring-boot/hippo4j-config-spring-boot-1x-starter/src/main/java/cn/hippo4j/config/springboot1x/starter/web/AbstractWebThreadPoolService1x.java @@ -54,16 +54,4 @@ public abstract class AbstractWebThreadPoolService1x extends AbstractWebThreadPo return getContainer().getPort(); } - @Override - public boolean isContainerStarted() { - try { - EmbeddedServletContainer container = getContainer(); - Field field = ReflectionUtils.findField(EmbeddedServletContainer.class, STARTED_FIELD_NAME); - ReflectionUtils.makeAccessible(field); - return (boolean) ReflectionUtils.getField(field, container); - } catch (Throwable th) { - log.error("Failed to get isStarted flag.", th); - return false; - } - } } diff --git a/hippo4j-spring-boot/hippo4j-config-spring-boot-starter/src/main/java/cn/hippo4j/config/springboot/starter/refresher/event/WebExecutorRefreshListener.java b/hippo4j-spring-boot/hippo4j-config-spring-boot-starter/src/main/java/cn/hippo4j/config/springboot/starter/refresher/event/WebExecutorRefreshListener.java index 9acad068..a7f9e60d 100644 --- a/hippo4j-spring-boot/hippo4j-config-spring-boot-starter/src/main/java/cn/hippo4j/config/springboot/starter/refresher/event/WebExecutorRefreshListener.java +++ b/hippo4j-spring-boot/hippo4j-config-spring-boot-starter/src/main/java/cn/hippo4j/config/springboot/starter/refresher/event/WebExecutorRefreshListener.java @@ -69,8 +69,7 @@ public class WebExecutorRefreshListener extends AbstractRefreshListener