Skip to content

Commit c668caa

Browse files
committed
refactor: add packer module
1 parent 69ad11f commit c668caa

File tree

176 files changed

+831
-1063
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

176 files changed

+831
-1063
lines changed

boot/build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ dependencies {
2626
exclude(group = "org.apache.tomcat", module = "tomcat-catalina")
2727
exclude(group = "commons-logging", module = "commons-logging")
2828
}
29-
implementation(project(":deserialize")) {
29+
implementation(project(":packer")) {
3030
exclude(group = "commons-logging", module = "commons-logging")
3131
}
3232
implementation("org.springframework.boot:spring-boot-starter-thymeleaf")

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
package com.reajason.javaweb.boot.controller;
22

33
import com.reajason.javaweb.boot.vo.CommandConfigVO;
4-
import com.reajason.javaweb.memshell.Packers;
54
import com.reajason.javaweb.memshell.Server;
65
import com.reajason.javaweb.memshell.ShellTool;
76
import com.reajason.javaweb.memshell.config.CommandConfig;
87
import com.reajason.javaweb.memshell.server.AbstractShell;
8+
import com.reajason.javaweb.packer.Packers;
99
import org.springframework.web.bind.annotation.CrossOrigin;
1010
import org.springframework.web.bind.annotation.GetMapping;
1111
import org.springframework.web.bind.annotation.RequestMapping;

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@
77
import com.reajason.javaweb.memshell.config.InjectorConfig;
88
import com.reajason.javaweb.memshell.config.ShellConfig;
99
import com.reajason.javaweb.memshell.config.ShellToolConfig;
10-
import com.reajason.javaweb.memshell.packer.AggregatePacker;
11-
import com.reajason.javaweb.memshell.packer.Packer;
12-
import com.reajason.javaweb.memshell.packer.jar.JarPacker;
10+
import com.reajason.javaweb.packer.AggregatePacker;
11+
import com.reajason.javaweb.packer.Packer;
12+
import com.reajason.javaweb.packer.jar.JarPacker;
1313
import org.springframework.web.bind.annotation.*;
1414

1515
import java.util.Base64;
@@ -30,11 +30,11 @@ public GenerateResponse generate(@RequestBody GenerateRequest request) {
3030
GenerateResult generateResult = MemShellGenerator.generate(shellConfig, injectorConfig, shellToolConfig);
3131
Packer packer = request.getPacker().getInstance();
3232
if (packer instanceof JarPacker) {
33-
return new GenerateResponse(generateResult, Base64.getEncoder().encodeToString(((JarPacker) packer).packBytes(generateResult)));
33+
return new GenerateResponse(generateResult, Base64.getEncoder().encodeToString(((JarPacker) packer).packBytes(generateResult.toJarPackerConfig())));
3434
} else if (packer instanceof AggregatePacker) {
35-
return new GenerateResponse(generateResult, ((AggregatePacker) packer).packAll(generateResult));
35+
return new GenerateResponse(generateResult, ((AggregatePacker) packer).packAll(generateResult.toClassPackerConfig()));
3636
} else {
37-
return new GenerateResponse(generateResult, packer.pack(generateResult));
37+
return new GenerateResponse(generateResult, packer.pack(generateResult.toClassPackerConfig()));
3838
}
3939
}
4040
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
package com.reajason.javaweb.boot.dto;
22

3-
import com.reajason.javaweb.memshell.Packers;
43
import com.reajason.javaweb.memshell.config.*;
54
import com.reajason.javaweb.memshell.utils.CommonUtil;
5+
import com.reajason.javaweb.packer.Packers;
66
import lombok.Data;
77
import org.apache.commons.lang3.StringUtils;
88

build.gradle.kts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,12 @@ tasks.register("publishAllToMavenCentral") {
77
val isSnapshot = rootProject.version.toString().endsWith("-SNAPSHOT")
88
if (isSnapshot) {
99
dependsOn(":memshell-party-common:publishAllPublicationsToMavenCentralRepository")
10-
dependsOn(":deserialize:publishAllPublicationsToMavenCentralRepository")
10+
dependsOn(":packer:publishAllPublicationsToMavenCentralRepository")
1111
dependsOn(":memshell:publishAllPublicationsToMavenCentralRepository")
1212
dependsOn(":generator:publishAllPublicationsToMavenCentralRepository")
1313
} else {
1414
dependsOn(":memshell-party-common:publishAndReleaseToMavenCentral")
15-
dependsOn(":deserialize:publishAndReleaseToMavenCentral")
15+
dependsOn(":packer:publishAndReleaseToMavenCentral")
1616
dependsOn(":memshell:publishAndReleaseToMavenCentral")
1717
dependsOn(":generator:publishAndReleaseToMavenCentral")
1818
}

deserialize/src/main/java/com/reajason/javaweb/deserialize/DeserializeConfig.java

Lines changed: 0 additions & 12 deletions
This file was deleted.

deserialize/src/main/java/com/reajason/javaweb/deserialize/Hessian2DeserializeGenerator.java

Lines changed: 0 additions & 24 deletions
This file was deleted.

deserialize/src/main/java/com/reajason/javaweb/deserialize/HessianDeserializeGenerator.java

Lines changed: 0 additions & 24 deletions
This file was deleted.

deserialize/src/main/java/com/reajason/javaweb/deserialize/JavaDeserializeGenerator.java

Lines changed: 0 additions & 25 deletions
This file was deleted.

deserialize/src/main/java/com/reajason/javaweb/deserialize/Payload.java

Lines changed: 0 additions & 28 deletions
This file was deleted.

0 commit comments

Comments
 (0)