From ebb9b35a1786445c4fd7ed09880e4a91fc8b570b Mon Sep 17 00:00:00 2001 From: ReaJason Date: Sat, 22 Feb 2025 17:49:04 +0800 Subject: [PATCH] refactor: optimize import --- .../javaweb/memshell/server/BesShell.java | 13 ++-- .../memshell/server/GlassFishShell.java | 10 +-- .../memshell/server/InforSuiteShell.java | 10 +-- .../javaweb/memshell/server/JbossShell.java | 10 +-- .../memshell/server/SpringWebFluxShell.java | 29 ++++----- .../memshell/server/SpringWebMvcShell.java | 61 ++++++++++--------- .../javaweb/memshell/server/TomcatShell.java | 10 +-- .../memshell/server/TongWeb6Shell.java | 10 +-- .../memshell/server/TongWeb7Shell.java | 10 +-- .../config/GodzillaShellConfigTest.java | 1 - .../generator/GodzillaGeneratorTest.java | 5 +- 11 files changed, 85 insertions(+), 84 deletions(-) diff --git a/generator/src/main/java/com/reajason/javaweb/memshell/server/BesShell.java b/generator/src/main/java/com/reajason/javaweb/memshell/server/BesShell.java index dcb6b3e6..320ff3ac 100644 --- a/generator/src/main/java/com/reajason/javaweb/memshell/server/BesShell.java +++ b/generator/src/main/java/com/reajason/javaweb/memshell/server/BesShell.java @@ -1,7 +1,6 @@ package com.reajason.javaweb.memshell.server; import com.reajason.javaweb.memshell.ShellTool; -import com.reajason.javaweb.memshell.ShellType; import com.reajason.javaweb.memshell.bes.antsword.AntSwordValve; import com.reajason.javaweb.memshell.bes.behinder.BehinderValve; import com.reajason.javaweb.memshell.bes.command.CommandValve; @@ -33,7 +32,7 @@ public class BesShell extends AbstractShell { .addInjector(FILTER, BesFilterInjector.class) .addInjector(LISTENER, BesListenerInjector.class) .addInjector(VALVE, BesValveInjector.class) - .addInjector(ShellType.AGENT_FILTER_CHAIN, BesFilterChainAgentInjector.class) + .addInjector(AGENT_FILTER_CHAIN, BesFilterChainAgentInjector.class) .addInjector(CATALINA_AGENT_CONTEXT_VALVE, BesContextValveAgentInjector.class) .build(); } @@ -44,7 +43,7 @@ public class BesShell extends AbstractShell { .addShellClass(FILTER, CommandFilter.class) .addShellClass(LISTENER, ListenerGenerator.generateListenerShellClass(TomcatShell.ListenerInterceptor.class, ShellTool.Command)) .addShellClass(VALVE, CommandValve.class) - .addShellClass(ShellType.AGENT_FILTER_CHAIN, CommandFilterChainAdvisor.class) + .addShellClass(AGENT_FILTER_CHAIN, CommandFilterChainAdvisor.class) .addShellClass(CATALINA_AGENT_CONTEXT_VALVE, CommandFilterChainAdvisor.class) .build()); @@ -52,7 +51,7 @@ public class BesShell extends AbstractShell { .addShellClass(FILTER, GodzillaFilter.class) .addShellClass(LISTENER, ListenerGenerator.generateListenerShellClass(TomcatShell.ListenerInterceptor.class, ShellTool.Godzilla)) .addShellClass(VALVE, GodzillaValve.class) - .addShellClass(ShellType.AGENT_FILTER_CHAIN, GodzillaFilterChainAdvisor.class) + .addShellClass(AGENT_FILTER_CHAIN, GodzillaFilterChainAdvisor.class) .addShellClass(CATALINA_AGENT_CONTEXT_VALVE, GodzillaFilterChainAdvisor.class) .build()); @@ -60,7 +59,7 @@ public class BesShell extends AbstractShell { .addShellClass(FILTER, BehinderFilter.class) .addShellClass(LISTENER, ListenerGenerator.generateListenerShellClass(TomcatShell.ListenerInterceptor.class, ShellTool.Behinder)) .addShellClass(VALVE, BehinderValve.class) - .addShellClass(ShellType.AGENT_FILTER_CHAIN, BehinderFilterChainAdvisor.class) + .addShellClass(AGENT_FILTER_CHAIN, BehinderFilterChainAdvisor.class) .addShellClass(CATALINA_AGENT_CONTEXT_VALVE, BehinderFilterChainAdvisor.class) .build()); @@ -68,7 +67,7 @@ public class BesShell extends AbstractShell { .addShellClass(FILTER, Suo5Filter.class) .addShellClass(LISTENER, ListenerGenerator.generateListenerShellClass(TomcatShell.ListenerInterceptor.class, ShellTool.Suo5)) .addShellClass(VALVE, Suo5Valve.class) - .addShellClass(ShellType.AGENT_FILTER_CHAIN, BehinderFilterChainAdvisor.class) + .addShellClass(AGENT_FILTER_CHAIN, BehinderFilterChainAdvisor.class) .addShellClass(CATALINA_AGENT_CONTEXT_VALVE, BehinderFilterChainAdvisor.class) .build()); @@ -76,7 +75,7 @@ public class BesShell extends AbstractShell { .addShellClass(FILTER, AntSwordFilter.class) .addShellClass(LISTENER, ListenerGenerator.generateListenerShellClass(TomcatShell.ListenerInterceptor.class, ShellTool.AntSword)) .addShellClass(VALVE, AntSwordValve.class) - .addShellClass(ShellType.AGENT_FILTER_CHAIN, AntSwordFilterChainAdvisor.class) + .addShellClass(AGENT_FILTER_CHAIN, AntSwordFilterChainAdvisor.class) .addShellClass(CATALINA_AGENT_CONTEXT_VALVE, AntSwordFilterChainAdvisor.class) .build()); } diff --git a/generator/src/main/java/com/reajason/javaweb/memshell/server/GlassFishShell.java b/generator/src/main/java/com/reajason/javaweb/memshell/server/GlassFishShell.java index 77fabb14..c392a90d 100644 --- a/generator/src/main/java/com/reajason/javaweb/memshell/server/GlassFishShell.java +++ b/generator/src/main/java/com/reajason/javaweb/memshell/server/GlassFishShell.java @@ -60,7 +60,7 @@ public class GlassFishShell extends AbstractShell { .addInjector(JAKARTA_LISTENER, GlassFishListenerInjector.class) .addInjector(VALVE, GlassFishValveInjector.class) .addInjector(JAKARTA_VALVE, GlassFishValveInjector.class) - .addInjector(ShellType.AGENT_FILTER_CHAIN, TomcatFilterChainAgentInjector.class) + .addInjector(AGENT_FILTER_CHAIN, TomcatFilterChainAgentInjector.class) .addInjector(CATALINA_AGENT_CONTEXT_VALVE, TomcatContextValveAgentInjector.class) .build(); } @@ -76,7 +76,7 @@ public class GlassFishShell extends AbstractShell { .addShellClass(JAKARTA_LISTENER, commandListenerClass) .addShellClass(VALVE, CommandValve.class) .addShellClass(JAKARTA_VALVE, CommandValve.class) - .addShellClass(ShellType.AGENT_FILTER_CHAIN, CommandFilterChainAdvisor.class) + .addShellClass(AGENT_FILTER_CHAIN, CommandFilterChainAdvisor.class) .addShellClass(CATALINA_AGENT_CONTEXT_VALVE, CommandFilterChainAdvisor.class) .build()); @@ -88,7 +88,7 @@ public class GlassFishShell extends AbstractShell { .addShellClass(JAKARTA_LISTENER, godzillaListenerClass) .addShellClass(VALVE, GodzillaValve.class) .addShellClass(JAKARTA_VALVE, GodzillaValve.class) - .addShellClass(ShellType.AGENT_FILTER_CHAIN, GodzillaFilterChainAdvisor.class) + .addShellClass(AGENT_FILTER_CHAIN, GodzillaFilterChainAdvisor.class) .addShellClass(CATALINA_AGENT_CONTEXT_VALVE, GodzillaFilterChainAdvisor.class) .build()); @@ -100,7 +100,7 @@ public class GlassFishShell extends AbstractShell { .addShellClass(JAKARTA_LISTENER, behinderListenerClass) .addShellClass(VALVE, BehinderValve.class) .addShellClass(JAKARTA_VALVE, BehinderValve.class) - .addShellClass(ShellType.AGENT_FILTER_CHAIN, BehinderFilterChainAdvisor.class) + .addShellClass(AGENT_FILTER_CHAIN, BehinderFilterChainAdvisor.class) .addShellClass(CATALINA_AGENT_CONTEXT_VALVE, BehinderFilterChainAdvisor.class) .build()); @@ -119,7 +119,7 @@ public class GlassFishShell extends AbstractShell { .addShellClass(FILTER, AntSwordFilter.class) .addShellClass(LISTENER, antSwordListenerClass) .addShellClass(VALVE, AntSwordValve.class) - .addShellClass(ShellType.AGENT_FILTER_CHAIN, AntSwordFilterChainAdvisor.class) + .addShellClass(AGENT_FILTER_CHAIN, AntSwordFilterChainAdvisor.class) .addShellClass(CATALINA_AGENT_CONTEXT_VALVE, AntSwordFilterChainAdvisor.class) .build()); } diff --git a/generator/src/main/java/com/reajason/javaweb/memshell/server/InforSuiteShell.java b/generator/src/main/java/com/reajason/javaweb/memshell/server/InforSuiteShell.java index 1e678837..30a56df1 100644 --- a/generator/src/main/java/com/reajason/javaweb/memshell/server/InforSuiteShell.java +++ b/generator/src/main/java/com/reajason/javaweb/memshell/server/InforSuiteShell.java @@ -40,7 +40,7 @@ public class InforSuiteShell extends AbstractShell { .addInjector(JAKARTA_LISTENER, GlassFishListenerInjector.class) .addInjector(VALVE, GlassFishValveInjector.class) .addInjector(JAKARTA_VALVE, GlassFishValveInjector.class) - .addInjector(ShellType.AGENT_FILTER_CHAIN, TomcatFilterChainAgentInjector.class) + .addInjector(AGENT_FILTER_CHAIN, TomcatFilterChainAgentInjector.class) .addInjector(CATALINA_AGENT_CONTEXT_VALVE, TomcatContextValveAgentInjector.class) .build(); } @@ -55,7 +55,7 @@ public class InforSuiteShell extends AbstractShell { .addShellClass(JAKARTA_LISTENER, commandListenerClass) .addShellClass(VALVE, CommandValve.class) .addShellClass(JAKARTA_VALVE, CommandValve.class) - .addShellClass(ShellType.AGENT_FILTER_CHAIN, CommandFilterChainAdvisor.class) + .addShellClass(AGENT_FILTER_CHAIN, CommandFilterChainAdvisor.class) .addShellClass(CATALINA_AGENT_CONTEXT_VALVE, CommandFilterChainAdvisor.class) .build()); @@ -67,7 +67,7 @@ public class InforSuiteShell extends AbstractShell { .addShellClass(JAKARTA_LISTENER, godzillaListenerClass) .addShellClass(VALVE, GodzillaValve.class) .addShellClass(JAKARTA_VALVE, GodzillaValve.class) - .addShellClass(ShellType.AGENT_FILTER_CHAIN, GodzillaFilterChainAdvisor.class) + .addShellClass(AGENT_FILTER_CHAIN, GodzillaFilterChainAdvisor.class) .addShellClass(CATALINA_AGENT_CONTEXT_VALVE, GodzillaFilterChainAdvisor.class) .build()); @@ -79,7 +79,7 @@ public class InforSuiteShell extends AbstractShell { .addShellClass(JAKARTA_LISTENER, behinderListenerClass) .addShellClass(VALVE, BehinderValve.class) .addShellClass(JAKARTA_VALVE, BehinderValve.class) - .addShellClass(ShellType.AGENT_FILTER_CHAIN, BehinderFilterChainAdvisor.class) + .addShellClass(AGENT_FILTER_CHAIN, BehinderFilterChainAdvisor.class) .addShellClass(CATALINA_AGENT_CONTEXT_VALVE, BehinderFilterChainAdvisor.class) .build()); @@ -98,7 +98,7 @@ public class InforSuiteShell extends AbstractShell { .addShellClass(FILTER, AntSwordFilter.class) .addShellClass(LISTENER, antSwordListenerClass) .addShellClass(VALVE, AntSwordValve.class) - .addShellClass(ShellType.AGENT_FILTER_CHAIN, AntSwordFilterChainAdvisor.class) + .addShellClass(AGENT_FILTER_CHAIN, AntSwordFilterChainAdvisor.class) .addShellClass(CATALINA_AGENT_CONTEXT_VALVE, AntSwordFilterChainAdvisor.class) .build()); } diff --git a/generator/src/main/java/com/reajason/javaweb/memshell/server/JbossShell.java b/generator/src/main/java/com/reajason/javaweb/memshell/server/JbossShell.java index 82244052..b2f92514 100644 --- a/generator/src/main/java/com/reajason/javaweb/memshell/server/JbossShell.java +++ b/generator/src/main/java/com/reajason/javaweb/memshell/server/JbossShell.java @@ -37,7 +37,7 @@ public class JbossShell extends AbstractShell { .addInjector(FILTER, JbossFilterInjector.class) .addInjector(LISTENER, JbossListenerInjector.class) .addInjector(VALVE, JbossValveInjector.class) - .addInjector(ShellType.AGENT_FILTER_CHAIN, TomcatFilterChainAgentInjector.class) + .addInjector(AGENT_FILTER_CHAIN, TomcatFilterChainAgentInjector.class) .addInjector(CATALINA_AGENT_CONTEXT_VALVE, TomcatContextValveAgentInjector.class) .build(); } @@ -48,7 +48,7 @@ public class JbossShell extends AbstractShell { .addShellClass(FILTER, CommandFilter.class) .addShellClass(LISTENER, ListenerGenerator.generateListenerShellClass(TomcatShell.ListenerInterceptor.class, ShellTool.Command)) .addShellClass(VALVE, CommandValve.class) - .addShellClass(ShellType.AGENT_FILTER_CHAIN, CommandFilterChainAdvisor.class) + .addShellClass(AGENT_FILTER_CHAIN, CommandFilterChainAdvisor.class) .addShellClass(CATALINA_AGENT_CONTEXT_VALVE, CommandFilterChainAdvisor.class) .build()); @@ -56,7 +56,7 @@ public class JbossShell extends AbstractShell { .addShellClass(FILTER, GodzillaFilter.class) .addShellClass(LISTENER, ListenerGenerator.generateListenerShellClass(TomcatShell.ListenerInterceptor.class, ShellTool.Godzilla)) .addShellClass(VALVE, GodzillaValve.class) - .addShellClass(ShellType.AGENT_FILTER_CHAIN, GodzillaFilterChainAdvisor.class) + .addShellClass(AGENT_FILTER_CHAIN, GodzillaFilterChainAdvisor.class) .addShellClass(CATALINA_AGENT_CONTEXT_VALVE, GodzillaFilterChainAdvisor.class) .build()); @@ -64,7 +64,7 @@ public class JbossShell extends AbstractShell { .addShellClass(FILTER, BehinderFilter.class) .addShellClass(LISTENER, ListenerGenerator.generateListenerShellClass(TomcatShell.ListenerInterceptor.class, ShellTool.Behinder)) .addShellClass(VALVE, BehinderValve.class) - .addShellClass(ShellType.AGENT_FILTER_CHAIN, BehinderFilterChainAdvisor.class) + .addShellClass(AGENT_FILTER_CHAIN, BehinderFilterChainAdvisor.class) .addShellClass(CATALINA_AGENT_CONTEXT_VALVE, BehinderFilterChainAdvisor.class) .build()); @@ -78,7 +78,7 @@ public class JbossShell extends AbstractShell { .addShellClass(FILTER, AntSwordFilter.class) .addShellClass(LISTENER, ListenerGenerator.generateListenerShellClass(TomcatShell.ListenerInterceptor.class, ShellTool.AntSword)) .addShellClass(VALVE, AntSwordValve.class) - .addShellClass(ShellType.AGENT_FILTER_CHAIN, AntSwordFilterChainAdvisor.class) + .addShellClass(AGENT_FILTER_CHAIN, AntSwordFilterChainAdvisor.class) .addShellClass(CATALINA_AGENT_CONTEXT_VALVE, AntSwordFilterChainAdvisor.class) .build()); } diff --git a/generator/src/main/java/com/reajason/javaweb/memshell/server/SpringWebFluxShell.java b/generator/src/main/java/com/reajason/javaweb/memshell/server/SpringWebFluxShell.java index 6a1544c5..937c6a26 100644 --- a/generator/src/main/java/com/reajason/javaweb/memshell/server/SpringWebFluxShell.java +++ b/generator/src/main/java/com/reajason/javaweb/memshell/server/SpringWebFluxShell.java @@ -1,7 +1,6 @@ package com.reajason.javaweb.memshell.server; import com.reajason.javaweb.memshell.ShellTool; -import com.reajason.javaweb.memshell.ShellType; import com.reajason.javaweb.memshell.springwebflux.command.CommandHandlerFunction; import com.reajason.javaweb.memshell.springwebflux.command.CommandHandlerMethod; import com.reajason.javaweb.memshell.springwebflux.command.CommandNettyHandler; @@ -16,6 +15,8 @@ import com.reajason.javaweb.memshell.springwebflux.injector.SpringWebFluxNettyHa import com.reajason.javaweb.memshell.springwebflux.injector.SpringWebFluxWebFilterInjector; import com.reajason.javaweb.memshell.springwebflux.suo5.Suo5WebFilter; +import static com.reajason.javaweb.memshell.ShellType.*; + /** * @author ReaJason * @since 2024/12/24 @@ -25,31 +26,31 @@ public class SpringWebFluxShell extends AbstractShell { @Override protected InjectorMapping getShellInjectorMapping() { return InjectorMapping.builder() - .addInjector(ShellType.SPRING_WEBFLUX_WEB_FILTER, SpringWebFluxWebFilterInjector.class) - .addInjector(ShellType.SPRING_WEBFLUX_HANDLER_METHOD, SpringWebFluxHandlerMethodInjector.class) - .addInjector(ShellType.SPRING_WEBFLUX_HANDLER_FUNCTION, SpringWebFluxHandlerFunctionInjector.class) - .addInjector(ShellType.NETTY_HANDLER, SpringWebFluxNettyHandlerInjector.class) + .addInjector(SPRING_WEBFLUX_WEB_FILTER, SpringWebFluxWebFilterInjector.class) + .addInjector(SPRING_WEBFLUX_HANDLER_METHOD, SpringWebFluxHandlerMethodInjector.class) + .addInjector(SPRING_WEBFLUX_HANDLER_FUNCTION, SpringWebFluxHandlerFunctionInjector.class) + .addInjector(NETTY_HANDLER, SpringWebFluxNettyHandlerInjector.class) .build(); } @Override protected void init() { addToolMapping(ShellTool.Command, ToolMapping.builder() - .addShellClass(ShellType.SPRING_WEBFLUX_WEB_FILTER, CommandWebFilter.class) - .addShellClass(ShellType.SPRING_WEBFLUX_HANDLER_METHOD, CommandHandlerMethod.class) - .addShellClass(ShellType.SPRING_WEBFLUX_HANDLER_FUNCTION, CommandHandlerFunction.class) - .addShellClass(ShellType.NETTY_HANDLER, CommandNettyHandler.class) + .addShellClass(SPRING_WEBFLUX_WEB_FILTER, CommandWebFilter.class) + .addShellClass(SPRING_WEBFLUX_HANDLER_METHOD, CommandHandlerMethod.class) + .addShellClass(SPRING_WEBFLUX_HANDLER_FUNCTION, CommandHandlerFunction.class) + .addShellClass(NETTY_HANDLER, CommandNettyHandler.class) .build()); addToolMapping(ShellTool.Godzilla, ToolMapping.builder() - .addShellClass(ShellType.SPRING_WEBFLUX_WEB_FILTER, GodzillaWebFilter.class) - .addShellClass(ShellType.SPRING_WEBFLUX_HANDLER_METHOD, GodzillaHandlerMethod.class) - .addShellClass(ShellType.SPRING_WEBFLUX_HANDLER_FUNCTION, GodzillaHandlerFunction.class) - .addShellClass(ShellType.NETTY_HANDLER, GodzillaNettyHandler.class) + .addShellClass(SPRING_WEBFLUX_WEB_FILTER, GodzillaWebFilter.class) + .addShellClass(SPRING_WEBFLUX_HANDLER_METHOD, GodzillaHandlerMethod.class) + .addShellClass(SPRING_WEBFLUX_HANDLER_FUNCTION, GodzillaHandlerFunction.class) + .addShellClass(NETTY_HANDLER, GodzillaNettyHandler.class) .build()); addToolMapping(ShellTool.Suo5, ToolMapping.builder() - .addShellClass(ShellType.SPRING_WEBFLUX_WEB_FILTER, Suo5WebFilter.class) + .addShellClass(SPRING_WEBFLUX_WEB_FILTER, Suo5WebFilter.class) .build()); } } diff --git a/generator/src/main/java/com/reajason/javaweb/memshell/server/SpringWebMvcShell.java b/generator/src/main/java/com/reajason/javaweb/memshell/server/SpringWebMvcShell.java index fa005b71..3384feb9 100644 --- a/generator/src/main/java/com/reajason/javaweb/memshell/server/SpringWebMvcShell.java +++ b/generator/src/main/java/com/reajason/javaweb/memshell/server/SpringWebMvcShell.java @@ -1,7 +1,6 @@ package com.reajason.javaweb.memshell.server; import com.reajason.javaweb.memshell.ShellTool; -import com.reajason.javaweb.memshell.ShellType; import com.reajason.javaweb.memshell.springwebmvc.antsword.AntSwordControllerHandler; import com.reajason.javaweb.memshell.springwebmvc.antsword.AntSwordInterceptor; import com.reajason.javaweb.memshell.springwebmvc.antsword.AntSwordServletAdvisor; @@ -20,6 +19,8 @@ import com.reajason.javaweb.memshell.springwebmvc.injector.SpringWebMvcIntercept import com.reajason.javaweb.memshell.springwebmvc.suo5.Suo5ControllerHandler; import com.reajason.javaweb.memshell.springwebmvc.suo5.Suo5Interceptor; +import static com.reajason.javaweb.memshell.ShellType.*; + /** * @author ReaJason * @since 2024/12/22 @@ -29,53 +30,53 @@ public class SpringWebMvcShell extends AbstractShell { @Override protected InjectorMapping getShellInjectorMapping() { return InjectorMapping.builder() - .addInjector(ShellType.SPRING_WEBMVC_INTERCEPTOR, SpringWebMvcInterceptorInjector.class) - .addInjector(ShellType.SPRING_WEBMVC_JAKARTA_INTERCEPTOR, SpringWebMvcInterceptorInjector.class) - .addInjector(ShellType.SPRING_WEBMVC_CONTROLLER_HANDLER, SpringWebMvcControllerHandlerInjector.class) - .addInjector(ShellType.SPRING_WEBMVC_JAKARTA_CONTROLLER_HANDLER, SpringWebMvcControllerHandlerInjector.class) - .addInjector(ShellType.SPRING_WEBMVC_AGENT_FRAMEWORK_SERVLET, SpringWebMvcFrameworkServletAgentInjector.class) + .addInjector(SPRING_WEBMVC_INTERCEPTOR, SpringWebMvcInterceptorInjector.class) + .addInjector(SPRING_WEBMVC_JAKARTA_INTERCEPTOR, SpringWebMvcInterceptorInjector.class) + .addInjector(SPRING_WEBMVC_CONTROLLER_HANDLER, SpringWebMvcControllerHandlerInjector.class) + .addInjector(SPRING_WEBMVC_JAKARTA_CONTROLLER_HANDLER, SpringWebMvcControllerHandlerInjector.class) + .addInjector(SPRING_WEBMVC_AGENT_FRAMEWORK_SERVLET, SpringWebMvcFrameworkServletAgentInjector.class) .build(); } @Override protected void init() { addToolMapping(ShellTool.Command, ToolMapping.builder() - .addShellClass(ShellType.SPRING_WEBMVC_INTERCEPTOR, CommandInterceptor.class) - .addShellClass(ShellType.SPRING_WEBMVC_JAKARTA_INTERCEPTOR, CommandInterceptor.class) - .addShellClass(ShellType.SPRING_WEBMVC_CONTROLLER_HANDLER, CommandControllerHandler.class) - .addShellClass(ShellType.SPRING_WEBMVC_JAKARTA_CONTROLLER_HANDLER, CommandControllerHandler.class) - .addShellClass(ShellType.SPRING_WEBMVC_AGENT_FRAMEWORK_SERVLET, CommandServletAdvisor.class) + .addShellClass(SPRING_WEBMVC_INTERCEPTOR, CommandInterceptor.class) + .addShellClass(SPRING_WEBMVC_JAKARTA_INTERCEPTOR, CommandInterceptor.class) + .addShellClass(SPRING_WEBMVC_CONTROLLER_HANDLER, CommandControllerHandler.class) + .addShellClass(SPRING_WEBMVC_JAKARTA_CONTROLLER_HANDLER, CommandControllerHandler.class) + .addShellClass(SPRING_WEBMVC_AGENT_FRAMEWORK_SERVLET, CommandServletAdvisor.class) .build()); addToolMapping(ShellTool.Godzilla, ToolMapping.builder() - .addShellClass(ShellType.SPRING_WEBMVC_INTERCEPTOR, GodzillaInterceptor.class) - .addShellClass(ShellType.SPRING_WEBMVC_JAKARTA_INTERCEPTOR, GodzillaInterceptor.class) - .addShellClass(ShellType.SPRING_WEBMVC_CONTROLLER_HANDLER, GodzillaControllerHandler.class) - .addShellClass(ShellType.SPRING_WEBMVC_JAKARTA_CONTROLLER_HANDLER, GodzillaControllerHandler.class) - .addShellClass(ShellType.SPRING_WEBMVC_AGENT_FRAMEWORK_SERVLET, GodzillaServletAdvisor.class) + .addShellClass(SPRING_WEBMVC_INTERCEPTOR, GodzillaInterceptor.class) + .addShellClass(SPRING_WEBMVC_JAKARTA_INTERCEPTOR, GodzillaInterceptor.class) + .addShellClass(SPRING_WEBMVC_CONTROLLER_HANDLER, GodzillaControllerHandler.class) + .addShellClass(SPRING_WEBMVC_JAKARTA_CONTROLLER_HANDLER, GodzillaControllerHandler.class) + .addShellClass(SPRING_WEBMVC_AGENT_FRAMEWORK_SERVLET, GodzillaServletAdvisor.class) .build()); addToolMapping(ShellTool.Behinder, ToolMapping.builder() - .addShellClass(ShellType.SPRING_WEBMVC_INTERCEPTOR, BehinderInterceptor.class) - .addShellClass(ShellType.SPRING_WEBMVC_JAKARTA_INTERCEPTOR, BehinderInterceptor.class) - .addShellClass(ShellType.SPRING_WEBMVC_CONTROLLER_HANDLER, BehinderControllerHandler.class) - .addShellClass(ShellType.SPRING_WEBMVC_JAKARTA_CONTROLLER_HANDLER, BehinderControllerHandler.class) - .addShellClass(ShellType.SPRING_WEBMVC_AGENT_FRAMEWORK_SERVLET, BehinderServletAdvisor.class) + .addShellClass(SPRING_WEBMVC_INTERCEPTOR, BehinderInterceptor.class) + .addShellClass(SPRING_WEBMVC_JAKARTA_INTERCEPTOR, BehinderInterceptor.class) + .addShellClass(SPRING_WEBMVC_CONTROLLER_HANDLER, BehinderControllerHandler.class) + .addShellClass(SPRING_WEBMVC_JAKARTA_CONTROLLER_HANDLER, BehinderControllerHandler.class) + .addShellClass(SPRING_WEBMVC_AGENT_FRAMEWORK_SERVLET, BehinderServletAdvisor.class) .build()); addToolMapping(ShellTool.Suo5, ToolMapping.builder() - .addShellClass(ShellType.SPRING_WEBMVC_INTERCEPTOR, Suo5Interceptor.class) - .addShellClass(ShellType.SPRING_WEBMVC_JAKARTA_INTERCEPTOR, Suo5Interceptor.class) - .addShellClass(ShellType.SPRING_WEBMVC_CONTROLLER_HANDLER, Suo5ControllerHandler.class) - .addShellClass(ShellType.SPRING_WEBMVC_JAKARTA_CONTROLLER_HANDLER, Suo5ControllerHandler.class) + .addShellClass(SPRING_WEBMVC_INTERCEPTOR, Suo5Interceptor.class) + .addShellClass(SPRING_WEBMVC_JAKARTA_INTERCEPTOR, Suo5Interceptor.class) + .addShellClass(SPRING_WEBMVC_CONTROLLER_HANDLER, Suo5ControllerHandler.class) + .addShellClass(SPRING_WEBMVC_JAKARTA_CONTROLLER_HANDLER, Suo5ControllerHandler.class) .build()); addToolMapping(ShellTool.AntSword, ToolMapping.builder() - .addShellClass(ShellType.SPRING_WEBMVC_INTERCEPTOR, AntSwordInterceptor.class) - .addShellClass(ShellType.SPRING_WEBMVC_JAKARTA_INTERCEPTOR, AntSwordInterceptor.class) - .addShellClass(ShellType.SPRING_WEBMVC_CONTROLLER_HANDLER, AntSwordControllerHandler.class) - .addShellClass(ShellType.SPRING_WEBMVC_JAKARTA_CONTROLLER_HANDLER, AntSwordControllerHandler.class) - .addShellClass(ShellType.SPRING_WEBMVC_AGENT_FRAMEWORK_SERVLET, AntSwordServletAdvisor.class) + .addShellClass(SPRING_WEBMVC_INTERCEPTOR, AntSwordInterceptor.class) + .addShellClass(SPRING_WEBMVC_JAKARTA_INTERCEPTOR, AntSwordInterceptor.class) + .addShellClass(SPRING_WEBMVC_CONTROLLER_HANDLER, AntSwordControllerHandler.class) + .addShellClass(SPRING_WEBMVC_JAKARTA_CONTROLLER_HANDLER, AntSwordControllerHandler.class) + .addShellClass(SPRING_WEBMVC_AGENT_FRAMEWORK_SERVLET, AntSwordServletAdvisor.class) .build()); } } \ No newline at end of file diff --git a/generator/src/main/java/com/reajason/javaweb/memshell/server/TomcatShell.java b/generator/src/main/java/com/reajason/javaweb/memshell/server/TomcatShell.java index a294b2bd..3b6c66b8 100644 --- a/generator/src/main/java/com/reajason/javaweb/memshell/server/TomcatShell.java +++ b/generator/src/main/java/com/reajason/javaweb/memshell/server/TomcatShell.java @@ -55,7 +55,7 @@ public class TomcatShell extends AbstractShell { .addInjector(JAKARTA_LISTENER, TomcatListenerInjector.class) .addInjector(VALVE, TomcatValveInjector.class) .addInjector(JAKARTA_VALVE, TomcatValveInjector.class) - .addInjector(ShellType.AGENT_FILTER_CHAIN, TomcatFilterChainAgentInjector.class) + .addInjector(AGENT_FILTER_CHAIN, TomcatFilterChainAgentInjector.class) .addInjector(CATALINA_AGENT_CONTEXT_VALVE, TomcatContextValveAgentInjector.class) .addInjector(WEBSOCKET, TomcatWebSocketInjector.class) .build(); @@ -73,7 +73,7 @@ public class TomcatShell extends AbstractShell { .addShellClass(JAKARTA_LISTENER, commandListenerClass) .addShellClass(VALVE, CommandValve.class) .addShellClass(JAKARTA_VALVE, CommandValve.class) - .addShellClass(ShellType.AGENT_FILTER_CHAIN, CommandFilterChainAdvisor.class) + .addShellClass(AGENT_FILTER_CHAIN, CommandFilterChainAdvisor.class) .addShellClass(CATALINA_AGENT_CONTEXT_VALVE, CommandFilterChainAdvisor.class) .addShellClass(WEBSOCKET, CommandWebSocket.class) .build()); @@ -88,7 +88,7 @@ public class TomcatShell extends AbstractShell { .addShellClass(JAKARTA_LISTENER, godzillaListenerClass) .addShellClass(VALVE, GodzillaValve.class) .addShellClass(JAKARTA_VALVE, GodzillaValve.class) - .addShellClass(ShellType.AGENT_FILTER_CHAIN, GodzillaFilterChainAdvisor.class) + .addShellClass(AGENT_FILTER_CHAIN, GodzillaFilterChainAdvisor.class) .addShellClass(CATALINA_AGENT_CONTEXT_VALVE, GodzillaFilterChainAdvisor.class) .build()); @@ -102,7 +102,7 @@ public class TomcatShell extends AbstractShell { .addShellClass(JAKARTA_LISTENER, behinderListenerClass) .addShellClass(VALVE, BehinderValve.class) .addShellClass(JAKARTA_VALVE, BehinderValve.class) - .addShellClass(ShellType.AGENT_FILTER_CHAIN, BehinderFilterChainAdvisor.class) + .addShellClass(AGENT_FILTER_CHAIN, BehinderFilterChainAdvisor.class) .addShellClass(CATALINA_AGENT_CONTEXT_VALVE, BehinderFilterChainAdvisor.class) .build()); @@ -124,7 +124,7 @@ public class TomcatShell extends AbstractShell { .addShellClass(FILTER, AntSwordFilter.class) .addShellClass(LISTENER, antSwordListenerClass) .addShellClass(VALVE, AntSwordValve.class) - .addShellClass(ShellType.AGENT_FILTER_CHAIN, AntSwordFilterChainAdvisor.class) + .addShellClass(AGENT_FILTER_CHAIN, AntSwordFilterChainAdvisor.class) .addShellClass(CATALINA_AGENT_CONTEXT_VALVE, AntSwordFilterChainAdvisor.class) .build()); } diff --git a/generator/src/main/java/com/reajason/javaweb/memshell/server/TongWeb6Shell.java b/generator/src/main/java/com/reajason/javaweb/memshell/server/TongWeb6Shell.java index 24f78f3f..e0990b1d 100644 --- a/generator/src/main/java/com/reajason/javaweb/memshell/server/TongWeb6Shell.java +++ b/generator/src/main/java/com/reajason/javaweb/memshell/server/TongWeb6Shell.java @@ -36,7 +36,7 @@ public class TongWeb6Shell extends AbstractShell { .addInjector(JAKARTA_LISTENER, TongWebListenerInjector.class) .addInjector(VALVE, TongWebValveInjector.class) .addInjector(JAKARTA_VALVE, TongWebValveInjector.class) - .addInjector(ShellType.AGENT_FILTER_CHAIN, TongWebFilterChainAgentInjector.class) + .addInjector(AGENT_FILTER_CHAIN, TongWebFilterChainAgentInjector.class) .addInjector(CATALINA_AGENT_CONTEXT_VALVE, TongWebContextValveAgentInjector.class) .build(); } @@ -52,7 +52,7 @@ public class TongWeb6Shell extends AbstractShell { .addShellClass(JAKARTA_LISTENER, commandListenerClass) .addShellClass(VALVE, CommandValve6.class) .addShellClass(JAKARTA_VALVE, CommandValve6.class) - .addShellClass(ShellType.AGENT_FILTER_CHAIN, CommandFilterChainAdvisor.class) + .addShellClass(AGENT_FILTER_CHAIN, CommandFilterChainAdvisor.class) .addShellClass(CATALINA_AGENT_CONTEXT_VALVE, CommandFilterChainAdvisor.class) .build()); @@ -64,7 +64,7 @@ public class TongWeb6Shell extends AbstractShell { .addShellClass(JAKARTA_LISTENER, godzillaListenerClass) .addShellClass(VALVE, GodzillaValve6.class) .addShellClass(JAKARTA_VALVE, GodzillaValve6.class) - .addShellClass(ShellType.AGENT_FILTER_CHAIN, GodzillaFilterChainAdvisor.class) + .addShellClass(AGENT_FILTER_CHAIN, GodzillaFilterChainAdvisor.class) .addShellClass(CATALINA_AGENT_CONTEXT_VALVE, GodzillaFilterChainAdvisor.class) .build()); @@ -76,7 +76,7 @@ public class TongWeb6Shell extends AbstractShell { .addShellClass(JAKARTA_LISTENER, behinderListenerClass) .addShellClass(VALVE, BehinderValve6.class) .addShellClass(JAKARTA_VALVE, BehinderValve6.class) - .addShellClass(ShellType.AGENT_FILTER_CHAIN, BehinderFilterChainAdvisor.class) + .addShellClass(AGENT_FILTER_CHAIN, BehinderFilterChainAdvisor.class) .addShellClass(CATALINA_AGENT_CONTEXT_VALVE, BehinderFilterChainAdvisor.class) .build()); @@ -95,7 +95,7 @@ public class TongWeb6Shell extends AbstractShell { .addShellClass(FILTER, AntSwordFilter.class) .addShellClass(LISTENER, antSwordListenerClass) .addShellClass(VALVE, AntSwordValve6.class) - .addShellClass(ShellType.AGENT_FILTER_CHAIN, AntSwordFilterChainAdvisor.class) + .addShellClass(AGENT_FILTER_CHAIN, AntSwordFilterChainAdvisor.class) .addShellClass(CATALINA_AGENT_CONTEXT_VALVE, AntSwordFilterChainAdvisor.class) .build()); } diff --git a/generator/src/main/java/com/reajason/javaweb/memshell/server/TongWeb7Shell.java b/generator/src/main/java/com/reajason/javaweb/memshell/server/TongWeb7Shell.java index d74e29a6..368fde71 100644 --- a/generator/src/main/java/com/reajason/javaweb/memshell/server/TongWeb7Shell.java +++ b/generator/src/main/java/com/reajason/javaweb/memshell/server/TongWeb7Shell.java @@ -35,7 +35,7 @@ public class TongWeb7Shell extends AbstractShell { .addInjector(JAKARTA_LISTENER, TongWebListenerInjector.class) .addInjector(VALVE, TongWebValveInjector.class) .addInjector(JAKARTA_VALVE, TongWebValveInjector.class) - .addInjector(ShellType.AGENT_FILTER_CHAIN, TongWebFilterChainAgentInjector.class) + .addInjector(AGENT_FILTER_CHAIN, TongWebFilterChainAgentInjector.class) .addInjector(CATALINA_AGENT_CONTEXT_VALVE, TongWebContextValveAgentInjector.class) .build(); } @@ -51,7 +51,7 @@ public class TongWeb7Shell extends AbstractShell { .addShellClass(JAKARTA_LISTENER, commandListenerClass) .addShellClass(VALVE, CommandValve7.class) .addShellClass(JAKARTA_VALVE, CommandValve7.class) - .addShellClass(ShellType.AGENT_FILTER_CHAIN, CommandFilterChainAdvisor.class) + .addShellClass(AGENT_FILTER_CHAIN, CommandFilterChainAdvisor.class) .addShellClass(CATALINA_AGENT_CONTEXT_VALVE, CommandFilterChainAdvisor.class) .build()); @@ -63,7 +63,7 @@ public class TongWeb7Shell extends AbstractShell { .addShellClass(JAKARTA_LISTENER, godzillaListenerClass) .addShellClass(VALVE, GodzillaValve7.class) .addShellClass(JAKARTA_VALVE, GodzillaValve7.class) - .addShellClass(ShellType.AGENT_FILTER_CHAIN, GodzillaFilterChainAdvisor.class) + .addShellClass(AGENT_FILTER_CHAIN, GodzillaFilterChainAdvisor.class) .addShellClass(CATALINA_AGENT_CONTEXT_VALVE, GodzillaFilterChainAdvisor.class) .build()); @@ -75,7 +75,7 @@ public class TongWeb7Shell extends AbstractShell { .addShellClass(JAKARTA_LISTENER, behinderListenerClass) .addShellClass(VALVE, BehinderValve7.class) .addShellClass(JAKARTA_VALVE, BehinderValve7.class) - .addShellClass(ShellType.AGENT_FILTER_CHAIN, BehinderFilterChainAdvisor.class) + .addShellClass(AGENT_FILTER_CHAIN, BehinderFilterChainAdvisor.class) .addShellClass(CATALINA_AGENT_CONTEXT_VALVE, BehinderFilterChainAdvisor.class) .build()); @@ -94,7 +94,7 @@ public class TongWeb7Shell extends AbstractShell { .addShellClass(FILTER, AntSwordFilter.class) .addShellClass(LISTENER, antSwordListenerClass) .addShellClass(VALVE, AntSwordValve7.class) - .addShellClass(ShellType.AGENT_FILTER_CHAIN, AntSwordFilterChainAdvisor.class) + .addShellClass(AGENT_FILTER_CHAIN, AntSwordFilterChainAdvisor.class) .addShellClass(CATALINA_AGENT_CONTEXT_VALVE, AntSwordFilterChainAdvisor.class) .build()); } diff --git a/generator/src/test/java/com/reajason/javaweb/memshell/config/GodzillaShellConfigTest.java b/generator/src/test/java/com/reajason/javaweb/memshell/config/GodzillaShellConfigTest.java index 205747a9..91bfd1da 100644 --- a/generator/src/test/java/com/reajason/javaweb/memshell/config/GodzillaShellConfigTest.java +++ b/generator/src/test/java/com/reajason/javaweb/memshell/config/GodzillaShellConfigTest.java @@ -1,6 +1,5 @@ package com.reajason.javaweb.memshell.config; -import com.reajason.javaweb.memshell.config.GodzillaConfig; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/generator/src/test/java/com/reajason/javaweb/memshell/generator/GodzillaGeneratorTest.java b/generator/src/test/java/com/reajason/javaweb/memshell/generator/GodzillaGeneratorTest.java index 3e7eaaca..3b593d83 100644 --- a/generator/src/test/java/com/reajason/javaweb/memshell/generator/GodzillaGeneratorTest.java +++ b/generator/src/test/java/com/reajason/javaweb/memshell/generator/GodzillaGeneratorTest.java @@ -1,9 +1,10 @@ package com.reajason.javaweb.memshell.generator; -import com.reajason.javaweb.memshell.ShellType; import com.reajason.javaweb.memshell.Server; import com.reajason.javaweb.memshell.ShellTool; -import com.reajason.javaweb.memshell.config.*; +import com.reajason.javaweb.memshell.ShellType; +import com.reajason.javaweb.memshell.config.GodzillaConfig; +import com.reajason.javaweb.memshell.config.ShellConfig; import com.reajason.javaweb.memshell.shelltool.godzilla.GodzillaServlet; import com.reajason.javaweb.memshell.utils.CommonUtil; import com.reajason.javaweb.util.ClassUtils;