From 17dcb183c49916c997924b973cb33eb70b995625 Mon Sep 17 00:00:00 2001 From: ReaJason Date: Fri, 22 Aug 2025 22:11:47 +0800 Subject: [PATCH] refactor: remove ShellTool enum --- .../boot/controller/ConfigController.java | 5 +- .../boot/dto/MemShellGenerateRequest.java | 2 + .../javaweb/memshell/MemShellGenerator.java | 2 +- .../javaweb/memshell/ServerFactory.java | 2 +- .../reajason/javaweb/memshell/ShellTool.java | 44 ++++------------ .../javaweb/memshell/ShellToolFactory.java | 50 +++++++++++++++++++ .../javaweb/memshell/config/ShellConfig.java | 3 +- .../memshell/server/AbstractServer.java | 11 ++-- gradle/libs.versions.toml | 2 +- .../javaweb/integration/ShellAssertion.java | 20 ++++---- .../integration/TestCasesProvider.java | 9 ++-- .../glassfish/GlassFish3ContainerTest.java | 3 +- .../glassfish/GlassFish4ContainerTest.java | 3 +- .../glassfish/GlassFish501ContainerTest.java | 3 +- .../glassfish/GlassFish510ContainerTest.java | 3 +- .../glassfish/GlassFish6ContainerTest.java | 2 +- .../glassfish/GlassFish7ContainerTest.java | 2 +- .../jbossas/Jboss423ContainerTest.java | 3 +- .../jbossas/Jboss510ContainerTest.java | 2 +- .../jbossas/Jboss610ContainerTest.java | 3 +- .../jbossas/Jboss711ContainerTest.java | 3 +- .../jbosseap/JbossEap6ContainerTest.java | 3 +- .../jbosseap/JbossEap7ContainerTest.java | 3 +- .../memshell/jetty/Jetty10ContainerTest.java | 3 +- .../memshell/jetty/Jetty11ContainerTest.java | 2 +- .../jetty/Jetty12ee10ContainerTest.java | 2 +- .../jetty/Jetty12ee8ContainerTest.java | 3 +- .../jetty/Jetty12ee9ContainerTest.java | 2 +- .../memshell/jetty/Jetty61ContainerTest.java | 3 +- .../memshell/jetty/Jetty75ContainerTest.java | 3 +- .../memshell/jetty/Jetty76ContainerTest.java | 3 +- .../memshell/jetty/Jetty81ContainerTest.java | 3 +- .../memshell/jetty/Jetty92ContainerTest.java | 3 +- .../memshell/jetty/Jetty93ContainerTest.java | 3 +- .../memshell/jetty/Jetty94ContainerTest.java | 3 +- .../payara/Payara5201ContainerTest.java | 3 +- .../payara/Payara520225ContainerTest.java | 3 +- .../payara/Payara620222ContainerTest.java | 2 +- .../resin/Resin3116ContainerTest.java | 3 +- .../memshell/resin/Resin318ContainerTest.java | 3 +- .../resin/Resin4058ContainerTest.java | 3 +- .../resin/Resin4067ContainerTest.java | 3 +- .../SpringBoot2WebFluxContainerTest.java | 3 +- .../SpringBoot3WebFluxContainerTest.java | 3 +- .../SpringBoot1ContainerTest.java | 3 +- .../SpringBoot2ContainerTest.java | 5 +- .../SpringBoot2JettyContainerTest.java | 5 +- .../SpringBoot2UndertowContainerTest.java | 9 ++-- .../SpringBoot2WarContainerTest.java | 5 +- .../SpringBoot3ContainerTest.java | 4 +- .../tomcat/Tomcat10ContainerTest.java | 2 +- .../tomcat/Tomcat11ContainerTest.java | 2 +- .../tomcat/Tomcat11JRE21ContainerTest.java | 2 +- .../memshell/tomcat/Tomcat5ContainerTest.java | 3 +- .../memshell/tomcat/Tomcat6ContainerTest.java | 3 +- .../memshell/tomcat/Tomcat7ContainerTest.java | 3 +- .../Tomcat8CommandEncryptorContainerTest.java | 2 +- .../memshell/tomcat/Tomcat8ContainerTest.java | 3 +- .../Tomcat8DeserializeContainerTest.java | 2 +- .../Tomcat8ExpressionContainerTest.java | 2 +- .../memshell/tomcat/Tomcat9ContainerTest.java | 3 +- .../weblogic/WebLogic1036ContainerTest.java | 3 +- .../weblogic/WebLogic12214ContainerTest.java | 3 +- .../weblogic/WebLogic14110ContainerTest.java | 3 +- .../websphere/WebSphere855ContainerTest.java | 3 +- .../websphere/WebSphere905ContainerTest.java | 3 +- .../websphere7/WebSphere700ContainerTest.java | 3 +- .../wildfly/Wildfly18ContainerTest.java | 3 +- .../wildfly/Wildfly23ContainerTest.java | 3 +- .../wildfly/Wildfly30ContainerTest.java | 2 +- .../wildfly/Wildfly9ContainerTest.java | 4 +- .../xxljob/XxlJob220ContainerTest.java | 3 +- .../xxljob/XxlJob230ContainerTest.java | 3 +- 73 files changed, 156 insertions(+), 180 deletions(-) create mode 100644 generator/src/main/java/com/reajason/javaweb/memshell/ShellToolFactory.java diff --git a/boot/src/main/java/com/reajason/javaweb/boot/controller/ConfigController.java b/boot/src/main/java/com/reajason/javaweb/boot/controller/ConfigController.java index 1cc49cca..9c20a0c6 100644 --- a/boot/src/main/java/com/reajason/javaweb/boot/controller/ConfigController.java +++ b/boot/src/main/java/com/reajason/javaweb/boot/controller/ConfigController.java @@ -2,7 +2,6 @@ package com.reajason.javaweb.boot.controller; import com.reajason.javaweb.boot.vo.CommandConfigVO; import com.reajason.javaweb.memshell.ServerFactory; -import com.reajason.javaweb.memshell.ShellTool; import com.reajason.javaweb.memshell.config.CommandConfig; import com.reajason.javaweb.memshell.server.AbstractServer; import com.reajason.javaweb.packer.Packers; @@ -50,12 +49,12 @@ public class ConfigController { continue; } Map> map = new LinkedHashMap<>(16); - for (ShellTool shellTool : server.getSupportedShellTools()) { + for (String shellTool : server.getSupportedShellTools()) { Set supportedShellTypes = server.getSupportedShellTypes(shellTool); if (supportedShellTypes.isEmpty()) { continue; } - map.put(shellTool.name(), supportedShellTypes); + map.put(shellTool, supportedShellTypes); } coreMap.put(supportedServer, map); } diff --git a/boot/src/main/java/com/reajason/javaweb/boot/dto/MemShellGenerateRequest.java b/boot/src/main/java/com/reajason/javaweb/boot/dto/MemShellGenerateRequest.java index 6d41570b..ab3e44af 100644 --- a/boot/src/main/java/com/reajason/javaweb/boot/dto/MemShellGenerateRequest.java +++ b/boot/src/main/java/com/reajason/javaweb/boot/dto/MemShellGenerateRequest.java @@ -6,6 +6,8 @@ import com.reajason.javaweb.utils.CommonUtil; import lombok.Data; import org.apache.commons.lang3.StringUtils; +import static com.reajason.javaweb.memshell.ShellTool.*; + /** * @author ReaJason * @since 2024/12/18 diff --git a/generator/src/main/java/com/reajason/javaweb/memshell/MemShellGenerator.java b/generator/src/main/java/com/reajason/javaweb/memshell/MemShellGenerator.java index 6f0da681..102e80e9 100644 --- a/generator/src/main/java/com/reajason/javaweb/memshell/MemShellGenerator.java +++ b/generator/src/main/java/com/reajason/javaweb/memshell/MemShellGenerator.java @@ -47,7 +47,7 @@ public class MemShellGenerator { shellToolConfig.setShellClass(shellClass); } - byte[] shellBytes = shellConfig.getShellTool().generateBytes(shellConfig, shellToolConfig); + byte[] shellBytes = ShellToolFactory.generateBytes(shellConfig, shellToolConfig); injectorConfig.setInjectorClass(injectorClass); injectorConfig.setShellClassName(shellToolConfig.getShellClassName()); diff --git a/generator/src/main/java/com/reajason/javaweb/memshell/ServerFactory.java b/generator/src/main/java/com/reajason/javaweb/memshell/ServerFactory.java index 5cd89f02..eff0e82c 100644 --- a/generator/src/main/java/com/reajason/javaweb/memshell/ServerFactory.java +++ b/generator/src/main/java/com/reajason/javaweb/memshell/ServerFactory.java @@ -219,7 +219,7 @@ public class ServerFactory { }); } - public static void addToolMapping(ShellTool shellTool, ToolMapping toolMapping) { + public static void addToolMapping(String shellTool, ToolMapping toolMapping) { Map> rawToolMapping = toolMapping.getShellClassMap(); List supportedServers = ServerFactory.getSupportedServers(); for (String supportedServer : supportedServers) { diff --git a/generator/src/main/java/com/reajason/javaweb/memshell/ShellTool.java b/generator/src/main/java/com/reajason/javaweb/memshell/ShellTool.java index d607bf67..9a6cdb82 100644 --- a/generator/src/main/java/com/reajason/javaweb/memshell/ShellTool.java +++ b/generator/src/main/java/com/reajason/javaweb/memshell/ShellTool.java @@ -1,41 +1,15 @@ package com.reajason.javaweb.memshell; -import com.reajason.javaweb.ShellGenerator; -import com.reajason.javaweb.memshell.config.*; -import com.reajason.javaweb.memshell.generator.*; -import com.reajason.javaweb.memshell.generator.command.CommandGenerator; - -import java.lang.reflect.Constructor; - /** * @author ReaJason - * @since 2024/11/22 + * @since 2025/8/22 */ -public enum ShellTool { - Godzilla(GodzillaGenerator.class, GodzillaConfig.class), - Command(CommandGenerator.class, CommandConfig.class), - Behinder(BehinderGenerator.class, BehinderConfig.class), - Suo5(Suo5Generator.class, Suo5Config.class), - AntSword(AntSwordGenerator.class, AntSwordConfig.class), - NeoreGeorg(NeoreGeorgGenerator.class, NeoreGeorgConfig.class), - Custom(CustomShellGenerator.class, CustomConfig.class); - - private final Class generatorClass; - private final Class configClass; - - ShellTool(Class generatorClass, Class configClass) { - this.generatorClass = generatorClass; - this.configClass = configClass; - } - - public byte[] generateBytes(ShellConfig shellConfig, ShellToolConfig shellToolConfig) { - try { - Constructor constructor = - generatorClass.getConstructor(ShellConfig.class, configClass); - ShellGenerator generator = constructor.newInstance(shellConfig, configClass.cast(shellToolConfig)); - return generator.getBytes(); - } catch (Exception e) { - throw new RuntimeException("shell generate failed " + e.getMessage(), e); - } - } +public class ShellTool { + public static final String Godzilla = "Godzilla"; + public static final String Behinder = "Behinder"; + public static final String Command = "Command"; + public static final String Suo5 = "Suo5"; + public static final String AntSword = "AntSword"; + public static final String NeoreGeorg = "NeoreGeorg"; + public static final String Custom = "Custom"; } diff --git a/generator/src/main/java/com/reajason/javaweb/memshell/ShellToolFactory.java b/generator/src/main/java/com/reajason/javaweb/memshell/ShellToolFactory.java new file mode 100644 index 00000000..1bb544e3 --- /dev/null +++ b/generator/src/main/java/com/reajason/javaweb/memshell/ShellToolFactory.java @@ -0,0 +1,50 @@ +package com.reajason.javaweb.memshell; + +import com.reajason.javaweb.GenerationException; +import com.reajason.javaweb.ShellGenerator; +import com.reajason.javaweb.memshell.config.*; +import com.reajason.javaweb.memshell.generator.*; +import com.reajason.javaweb.memshell.generator.command.CommandGenerator; +import org.apache.commons.lang3.tuple.Pair; + +import java.lang.reflect.Constructor; +import java.util.Map; +import java.util.concurrent.ConcurrentHashMap; + +/** + * @author ReaJason + * @since 2025/08/22 + */ +public class ShellToolFactory { + private static final Map, Class>> instances = new ConcurrentHashMap<>(); + + static { + register(ShellTool.Godzilla, GodzillaGenerator.class, GodzillaConfig.class); + register(ShellTool.Behinder, BehinderGenerator.class, BehinderConfig.class); + register(ShellTool.Command, CommandGenerator.class, CommandConfig.class); + register(ShellTool.Suo5, Suo5Generator.class, Suo5Config.class); + register(ShellTool.AntSword, AntSwordGenerator.class, AntSwordConfig.class); + register(ShellTool.NeoreGeorg, NeoreGeorgGenerator.class, NeoreGeorgConfig.class); + register(ShellTool.Custom, CustomShellGenerator.class, CustomConfig.class); + } + + public static void register(String shellToolName, Class generatorClass, Class configClass) { + if (shellToolName == null || shellToolName.trim().isEmpty()) { + throw new IllegalArgumentException("ShellTool name cannot be null or empty."); + } + instances.put(shellToolName, Pair.of(generatorClass, configClass)); + } + + + public static byte[] generateBytes(ShellConfig shellConfig, ShellToolConfig shellToolConfig) { + try { + Pair, Class> classClassPair = instances.get(shellConfig.getShellTool()); + Constructor constructor = + classClassPair.getLeft().getConstructor(ShellConfig.class, classClassPair.getRight()); + ShellGenerator generator = constructor.newInstance(shellConfig, classClassPair.getRight().cast(shellToolConfig)); + return generator.getBytes(); + } catch (Exception e) { + throw new GenerationException("shell generate failed " + e.getMessage(), e); + } + } +} diff --git a/generator/src/main/java/com/reajason/javaweb/memshell/config/ShellConfig.java b/generator/src/main/java/com/reajason/javaweb/memshell/config/ShellConfig.java index c05a25c4..897b6671 100644 --- a/generator/src/main/java/com/reajason/javaweb/memshell/config/ShellConfig.java +++ b/generator/src/main/java/com/reajason/javaweb/memshell/config/ShellConfig.java @@ -1,6 +1,5 @@ package com.reajason.javaweb.memshell.config; -import com.reajason.javaweb.memshell.ShellTool; import com.reajason.javaweb.memshell.ShellType; import lombok.AllArgsConstructor; import lombok.Builder; @@ -31,7 +30,7 @@ public class ShellConfig { /** * 内存马功能 */ - private ShellTool shellTool; + private String shellTool; /** * 内存马类型 diff --git a/generator/src/main/java/com/reajason/javaweb/memshell/server/AbstractServer.java b/generator/src/main/java/com/reajason/javaweb/memshell/server/AbstractServer.java index 3baab150..43ced34b 100644 --- a/generator/src/main/java/com/reajason/javaweb/memshell/server/AbstractServer.java +++ b/generator/src/main/java/com/reajason/javaweb/memshell/server/AbstractServer.java @@ -1,6 +1,5 @@ package com.reajason.javaweb.memshell.server; -import com.reajason.javaweb.memshell.ShellTool; import org.apache.commons.lang3.tuple.Pair; import java.util.Collections; @@ -14,7 +13,7 @@ import java.util.Set; */ public abstract class AbstractServer { - private final Map map = new LinkedHashMap<>(); + private final Map map = new LinkedHashMap<>(); /** * 定义注入器映射 @@ -27,7 +26,7 @@ public abstract class AbstractServer { return null; } - public void addToolMapping(ShellTool shellTool, ToolMapping mapping) { + public void addToolMapping(String shellTool, ToolMapping mapping) { map.put(shellTool, mapping); } @@ -37,7 +36,7 @@ public abstract class AbstractServer { * @param shellTool 内存马功能 * @return shellTypes */ - public Set getSupportedShellTypes(ShellTool shellTool) { + public Set getSupportedShellTypes(String shellTool) { ToolMapping toolMapping = map.get(shellTool); if (toolMapping == null) { return Collections.emptySet(); @@ -45,11 +44,11 @@ public abstract class AbstractServer { return Collections.unmodifiableSet(toolMapping.getSupportedShellTypes()); } - public Set getSupportedShellTools() { + public Set getSupportedShellTools() { return Collections.unmodifiableSet(map.keySet()); } - public Pair, Class> getShellInjectorPair(ShellTool shellTool, String shellType) { + public Pair, Class> getShellInjectorPair(String shellTool, String shellType) { ToolMapping mapping = map.get(shellTool); if (mapping == null) { throw new UnsupportedOperationException("please implement shell type: " + shellType + " for " + shellTool); diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 6b3c5403..3ef9cb30 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,6 +1,6 @@ [versions] asm = "9.8" -jna = "5.13.0" +jna = "5.13.0" # 为适配 JDK6+ 这个不可修改 bcel = "5.2" javax-servlet-api = "3.0.1" javax-websocket-api = "1.1" diff --git a/integration-test/src/test/java/com/reajason/javaweb/integration/ShellAssertion.java b/integration-test/src/test/java/com/reajason/javaweb/integration/ShellAssertion.java index 74b6b3dd..2da52d23 100644 --- a/integration-test/src/test/java/com/reajason/javaweb/integration/ShellAssertion.java +++ b/integration-test/src/test/java/com/reajason/javaweb/integration/ShellAssertion.java @@ -6,7 +6,6 @@ import com.reajason.javaweb.godzilla.BlockingJavaWebSocketClient; import com.reajason.javaweb.godzilla.GodzillaManager; import com.reajason.javaweb.memshell.MemShellGenerator; import com.reajason.javaweb.memshell.MemShellResult; -import com.reajason.javaweb.memshell.ShellTool; import com.reajason.javaweb.memshell.ShellType; import com.reajason.javaweb.memshell.config.*; import com.reajason.javaweb.packer.Packers; @@ -37,6 +36,7 @@ import java.nio.file.Path; import java.util.Objects; import java.util.Random; +import static com.reajason.javaweb.memshell.ShellTool.*; import static com.reajason.javaweb.utils.CommonUtil.INJECTOR_CLASS_NAMES; import static com.reajason.javaweb.utils.CommonUtil.getRandomString; import static org.hamcrest.CoreMatchers.anyOf; @@ -52,17 +52,17 @@ import static org.junit.jupiter.api.Assertions.assertTrue; @Slf4j public class ShellAssertion { - public static void shellInjectIsOk(String url, String server, String shellType, ShellTool shellTool, int targetJdkVersion, Packers packer) { + public static void shellInjectIsOk(String url, String server, String shellType, String shellTool, int targetJdkVersion, Packers packer) { shellInjectIsOk(url, server, shellType, shellTool, targetJdkVersion, packer, null); } @SneakyThrows - public static void shellInjectIsOk(String url, String server, String shellType, ShellTool shellTool, int targetJdkVersion, Packers packer, GenericContainer container) { + public static void shellInjectIsOk(String url, String server, String shellType, String shellTool, int targetJdkVersion, Packers packer, GenericContainer container) { shellInjectIsOk(url, server, shellType, shellTool, targetJdkVersion, packer, container, null); } @SneakyThrows - public static Pair getUrls(String url, String shellType, ShellTool shellTool, Packers packer) { + public static Pair getUrls(String url, String shellType, String shellTool, Packers packer) { String shellUrl = url + "/test"; String urlPattern = null; if (shellType.endsWith(ShellType.SERVLET) @@ -83,7 +83,7 @@ public class ShellAssertion { } @SneakyThrows - public static void shellInjectIsOk(String url, String server, String shellType, ShellTool shellTool, int targetJdkVersion, Packers packer, GenericContainer appContainer, GenericContainer pythonContainer) { + public static void shellInjectIsOk(String url, String server, String shellType, String shellTool, int targetJdkVersion, Packers packer, GenericContainer appContainer, GenericContainer pythonContainer) { Pair urls = getUrls(url, shellType, shellTool, packer); String shellUrl = urls.getLeft(); String urlPattern = urls.getRight(); @@ -98,7 +98,7 @@ public class ShellAssertion { } @SneakyThrows - public static void packerResultAndInject(MemShellResult generateResult, String url, ShellTool shellTool, String shellType, Packers packer, GenericContainer appContainer) { + public static void packerResultAndInject(MemShellResult generateResult, String url, String shellTool, String shellType, Packers packer, GenericContainer appContainer) { String content = null; if (packer.getInstance() instanceof AgentJarPacker) { byte[] bytes = ((JarPacker) packer.getInstance()).packBytes(generateResult.toJarPackerConfig()); @@ -144,7 +144,7 @@ public class ShellAssertion { } @SneakyThrows - public static void assertShellIsOk(MemShellResult generateResult, String shellUrl, ShellTool shellTool, String shellType, GenericContainer appContainer, GenericContainer pythonContainer) { + public static void assertShellIsOk(MemShellResult generateResult, String shellUrl, String shellTool, String shellType, GenericContainer appContainer, GenericContainer pythonContainer) { switch (shellTool) { case Godzilla: godzillaIsOk(shellUrl, ((GodzillaConfig) generateResult.getShellToolConfig())); @@ -236,7 +236,7 @@ public class ShellAssertion { assertTrue(antSwordManager.getInfo().contains("ok")); } - public static ShellToolConfig getShellToolConfig(String shellType, ShellTool shellTool, Packers packer) { + public static ShellToolConfig getShellToolConfig(String shellType, String shellTool, Packers packer) { ShellToolConfig shellToolConfig = null; String uniqueName = shellTool + RandomStringUtils.randomAlphabetic(5) + shellType + RandomStringUtils.randomAlphabetic(5) + packer.name(); switch (shellTool) { @@ -291,7 +291,7 @@ public class ShellAssertion { return shellToolConfig; } - public static MemShellResult generate(String urlPattern, String server, String shellType, ShellTool shellTool, int targetJdkVersion, ShellToolConfig shellToolConfig, Packers packer) { + public static MemShellResult generate(String urlPattern, String server, String shellType, String shellTool, int targetJdkVersion, ShellToolConfig shellToolConfig, Packers packer) { InjectorConfig injectorConfig = new InjectorConfig(); if (StringUtils.isNotBlank(urlPattern)) { injectorConfig.setUrlPattern(urlPattern); @@ -312,7 +312,7 @@ public class ShellAssertion { return MemShellGenerator.generate(shellConfig, injectorConfig, shellToolConfig); } - public static void injectIsOk(String url, String shellType, ShellTool shellTool, String content, Packers packer, GenericContainer container) { + public static void injectIsOk(String url, String shellType, String shellTool, String content, Packers packer, GenericContainer container) { switch (packer) { case JSP, ClassLoaderJSP, DefineClassJSP -> { String uploadEntry = url + "/upload"; diff --git a/integration-test/src/test/java/com/reajason/javaweb/integration/TestCasesProvider.java b/integration-test/src/test/java/com/reajason/javaweb/integration/TestCasesProvider.java index 2d9acf39..7bc1da24 100644 --- a/integration-test/src/test/java/com/reajason/javaweb/integration/TestCasesProvider.java +++ b/integration-test/src/test/java/com/reajason/javaweb/integration/TestCasesProvider.java @@ -1,7 +1,6 @@ package com.reajason.javaweb.integration; import com.reajason.javaweb.memshell.ServerFactory; -import com.reajason.javaweb.memshell.ShellTool; import com.reajason.javaweb.memshell.ShellType; import com.reajason.javaweb.packer.Packers; import org.junit.jupiter.params.provider.Arguments; @@ -23,7 +22,7 @@ public class TestCasesProvider { String server, List testShellTypes, List testPackers, - List> unSupportedCases) { + List> unSupportedCases) { return getTestCases(imageName, server, testShellTypes, testPackers, unSupportedCases, null); } @@ -31,9 +30,9 @@ public class TestCasesProvider { String server, List testShellTypes, List testPackers, - List> unSupportedCases, - List unSupportedShellTools) { - Set supportedShellTools = new TreeSet<>(ServerFactory.getServer(server).getSupportedShellTools()); + List> unSupportedCases, + List unSupportedShellTools) { + Set supportedShellTools = new TreeSet<>(ServerFactory.getServer(server).getSupportedShellTools()); if (unSupportedShellTools != null) { unSupportedShellTools.forEach(supportedShellTools::remove); } diff --git a/integration-test/src/test/java/com/reajason/javaweb/integration/memshell/glassfish/GlassFish3ContainerTest.java b/integration-test/src/test/java/com/reajason/javaweb/integration/memshell/glassfish/GlassFish3ContainerTest.java index 1da5f36c..cb1f288f 100644 --- a/integration-test/src/test/java/com/reajason/javaweb/integration/memshell/glassfish/GlassFish3ContainerTest.java +++ b/integration-test/src/test/java/com/reajason/javaweb/integration/memshell/glassfish/GlassFish3ContainerTest.java @@ -2,7 +2,6 @@ package com.reajason.javaweb.integration.memshell.glassfish; import com.reajason.javaweb.Server; import com.reajason.javaweb.integration.TestCasesProvider; -import com.reajason.javaweb.memshell.ShellTool; import com.reajason.javaweb.memshell.ShellType; import com.reajason.javaweb.packer.Packers; import lombok.extern.slf4j.Slf4j; @@ -76,7 +75,7 @@ public class GlassFish3ContainerTest { @ParameterizedTest(name = "{0}|{1}{2}|{3}") @MethodSource("casesProvider") - void test(String imageName, String shellType, ShellTool shellTool, Packers packer) { + void test(String imageName, String shellType, String shellTool, Packers packer) { shellInjectIsOk(getUrl(container), Server.GlassFish, shellType, shellTool, Opcodes.V1_6, packer, container, python); } } diff --git a/integration-test/src/test/java/com/reajason/javaweb/integration/memshell/glassfish/GlassFish4ContainerTest.java b/integration-test/src/test/java/com/reajason/javaweb/integration/memshell/glassfish/GlassFish4ContainerTest.java index 1356148c..61ebc8a0 100644 --- a/integration-test/src/test/java/com/reajason/javaweb/integration/memshell/glassfish/GlassFish4ContainerTest.java +++ b/integration-test/src/test/java/com/reajason/javaweb/integration/memshell/glassfish/GlassFish4ContainerTest.java @@ -2,7 +2,6 @@ package com.reajason.javaweb.integration.memshell.glassfish; import com.reajason.javaweb.Server; import com.reajason.javaweb.integration.TestCasesProvider; -import com.reajason.javaweb.memshell.ShellTool; import com.reajason.javaweb.memshell.ShellType; import com.reajason.javaweb.packer.Packers; import lombok.extern.slf4j.Slf4j; @@ -76,7 +75,7 @@ public class GlassFish4ContainerTest { @ParameterizedTest(name = "{0}|{1}{2}|{3}") @MethodSource("casesProvider") - void test(String imageName, String shellType, ShellTool shellTool, Packers packer) { + void test(String imageName, String shellType, String shellTool, Packers packer) { shellInjectIsOk(getUrl(container), Server.GlassFish, shellType, shellTool, Opcodes.V1_6, packer, container, python); } } diff --git a/integration-test/src/test/java/com/reajason/javaweb/integration/memshell/glassfish/GlassFish501ContainerTest.java b/integration-test/src/test/java/com/reajason/javaweb/integration/memshell/glassfish/GlassFish501ContainerTest.java index 44179071..b3850344 100644 --- a/integration-test/src/test/java/com/reajason/javaweb/integration/memshell/glassfish/GlassFish501ContainerTest.java +++ b/integration-test/src/test/java/com/reajason/javaweb/integration/memshell/glassfish/GlassFish501ContainerTest.java @@ -2,7 +2,6 @@ package com.reajason.javaweb.integration.memshell.glassfish; import com.reajason.javaweb.Server; import com.reajason.javaweb.integration.TestCasesProvider; -import com.reajason.javaweb.memshell.ShellTool; import com.reajason.javaweb.memshell.ShellType; import com.reajason.javaweb.packer.Packers; import lombok.extern.slf4j.Slf4j; @@ -68,7 +67,7 @@ public class GlassFish501ContainerTest { @ParameterizedTest(name = "{0}|{1}{2}|{3}") @MethodSource("casesProvider") - void test(String imageName, String shellType, ShellTool shellTool, Packers packer) { + void test(String imageName, String shellType, String shellTool, Packers packer) { shellInjectIsOk(getUrl(container), Server.GlassFish, shellType, shellTool, Opcodes.V1_6, packer, container, python); } } diff --git a/integration-test/src/test/java/com/reajason/javaweb/integration/memshell/glassfish/GlassFish510ContainerTest.java b/integration-test/src/test/java/com/reajason/javaweb/integration/memshell/glassfish/GlassFish510ContainerTest.java index 40c5c28a..94a1b7d6 100644 --- a/integration-test/src/test/java/com/reajason/javaweb/integration/memshell/glassfish/GlassFish510ContainerTest.java +++ b/integration-test/src/test/java/com/reajason/javaweb/integration/memshell/glassfish/GlassFish510ContainerTest.java @@ -2,7 +2,6 @@ package com.reajason.javaweb.integration.memshell.glassfish; import com.reajason.javaweb.Server; import com.reajason.javaweb.integration.TestCasesProvider; -import com.reajason.javaweb.memshell.ShellTool; import com.reajason.javaweb.memshell.ShellType; import com.reajason.javaweb.packer.Packers; import lombok.extern.slf4j.Slf4j; @@ -69,7 +68,7 @@ public class GlassFish510ContainerTest { @ParameterizedTest(name = "{0}|{1}{2}|{3}") @MethodSource("casesProvider") - void test(String imageName, String shellType, ShellTool shellTool, Packers packer) { + void test(String imageName, String shellType, String shellTool, Packers packer) { shellInjectIsOk(getUrl(container), Server.GlassFish, shellType, shellTool, Opcodes.V1_6, packer, container, python); } } diff --git a/integration-test/src/test/java/com/reajason/javaweb/integration/memshell/glassfish/GlassFish6ContainerTest.java b/integration-test/src/test/java/com/reajason/javaweb/integration/memshell/glassfish/GlassFish6ContainerTest.java index 6d1ee141..fcc221c3 100644 --- a/integration-test/src/test/java/com/reajason/javaweb/integration/memshell/glassfish/GlassFish6ContainerTest.java +++ b/integration-test/src/test/java/com/reajason/javaweb/integration/memshell/glassfish/GlassFish6ContainerTest.java @@ -69,7 +69,7 @@ public class GlassFish6ContainerTest { @ParameterizedTest(name = "{0}|{1}{2}|{3}") @MethodSource("casesProvider") - void test(String imageName, String shellType, ShellTool shellTool, Packers packer) { + void test(String imageName, String shellType, String shellTool, Packers packer) { shellInjectIsOk(getUrl(container), Server.GlassFish, shellType, shellTool, Opcodes.V11, packer, container, python); } } diff --git a/integration-test/src/test/java/com/reajason/javaweb/integration/memshell/glassfish/GlassFish7ContainerTest.java b/integration-test/src/test/java/com/reajason/javaweb/integration/memshell/glassfish/GlassFish7ContainerTest.java index 4850b9b1..3c752274 100644 --- a/integration-test/src/test/java/com/reajason/javaweb/integration/memshell/glassfish/GlassFish7ContainerTest.java +++ b/integration-test/src/test/java/com/reajason/javaweb/integration/memshell/glassfish/GlassFish7ContainerTest.java @@ -68,7 +68,7 @@ public class GlassFish7ContainerTest { @ParameterizedTest(name = "{0}|{1}{2}|{3}") @MethodSource("casesProvider") - void test(String imageName, String shellType, ShellTool shellTool, Packers packer) { + void test(String imageName, String shellType, String shellTool, Packers packer) { shellInjectIsOk(getUrl(container), Server.GlassFish, shellType, shellTool, Opcodes.V17, packer, container, python); } } diff --git a/integration-test/src/test/java/com/reajason/javaweb/integration/memshell/jbossas/Jboss423ContainerTest.java b/integration-test/src/test/java/com/reajason/javaweb/integration/memshell/jbossas/Jboss423ContainerTest.java index 3d1ad702..3cdd1fb7 100644 --- a/integration-test/src/test/java/com/reajason/javaweb/integration/memshell/jbossas/Jboss423ContainerTest.java +++ b/integration-test/src/test/java/com/reajason/javaweb/integration/memshell/jbossas/Jboss423ContainerTest.java @@ -2,7 +2,6 @@ package com.reajason.javaweb.integration.memshell.jbossas; import com.reajason.javaweb.Server; import com.reajason.javaweb.integration.TestCasesProvider; -import com.reajason.javaweb.memshell.ShellTool; import com.reajason.javaweb.memshell.ShellType; import com.reajason.javaweb.packer.Packers; import lombok.extern.slf4j.Slf4j; @@ -67,7 +66,7 @@ public class Jboss423ContainerTest { @ParameterizedTest(name = "{0}|{1}{2}|{3}") @MethodSource("casesProvider") - void test(String imageName, String shellType, ShellTool shellTool, Packers packer) { + void test(String imageName, String shellType, String shellTool, Packers packer) { shellInjectIsOk(getUrl(container), Server.JBoss, shellType, shellTool, Opcodes.V1_6, packer, container, python); } } diff --git a/integration-test/src/test/java/com/reajason/javaweb/integration/memshell/jbossas/Jboss510ContainerTest.java b/integration-test/src/test/java/com/reajason/javaweb/integration/memshell/jbossas/Jboss510ContainerTest.java index aee9735c..cbba497f 100644 --- a/integration-test/src/test/java/com/reajason/javaweb/integration/memshell/jbossas/Jboss510ContainerTest.java +++ b/integration-test/src/test/java/com/reajason/javaweb/integration/memshell/jbossas/Jboss510ContainerTest.java @@ -73,7 +73,7 @@ public class Jboss510ContainerTest { @ParameterizedTest(name = "{0}|{1}{2}|{3}") @MethodSource("casesProvider") - void test(String imageName, String shellType, ShellTool shellTool, Packers packer) { + void test(String imageName, String shellType, String shellTool, Packers packer) { shellInjectIsOk(getUrl(container), Server.JBoss, shellType, shellTool, Opcodes.V1_6, packer, container, python); } } diff --git a/integration-test/src/test/java/com/reajason/javaweb/integration/memshell/jbossas/Jboss610ContainerTest.java b/integration-test/src/test/java/com/reajason/javaweb/integration/memshell/jbossas/Jboss610ContainerTest.java index b59cbdd3..28d44d7b 100644 --- a/integration-test/src/test/java/com/reajason/javaweb/integration/memshell/jbossas/Jboss610ContainerTest.java +++ b/integration-test/src/test/java/com/reajason/javaweb/integration/memshell/jbossas/Jboss610ContainerTest.java @@ -2,7 +2,6 @@ package com.reajason.javaweb.integration.memshell.jbossas; import com.reajason.javaweb.Server; import com.reajason.javaweb.integration.TestCasesProvider; -import com.reajason.javaweb.memshell.ShellTool; import com.reajason.javaweb.memshell.ShellType; import com.reajason.javaweb.packer.Packers; import lombok.extern.slf4j.Slf4j; @@ -70,7 +69,7 @@ public class Jboss610ContainerTest { @ParameterizedTest(name = "{0}|{1}{2}|{3}") @MethodSource("casesProvider") - void test(String imageName, String shellType, ShellTool shellTool, Packers packer) { + void test(String imageName, String shellType, String shellTool, Packers packer) { shellInjectIsOk(getUrl(container), Server.JBoss, shellType, shellTool, Opcodes.V1_6, packer, container, python); } } diff --git a/integration-test/src/test/java/com/reajason/javaweb/integration/memshell/jbossas/Jboss711ContainerTest.java b/integration-test/src/test/java/com/reajason/javaweb/integration/memshell/jbossas/Jboss711ContainerTest.java index ea9a0c4b..cd5c36de 100644 --- a/integration-test/src/test/java/com/reajason/javaweb/integration/memshell/jbossas/Jboss711ContainerTest.java +++ b/integration-test/src/test/java/com/reajason/javaweb/integration/memshell/jbossas/Jboss711ContainerTest.java @@ -2,7 +2,6 @@ package com.reajason.javaweb.integration.memshell.jbossas; import com.reajason.javaweb.Server; import com.reajason.javaweb.integration.TestCasesProvider; -import com.reajason.javaweb.memshell.ShellTool; import com.reajason.javaweb.memshell.ShellType; import com.reajason.javaweb.packer.Packers; import lombok.extern.slf4j.Slf4j; @@ -73,7 +72,7 @@ public class Jboss711ContainerTest { @ParameterizedTest(name = "{0}|{1}{2}|{3}") @MethodSource("casesProvider") - void test(String imageName, String shellType, ShellTool shellTool, Packers packer) { + void test(String imageName, String shellType, String shellTool, Packers packer) { shellInjectIsOk(getUrl(container), Server.JBoss, shellType, shellTool, Opcodes.V1_7, packer, container, python); } } diff --git a/integration-test/src/test/java/com/reajason/javaweb/integration/memshell/jbosseap/JbossEap6ContainerTest.java b/integration-test/src/test/java/com/reajason/javaweb/integration/memshell/jbosseap/JbossEap6ContainerTest.java index 328fd50c..61ce1e72 100644 --- a/integration-test/src/test/java/com/reajason/javaweb/integration/memshell/jbosseap/JbossEap6ContainerTest.java +++ b/integration-test/src/test/java/com/reajason/javaweb/integration/memshell/jbosseap/JbossEap6ContainerTest.java @@ -2,7 +2,6 @@ package com.reajason.javaweb.integration.memshell.jbosseap; import com.reajason.javaweb.Server; import com.reajason.javaweb.integration.TestCasesProvider; -import com.reajason.javaweb.memshell.ShellTool; import com.reajason.javaweb.memshell.ShellType; import com.reajason.javaweb.packer.Packers; import lombok.extern.slf4j.Slf4j; @@ -67,7 +66,7 @@ public class JbossEap6ContainerTest { @ParameterizedTest(name = "{0}|{1}{2}|{3}") @MethodSource("casesProvider") - void test(String imageName, String shellType, ShellTool shellTool, Packers packer) { + void test(String imageName, String shellType, String shellTool, Packers packer) { shellInjectIsOk(getUrl(container), Server.JBoss, shellType, shellTool, Opcodes.V1_6, packer, container, python); } } diff --git a/integration-test/src/test/java/com/reajason/javaweb/integration/memshell/jbosseap/JbossEap7ContainerTest.java b/integration-test/src/test/java/com/reajason/javaweb/integration/memshell/jbosseap/JbossEap7ContainerTest.java index 298c7705..704aef83 100644 --- a/integration-test/src/test/java/com/reajason/javaweb/integration/memshell/jbosseap/JbossEap7ContainerTest.java +++ b/integration-test/src/test/java/com/reajason/javaweb/integration/memshell/jbosseap/JbossEap7ContainerTest.java @@ -2,7 +2,6 @@ package com.reajason.javaweb.integration.memshell.jbosseap; import com.reajason.javaweb.Server; import com.reajason.javaweb.integration.TestCasesProvider; -import com.reajason.javaweb.memshell.ShellTool; import com.reajason.javaweb.memshell.ShellType; import com.reajason.javaweb.packer.Packers; import lombok.extern.slf4j.Slf4j; @@ -68,7 +67,7 @@ public class JbossEap7ContainerTest { @ParameterizedTest(name = "{0}|{1}{2}|{3}") @MethodSource("casesProvider") - void test(String imageName, String shellType, ShellTool shellTool, Packers packer) { + void test(String imageName, String shellType, String shellTool, Packers packer) { shellInjectIsOk(getUrl(container), Server.Undertow, shellType, shellTool, Opcodes.V1_6, packer, container, python); } } diff --git a/integration-test/src/test/java/com/reajason/javaweb/integration/memshell/jetty/Jetty10ContainerTest.java b/integration-test/src/test/java/com/reajason/javaweb/integration/memshell/jetty/Jetty10ContainerTest.java index ab0dfc41..c24ff5a7 100644 --- a/integration-test/src/test/java/com/reajason/javaweb/integration/memshell/jetty/Jetty10ContainerTest.java +++ b/integration-test/src/test/java/com/reajason/javaweb/integration/memshell/jetty/Jetty10ContainerTest.java @@ -2,7 +2,6 @@ package com.reajason.javaweb.integration.memshell.jetty; import com.reajason.javaweb.Server; import com.reajason.javaweb.integration.TestCasesProvider; -import com.reajason.javaweb.memshell.ShellTool; import com.reajason.javaweb.memshell.ShellType; import com.reajason.javaweb.packer.Packers; import lombok.extern.slf4j.Slf4j; @@ -68,7 +67,7 @@ public class Jetty10ContainerTest { @ParameterizedTest(name = "{0}|{1}{2}|{3}") @MethodSource("casesProvider") - void test(String imageName, String shellType, ShellTool shellTool, Packers packer) { + void test(String imageName, String shellType, String shellTool, Packers packer) { shellInjectIsOk(getUrl(container), Server.Jetty, shellType, shellTool, Opcodes.V11, packer, container, python); } } diff --git a/integration-test/src/test/java/com/reajason/javaweb/integration/memshell/jetty/Jetty11ContainerTest.java b/integration-test/src/test/java/com/reajason/javaweb/integration/memshell/jetty/Jetty11ContainerTest.java index d214ed65..f3db5925 100644 --- a/integration-test/src/test/java/com/reajason/javaweb/integration/memshell/jetty/Jetty11ContainerTest.java +++ b/integration-test/src/test/java/com/reajason/javaweb/integration/memshell/jetty/Jetty11ContainerTest.java @@ -71,7 +71,7 @@ public class Jetty11ContainerTest { @ParameterizedTest(name = "{0}|{1}{2}|{3}") @MethodSource("casesProvider") - void test(String imageName, String shellType, ShellTool shellTool, Packers packer) { + void test(String imageName, String shellType, String shellTool, Packers packer) { shellInjectIsOk(getUrl(container), Server.Jetty, shellType, shellTool, Opcodes.V17, packer, container, python); } } diff --git a/integration-test/src/test/java/com/reajason/javaweb/integration/memshell/jetty/Jetty12ee10ContainerTest.java b/integration-test/src/test/java/com/reajason/javaweb/integration/memshell/jetty/Jetty12ee10ContainerTest.java index f3de0b9e..ea0d218b 100644 --- a/integration-test/src/test/java/com/reajason/javaweb/integration/memshell/jetty/Jetty12ee10ContainerTest.java +++ b/integration-test/src/test/java/com/reajason/javaweb/integration/memshell/jetty/Jetty12ee10ContainerTest.java @@ -71,7 +71,7 @@ public class Jetty12ee10ContainerTest { @ParameterizedTest(name = "{0}|{1}{2}|{3}") @MethodSource("casesProvider") - void test(String imageName, String shellType, ShellTool shellTool, Packers packer) { + void test(String imageName, String shellType, String shellTool, Packers packer) { shellInjectIsOk(getUrl(container), Server.Jetty, shellType, shellTool, Opcodes.V21, packer, container, python); } } diff --git a/integration-test/src/test/java/com/reajason/javaweb/integration/memshell/jetty/Jetty12ee8ContainerTest.java b/integration-test/src/test/java/com/reajason/javaweb/integration/memshell/jetty/Jetty12ee8ContainerTest.java index 63d9af45..91b3e70d 100644 --- a/integration-test/src/test/java/com/reajason/javaweb/integration/memshell/jetty/Jetty12ee8ContainerTest.java +++ b/integration-test/src/test/java/com/reajason/javaweb/integration/memshell/jetty/Jetty12ee8ContainerTest.java @@ -2,7 +2,6 @@ package com.reajason.javaweb.integration.memshell.jetty; import com.reajason.javaweb.Server; import com.reajason.javaweb.integration.TestCasesProvider; -import com.reajason.javaweb.memshell.ShellTool; import com.reajason.javaweb.memshell.ShellType; import com.reajason.javaweb.packer.Packers; import lombok.extern.slf4j.Slf4j; @@ -69,7 +68,7 @@ public class Jetty12ee8ContainerTest { @ParameterizedTest(name = "{0}|{1}{2}|{3}") @MethodSource("casesProvider") - void test(String imageName, String shellType, ShellTool shellTool, Packers packer) { + void test(String imageName, String shellType, String shellTool, Packers packer) { shellInjectIsOk(getUrl(container), Server.Jetty, shellType, shellTool, Opcodes.V21, packer, container, python); } } diff --git a/integration-test/src/test/java/com/reajason/javaweb/integration/memshell/jetty/Jetty12ee9ContainerTest.java b/integration-test/src/test/java/com/reajason/javaweb/integration/memshell/jetty/Jetty12ee9ContainerTest.java index c237e101..b8880926 100644 --- a/integration-test/src/test/java/com/reajason/javaweb/integration/memshell/jetty/Jetty12ee9ContainerTest.java +++ b/integration-test/src/test/java/com/reajason/javaweb/integration/memshell/jetty/Jetty12ee9ContainerTest.java @@ -71,7 +71,7 @@ public class Jetty12ee9ContainerTest { @ParameterizedTest(name = "{0}|{1}{2}|{3}") @MethodSource("casesProvider") - void test(String imageName, String shellType, ShellTool shellTool, Packers packer) { + void test(String imageName, String shellType, String shellTool, Packers packer) { shellInjectIsOk(getUrl(container), Server.Jetty, shellType, shellTool, Opcodes.V21, packer, container, python); } } diff --git a/integration-test/src/test/java/com/reajason/javaweb/integration/memshell/jetty/Jetty61ContainerTest.java b/integration-test/src/test/java/com/reajason/javaweb/integration/memshell/jetty/Jetty61ContainerTest.java index 568da231..cd3aee10 100644 --- a/integration-test/src/test/java/com/reajason/javaweb/integration/memshell/jetty/Jetty61ContainerTest.java +++ b/integration-test/src/test/java/com/reajason/javaweb/integration/memshell/jetty/Jetty61ContainerTest.java @@ -2,7 +2,6 @@ package com.reajason.javaweb.integration.memshell.jetty; import com.reajason.javaweb.Server; import com.reajason.javaweb.integration.TestCasesProvider; -import com.reajason.javaweb.memshell.ShellTool; import com.reajason.javaweb.memshell.ShellType; import com.reajason.javaweb.packer.Packers; import lombok.extern.slf4j.Slf4j; @@ -68,7 +67,7 @@ public class Jetty61ContainerTest { @ParameterizedTest(name = "{0}|{1}{2}|{3}") @MethodSource("casesProvider") - void test(String imageName, String shellType, ShellTool shellTool, Packers packer) { + void test(String imageName, String shellType, String shellTool, Packers packer) { shellInjectIsOk(getUrl(container), Server.Jetty, shellType, shellTool, Opcodes.V1_6, packer, container, python); } } diff --git a/integration-test/src/test/java/com/reajason/javaweb/integration/memshell/jetty/Jetty75ContainerTest.java b/integration-test/src/test/java/com/reajason/javaweb/integration/memshell/jetty/Jetty75ContainerTest.java index 05ff5413..012ae76b 100644 --- a/integration-test/src/test/java/com/reajason/javaweb/integration/memshell/jetty/Jetty75ContainerTest.java +++ b/integration-test/src/test/java/com/reajason/javaweb/integration/memshell/jetty/Jetty75ContainerTest.java @@ -2,7 +2,6 @@ package com.reajason.javaweb.integration.memshell.jetty; import com.reajason.javaweb.Server; import com.reajason.javaweb.integration.TestCasesProvider; -import com.reajason.javaweb.memshell.ShellTool; import com.reajason.javaweb.memshell.ShellType; import com.reajason.javaweb.packer.Packers; import lombok.extern.slf4j.Slf4j; @@ -67,7 +66,7 @@ public class Jetty75ContainerTest { @ParameterizedTest(name = "{0}|{1}{2}|{3}") @MethodSource("casesProvider") - void test(String imageName, String shellType, ShellTool shellTool, Packers packer) { + void test(String imageName, String shellType, String shellTool, Packers packer) { shellInjectIsOk(getUrl(container), Server.Jetty, shellType, shellTool, Opcodes.V1_6, packer, container, python); } } diff --git a/integration-test/src/test/java/com/reajason/javaweb/integration/memshell/jetty/Jetty76ContainerTest.java b/integration-test/src/test/java/com/reajason/javaweb/integration/memshell/jetty/Jetty76ContainerTest.java index ee71af7e..48ba4b73 100644 --- a/integration-test/src/test/java/com/reajason/javaweb/integration/memshell/jetty/Jetty76ContainerTest.java +++ b/integration-test/src/test/java/com/reajason/javaweb/integration/memshell/jetty/Jetty76ContainerTest.java @@ -2,7 +2,6 @@ package com.reajason.javaweb.integration.memshell.jetty; import com.reajason.javaweb.Server; import com.reajason.javaweb.integration.TestCasesProvider; -import com.reajason.javaweb.memshell.ShellTool; import com.reajason.javaweb.memshell.ShellType; import com.reajason.javaweb.packer.Packers; import lombok.extern.slf4j.Slf4j; @@ -67,7 +66,7 @@ public class Jetty76ContainerTest { @ParameterizedTest(name = "{0}|{1}{2}|{3}") @MethodSource("casesProvider") - void test(String imageName, String shellType, ShellTool shellTool, Packers packer) { + void test(String imageName, String shellType, String shellTool, Packers packer) { shellInjectIsOk(getUrl(container), Server.Jetty, shellType, shellTool, Opcodes.V1_6, packer, container, python); } } diff --git a/integration-test/src/test/java/com/reajason/javaweb/integration/memshell/jetty/Jetty81ContainerTest.java b/integration-test/src/test/java/com/reajason/javaweb/integration/memshell/jetty/Jetty81ContainerTest.java index 1375743f..c9061e4b 100644 --- a/integration-test/src/test/java/com/reajason/javaweb/integration/memshell/jetty/Jetty81ContainerTest.java +++ b/integration-test/src/test/java/com/reajason/javaweb/integration/memshell/jetty/Jetty81ContainerTest.java @@ -2,7 +2,6 @@ package com.reajason.javaweb.integration.memshell.jetty; import com.reajason.javaweb.Server; import com.reajason.javaweb.integration.TestCasesProvider; -import com.reajason.javaweb.memshell.ShellTool; import com.reajason.javaweb.memshell.ShellType; import com.reajason.javaweb.packer.Packers; import lombok.extern.slf4j.Slf4j; @@ -67,7 +66,7 @@ public class Jetty81ContainerTest { @ParameterizedTest(name = "{0}|{1}{2}|{3}") @MethodSource("casesProvider") - void test(String imageName, String shellType, ShellTool shellTool, Packers packer) { + void test(String imageName, String shellType, String shellTool, Packers packer) { shellInjectIsOk(getUrl(container), Server.Jetty, shellType, shellTool, Opcodes.V1_6, packer, container, python); } } diff --git a/integration-test/src/test/java/com/reajason/javaweb/integration/memshell/jetty/Jetty92ContainerTest.java b/integration-test/src/test/java/com/reajason/javaweb/integration/memshell/jetty/Jetty92ContainerTest.java index 7e035666..5d934571 100644 --- a/integration-test/src/test/java/com/reajason/javaweb/integration/memshell/jetty/Jetty92ContainerTest.java +++ b/integration-test/src/test/java/com/reajason/javaweb/integration/memshell/jetty/Jetty92ContainerTest.java @@ -2,7 +2,6 @@ package com.reajason.javaweb.integration.memshell.jetty; import com.reajason.javaweb.Server; import com.reajason.javaweb.integration.TestCasesProvider; -import com.reajason.javaweb.memshell.ShellTool; import com.reajason.javaweb.memshell.ShellType; import com.reajason.javaweb.packer.Packers; import lombok.extern.slf4j.Slf4j; @@ -69,7 +68,7 @@ public class Jetty92ContainerTest { @ParameterizedTest(name = "{0}|{1}{2}|{3}") @MethodSource("casesProvider") - void test(String imageName, String shellType, ShellTool shellTool, Packers packer) { + void test(String imageName, String shellType, String shellTool, Packers packer) { shellInjectIsOk(getUrl(container), Server.Jetty, shellType, shellTool, Opcodes.V1_6, packer, container, python); } } diff --git a/integration-test/src/test/java/com/reajason/javaweb/integration/memshell/jetty/Jetty93ContainerTest.java b/integration-test/src/test/java/com/reajason/javaweb/integration/memshell/jetty/Jetty93ContainerTest.java index 62f2cc40..f33d4075 100644 --- a/integration-test/src/test/java/com/reajason/javaweb/integration/memshell/jetty/Jetty93ContainerTest.java +++ b/integration-test/src/test/java/com/reajason/javaweb/integration/memshell/jetty/Jetty93ContainerTest.java @@ -2,7 +2,6 @@ package com.reajason.javaweb.integration.memshell.jetty; import com.reajason.javaweb.Server; import com.reajason.javaweb.integration.TestCasesProvider; -import com.reajason.javaweb.memshell.ShellTool; import com.reajason.javaweb.memshell.ShellType; import com.reajason.javaweb.packer.Packers; import lombok.extern.slf4j.Slf4j; @@ -68,7 +67,7 @@ public class Jetty93ContainerTest { @ParameterizedTest(name = "{0}|{1}{2}|{3}") @MethodSource("casesProvider") - void test(String imageName, String shellType, ShellTool shellTool, Packers packer) { + void test(String imageName, String shellType, String shellTool, Packers packer) { shellInjectIsOk(getUrl(container), Server.Jetty, shellType, shellTool, Opcodes.V1_6, packer, container, python); } } diff --git a/integration-test/src/test/java/com/reajason/javaweb/integration/memshell/jetty/Jetty94ContainerTest.java b/integration-test/src/test/java/com/reajason/javaweb/integration/memshell/jetty/Jetty94ContainerTest.java index 8113ef09..cdaca8dd 100644 --- a/integration-test/src/test/java/com/reajason/javaweb/integration/memshell/jetty/Jetty94ContainerTest.java +++ b/integration-test/src/test/java/com/reajason/javaweb/integration/memshell/jetty/Jetty94ContainerTest.java @@ -2,7 +2,6 @@ package com.reajason.javaweb.integration.memshell.jetty; import com.reajason.javaweb.Server; import com.reajason.javaweb.integration.TestCasesProvider; -import com.reajason.javaweb.memshell.ShellTool; import com.reajason.javaweb.memshell.ShellType; import com.reajason.javaweb.packer.Packers; import lombok.extern.slf4j.Slf4j; @@ -68,7 +67,7 @@ public class Jetty94ContainerTest { @ParameterizedTest(name = "{0}|{1}{2}|{3}") @MethodSource("casesProvider") - void test(String imageName, String shellType, ShellTool shellTool, Packers packer) { + void test(String imageName, String shellType, String shellTool, Packers packer) { shellInjectIsOk(getUrl(container), Server.Jetty, shellType, shellTool, Opcodes.V1_6, packer, container, python); } } diff --git a/integration-test/src/test/java/com/reajason/javaweb/integration/memshell/payara/Payara5201ContainerTest.java b/integration-test/src/test/java/com/reajason/javaweb/integration/memshell/payara/Payara5201ContainerTest.java index 27a413ea..231d9aa3 100644 --- a/integration-test/src/test/java/com/reajason/javaweb/integration/memshell/payara/Payara5201ContainerTest.java +++ b/integration-test/src/test/java/com/reajason/javaweb/integration/memshell/payara/Payara5201ContainerTest.java @@ -2,7 +2,6 @@ package com.reajason.javaweb.integration.memshell.payara; import com.reajason.javaweb.Server; import com.reajason.javaweb.integration.TestCasesProvider; -import com.reajason.javaweb.memshell.ShellTool; import com.reajason.javaweb.memshell.ShellType; import com.reajason.javaweb.packer.Packers; import lombok.extern.slf4j.Slf4j; @@ -67,7 +66,7 @@ public class Payara5201ContainerTest { @ParameterizedTest(name = "{0}|{1}{2}|{3}") @MethodSource("casesProvider") - void test(String imageName, String shellType, ShellTool shellTool, Packers packer) { + void test(String imageName, String shellType, String shellTool, Packers packer) { shellInjectIsOk(getUrl(container), Server.GlassFish, shellType, shellTool, Opcodes.V1_6, packer, container, python); } } diff --git a/integration-test/src/test/java/com/reajason/javaweb/integration/memshell/payara/Payara520225ContainerTest.java b/integration-test/src/test/java/com/reajason/javaweb/integration/memshell/payara/Payara520225ContainerTest.java index 209e0f0d..4fae4e5c 100644 --- a/integration-test/src/test/java/com/reajason/javaweb/integration/memshell/payara/Payara520225ContainerTest.java +++ b/integration-test/src/test/java/com/reajason/javaweb/integration/memshell/payara/Payara520225ContainerTest.java @@ -2,7 +2,6 @@ package com.reajason.javaweb.integration.memshell.payara; import com.reajason.javaweb.Server; import com.reajason.javaweb.integration.TestCasesProvider; -import com.reajason.javaweb.memshell.ShellTool; import com.reajason.javaweb.memshell.ShellType; import com.reajason.javaweb.packer.Packers; import lombok.extern.slf4j.Slf4j; @@ -67,7 +66,7 @@ public class Payara520225ContainerTest { @ParameterizedTest(name = "{0}|{1}{2}|{3}") @MethodSource("casesProvider") - void test(String imageName, String shellType, ShellTool shellTool, Packers packer) { + void test(String imageName, String shellType, String shellTool, Packers packer) { shellInjectIsOk(getUrl(container), Server.GlassFish, shellType, shellTool, Opcodes.V1_6, packer, container, python); } } diff --git a/integration-test/src/test/java/com/reajason/javaweb/integration/memshell/payara/Payara620222ContainerTest.java b/integration-test/src/test/java/com/reajason/javaweb/integration/memshell/payara/Payara620222ContainerTest.java index 9d40a917..b62790bb 100644 --- a/integration-test/src/test/java/com/reajason/javaweb/integration/memshell/payara/Payara620222ContainerTest.java +++ b/integration-test/src/test/java/com/reajason/javaweb/integration/memshell/payara/Payara620222ContainerTest.java @@ -67,7 +67,7 @@ public class Payara620222ContainerTest { @ParameterizedTest(name = "{0}|{1}{2}|{3}") @MethodSource("casesProvider") - void test(String imageName, String shellType, ShellTool shellTool, Packers packer) { + void test(String imageName, String shellType, String shellTool, Packers packer) { shellInjectIsOk(getUrl(container), Server.GlassFish, shellType, shellTool, Opcodes.V11, packer, container, python); } } diff --git a/integration-test/src/test/java/com/reajason/javaweb/integration/memshell/resin/Resin3116ContainerTest.java b/integration-test/src/test/java/com/reajason/javaweb/integration/memshell/resin/Resin3116ContainerTest.java index 50fd4143..d9556a80 100644 --- a/integration-test/src/test/java/com/reajason/javaweb/integration/memshell/resin/Resin3116ContainerTest.java +++ b/integration-test/src/test/java/com/reajason/javaweb/integration/memshell/resin/Resin3116ContainerTest.java @@ -2,7 +2,6 @@ package com.reajason.javaweb.integration.memshell.resin; import com.reajason.javaweb.Server; import com.reajason.javaweb.integration.TestCasesProvider; -import com.reajason.javaweb.memshell.ShellTool; import com.reajason.javaweb.memshell.ShellType; import com.reajason.javaweb.packer.Packers; import lombok.SneakyThrows; @@ -71,7 +70,7 @@ public class Resin3116ContainerTest { @ParameterizedTest(name = "{0}|{1}{2}|{3}") @MethodSource("casesProvider") - void test(String imageName, String shellType, ShellTool shellTool, Packers packer) { + void test(String imageName, String shellType, String shellTool, Packers packer) { shellInjectIsOk(getUrl(container), Server.Resin, shellType, shellTool, Opcodes.V1_6, packer, container, python); } } \ No newline at end of file diff --git a/integration-test/src/test/java/com/reajason/javaweb/integration/memshell/resin/Resin318ContainerTest.java b/integration-test/src/test/java/com/reajason/javaweb/integration/memshell/resin/Resin318ContainerTest.java index bccafa5a..a7661c5a 100644 --- a/integration-test/src/test/java/com/reajason/javaweb/integration/memshell/resin/Resin318ContainerTest.java +++ b/integration-test/src/test/java/com/reajason/javaweb/integration/memshell/resin/Resin318ContainerTest.java @@ -2,7 +2,6 @@ package com.reajason.javaweb.integration.memshell.resin; import com.reajason.javaweb.Server; import com.reajason.javaweb.integration.TestCasesProvider; -import com.reajason.javaweb.memshell.ShellTool; import com.reajason.javaweb.memshell.ShellType; import com.reajason.javaweb.packer.Packers; import lombok.extern.slf4j.Slf4j; @@ -67,7 +66,7 @@ public class Resin318ContainerTest { @ParameterizedTest(name = "{0}|{1}{2}|{3}") @MethodSource("casesProvider") - void test(String imageName, String shellType, ShellTool shellTool, Packers packer) { + void test(String imageName, String shellType, String shellTool, Packers packer) { shellInjectIsOk(getUrl(container), Server.Resin, shellType, shellTool, Opcodes.V1_6, packer, container, python); } } \ No newline at end of file diff --git a/integration-test/src/test/java/com/reajason/javaweb/integration/memshell/resin/Resin4058ContainerTest.java b/integration-test/src/test/java/com/reajason/javaweb/integration/memshell/resin/Resin4058ContainerTest.java index 049fbd21..4aa9982c 100644 --- a/integration-test/src/test/java/com/reajason/javaweb/integration/memshell/resin/Resin4058ContainerTest.java +++ b/integration-test/src/test/java/com/reajason/javaweb/integration/memshell/resin/Resin4058ContainerTest.java @@ -2,7 +2,6 @@ package com.reajason.javaweb.integration.memshell.resin; import com.reajason.javaweb.Server; import com.reajason.javaweb.integration.TestCasesProvider; -import com.reajason.javaweb.memshell.ShellTool; import com.reajason.javaweb.memshell.ShellType; import com.reajason.javaweb.packer.Packers; import lombok.extern.slf4j.Slf4j; @@ -67,7 +66,7 @@ public class Resin4058ContainerTest { @ParameterizedTest(name = "{0}|{1}{2}|{3}") @MethodSource("casesProvider") - void test(String imageName, String shellType, ShellTool shellTool, Packers packer) { + void test(String imageName, String shellType, String shellTool, Packers packer) { shellInjectIsOk(getUrl(container), Server.Resin, shellType, shellTool, Opcodes.V1_6, packer, container, python); } } \ No newline at end of file diff --git a/integration-test/src/test/java/com/reajason/javaweb/integration/memshell/resin/Resin4067ContainerTest.java b/integration-test/src/test/java/com/reajason/javaweb/integration/memshell/resin/Resin4067ContainerTest.java index 925158c9..ace0248c 100644 --- a/integration-test/src/test/java/com/reajason/javaweb/integration/memshell/resin/Resin4067ContainerTest.java +++ b/integration-test/src/test/java/com/reajason/javaweb/integration/memshell/resin/Resin4067ContainerTest.java @@ -2,7 +2,6 @@ package com.reajason.javaweb.integration.memshell.resin; import com.reajason.javaweb.Server; import com.reajason.javaweb.integration.TestCasesProvider; -import com.reajason.javaweb.memshell.ShellTool; import com.reajason.javaweb.memshell.ShellType; import com.reajason.javaweb.packer.Packers; import lombok.extern.slf4j.Slf4j; @@ -68,7 +67,7 @@ public class Resin4067ContainerTest { @ParameterizedTest(name = "{0}|{1}{2}|{3}") @MethodSource("casesProvider") - void test(String imageName, String shellType, ShellTool shellTool, Packers packer) { + void test(String imageName, String shellType, String shellTool, Packers packer) { shellInjectIsOk(getUrl(container), Server.Resin, shellType, shellTool, Opcodes.V11, packer, container, python); } } \ No newline at end of file diff --git a/integration-test/src/test/java/com/reajason/javaweb/integration/memshell/springwebflux/SpringBoot2WebFluxContainerTest.java b/integration-test/src/test/java/com/reajason/javaweb/integration/memshell/springwebflux/SpringBoot2WebFluxContainerTest.java index a234749e..2f284f14 100644 --- a/integration-test/src/test/java/com/reajason/javaweb/integration/memshell/springwebflux/SpringBoot2WebFluxContainerTest.java +++ b/integration-test/src/test/java/com/reajason/javaweb/integration/memshell/springwebflux/SpringBoot2WebFluxContainerTest.java @@ -2,7 +2,6 @@ package com.reajason.javaweb.integration.memshell.springwebflux; import com.reajason.javaweb.Server; import com.reajason.javaweb.integration.TestCasesProvider; -import com.reajason.javaweb.memshell.ShellTool; import com.reajason.javaweb.memshell.ShellType; import com.reajason.javaweb.packer.Packers; import lombok.extern.slf4j.Slf4j; @@ -65,7 +64,7 @@ public class SpringBoot2WebFluxContainerTest { @ParameterizedTest(name = "{0}|{1}{2}|{3}") @MethodSource("casesProvider") - void test(String imageName, String shellType, ShellTool shellTool, Packers packer) { + void test(String imageName, String shellType, String shellTool, Packers packer) { shellInjectIsOk(getUrl(container), Server.SpringWebFlux, shellType, shellTool, Opcodes.V1_8, packer, container, python); } diff --git a/integration-test/src/test/java/com/reajason/javaweb/integration/memshell/springwebflux/SpringBoot3WebFluxContainerTest.java b/integration-test/src/test/java/com/reajason/javaweb/integration/memshell/springwebflux/SpringBoot3WebFluxContainerTest.java index e4725dc6..e84ff663 100644 --- a/integration-test/src/test/java/com/reajason/javaweb/integration/memshell/springwebflux/SpringBoot3WebFluxContainerTest.java +++ b/integration-test/src/test/java/com/reajason/javaweb/integration/memshell/springwebflux/SpringBoot3WebFluxContainerTest.java @@ -2,7 +2,6 @@ package com.reajason.javaweb.integration.memshell.springwebflux; import com.reajason.javaweb.Server; import com.reajason.javaweb.integration.TestCasesProvider; -import com.reajason.javaweb.memshell.ShellTool; import com.reajason.javaweb.memshell.ShellType; import com.reajason.javaweb.packer.Packers; import lombok.extern.slf4j.Slf4j; @@ -63,7 +62,7 @@ public class SpringBoot3WebFluxContainerTest { @ParameterizedTest(name = "{0}|{1}{2}|{3}") @MethodSource("casesProvider") - void test(String imageName, String shellType, ShellTool shellTool, Packers packer) { + void test(String imageName, String shellType, String shellTool, Packers packer) { shellInjectIsOk(getUrl(container), Server.SpringWebFlux, shellType, shellTool, Opcodes.V17, packer, container, python); } diff --git a/integration-test/src/test/java/com/reajason/javaweb/integration/memshell/springwebmvc/SpringBoot1ContainerTest.java b/integration-test/src/test/java/com/reajason/javaweb/integration/memshell/springwebmvc/SpringBoot1ContainerTest.java index e365c5a3..77b3e449 100644 --- a/integration-test/src/test/java/com/reajason/javaweb/integration/memshell/springwebmvc/SpringBoot1ContainerTest.java +++ b/integration-test/src/test/java/com/reajason/javaweb/integration/memshell/springwebmvc/SpringBoot1ContainerTest.java @@ -2,7 +2,6 @@ package com.reajason.javaweb.integration.memshell.springwebmvc; import com.reajason.javaweb.Server; import com.reajason.javaweb.integration.TestCasesProvider; -import com.reajason.javaweb.memshell.ShellTool; import com.reajason.javaweb.memshell.ShellType; import com.reajason.javaweb.packer.Packers; import lombok.extern.slf4j.Slf4j; @@ -69,7 +68,7 @@ public class SpringBoot1ContainerTest { @ParameterizedTest(name = "{0}|{1}{2}|{3}") @MethodSource("casesProvider") - void test(String imageName, String shellType, ShellTool shellTool, Packers packer) { + void test(String imageName, String shellType, String shellTool, Packers packer) { shellInjectIsOk(getUrl(container), Server.SpringWebMvc, shellType, shellTool, Opcodes.V1_8, packer, container, python); } diff --git a/integration-test/src/test/java/com/reajason/javaweb/integration/memshell/springwebmvc/SpringBoot2ContainerTest.java b/integration-test/src/test/java/com/reajason/javaweb/integration/memshell/springwebmvc/SpringBoot2ContainerTest.java index 6e7c712b..70d2e398 100644 --- a/integration-test/src/test/java/com/reajason/javaweb/integration/memshell/springwebmvc/SpringBoot2ContainerTest.java +++ b/integration-test/src/test/java/com/reajason/javaweb/integration/memshell/springwebmvc/SpringBoot2ContainerTest.java @@ -2,7 +2,6 @@ package com.reajason.javaweb.integration.memshell.springwebmvc; import com.reajason.javaweb.Server; import com.reajason.javaweb.integration.TestCasesProvider; -import com.reajason.javaweb.memshell.ShellTool; import com.reajason.javaweb.memshell.ShellType; import com.reajason.javaweb.packer.Packers; import lombok.extern.slf4j.Slf4j; @@ -71,7 +70,7 @@ public class SpringBoot2ContainerTest { @ParameterizedTest(name = "{0}|{1}{2}|{3}") @MethodSource("casesProvider") - void test(String imageName, String shellType, ShellTool shellTool, Packers packer) { + void test(String imageName, String shellType, String shellTool, Packers packer) { shellInjectIsOk(getUrl(container), Server.SpringWebMvc, shellType, shellTool, Opcodes.V1_8, packer, container, python); } @@ -99,7 +98,7 @@ public class SpringBoot2ContainerTest { @ParameterizedTest(name = "{0}|{1}{2}|{3}") @MethodSource("tomcatCasesProvider") - void testTomcat(String imageName, String shellType, ShellTool shellTool, Packers packer) { + void testTomcat(String imageName, String shellType, String shellTool, Packers packer) { shellInjectIsOk(getUrl(container), Server.Tomcat, shellType, shellTool, Opcodes.V1_8, packer, container, python); } } diff --git a/integration-test/src/test/java/com/reajason/javaweb/integration/memshell/springwebmvc/SpringBoot2JettyContainerTest.java b/integration-test/src/test/java/com/reajason/javaweb/integration/memshell/springwebmvc/SpringBoot2JettyContainerTest.java index 042778fb..31a875bb 100644 --- a/integration-test/src/test/java/com/reajason/javaweb/integration/memshell/springwebmvc/SpringBoot2JettyContainerTest.java +++ b/integration-test/src/test/java/com/reajason/javaweb/integration/memshell/springwebmvc/SpringBoot2JettyContainerTest.java @@ -2,7 +2,6 @@ package com.reajason.javaweb.integration.memshell.springwebmvc; import com.reajason.javaweb.Server; import com.reajason.javaweb.integration.TestCasesProvider; -import com.reajason.javaweb.memshell.ShellTool; import com.reajason.javaweb.memshell.ShellType; import com.reajason.javaweb.packer.Packers; import lombok.extern.slf4j.Slf4j; @@ -71,7 +70,7 @@ public class SpringBoot2JettyContainerTest { @ParameterizedTest(name = "{0}|{1}{2}|{3}") @MethodSource("casesProvider") - void test(String imageName, String shellType, ShellTool shellTool, Packers packer) { + void test(String imageName, String shellType, String shellTool, Packers packer) { shellInjectIsOk(getUrl(container), Server.SpringWebMvc, shellType, shellTool, Opcodes.V1_8, packer, container, python); } @@ -97,7 +96,7 @@ public class SpringBoot2JettyContainerTest { @ParameterizedTest(name = "{0}|{1}{2}|{3}") @MethodSource("jettyCasesProvider") - void testJetty(String imageName, String shellType, ShellTool shellTool, Packers packer) { + void testJetty(String imageName, String shellType, String shellTool, Packers packer) { shellInjectIsOk(getUrl(container), Server.Jetty, shellType, shellTool, Opcodes.V1_8, packer, container, python); } } diff --git a/integration-test/src/test/java/com/reajason/javaweb/integration/memshell/springwebmvc/SpringBoot2UndertowContainerTest.java b/integration-test/src/test/java/com/reajason/javaweb/integration/memshell/springwebmvc/SpringBoot2UndertowContainerTest.java index 1585d99e..5eabf475 100644 --- a/integration-test/src/test/java/com/reajason/javaweb/integration/memshell/springwebmvc/SpringBoot2UndertowContainerTest.java +++ b/integration-test/src/test/java/com/reajason/javaweb/integration/memshell/springwebmvc/SpringBoot2UndertowContainerTest.java @@ -2,7 +2,6 @@ package com.reajason.javaweb.integration.memshell.springwebmvc; import com.reajason.javaweb.Server; import com.reajason.javaweb.integration.TestCasesProvider; -import com.reajason.javaweb.memshell.ShellTool; import com.reajason.javaweb.memshell.ShellType; import com.reajason.javaweb.packer.Packers; import lombok.extern.slf4j.Slf4j; @@ -71,7 +70,7 @@ public class SpringBoot2UndertowContainerTest { @ParameterizedTest(name = "{0}|{1}{2}|{3}") @MethodSource("casesProvider") - void test(String imageName, String shellType, ShellTool shellTool, Packers packer) { + void test(String imageName, String shellType, String shellTool, Packers packer) { shellInjectIsOk(getUrl(container), Server.SpringWebMvc, shellType, shellTool, Opcodes.V1_8, packer, container, python); } @@ -83,7 +82,7 @@ public class SpringBoot2UndertowContainerTest { return url; } - static Stream jettyCasesProvider() { + static Stream undertowCasesProvider() { String server = Server.Undertow; List supportedShellTypes = List.of( ShellType.SERVLET, @@ -96,8 +95,8 @@ public class SpringBoot2UndertowContainerTest { } @ParameterizedTest(name = "{0}|{1}{2}|{3}") - @MethodSource("jettyCasesProvider") - void testJetty(String imageName, String shellType, ShellTool shellTool, Packers packer) { + @MethodSource("undertowCasesProvider") + void testJetty(String imageName, String shellType, String shellTool, Packers packer) { shellInjectIsOk(getUrl(container), Server.Undertow, shellType, shellTool, Opcodes.V1_8, packer, container, python); } } diff --git a/integration-test/src/test/java/com/reajason/javaweb/integration/memshell/springwebmvc/SpringBoot2WarContainerTest.java b/integration-test/src/test/java/com/reajason/javaweb/integration/memshell/springwebmvc/SpringBoot2WarContainerTest.java index d8db65ff..4e20cc75 100644 --- a/integration-test/src/test/java/com/reajason/javaweb/integration/memshell/springwebmvc/SpringBoot2WarContainerTest.java +++ b/integration-test/src/test/java/com/reajason/javaweb/integration/memshell/springwebmvc/SpringBoot2WarContainerTest.java @@ -2,7 +2,6 @@ package com.reajason.javaweb.integration.memshell.springwebmvc; import com.reajason.javaweb.Server; import com.reajason.javaweb.integration.TestCasesProvider; -import com.reajason.javaweb.memshell.ShellTool; import com.reajason.javaweb.memshell.ShellType; import com.reajason.javaweb.packer.Packers; import lombok.extern.slf4j.Slf4j; @@ -68,7 +67,7 @@ public class SpringBoot2WarContainerTest { @ParameterizedTest(name = "{0}|{1}{2}|{3}") @MethodSource("casesProvider") - void test(String imageName, String shellType, ShellTool shellTool, Packers packer) { + void test(String imageName, String shellType, String shellTool, Packers packer) { shellInjectIsOk(getUrl(container), Server.SpringWebMvc, shellType, shellTool, Opcodes.V1_8, packer, container, python); } @@ -88,7 +87,7 @@ public class SpringBoot2WarContainerTest { @ParameterizedTest(name = "{0}|{1}{2}|{3}") @MethodSource("tomcatCasesProvider") - void testTomcat(String imageName, String shellType, ShellTool shellTool, Packers packer) { + void testTomcat(String imageName, String shellType, String shellTool, Packers packer) { shellInjectIsOk(getUrl(container), Server.Tomcat, shellType, shellTool, Opcodes.V1_8, packer, container, python); } } diff --git a/integration-test/src/test/java/com/reajason/javaweb/integration/memshell/springwebmvc/SpringBoot3ContainerTest.java b/integration-test/src/test/java/com/reajason/javaweb/integration/memshell/springwebmvc/SpringBoot3ContainerTest.java index 19700b14..78749f85 100644 --- a/integration-test/src/test/java/com/reajason/javaweb/integration/memshell/springwebmvc/SpringBoot3ContainerTest.java +++ b/integration-test/src/test/java/com/reajason/javaweb/integration/memshell/springwebmvc/SpringBoot3ContainerTest.java @@ -71,7 +71,7 @@ public class SpringBoot3ContainerTest { @ParameterizedTest(name = "{0}|{1}{2}|{3}") @MethodSource("casesProvider") - void test(String imageName, String shellType, ShellTool shellTool, Packers packer) { + void test(String imageName, String shellType, String shellTool, Packers packer) { shellInjectIsOk(getUrl(container), Server.SpringWebMvc, shellType, shellTool, Opcodes.V17, packer, container, python); } @@ -99,7 +99,7 @@ public class SpringBoot3ContainerTest { @ParameterizedTest(name = "{0}|{1}{2}|{3}") @MethodSource("tomcatCasesProvider") - void testTomcat(String imageName, String shellType, ShellTool shellTool, Packers packer) { + void testTomcat(String imageName, String shellType, String shellTool, Packers packer) { shellInjectIsOk(getUrl(container), Server.Tomcat, shellType, shellTool, Opcodes.V17, packer, container, python); } diff --git a/integration-test/src/test/java/com/reajason/javaweb/integration/memshell/tomcat/Tomcat10ContainerTest.java b/integration-test/src/test/java/com/reajason/javaweb/integration/memshell/tomcat/Tomcat10ContainerTest.java index 9c9c5fa7..ef00da50 100644 --- a/integration-test/src/test/java/com/reajason/javaweb/integration/memshell/tomcat/Tomcat10ContainerTest.java +++ b/integration-test/src/test/java/com/reajason/javaweb/integration/memshell/tomcat/Tomcat10ContainerTest.java @@ -73,7 +73,7 @@ public class Tomcat10ContainerTest { @ParameterizedTest(name = "{0}|{1}{2}|{3}") @MethodSource("casesProvider") - void test(String imageName, String shellType, ShellTool shellTool, Packers packer) { + void test(String imageName, String shellType, String shellTool, Packers packer) { shellInjectIsOk(getUrl(container), Server.Tomcat, shellType, shellTool, Opcodes.V11, packer, container, python); } } diff --git a/integration-test/src/test/java/com/reajason/javaweb/integration/memshell/tomcat/Tomcat11ContainerTest.java b/integration-test/src/test/java/com/reajason/javaweb/integration/memshell/tomcat/Tomcat11ContainerTest.java index df788967..53453002 100644 --- a/integration-test/src/test/java/com/reajason/javaweb/integration/memshell/tomcat/Tomcat11ContainerTest.java +++ b/integration-test/src/test/java/com/reajason/javaweb/integration/memshell/tomcat/Tomcat11ContainerTest.java @@ -74,7 +74,7 @@ public class Tomcat11ContainerTest { @ParameterizedTest(name = "{0}|{1}{2}|{3}") @MethodSource("casesProvider") - void test(String imageName, String shellType, ShellTool shellTool, Packers packer) { + void test(String imageName, String shellType, String shellTool, Packers packer) { shellInjectIsOk(getUrl(container), Server.Tomcat, shellType, shellTool, Opcodes.V17, packer, container, python); } } diff --git a/integration-test/src/test/java/com/reajason/javaweb/integration/memshell/tomcat/Tomcat11JRE21ContainerTest.java b/integration-test/src/test/java/com/reajason/javaweb/integration/memshell/tomcat/Tomcat11JRE21ContainerTest.java index 89c01f23..b55eaaac 100644 --- a/integration-test/src/test/java/com/reajason/javaweb/integration/memshell/tomcat/Tomcat11JRE21ContainerTest.java +++ b/integration-test/src/test/java/com/reajason/javaweb/integration/memshell/tomcat/Tomcat11JRE21ContainerTest.java @@ -75,7 +75,7 @@ public class Tomcat11JRE21ContainerTest { @ParameterizedTest(name = "{0}|{1}{2}|{3}") @MethodSource("casesProvider") - void test(String imageName, String shellType, ShellTool shellTool, Packers packer) { + void test(String imageName, String shellType, String shellTool, Packers packer) { shellInjectIsOk(getUrl(container), Server.Tomcat, shellType, shellTool, Opcodes.V21, packer, container, python); } } diff --git a/integration-test/src/test/java/com/reajason/javaweb/integration/memshell/tomcat/Tomcat5ContainerTest.java b/integration-test/src/test/java/com/reajason/javaweb/integration/memshell/tomcat/Tomcat5ContainerTest.java index 6fb7fd8e..a2417108 100644 --- a/integration-test/src/test/java/com/reajason/javaweb/integration/memshell/tomcat/Tomcat5ContainerTest.java +++ b/integration-test/src/test/java/com/reajason/javaweb/integration/memshell/tomcat/Tomcat5ContainerTest.java @@ -2,7 +2,6 @@ package com.reajason.javaweb.integration.memshell.tomcat; import com.reajason.javaweb.Server; import com.reajason.javaweb.integration.TestCasesProvider; -import com.reajason.javaweb.memshell.ShellTool; import com.reajason.javaweb.memshell.ShellType; import com.reajason.javaweb.packer.Packers; import lombok.extern.slf4j.Slf4j; @@ -74,7 +73,7 @@ public class Tomcat5ContainerTest { @ParameterizedTest(name = "{0}|{1}{2}|{3}") @MethodSource("casesProvider") - void test(String imageName, String shellType, ShellTool shellTool, Packers packer) { + void test(String imageName, String shellType, String shellTool, Packers packer) { shellInjectIsOk(getUrl(container), Server.Tomcat, shellType, shellTool, Opcodes.V1_6, packer, container, python); } } \ No newline at end of file diff --git a/integration-test/src/test/java/com/reajason/javaweb/integration/memshell/tomcat/Tomcat6ContainerTest.java b/integration-test/src/test/java/com/reajason/javaweb/integration/memshell/tomcat/Tomcat6ContainerTest.java index 7cee5993..0bced55e 100644 --- a/integration-test/src/test/java/com/reajason/javaweb/integration/memshell/tomcat/Tomcat6ContainerTest.java +++ b/integration-test/src/test/java/com/reajason/javaweb/integration/memshell/tomcat/Tomcat6ContainerTest.java @@ -2,7 +2,6 @@ package com.reajason.javaweb.integration.memshell.tomcat; import com.reajason.javaweb.Server; import com.reajason.javaweb.integration.TestCasesProvider; -import com.reajason.javaweb.memshell.ShellTool; import com.reajason.javaweb.memshell.ShellType; import com.reajason.javaweb.packer.Packers; import lombok.extern.slf4j.Slf4j; @@ -72,7 +71,7 @@ public class Tomcat6ContainerTest { @ParameterizedTest(name = "{0}|{1}{2}|{3}") @MethodSource("casesProvider") - void test(String imageName, String shellType, ShellTool shellTool, Packers packer) { + void test(String imageName, String shellType, String shellTool, Packers packer) { shellInjectIsOk(getUrl(container), Server.Tomcat, shellType, shellTool, Opcodes.V1_6, packer, container, python); } } \ No newline at end of file diff --git a/integration-test/src/test/java/com/reajason/javaweb/integration/memshell/tomcat/Tomcat7ContainerTest.java b/integration-test/src/test/java/com/reajason/javaweb/integration/memshell/tomcat/Tomcat7ContainerTest.java index 8cae394b..e534c5df 100644 --- a/integration-test/src/test/java/com/reajason/javaweb/integration/memshell/tomcat/Tomcat7ContainerTest.java +++ b/integration-test/src/test/java/com/reajason/javaweb/integration/memshell/tomcat/Tomcat7ContainerTest.java @@ -2,7 +2,6 @@ package com.reajason.javaweb.integration.memshell.tomcat; import com.reajason.javaweb.Server; import com.reajason.javaweb.integration.TestCasesProvider; -import com.reajason.javaweb.memshell.ShellTool; import com.reajason.javaweb.memshell.ShellType; import com.reajason.javaweb.packer.Packers; import lombok.extern.slf4j.Slf4j; @@ -73,7 +72,7 @@ public class Tomcat7ContainerTest { @ParameterizedTest(name = "{0}|{1}{2}|{3}") @MethodSource("casesProvider") - void test(String imageName, String shellType, ShellTool shellTool, Packers packer) { + void test(String imageName, String shellType, String shellTool, Packers packer) { shellInjectIsOk(getUrl(container), Server.Tomcat, shellType, shellTool, Opcodes.V1_7, packer, container, python); } } \ No newline at end of file diff --git a/integration-test/src/test/java/com/reajason/javaweb/integration/memshell/tomcat/Tomcat8CommandEncryptorContainerTest.java b/integration-test/src/test/java/com/reajason/javaweb/integration/memshell/tomcat/Tomcat8CommandEncryptorContainerTest.java index 53ed195d..226b42a7 100644 --- a/integration-test/src/test/java/com/reajason/javaweb/integration/memshell/tomcat/Tomcat8CommandEncryptorContainerTest.java +++ b/integration-test/src/test/java/com/reajason/javaweb/integration/memshell/tomcat/Tomcat8CommandEncryptorContainerTest.java @@ -64,7 +64,7 @@ public class Tomcat8CommandEncryptorContainerTest { @ParameterizedTest(name = "{0}|{1}{2}|{3}") @MethodSource("casesProvider") - void test(String imageName, String shellType, ShellTool shellTool, Packers packer) { + void test(String imageName, String shellType, String shellTool, Packers packer) { String url = getUrl(container); Pair urls = ShellAssertion.getUrls(url, shellType, shellTool, packer); diff --git a/integration-test/src/test/java/com/reajason/javaweb/integration/memshell/tomcat/Tomcat8ContainerTest.java b/integration-test/src/test/java/com/reajason/javaweb/integration/memshell/tomcat/Tomcat8ContainerTest.java index d94b2d04..a7cb78d7 100644 --- a/integration-test/src/test/java/com/reajason/javaweb/integration/memshell/tomcat/Tomcat8ContainerTest.java +++ b/integration-test/src/test/java/com/reajason/javaweb/integration/memshell/tomcat/Tomcat8ContainerTest.java @@ -2,7 +2,6 @@ package com.reajason.javaweb.integration.memshell.tomcat; import com.reajason.javaweb.Server; import com.reajason.javaweb.integration.TestCasesProvider; -import com.reajason.javaweb.memshell.ShellTool; import com.reajason.javaweb.memshell.ShellType; import com.reajason.javaweb.packer.Packers; import lombok.extern.slf4j.Slf4j; @@ -75,7 +74,7 @@ public class Tomcat8ContainerTest { @ParameterizedTest(name = "{0}|{1}{2}|{3}") @MethodSource("casesProvider") - void test(String imageName, String shellType, ShellTool shellTool, Packers packer) { + void test(String imageName, String shellType, String shellTool, Packers packer) { shellInjectIsOk(getUrl(container), Server.Tomcat, shellType, shellTool, Opcodes.V1_8, packer, container, python); } } \ No newline at end of file diff --git a/integration-test/src/test/java/com/reajason/javaweb/integration/memshell/tomcat/Tomcat8DeserializeContainerTest.java b/integration-test/src/test/java/com/reajason/javaweb/integration/memshell/tomcat/Tomcat8DeserializeContainerTest.java index 3ec8312c..9a0d3796 100644 --- a/integration-test/src/test/java/com/reajason/javaweb/integration/memshell/tomcat/Tomcat8DeserializeContainerTest.java +++ b/integration-test/src/test/java/com/reajason/javaweb/integration/memshell/tomcat/Tomcat8DeserializeContainerTest.java @@ -64,7 +64,7 @@ public class Tomcat8DeserializeContainerTest { @ParameterizedTest(name = "{0}-deserialize|{1}{2}|{3}") @MethodSource("casesProvider") - void test(String imageName, String shellType, ShellTool shellTool, Packers packer) { + void test(String imageName, String shellType, String shellTool, Packers packer) { ShellAssertion.shellInjectIsOk(getUrl(container), Server.Tomcat, shellType, shellTool, Opcodes.V1_8, packer, container); } } \ No newline at end of file diff --git a/integration-test/src/test/java/com/reajason/javaweb/integration/memshell/tomcat/Tomcat8ExpressionContainerTest.java b/integration-test/src/test/java/com/reajason/javaweb/integration/memshell/tomcat/Tomcat8ExpressionContainerTest.java index 63a88832..b2c78cfa 100644 --- a/integration-test/src/test/java/com/reajason/javaweb/integration/memshell/tomcat/Tomcat8ExpressionContainerTest.java +++ b/integration-test/src/test/java/com/reajason/javaweb/integration/memshell/tomcat/Tomcat8ExpressionContainerTest.java @@ -71,7 +71,7 @@ public class Tomcat8ExpressionContainerTest { @ParameterizedTest(name = "{0}-expression|{1}{2}|{3}") @MethodSource("casesProvider") - void test(String imageName, String shellType, ShellTool shellTool, Packers packer) { + void test(String imageName, String shellType, String shellTool, Packers packer) { ShellAssertion.shellInjectIsOk(getUrl(container), Server.Tomcat, shellType, shellTool, Opcodes.V1_8, packer, container); } } \ No newline at end of file diff --git a/integration-test/src/test/java/com/reajason/javaweb/integration/memshell/tomcat/Tomcat9ContainerTest.java b/integration-test/src/test/java/com/reajason/javaweb/integration/memshell/tomcat/Tomcat9ContainerTest.java index ae3012b2..18c05342 100644 --- a/integration-test/src/test/java/com/reajason/javaweb/integration/memshell/tomcat/Tomcat9ContainerTest.java +++ b/integration-test/src/test/java/com/reajason/javaweb/integration/memshell/tomcat/Tomcat9ContainerTest.java @@ -2,7 +2,6 @@ package com.reajason.javaweb.integration.memshell.tomcat; import com.reajason.javaweb.Server; import com.reajason.javaweb.integration.TestCasesProvider; -import com.reajason.javaweb.memshell.ShellTool; import com.reajason.javaweb.memshell.ShellType; import com.reajason.javaweb.packer.Packers; import lombok.extern.slf4j.Slf4j; @@ -73,7 +72,7 @@ public class Tomcat9ContainerTest { @ParameterizedTest(name = "{0}|{1}{2}|{3}") @MethodSource("casesProvider") - void test(String imageName, String shellType, ShellTool shellTool, Packers packer) { + void test(String imageName, String shellType, String shellTool, Packers packer) { shellInjectIsOk(getUrl(container), Server.Tomcat, shellType, shellTool, Opcodes.V9, packer, container, python); } } diff --git a/integration-test/src/test/java/com/reajason/javaweb/integration/memshell/weblogic/WebLogic1036ContainerTest.java b/integration-test/src/test/java/com/reajason/javaweb/integration/memshell/weblogic/WebLogic1036ContainerTest.java index b6c8499e..441e9896 100644 --- a/integration-test/src/test/java/com/reajason/javaweb/integration/memshell/weblogic/WebLogic1036ContainerTest.java +++ b/integration-test/src/test/java/com/reajason/javaweb/integration/memshell/weblogic/WebLogic1036ContainerTest.java @@ -2,7 +2,6 @@ package com.reajason.javaweb.integration.memshell.weblogic; import com.reajason.javaweb.Server; import com.reajason.javaweb.integration.TestCasesProvider; -import com.reajason.javaweb.memshell.ShellTool; import com.reajason.javaweb.memshell.ShellType; import com.reajason.javaweb.packer.Packers; import lombok.extern.slf4j.Slf4j; @@ -65,7 +64,7 @@ public class WebLogic1036ContainerTest { @ParameterizedTest(name = "{0}|{1}{2}|{3}") @MethodSource("casesProvider") - void test(String imageName, String shellType, ShellTool shellTool, Packers packer) { + void test(String imageName, String shellType, String shellTool, Packers packer) { shellInjectIsOk(getUrl(container), Server.WebLogic, shellType, shellTool, Opcodes.V1_6, packer, container, python); } diff --git a/integration-test/src/test/java/com/reajason/javaweb/integration/memshell/weblogic/WebLogic12214ContainerTest.java b/integration-test/src/test/java/com/reajason/javaweb/integration/memshell/weblogic/WebLogic12214ContainerTest.java index 2873a2f8..a881bc3a 100644 --- a/integration-test/src/test/java/com/reajason/javaweb/integration/memshell/weblogic/WebLogic12214ContainerTest.java +++ b/integration-test/src/test/java/com/reajason/javaweb/integration/memshell/weblogic/WebLogic12214ContainerTest.java @@ -2,7 +2,6 @@ package com.reajason.javaweb.integration.memshell.weblogic; import com.reajason.javaweb.Server; import com.reajason.javaweb.integration.TestCasesProvider; -import com.reajason.javaweb.memshell.ShellTool; import com.reajason.javaweb.memshell.ShellType; import com.reajason.javaweb.packer.Packers; import lombok.extern.slf4j.Slf4j; @@ -67,7 +66,7 @@ public class WebLogic12214ContainerTest { @ParameterizedTest(name = "{0}|{1}{2}|{3}") @MethodSource("casesProvider") - void test(String imageName, String shellType, ShellTool shellTool, Packers packer) { + void test(String imageName, String shellType, String shellTool, Packers packer) { shellInjectIsOk(getUrl(container), Server.WebLogic, shellType, shellTool, Opcodes.V1_6, packer, container, python); } diff --git a/integration-test/src/test/java/com/reajason/javaweb/integration/memshell/weblogic/WebLogic14110ContainerTest.java b/integration-test/src/test/java/com/reajason/javaweb/integration/memshell/weblogic/WebLogic14110ContainerTest.java index 26ec696d..2d455ccd 100644 --- a/integration-test/src/test/java/com/reajason/javaweb/integration/memshell/weblogic/WebLogic14110ContainerTest.java +++ b/integration-test/src/test/java/com/reajason/javaweb/integration/memshell/weblogic/WebLogic14110ContainerTest.java @@ -2,7 +2,6 @@ package com.reajason.javaweb.integration.memshell.weblogic; import com.reajason.javaweb.Server; import com.reajason.javaweb.integration.TestCasesProvider; -import com.reajason.javaweb.memshell.ShellTool; import com.reajason.javaweb.memshell.ShellType; import com.reajason.javaweb.packer.Packers; import lombok.extern.slf4j.Slf4j; @@ -68,7 +67,7 @@ public class WebLogic14110ContainerTest { @ParameterizedTest(name = "{0}|{1}{2}|{3}") @MethodSource("casesProvider") - void test(String imageName, String shellType, ShellTool shellTool, Packers packer) { + void test(String imageName, String shellType, String shellTool, Packers packer) { shellInjectIsOk(getUrl(container), Server.WebLogic, shellType, shellTool, Opcodes.V1_6, packer, container, python); } diff --git a/integration-test/src/test/java/com/reajason/javaweb/integration/memshell/websphere/WebSphere855ContainerTest.java b/integration-test/src/test/java/com/reajason/javaweb/integration/memshell/websphere/WebSphere855ContainerTest.java index 93e04f20..f5a74530 100644 --- a/integration-test/src/test/java/com/reajason/javaweb/integration/memshell/websphere/WebSphere855ContainerTest.java +++ b/integration-test/src/test/java/com/reajason/javaweb/integration/memshell/websphere/WebSphere855ContainerTest.java @@ -2,7 +2,6 @@ package com.reajason.javaweb.integration.memshell.websphere; import com.reajason.javaweb.Server; import com.reajason.javaweb.integration.TestCasesProvider; -import com.reajason.javaweb.memshell.ShellTool; import com.reajason.javaweb.memshell.ShellType; import com.reajason.javaweb.packer.Packers; import lombok.extern.slf4j.Slf4j; @@ -71,7 +70,7 @@ public class WebSphere855ContainerTest { @ParameterizedTest(name = "{0}|{1}{2}|{3}") @MethodSource("casesProvider") - void test(String imageName, String shellType, ShellTool shellTool, Packers packer) { + void test(String imageName, String shellType, String shellTool, Packers packer) { shellInjectIsOk(getUrl(container), Server.WebSphere, shellType, shellTool, Opcodes.V1_6, packer, container, python); } diff --git a/integration-test/src/test/java/com/reajason/javaweb/integration/memshell/websphere/WebSphere905ContainerTest.java b/integration-test/src/test/java/com/reajason/javaweb/integration/memshell/websphere/WebSphere905ContainerTest.java index bb422bc4..5d43bb5c 100644 --- a/integration-test/src/test/java/com/reajason/javaweb/integration/memshell/websphere/WebSphere905ContainerTest.java +++ b/integration-test/src/test/java/com/reajason/javaweb/integration/memshell/websphere/WebSphere905ContainerTest.java @@ -2,7 +2,6 @@ package com.reajason.javaweb.integration.memshell.websphere; import com.reajason.javaweb.Server; import com.reajason.javaweb.integration.TestCasesProvider; -import com.reajason.javaweb.memshell.ShellTool; import com.reajason.javaweb.memshell.ShellType; import com.reajason.javaweb.packer.Packers; import lombok.extern.slf4j.Slf4j; @@ -70,7 +69,7 @@ public class WebSphere905ContainerTest { @ParameterizedTest(name = "{0}|{1}{2}|{3}") @MethodSource("casesProvider") - void test(String imageName, String shellType, ShellTool shellTool, Packers packer) { + void test(String imageName, String shellType, String shellTool, Packers packer) { shellInjectIsOk(getUrl(container), Server.WebSphere, shellType, shellTool, Opcodes.V1_6, packer, container, python); } diff --git a/integration-test/src/test/java/com/reajason/javaweb/integration/memshell/websphere7/WebSphere700ContainerTest.java b/integration-test/src/test/java/com/reajason/javaweb/integration/memshell/websphere7/WebSphere700ContainerTest.java index 5e6e020c..55fc774b 100644 --- a/integration-test/src/test/java/com/reajason/javaweb/integration/memshell/websphere7/WebSphere700ContainerTest.java +++ b/integration-test/src/test/java/com/reajason/javaweb/integration/memshell/websphere7/WebSphere700ContainerTest.java @@ -2,7 +2,6 @@ package com.reajason.javaweb.integration.memshell.websphere7; import com.reajason.javaweb.Server; import com.reajason.javaweb.integration.TestCasesProvider; -import com.reajason.javaweb.memshell.ShellTool; import com.reajason.javaweb.memshell.ShellType; import com.reajason.javaweb.packer.Packers; import lombok.extern.slf4j.Slf4j; @@ -71,7 +70,7 @@ public class WebSphere700ContainerTest { @ParameterizedTest(name = "{0}|{1}{2}|{3}") @MethodSource("casesProvider") - void test(String imageName, String shellType, ShellTool shellTool, Packers packer) { + void test(String imageName, String shellType, String shellTool, Packers packer) { shellInjectIsOk(getUrl(container), Server.WebSphere, shellType, shellTool, Opcodes.V1_6, packer, container, python); } diff --git a/integration-test/src/test/java/com/reajason/javaweb/integration/memshell/wildfly/Wildfly18ContainerTest.java b/integration-test/src/test/java/com/reajason/javaweb/integration/memshell/wildfly/Wildfly18ContainerTest.java index 5cda16db..86b785f8 100644 --- a/integration-test/src/test/java/com/reajason/javaweb/integration/memshell/wildfly/Wildfly18ContainerTest.java +++ b/integration-test/src/test/java/com/reajason/javaweb/integration/memshell/wildfly/Wildfly18ContainerTest.java @@ -2,7 +2,6 @@ package com.reajason.javaweb.integration.memshell.wildfly; import com.reajason.javaweb.Server; import com.reajason.javaweb.integration.TestCasesProvider; -import com.reajason.javaweb.memshell.ShellTool; import com.reajason.javaweb.memshell.ShellType; import com.reajason.javaweb.packer.Packers; import lombok.extern.slf4j.Slf4j; @@ -67,7 +66,7 @@ public class Wildfly18ContainerTest { @ParameterizedTest(name = "{0}|{1}{2}|{3}") @MethodSource("casesProvider") - void test(String imageName, String shellType, ShellTool shellTool, Packers packer) { + void test(String imageName, String shellType, String shellTool, Packers packer) { shellInjectIsOk(getUrl(container), Server.Undertow, shellType, shellTool, Opcodes.V1_6, packer, container, python); } } diff --git a/integration-test/src/test/java/com/reajason/javaweb/integration/memshell/wildfly/Wildfly23ContainerTest.java b/integration-test/src/test/java/com/reajason/javaweb/integration/memshell/wildfly/Wildfly23ContainerTest.java index 3f263576..f5b94523 100644 --- a/integration-test/src/test/java/com/reajason/javaweb/integration/memshell/wildfly/Wildfly23ContainerTest.java +++ b/integration-test/src/test/java/com/reajason/javaweb/integration/memshell/wildfly/Wildfly23ContainerTest.java @@ -2,7 +2,6 @@ package com.reajason.javaweb.integration.memshell.wildfly; import com.reajason.javaweb.Server; import com.reajason.javaweb.integration.TestCasesProvider; -import com.reajason.javaweb.memshell.ShellTool; import com.reajason.javaweb.memshell.ShellType; import com.reajason.javaweb.packer.Packers; import lombok.extern.slf4j.Slf4j; @@ -67,7 +66,7 @@ public class Wildfly23ContainerTest { @ParameterizedTest(name = "{0}|{1}{2}|{3}") @MethodSource("casesProvider") - void test(String imageName, String shellType, ShellTool shellTool, Packers packer) { + void test(String imageName, String shellType, String shellTool, Packers packer) { shellInjectIsOk(getUrl(container), Server.Undertow, shellType, shellTool, Opcodes.V1_6, packer, container, python); } } diff --git a/integration-test/src/test/java/com/reajason/javaweb/integration/memshell/wildfly/Wildfly30ContainerTest.java b/integration-test/src/test/java/com/reajason/javaweb/integration/memshell/wildfly/Wildfly30ContainerTest.java index 5aebc9db..e16743cb 100644 --- a/integration-test/src/test/java/com/reajason/javaweb/integration/memshell/wildfly/Wildfly30ContainerTest.java +++ b/integration-test/src/test/java/com/reajason/javaweb/integration/memshell/wildfly/Wildfly30ContainerTest.java @@ -70,7 +70,7 @@ public class Wildfly30ContainerTest { @ParameterizedTest(name = "{0}|{1}{2}|{3}") @MethodSource("casesProvider") - void test(String imageName, String shellType, ShellTool shellTool, Packers packer) { + void test(String imageName, String shellType, String shellTool, Packers packer) { shellInjectIsOk(getUrl(container), Server.Undertow, shellType, shellTool, Opcodes.V17, packer, container, python); } } diff --git a/integration-test/src/test/java/com/reajason/javaweb/integration/memshell/wildfly/Wildfly9ContainerTest.java b/integration-test/src/test/java/com/reajason/javaweb/integration/memshell/wildfly/Wildfly9ContainerTest.java index 6d5f446c..4b70d1e7 100644 --- a/integration-test/src/test/java/com/reajason/javaweb/integration/memshell/wildfly/Wildfly9ContainerTest.java +++ b/integration-test/src/test/java/com/reajason/javaweb/integration/memshell/wildfly/Wildfly9ContainerTest.java @@ -60,7 +60,7 @@ public class Wildfly9ContainerTest { ShellType.UNDERTOW_AGENT_SERVLET_HANDLER ); List testPackers = List.of(Packers.JSP, Packers.JSPX, Packers.ScriptEngine); - List> unSupportedCases = List.of( + List> unSupportedCases = List.of( Triple.of(ShellType.UNDERTOW_AGENT_SERVLET_HANDLER, ShellTool.AntSword, Packers.AgentJar) // Request ClassNotFound in module ); return TestCasesProvider.getTestCases(imageName, server, supportedShellTypes, testPackers, unSupportedCases); @@ -75,7 +75,7 @@ public class Wildfly9ContainerTest { @ParameterizedTest(name = "{0}|{1}{2}|{3}") @MethodSource("casesProvider") - void test(String imageName, String shellType, ShellTool shellTool, Packers packer) { + void test(String imageName, String shellType, String shellTool, Packers packer) { shellInjectIsOk(getUrl(container), Server.Undertow, shellType, shellTool, Opcodes.V1_6, packer, container, python); } } diff --git a/integration-test/src/test/java/com/reajason/javaweb/integration/memshell/xxljob/XxlJob220ContainerTest.java b/integration-test/src/test/java/com/reajason/javaweb/integration/memshell/xxljob/XxlJob220ContainerTest.java index 162f21ba..235135ef 100644 --- a/integration-test/src/test/java/com/reajason/javaweb/integration/memshell/xxljob/XxlJob220ContainerTest.java +++ b/integration-test/src/test/java/com/reajason/javaweb/integration/memshell/xxljob/XxlJob220ContainerTest.java @@ -3,7 +3,6 @@ package com.reajason.javaweb.integration.memshell.xxljob; import com.reajason.javaweb.Server; import com.reajason.javaweb.integration.ShellAssertion; import com.reajason.javaweb.integration.TestCasesProvider; -import com.reajason.javaweb.memshell.ShellTool; import com.reajason.javaweb.memshell.ShellType; import com.reajason.javaweb.packer.Packers; import lombok.extern.slf4j.Slf4j; @@ -54,7 +53,7 @@ public class XxlJob220ContainerTest { @ParameterizedTest(name = "{0}|{1}{2}|{3}") @MethodSource("casesProvider") - void test(String imageName, String shellType, ShellTool shellTool, Packers packer) { + void test(String imageName, String shellType, String shellTool, Packers packer) { ShellAssertion.shellInjectIsOk(getUrl(), Server.XXLJOB, shellType, shellTool, Opcodes.V1_8, packer); } diff --git a/integration-test/src/test/java/com/reajason/javaweb/integration/memshell/xxljob/XxlJob230ContainerTest.java b/integration-test/src/test/java/com/reajason/javaweb/integration/memshell/xxljob/XxlJob230ContainerTest.java index 424998be..b95bb065 100644 --- a/integration-test/src/test/java/com/reajason/javaweb/integration/memshell/xxljob/XxlJob230ContainerTest.java +++ b/integration-test/src/test/java/com/reajason/javaweb/integration/memshell/xxljob/XxlJob230ContainerTest.java @@ -3,7 +3,6 @@ package com.reajason.javaweb.integration.memshell.xxljob; import com.reajason.javaweb.Server; import com.reajason.javaweb.integration.ShellAssertion; import com.reajason.javaweb.integration.TestCasesProvider; -import com.reajason.javaweb.memshell.ShellTool; import com.reajason.javaweb.memshell.ShellType; import com.reajason.javaweb.packer.Packers; import lombok.extern.slf4j.Slf4j; @@ -54,7 +53,7 @@ public class XxlJob230ContainerTest { @ParameterizedTest(name = "{0}|{1}{2}|{3}") @MethodSource("casesProvider") - void test(String imageName, String shellType, ShellTool shellTool, Packers packer) { + void test(String imageName, String shellType, String shellTool, Packers packer) { ShellAssertion.shellInjectIsOk(getUrl(), Server.XXLJOB, shellType, shellTool, Opcodes.V1_8, packer); }