From aee8f5326c04e6ab36bbe31f1a57162fc15d4416 Mon Sep 17 00:00:00 2001 From: yanrongzhen Date: Tue, 21 Mar 2023 16:26:21 +0800 Subject: [PATCH] Revert the bugfix changes and split them into issue #1134. --- .../DefaultAbstractWebThreadPoolService.java | 20 ------------------- .../adapter/web/WebThreadPoolService.java | 5 ----- .../web/AbstractWebThreadPoolService1x.java | 20 ------------------- .../event/WebExecutorRefreshListener.java | 5 +---- 4 files changed, 1 insertion(+), 49 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 6f14b28a..ebb98f0e 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 @@ -18,29 +18,22 @@ package cn.hippo4j.adapter.web; import cn.hippo4j.common.config.ApplicationContextHolder; -import io.undertow.Undertow; -import lombok.extern.slf4j.Slf4j; import org.springframework.boot.web.context.WebServerApplicationContext; import org.springframework.boot.web.server.WebServer; import org.springframework.context.ApplicationContext; -import org.springframework.util.ReflectionUtils; -import java.lang.reflect.Field; import java.util.concurrent.Executor; /** * Default WebThreadPoolService abstract class, * reuses common capabilities for web container operations. */ -@Slf4j public abstract class DefaultAbstractWebThreadPoolService extends AbstractWebThreadPoolService { public DefaultAbstractWebThreadPoolService(IWebThreadPoolHandlerSupport support) { super(support); } - private static final String STARTED_FIELD_NAME = "started"; - /** * Get the internal abstract method of the web container thread pool, * to be implemented by subclasses. @@ -60,19 +53,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..333a4d07 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 @@ -20,25 +20,18 @@ package cn.hippo4j.config.springboot1x.starter.web; import cn.hippo4j.adapter.web.AbstractWebThreadPoolService; import cn.hippo4j.adapter.web.IWebThreadPoolHandlerSupport; import cn.hippo4j.common.config.ApplicationContextHolder; -import lombok.extern.slf4j.Slf4j; import org.springframework.boot.context.embedded.EmbeddedServletContainer; import org.springframework.boot.context.embedded.EmbeddedWebApplicationContext; -import org.springframework.util.ReflectionUtils; - -import java.lang.reflect.Field; /** * Abstract class for adapting WebThreadPoolService to Spring 1.x version. */ -@Slf4j public abstract class AbstractWebThreadPoolService1x extends AbstractWebThreadPoolService { public AbstractWebThreadPoolService1x(IWebThreadPoolHandlerSupport support) { super(support); } - private static final String STARTED_FIELD_NAME = "started"; - /** * Get the embedded Servlet container from the Spring application context. */ @@ -53,17 +46,4 @@ public abstract class AbstractWebThreadPoolService1x extends AbstractWebThreadPo public Integer getPort() { 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 bfe1257b..38205b45 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 @@ -25,8 +25,6 @@ import cn.hippo4j.common.model.ThreadPoolParameter; import cn.hippo4j.common.model.ThreadPoolParameterInfo; import cn.hippo4j.config.springboot.starter.config.BootstrapConfigProperties; import cn.hippo4j.config.springboot.starter.config.WebExecutorProperties; -import cn.hippo4j.message.enums.NotifyTypeEnum; -import cn.hippo4j.message.request.ChangeParameterNotifyRequest; import cn.hippo4j.message.request.WebChangeParameterNotifyRequest; import lombok.extern.slf4j.Slf4j; import org.springframework.core.annotation.Order; @@ -79,8 +77,7 @@ public class WebExecutorRefreshListener extends AbstractRefreshListener