Merge pull request #353 from shining-stars-lk/develop

Fixed web container thread pool adaptation issues

hippo4j-spring-boot/hippo4j-spring-boot-starter-adapter/hippo4j-spring-boot-starter-adapter-web/pom.xml

@@ -14,9 +14,22 @@
             <groupId>cn.hippo4j</groupId>
             <artifactId>hippo4j-adapter-web</artifactId>
         </dependency>
+
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-tomcat</artifactId>
+            <optional>true</optional>
+        </dependency>
+
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-jetty</artifactId>
+            <optional>true</optional>
+        </dependency>
+
         <dependency>
             <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-web</artifactId>
+            <artifactId>spring-boot-starter-undertow</artifactId>
             <optional>true</optional>
         </dependency>
     </dependencies>

hippo4j-spring-boot/hippo4j-spring-boot-starter-adapter/hippo4j-spring-boot-starter-adapter-web/src/main/java/cn/hippo4j/springboot/starter/adapter/web/WebAdapterAutoConfiguration.java

@@ -22,31 +22,22 @@ import cn.hippo4j.common.config.ApplicationContextHolder;
 import cn.hippo4j.core.executor.state.ThreadPoolRunStateHandler;
 import cn.hippo4j.core.toolkit.inet.InetUtils;
 import lombok.RequiredArgsConstructor;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
-import org.springframework.boot.autoconfigure.condition.SearchStrategy;
-import org.springframework.boot.web.servlet.server.ServletWebServerFactory;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.Import;
 import org.springframework.core.env.ConfigurableEnvironment;
 
-import javax.servlet.Servlet;
-
-import org.apache.catalina.startup.Tomcat;
-import org.apache.coyote.UpgradeProtocol;
-
 /**
  * Web adapter auto configuration.
  */
 @Configuration
