diff --git a/generator/src/main/java/com/reajason/javaweb/GeneratorMain.java b/generator/src/main/java/com/reajason/javaweb/GeneratorMain.java index 4de16aeb..1d570d54 100644 --- a/generator/src/main/java/com/reajason/javaweb/GeneratorMain.java +++ b/generator/src/main/java/com/reajason/javaweb/GeneratorMain.java @@ -2,7 +2,6 @@ package com.reajason.javaweb; import com.reajason.javaweb.memshell.AbstractShell; import com.reajason.javaweb.memshell.SpringWebFluxShell; -import com.reajason.javaweb.memshell.WebSphereShell; import com.reajason.javaweb.memshell.config.*; import com.reajason.javaweb.memshell.packer.Packer; import com.reajason.javaweb.memshell.utils.CommonUtil; @@ -12,8 +11,6 @@ import org.apache.commons.codec.binary.Base64; import org.apache.commons.lang3.StringUtils; import java.io.IOException; -import java.nio.file.Files; -import java.nio.file.Path; /** * @author ReaJason @@ -23,7 +20,7 @@ public class GeneratorMain { public static void main(String[] args) throws IOException { ShellConfig shellConfig = ShellConfig.builder() - .server(Server.SpringWebflux) + .server(Server.SpringWebFlux) .shellTool(ShellTool.Godzilla) .shellType(SpringWebFluxShell.NETTY_HANDLER) .targetJreVersion(Opcodes.V1_8) diff --git a/generator/src/main/java/com/reajason/javaweb/memshell/config/Server.java b/generator/src/main/java/com/reajason/javaweb/memshell/config/Server.java index f0c84044..eb9a3554 100644 --- a/generator/src/main/java/com/reajason/javaweb/memshell/config/Server.java +++ b/generator/src/main/java/com/reajason/javaweb/memshell/config/Server.java @@ -36,9 +36,9 @@ public enum Server { SpringWebMvc(new SpringWebMvcShell()), /** - * Spring Webflux 框架 + * Spring WebFlux 框架 */ - SpringWebflux(new SpringWebFluxShell()), + SpringWebFlux(new SpringWebFluxShell()), /** * WebSphere 中间件 diff --git a/generator/src/main/java/com/reajason/javaweb/memshell/utils/CommonUtil.java b/generator/src/main/java/com/reajason/javaweb/memshell/utils/CommonUtil.java index 466c3a7f..87642ca6 100644 --- a/generator/src/main/java/com/reajason/javaweb/memshell/utils/CommonUtil.java +++ b/generator/src/main/java/com/reajason/javaweb/memshell/utils/CommonUtil.java @@ -71,7 +71,7 @@ public class CommonUtil { case Jetty -> "org.eclipse.jetty.servlet.handlers"; case Undertow, JBossEAP7, WildFly -> "io.undertow.servlet.handlers"; case SpringWebMvc -> "org.springframework.boot.mvc.handlers"; - case SpringWebflux -> "org.springframework.boot.webflux.handlers"; + case SpringWebFlux -> "org.springframework.boot.webflux.handlers"; case WebSphere -> "com.ibm.ws.webcontainer.handlers"; case WebLogic -> "weblogic.servlet.internal.handlers"; case Resin -> "com.caucho.server.dispatch.handlers"; diff --git a/integration-test/src/test/java/com/reajason/javaweb/integration/springwebflux/SpringBoot2WebFluxContainerTest.java b/integration-test/src/test/java/com/reajason/javaweb/integration/springwebflux/SpringBoot2WebFluxContainerTest.java index 6357e453..c6823233 100644 --- a/integration-test/src/test/java/com/reajason/javaweb/integration/springwebflux/SpringBoot2WebFluxContainerTest.java +++ b/integration-test/src/test/java/com/reajason/javaweb/integration/springwebflux/SpringBoot2WebFluxContainerTest.java @@ -62,7 +62,7 @@ public class SpringBoot2WebFluxContainerTest { @ParameterizedTest(name = "{0}|{1}{2}|{3}") @MethodSource("casesProvider") void test(String imageName, String shellType, ShellTool shellTool, Packer.INSTANCE packer) { - testShellInjectAssertOk(getUrl(container), Server.SpringWebflux, shellType, shellTool, Opcodes.V1_8, packer); + testShellInjectAssertOk(getUrl(container), Server.SpringWebFlux, shellType, shellTool, Opcodes.V1_8, packer); } public static String getUrl(GenericContainer container) { diff --git a/integration-test/src/test/java/com/reajason/javaweb/integration/springwebflux/SpringBoot3WebFluxContainerTest.java b/integration-test/src/test/java/com/reajason/javaweb/integration/springwebflux/SpringBoot3WebFluxContainerTest.java index 7c134e92..2d7b47ac 100644 --- a/integration-test/src/test/java/com/reajason/javaweb/integration/springwebflux/SpringBoot3WebFluxContainerTest.java +++ b/integration-test/src/test/java/com/reajason/javaweb/integration/springwebflux/SpringBoot3WebFluxContainerTest.java @@ -61,7 +61,7 @@ public class SpringBoot3WebFluxContainerTest { @ParameterizedTest(name = "{0}|{1}{2}|{3}") @MethodSource("casesProvider") void test(String imageName, String shellType, ShellTool shellTool, Packer.INSTANCE packer) { - testShellInjectAssertOk(getUrl(container), Server.SpringWebflux, shellType, shellTool, Opcodes.V17, packer); + testShellInjectAssertOk(getUrl(container), Server.SpringWebFlux, shellType, shellTool, Opcodes.V17, packer); } public static String getUrl(GenericContainer container) {