[#11] Update 参数解析器以及响应处理器的容器

Author: fzdwx

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

@@ -1,7 +1,6 @@
 package sky;
 
 import http.HttpServer;
-import io.github.fzdwx.lambada.Collections;
 import io.github.fzdwx.lambada.http.Router;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
@@ -11,24 +10,23 @@
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Primary;
 import org.springframework.web.servlet.config.annotation.WebMvcConfigurationSupport;
-import sky.starter.DispatchHandler;
-import sky.starter.SkyHandlerMappingContainer;
-import sky.starter.SkyWebServer;
-import sky.starter.SkyWebServerFactory;
+import sky.starter.bean.DispatchHandler;
+import sky.starter.bean.RequestArgumentResolverContainer;
+import sky.starter.bean.RequestResultHandlerContainer;
+import sky.starter.bean.SkyHandlerMappingContainer;
+import sky.starter.bean.SkyWebServer;
+import sky.starter.bean.SkyWebServerFactory;
 import sky.starter.domain.SkyRouteDefinition;
 import sky.starter.ext.EveryRequestResultHandler;
 import sky.starter.ext.HandlerMappingContainer;
 import sky.starter.ext.PathVariableResolver;
-import sky.starter.ext.RequestArgumentResolver;
-import sky.starter.ext.RequestResultHandler;
 import sky.starter.ext.ResponseBodyRequestResultHandler;
 import sky.starter.props.SkyHttpServerProps;
 import sky.starter.unsupport.SkyDispatcherServletPath;
 import sky.starter.unsupport.SkyServletContext;
 import sky.starter.util.SkyBanner;
 
 import javax.servlet.ServletContext;
-import java.util.List;
 
 /**
  * sky http server auto configuration.
@@ -54,34 +52,25 @@ public SkyHttpServerAutoConfiguration(final SkyHttpServerProps skyHttpServerProp
      */
     @Bean
     @ConditionalOnMissingBean
-    SkyWebServerFactory SkyWebServerFactory(
-            WebMvcConfigurationSupport webMvcConfigurationSupport,
-            HttpServer httpServer,
-            DispatchHandler dispatchHandler) {
+    SkyWebServerFactory SkyWebServerFactory(WebMvcConfigurationSupport webMvcConfigurationSupport, HttpServer httpServer,
+                                            DispatchHandler dispatchHandler) {
 
         webMvcConfigurationSupport.setServletContext(servletContext());
 
-        return new SkyWebServerFactory(
-                httpServer,
-                skyHttpServerProps,
-                dispatchHandler);
+        return new SkyWebServerFactory(httpServer, skyHttpServerProps, dispatchHandler);
     }
 
     @Bean
-    @ConditionalOnMissingBean
-    List<RequestResultHandler> resultHandlers() {
-        return Collections.list(
-                new ResponseBodyRequestResultHandler(),
-                new EveryRequestResultHandler()
-        );
+    RequestArgumentResolverContainer requestArgumentResolverContainer() {
+        return new RequestArgumentResolverContainer()
+                .add(new PathVariableResolver());
     }
 
     @Bean
-    @ConditionalOnMissingBean
-    List<RequestArgumentResolver> argumentResolvers() {
-        return Collections.list(
-                new PathVariableResolver()
-        );
+    RequestResultHandlerContainer requestResultHandlerContainer() {
+        return new RequestResultHandlerContainer()
+                .add(new ResponseBodyRequestResultHandler())
+                .add(new EveryRequestResultHandler());
     }
 
     /**
@@ -101,9 +90,10 @@ HandlerMappingContainer<?> container(Router<SkyRouteDefinition> router) {
      */
     @Bean
     @ConditionalOnMissingBean
-    DispatchHandler dispatchHandler(
-            Router<SkyRouteDefinition> router) {
-        return new DispatchHandler(router, resultHandlers(), argumentResolvers());
+    DispatchHandler dispatchHandler(Router<SkyRouteDefinition> router, RequestResultHandlerContainer requestResultHandlerContainer,
+                                    RequestArgumentResolverContainer requestArgumentResolverContainer) {
+
+        return new DispatchHandler(router, requestResultHandlerContainer, requestArgumentResolverContainer);
     }
 
     /**

sky-http-springboot-starter/src/main/java/sky/starter/DispatchHandler.java sky-http-springboot-starter/src/main/java/sky/starter/bean/DispatchHandler.java

@@ -1,9 +1,8 @@
-package sky.starter;
+package sky.starter.bean;
 
 import http.HttpServerRequest;
 import http.HttpServerResponse;
 import http.ext.HttpHandler;
-import io.github.fzdwx.lambada.Seq;
 import io.github.fzdwx.lambada.http.HttpPath;
 import io.github.fzdwx.lambada.http.Router;
 import io.netty.handler.codec.http.HttpResponseStatus;
@@ -14,7 +13,7 @@
 import sky.starter.ext.RequestArgumentResolver;
 import sky.starter.ext.RequestResultHandler;
 
-import java.util.List;
+import java.util.Collection;
 
 /**
  * dispatch handler.
@@ -27,15 +26,15 @@ public class DispatchHandler implements HttpHandler {
 
     static Object[] EMPTY_ARGS = new Object[0];
     private final Router<SkyRouteDefinition> router;
-    private final List<RequestResultHandler> resultHandlers;
-    private final List<RequestArgumentResolver> argumentResolvers;
+    private final Collection<RequestResultHandler> resultHandlers;
+    private final Collection<RequestArgumentResolver> argumentResolvers;
 
     public DispatchHandler(final Router<SkyRouteDefinition> router,
-                           final List<RequestResultHandler> resultHandlers,
-                           final List<RequestArgumentResolver> argumentResolvers) {
+                           final RequestResultHandlerContainer resultHandlers,
+                           final RequestArgumentResolverContainer argumentResolvers) {
         this.router = router;
-        this.resultHandlers = Seq.sort(resultHandlers, RequestResultHandler.sort);
-        this.argumentResolvers = argumentResolvers;
+        this.resultHandlers = resultHandlers.container();
+        this.argumentResolvers = argumentResolvers.container();
     }
 
     @SneakyThrows

sky-http-springboot-starter/src/main/java/sky/starter/bean/RequestArgumentResolverContainer.java

@@ -0,0 +1,46 @@
+package sky.starter.bean;
+
+import sky.starter.ext.RequestArgumentResolver;
+import sky.starter.ext.SomeContainer;
+
+import java.util.Collection;
+import java.util.HashSet;
+
+/**
+ * request argument resolver container
+ * <p>
+ * you can inject this Container  to add your own RequestArgumentResolver.
+ *
+ * @author <a href="mailto:likelovec@gmail.com">fzdwx</a>
+ * @date 2022/5/19 21:49
+ */
+public class RequestArgumentResolverContainer extends SomeContainer<RequestArgumentResolver> {
+
+    public RequestArgumentResolverContainer() {
+        super(new HashSet<>());
+    }
+
+    @Override
+    public RequestArgumentResolverContainer add(final RequestArgumentResolver requestArgumentResolver) {
+        super.add(requestArgumentResolver);
+        return this;
+    }
+
+    @Override
+    public RequestArgumentResolverContainer add(final RequestArgumentResolver... some) {
+        super.add(some);
+        return this;
+    }
+
+
+    @Override
+    public RequestArgumentResolverContainer addAll(final Collection<RequestArgumentResolver> requestArgumentResolvers) {
+        super.addAll(requestArgumentResolvers);
+        return this;
+    }
+
+    @Override
+    public RequestArgumentResolverContainer impl() {
+        return this;
+    }
+}

sky-http-springboot-starter/src/main/java/sky/starter/bean/RequestResultHandlerContainer.java

@@ -0,0 +1,46 @@
+package sky.starter.bean;
+
+import sky.starter.ext.RequestResultHandler;
+import sky.starter.ext.SomeContainer;
+
+import java.util.Collection;
+import java.util.TreeSet;
+
+/**
+ * is RequestResultHandler container.
+ * <p>
+ * you can inject this Container  to add your own RequestResultHandler.
+ *
+ * @author <a href="mailto:likelovec@gmail.com">fzdwx</a>
+ * @date 2022/5/19 21:52
+ */
+public class RequestResultHandlerContainer extends SomeContainer<RequestResultHandler> {
+
+    public RequestResultHandlerContainer() {
+        super(new TreeSet<>());
+    }
+
+    @Override
+    public RequestResultHandlerContainer add(final RequestResultHandler requestResultHandler) {
+        super.add(requestResultHandler);
+        return this;
+    }
+
+    @Override
+    public RequestResultHandlerContainer add(final RequestResultHandler... some) {
+        super.add(some);
+        return this;
+    }
+
+
+    @Override
+    public RequestResultHandlerContainer addAll(final Collection<RequestResultHandler> requestResultHandlers) {
+        super.addAll(requestResultHandlers);
+        return this;
+    }
+
+    @Override
+    public RequestResultHandlerContainer impl() {
+        return this;
+    }
+}

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

@@ -1,4 +1,4 @@
-package sky.starter;
+package sky.starter.bean;
 
 import io.github.fzdwx.lambada.http.Router;
 import org.springframework.core.annotation.AnnotatedElementUtils;

sky-http-springboot-starter/src/main/java/sky/starter/SkyWebServer.java sky-http-springboot-starter/src/main/java/sky/starter/bean/SkyWebServer.java

@@ -1,4 +1,4 @@
-package sky.starter;
+package sky.starter.bean;
 
 import http.HttpServer;
 import lombok.extern.slf4j.Slf4j;

sky-http-springboot-starter/src/main/java/sky/starter/SkyWebServerFactory.java sky-http-springboot-starter/src/main/java/sky/starter/bean/SkyWebServerFactory.java

@@ -1,11 +1,12 @@
-package sky.starter;
+package sky.starter.bean;
 
 import http.HttpServer;
 import org.springframework.boot.web.server.ConfigurableWebServerFactory;
 import org.springframework.boot.web.server.WebServer;
 import org.springframework.boot.web.servlet.ServletContextInitializer;
 import org.springframework.boot.web.servlet.server.AbstractServletWebServerFactory;
 import org.springframework.context.ResourceLoaderAware;
+import org.springframework.context.event.EventListener;
 import org.springframework.core.io.ResourceLoader;
 import sky.starter.props.SkyHttpServerProps;
 
@@ -30,6 +31,16 @@ public SkyWebServerFactory(final HttpServer httpServer,
         this.dispatchHandler = dispatchHandler;
     }
 
+    @EventListener
+    public void test2(RequestResultHandlerContainer event) {
+        System.out.println(event);
+    }
+
+    @EventListener
+    public void test3(RequestArgumentResolverContainer event) {
+        System.out.println(event);
+    }
+
     @Override
     public WebServer getWebServer(final ServletContextInitializer... initializers) {
         return getSkyWebServer(initializers);

sky-http-springboot-starter/src/main/java/sky/starter/ext/SomeContainer.java

@@ -0,0 +1,51 @@
+package sky.starter.ext;
+
+import io.github.fzdwx.lambada.Collections;
+
+import java.util.Arrays;
+import java.util.Collection;
+
+/**
+ * @author <a href="mailto:likelovec@gmail.com">fzdwx</a>
+ * @date 2022/5/19 22:01
+ */
+public abstract class SomeContainer<Some>{
+
+    Collection<Some> container;
+
+    protected SomeContainer(final Collection<Some> container) {
+        this.container = container;
+    }
+
+    public SomeContainer<Some> add(Some some) {
+        if (some != null) {
+            container.add(some);
+        }
+        return impl();
+    }
+
+    public SomeContainer<Some> add(Some... some) {
+        if (some != null) {
+            container.addAll(Arrays.asList(some));
+        }
+        return impl();
+    }
+
+    public SomeContainer<Some> addAll(Collection<Some> somes) {
+        if (somes != null) {
+            this.container.addAll(somes);
+        }
+        return impl();
+    }
+
+    public abstract SomeContainer<Some> impl();
+
+    /**
+     * unmodifiable.
+     *
+     * @return {@link Collection }<{@link Some }>
+     */
+    public final Collection<Some> container() {
+        return Collections.unmodifiable(container);
+    }
+}