[#11] 实现收集所有controller，抽象出dispatch handler

Author: fzdwx

sky-http-springboot-starter/src/main/java/sky/SkyHttpServerAutoConfiguration.java

@@ -1,19 +1,23 @@
 package sky;
 
+import http.HttpServer;
+import io.github.fzdwx.lambada.http.Router;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
 import org.springframework.boot.autoconfigure.web.servlet.DispatcherServletPath;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
-import org.springframework.boot.web.servlet.server.AbstractServletWebServerFactory;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Primary;
+import org.springframework.web.method.HandlerMethod;
 import org.springframework.web.servlet.config.annotation.WebMvcConfigurationSupport;
-import sky.starter.HandlerMappingContainer;
 import sky.starter.SkyHandlerMappingContainer;
 import sky.starter.SkyWebServer;
 import sky.starter.SkyWebServerFactory;
+import sky.starter.ext.HandlerMappingContainer;
 import sky.starter.ext.SkyBanner;
 import sky.starter.props.SkyHttpServerProps;
+import sky.starter.unsupport.DispatchHandler;
 import sky.starter.unsupport.SkyDispatcherServletPath;
 import sky.starter.unsupport.SkyServletContext;
 
@@ -42,17 +46,62 @@ public SkyHttpServerAutoConfiguration(final SkyHttpServerProps skyHttpServerProp
      * sky web server factory.
      */
     @Bean
-    AbstractServletWebServerFactory abstractServletWebServerFactory(WebMvcConfigurationSupport webMvcConfigurationSupport) {
+    @ConditionalOnMissingBean
+    SkyWebServerFactory SkyWebServerFactory(
+            WebMvcConfigurationSupport webMvcConfigurationSupport,
+            HttpServer httpServer) {
         webMvcConfigurationSupport.setServletContext(servletContext());
-        return new SkyWebServerFactory(skyHttpServerProps.port);
+        return new SkyWebServerFactory(skyHttpServerProps.port, httpServer, skyHttpServerProps);
     }
 
     /**
      * handler mapping container.
      */
     @Bean
-    HandlerMappingContainer<?> container() {
-        return new SkyHandlerMappingContainer(skyHttpServerProps);
+    @ConditionalOnMissingBean
+    HandlerMappingContainer<?> container(Router<HandlerMethod> router) {
+        return new SkyHandlerMappingContainer(skyHttpServerProps, router);
+    }
+
+    /**
+     * dispatch handler.
+     *
+     * @param router router
+     * @return {@link DispatchHandler }
+     */
+    @Bean
+    @ConditionalOnMissingBean
+    DispatchHandler dispatchHandler(
+            Router<HandlerMethod> router) {
+        return new DispatchHandler(router);
+    }
+
+    /**
+     * router.
+     * <p>
+     * Save the processor corresponding to the route.
+     *
+     * @return {@link Router }<{@link HandlerMethod }>
+     */
+    @Bean
+    @ConditionalOnMissingBean
+    Router<HandlerMethod> router() {
+        return Router.router();
+    }
+
+    /**
+     * http server
+     *
+     * @param dispatchHandler dispatchHandler
+     * @return {@link HttpServer }
+     */
+    @Bean
+    @ConditionalOnMissingBean
+    HttpServer httpServer(
+            DispatchHandler dispatchHandler) {
+        // TODO: 2022/5/18 customize exception handler
+        return HttpServer.create()
+                .handle(dispatchHandler);
     }
 
     /**

sky-http-springboot-starter/src/main/java/sky/starter/HandlerChecker.java

@@ -1,6 +1,5 @@
 package sky.starter;
 
-import io.github.fzdwx.lambada.http.HttpMethod;
 import io.github.fzdwx.lambada.http.Router;
 import org.springframework.util.ObjectUtils;
 import org.springframework.util.StringUtils;
@@ -96,9 +95,7 @@ public SkyHandlerInfo combine(final SkyHandlerInfo other) {
     public void addToRouter(final Router<HandlerMethod> router, final HandlerMethod handlerMethod) {
         patterns.forEach(pattern -> {
             for (final RequestMethod method : this.methods) {
-                final HttpMethod of = HttpMethod.of(method.name());
-                // TODO: 2022/5/18
-                // router.addRoute(of, pattern, handlerMethod);
+                router.addRoute(method.name(), pattern.getPatternString(), handlerMethod);
             }
         });
     }

sky-http-springboot-starter/src/main/java/sky/starter/SkyHandlerInfo.java

@@ -7,22 +7,25 @@
 import org.springframework.lang.Nullable;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.method.HandlerMethod;
+import sky.starter.ext.HandlerMappingContainer;
 import sky.starter.props.SkyHttpServerProps;
 
 import java.lang.reflect.AnnotatedElement;
 import java.lang.reflect.Method;
 
 /**
+ * sky http handler container.
+ *
  * @author <a href="mailto:likelovec@gmail.com">fzdwx</a>
  * @date 2022/5/17 22:04
  */
 public class SkyHandlerMappingContainer extends HandlerMappingContainer<SkyHandlerInfo> {
 
     final Router<HandlerMethod> router;
 
-    public SkyHandlerMappingContainer(final SkyHttpServerProps skyHttpServerProps) {
+    public SkyHandlerMappingContainer(final SkyHttpServerProps skyHttpServerProps, final Router<HandlerMethod> router) {
         super(skyHttpServerProps);
-        this.router = Router.router();
+        this.router = router;
     }
 
     @Override
@@ -46,7 +49,6 @@ protected HttpHandler getHandler(final HttpServerRequest request) {
     protected void registerHandlerMethod(final Object handler, final Method method, final SkyHandlerInfo mapping) {
         final HandlerMethod handlerMethod = createHandlerMethod(handler, method);
         mapping.addToRouter(router, handlerMethod);
-        System.out.println("44");
     }
 
     protected String[] resolveEmbeddedValuesInPatterns(String[] patterns) {

sky-http-springboot-starter/src/main/java/sky/starter/SkyHandlerMapping.java

@@ -1,32 +1,45 @@
 package sky.starter;
 
 import http.HttpServer;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.boot.web.server.WebServer;
 import org.springframework.boot.web.server.WebServerException;
+import sky.starter.props.SkyHttpServerProps;
+
+import static sky.starter.ext.Utils.DEBUG_PREFIX;
 
 /**
  * @author <a href="mailto:likelovec@gmail.com">fzdwx</a>
  * @date 2022/5/16 21:00
  */
+@Slf4j
 public class SkyWebServer implements WebServer {
 
     private final HttpServer server;
-
     private final int port;
+    private final SkyHttpServerProps skyHttpServerProps;
+
 
-    public SkyWebServer(final HttpServer server, final int port) {
+    public SkyWebServer(final HttpServer server, final int port, final SkyHttpServerProps skyHttpServerProps) {
         this.server = server;
         this.port = port;
+        this.skyHttpServerProps = skyHttpServerProps;
     }
 
     @Override
     public void start() throws WebServerException {
+        if (skyHttpServerProps.enableDebug()) {
+            log.info(DEBUG_PREFIX + "start SkyHttpServer");
+        }
         server.listen(getPort());
     }
 
     @Override
     public void stop() throws WebServerException {
-        // server.dispose();
+        if (skyHttpServerProps.enableDebug()) {
+            log.info(DEBUG_PREFIX + "stop SkyHttpServer");
+        }
+        server.close();
     }
 
     @Override

sky-http-springboot-starter/src/main/java/sky/starter/SkyHandlerMappingContainer.java

@@ -7,6 +7,7 @@
 import org.springframework.boot.web.servlet.server.AbstractServletWebServerFactory;
 import org.springframework.context.ResourceLoaderAware;
 import org.springframework.core.io.ResourceLoader;
+import sky.starter.props.SkyHttpServerProps;
 
 /**
  * //ServletWebServerFactoryConfiguration
@@ -16,11 +17,17 @@
  */
 public class SkyWebServerFactory extends AbstractServletWebServerFactory implements ConfigurableWebServerFactory, ResourceLoaderAware {
 
+    private SkyHttpServerProps skyHttpServerProps;
+    private HttpServer httpServer;
+
     public SkyWebServerFactory() {
+        this.httpServer = HttpServer.create();
     }
 
-    public SkyWebServerFactory(int port) {
+    public SkyWebServerFactory(int port, HttpServer httpServer, SkyHttpServerProps skyHttpServerProps) {
         super(port);
+        this.httpServer = httpServer;
+        this.skyHttpServerProps = skyHttpServerProps;
     }
 
     public SkyWebServerFactory(String contextPath, int port) {
@@ -38,7 +45,7 @@ public void setResourceLoader(final ResourceLoader resourceLoader) {
     }
 
     private SkyWebServer getSkyWebServer(final ServletContextInitializer[] initializers) {
-        return new SkyWebServer(HttpServer.create(), getPort());
+        return new SkyWebServer(httpServer, getPort(), skyHttpServerProps);
     }
 
 }