+@Import({WebThreadPoolHandlerConfiguration.EmbeddedTomcat.class,
+        WebThreadPoolHandlerConfiguration.EmbeddedJetty.class,
+        WebThreadPoolHandlerConfiguration.EmbeddedUndertow.class})
 @RequiredArgsConstructor
 public class WebAdapterAutoConfiguration {
 
-    private static final String JETTY_SERVLET_WEB_SERVER_FACTORY = "JettyServletWebServerFactory";
-
-    private static final String UNDERTOW_SERVLET_WEB_SERVER_FACTORY = "undertowServletWebServerFactory";
-
     private final ConfigurableEnvironment environment;
 
     @Bean
@@ -66,30 +57,6 @@ public class WebAdapterAutoConfiguration {
         return new ThreadPoolRunStateHandler(hippo4JInetUtils, environment);
     }
 
-    /**
-     * Refer to the Tomcat loading source code .
-     * This load is performed if the {@link Tomcat} class exists and
-     * the Web embedded server loads the {@link ServletWebServerFactory} top-level interface type at the same time
-     */
-    @Bean
-    @ConditionalOnClass({Servlet.class, Tomcat.class, UpgradeProtocol.class})
-    @ConditionalOnBean(value = ServletWebServerFactory.class, search = SearchStrategy.CURRENT)
-    public TomcatWebThreadPoolHandler tomcatWebThreadPoolHandler(WebThreadPoolRunStateHandler webThreadPoolRunStateHandler) {
-        return new TomcatWebThreadPoolHandler(webThreadPoolRunStateHandler);
-    }
-
-    @Bean
-    @ConditionalOnBean(name = JETTY_SERVLET_WEB_SERVER_FACTORY)
-    public JettyWebThreadPoolHandler jettyWebThreadPoolHandler() {
-        return new JettyWebThreadPoolHandler();
-    }
-
-    @Bean
-    @ConditionalOnBean(name = UNDERTOW_SERVLET_WEB_SERVER_FACTORY)
-    public UndertowWebThreadPoolHandler undertowWebThreadPoolHandler() {
-        return new UndertowWebThreadPoolHandler();
-    }
-
     @Bean
     public WebThreadPoolHandlerChoose webThreadPoolServiceChoose() {
         return new WebThreadPoolHandlerChoose();

hippo4j-spring-boot/hippo4j-spring-boot-starter-adapter/hippo4j-spring-boot-starter-adapter-web/src/main/java/cn/hippo4j/springboot/starter/adapter/web/WebThreadPoolHandlerConfiguration.java

@@ -0,0 +1,93 @@
+/*
+ * 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.springboot.starter.adapter.web;
+
+import cn.hippo4j.adapter.web.JettyWebThreadPoolHandler;
+import cn.hippo4j.adapter.web.TomcatWebThreadPoolHandler;
+import cn.hippo4j.adapter.web.UndertowWebThreadPoolHandler;
+import cn.hippo4j.adapter.web.WebThreadPoolRunStateHandler;
+import org.apache.catalina.startup.Tomcat;
+import org.apache.coyote.UpgradeProtocol;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
+import org.springframework.boot.autoconfigure.condition.SearchStrategy;
+import org.springframework.boot.web.servlet.server.ServletWebServerFactory;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.eclipse.jetty.server.Server;
+import org.eclipse.jetty.util.Loader;
+import org.eclipse.jetty.webapp.WebAppContext;
+import io.undertow.Undertow;
+import org.xnio.SslClientAuthMode;
+
+import javax.servlet.Servlet;
+
+/**
+ * Web Thread Pool Handler Configuration
+ **/
+@Configuration(proxyBeanMethods = false)
+public class WebThreadPoolHandlerConfiguration {
+
+    @Configuration(proxyBeanMethods = false)
+    @ConditionalOnClass({Servlet.class, Tomcat.class, UpgradeProtocol.class})
+    @ConditionalOnBean(value = ServletWebServerFactory.class, search = SearchStrategy.CURRENT)
+    static class EmbeddedTomcat {
+
+        /**
+         * Refer to the Tomcat loading source code .
+         * This load is performed if the {@link Tomcat} class exists and
+         * the Web embedded server loads the {@link ServletWebServerFactory} top-level interface type at the same time
+         */
+        @Bean
+        public TomcatWebThreadPoolHandler tomcatWebThreadPoolHandler(WebThreadPoolRunStateHandler webThreadPoolRunStateHandler) {
+            return new TomcatWebThreadPoolHandler(webThreadPoolRunStateHandler);
+        }
+    }
+
+    @Configuration(proxyBeanMethods = false)
+    @ConditionalOnClass({Servlet.class, Server.class, Loader.class, WebAppContext.class})
+    @ConditionalOnBean(value = ServletWebServerFactory.class, search = SearchStrategy.CURRENT)
+    static class EmbeddedJetty {
+
+        /**
+         * Refer to the Server loading source code .
+         * This load is performed if the {@link Server} class exists and
+         * the Web embedded server loads the {@link ServletWebServerFactory} top-level interface type at the same time
+         */
+        @Bean
+        public JettyWebThreadPoolHandler jettyWebThreadPoolHandler() {
+            return new JettyWebThreadPoolHandler();
+        }
+    }
+
+    @Configuration(proxyBeanMethods = false)
+    @ConditionalOnClass({Servlet.class, Undertow.class, SslClientAuthMode.class})
+    @ConditionalOnBean(value = ServletWebServerFactory.class, search = SearchStrategy.CURRENT)
+    static class EmbeddedUndertow {
+
+        /**
+         * Refer to the Undertow loading source code .
+         * This load is performed if the {@link Undertow} class exists and
+         * the Web embedded server loads the {@link ServletWebServerFactory} top-level interface type at the same time
+         */
+        @Bean
+        public UndertowWebThreadPoolHandler undertowWebThreadPoolHandler() {
+            return new UndertowWebThreadPoolHandler();
+        }
+    }
+}