refactor: merge memshell module

generator/build.gradle

@@ -35,7 +35,6 @@ dependencies {
     implementation project(":deserialize")
 
     implementation project(":memshell")
-    implementation project(":memshell-java8")
     implementation 'net.bytebuddy:byte-buddy'
     implementation 'org.ow2.asm:asm-commons'
 

generator/src/main/java/com/reajason/javaweb/memshell/Server.java

@@ -7,27 +7,6 @@ import com.reajason.javaweb.memshell.shelltool.command.*;
 import com.reajason.javaweb.memshell.shelltool.godzilla.*;
 import com.reajason.javaweb.memshell.shelltool.neoreg.*;
 import com.reajason.javaweb.memshell.shelltool.suo5.*;
-import com.reajason.javaweb.memshell.springwebflux.command.CommandHandlerFunction;
-import com.reajason.javaweb.memshell.springwebflux.command.CommandHandlerMethod;
-import com.reajason.javaweb.memshell.springwebflux.command.CommandNettyHandler;
-import com.reajason.javaweb.memshell.springwebflux.command.CommandWebFilter;
-import com.reajason.javaweb.memshell.springwebflux.godzilla.GodzillaHandlerFunction;
-import com.reajason.javaweb.memshell.springwebflux.godzilla.GodzillaHandlerMethod;
-import com.reajason.javaweb.memshell.springwebflux.godzilla.GodzillaNettyHandler;
-import com.reajason.javaweb.memshell.springwebflux.godzilla.GodzillaWebFilter;
-import com.reajason.javaweb.memshell.springwebflux.suo5.Suo5WebFilter;
-import com.reajason.javaweb.memshell.springwebmvc.antsword.AntSwordControllerHandler;
-import com.reajason.javaweb.memshell.springwebmvc.antsword.AntSwordInterceptor;
-import com.reajason.javaweb.memshell.springwebmvc.behinder.BehinderControllerHandler;
-import com.reajason.javaweb.memshell.springwebmvc.behinder.BehinderInterceptor;
-import com.reajason.javaweb.memshell.springwebmvc.command.CommandControllerHandler;
-import com.reajason.javaweb.memshell.springwebmvc.command.CommandInterceptor;
-import com.reajason.javaweb.memshell.springwebmvc.godzilla.GodzillaControllerHandler;
-import com.reajason.javaweb.memshell.springwebmvc.godzilla.GodzillaInterceptor;
-import com.reajason.javaweb.memshell.springwebmvc.neoreg.NeoreGeorgControllerHandler;
-import com.reajason.javaweb.memshell.springwebmvc.neoreg.NeoreGeorgInterceptor;
-import com.reajason.javaweb.memshell.springwebmvc.suo5.Suo5ControllerHandler;
-import com.reajason.javaweb.memshell.springwebmvc.suo5.Suo5Interceptor;
 import lombok.Getter;
 
 import static com.reajason.javaweb.memshell.ShellType.*;

generator/src/main/java/com/reajason/javaweb/memshell/server/SpringWebFluxShell.java

@@ -1,9 +1,9 @@
 package com.reajason.javaweb.memshell.server;
 
-import com.reajason.javaweb.memshell.springwebflux.injector.SpringWebFluxHandlerFunctionInjector;
+import com.reajason.javaweb.memshell.injector.springwebflux.SpringWebFluxHandlerFunctionInjector;
-import com.reajason.javaweb.memshell.springwebflux.injector.SpringWebFluxHandlerMethodInjector;
+import com.reajason.javaweb.memshell.injector.springwebflux.SpringWebFluxHandlerMethodInjector;
-import com.reajason.javaweb.memshell.springwebflux.injector.SpringWebFluxNettyHandlerInjector;
+import com.reajason.javaweb.memshell.injector.springwebflux.SpringWebFluxNettyHandlerInjector;
-import com.reajason.javaweb.memshell.springwebflux.injector.SpringWebFluxWebFilterInjector;
+import com.reajason.javaweb.memshell.injector.springwebflux.SpringWebFluxWebFilterInjector;
 
 import static com.reajason.javaweb.memshell.ShellType.*;
 

generator/src/main/java/com/reajason/javaweb/memshell/server/SpringWebMvcShell.java

@@ -1,8 +1,8 @@
 package com.reajason.javaweb.memshell.server;
 
-import com.reajason.javaweb.memshell.springwebmvc.injector.SpringWebMvcControllerHandlerInjector;
+import com.reajason.javaweb.memshell.injector.springwebmvc.SpringWebMvcControllerHandlerInjector;
-import com.reajason.javaweb.memshell.springwebmvc.injector.SpringWebMvcFrameworkServletAgentInjector;
+import com.reajason.javaweb.memshell.injector.springwebmvc.SpringWebMvcFrameworkServletAgentInjector;
-import com.reajason.javaweb.memshell.springwebmvc.injector.SpringWebMvcInterceptorInjector;
+import com.reajason.javaweb.memshell.injector.springwebmvc.SpringWebMvcInterceptorInjector;
 
 import static com.reajason.javaweb.memshell.ShellType.*;
 

generator/src/main/java/com/reajason/javaweb/memshell/server/XxlJobShell.java

@@ -1,6 +1,6 @@
 package com.reajason.javaweb.memshell.server;
 
-import com.reajason.javaweb.memshell.xxljob.injector.XxlJobNettyHandlerInjector;
+import com.reajason.javaweb.memshell.injector.xxljob.XxlJobNettyHandlerInjector;
 
 import static com.reajason.javaweb.memshell.ShellType.NETTY_HANDLER;
 

memshell-java8/build.gradle

@@ -1,30 +0,0 @@
-group = 'io.github.reajason'
-description = "Normal Java MemShell for Java8"
-version = rootProject.version
-
-java {
-    toolchain {
-        languageVersion = JavaLanguageVersion.of(8)
-    }
-    sourceCompatibility = JavaVersion.VERSION_1_8
-    targetCompatibility = JavaVersion.VERSION_1_8
-}
-
-dependencies {
-    implementation project(":memshell")
-    implementation 'net.bytebuddy:byte-buddy'
-    implementation 'org.ow2.asm:asm-commons'
-
-    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'
-}
-
-test {
-    useJUnitPlatform()
-}

memshell/build.gradle

@@ -7,8 +7,8 @@ java {
     toolchain {
         languageVersion = JavaLanguageVersion.of(8)
     }
-    sourceCompatibility = JavaVersion.VERSION_1_6
+    sourceCompatibility = JavaVersion.VERSION_1_8
-    targetCompatibility = JavaVersion.VERSION_1_6
+    targetCompatibility = JavaVersion.VERSION_1_8
 }
 
 dependencies {
@@ -16,4 +16,7 @@ dependencies {
     implementation 'org.ow2.asm:asm-commons'
     implementation 'javax.servlet:javax.servlet-api'
     implementation 'javax.websocket:javax.websocket-api'
+    implementation 'org.springframework:spring-webmvc'
+    implementation 'org.springframework:spring-webflux'
+    implementation 'io.projectreactor.netty:reactor-netty-core'
 }

memshell/src/main/java/com/reajason/javaweb/memshell/injector/springwebflux/SpringWebFluxHandlerFunctionInjector.java

@@ -1,4 +1,4 @@
-package com.reajason.javaweb.memshell.springwebflux.injector;
+package com.reajason.javaweb.memshell.injector.springwebflux;
 
 import org.springframework.util.Base64Utils;
 import org.springframework.web.reactive.function.server.*;

memshell/src/main/java/com/reajason/javaweb/memshell/injector/springwebflux/SpringWebFluxHandlerMethodInjector.java

@@ -1,4 +1,4 @@
-package com.reajason.javaweb.memshell.springwebflux.injector;
+package com.reajason.javaweb.memshell.injector.springwebflux;
 
 import org.springframework.util.Base64Utils;
 import org.springframework.web.method.HandlerMethod;

memshell/src/main/java/com/reajason/javaweb/memshell/injector/springwebflux/SpringWebFluxNettyHandlerInjector.java

@@ -1,4 +1,4 @@
-package com.reajason.javaweb.memshell.springwebflux.injector;
+package com.reajason.javaweb.memshell.injector.springwebflux;
 
 import io.netty.channel.Channel;
 import io.netty.channel.ChannelHandler;

memshell/src/main/java/com/reajason/javaweb/memshell/injector/springwebflux/SpringWebFluxWebFilterInjector.java

@@ -1,4 +1,4 @@
-package com.reajason.javaweb.memshell.springwebflux.injector;
+package com.reajason.javaweb.memshell.injector.springwebflux;
 
 import org.springframework.util.Base64Utils;
 import org.springframework.web.server.WebFilter;

memshell/src/main/java/com/reajason/javaweb/memshell/injector/springwebmvc/SpringWebMvcControllerHandlerInjector.java

@@ -1,4 +1,4 @@
-package com.reajason.javaweb.memshell.springwebmvc.injector;
+package com.reajason.javaweb.memshell.injector.springwebmvc;
 
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;

memshell/src/main/java/com/reajason/javaweb/memshell/injector/springwebmvc/SpringWebMvcFrameworkServletAgentInjector.java

@@ -1,4 +1,4 @@
-package com.reajason.javaweb.memshell.springwebmvc.injector;
+package com.reajason.javaweb.memshell.injector.springwebmvc;
 
 import org.objectweb.asm.*;
 

memshell/src/main/java/com/reajason/javaweb/memshell/injector/springwebmvc/SpringWebMvcInterceptorInjector.java

@@ -1,4 +1,4 @@
-package com.reajason.javaweb.memshell.springwebmvc.injector;
+package com.reajason.javaweb.memshell.injector.springwebmvc;
 
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;

memshell/src/main/java/com/reajason/javaweb/memshell/injector/xxljob/XxlJobNettyHandlerInjector.java

@@ -1,4 +1,4 @@
-package com.reajason.javaweb.memshell.xxljob.injector;
+package com.reajason.javaweb.memshell.injector.xxljob;
 
 import com.xxl.job.core.biz.impl.ExecutorBizImpl;
 import com.xxl.job.core.server.EmbedServer;

memshell/src/main/java/com/reajason/javaweb/memshell/shelltool/antsword/AntSwordControllerHandler.java

@@ -1,4 +1,4 @@
-package com.reajason.javaweb.memshell.springwebmvc.antsword;
+package com.reajason.javaweb.memshell.shelltool.antsword;
 
 import org.springframework.web.servlet.ModelAndView;
 import org.springframework.web.servlet.mvc.Controller;

memshell/src/main/java/com/reajason/javaweb/memshell/shelltool/antsword/AntSwordInterceptor.java

@@ -1,4 +1,4 @@
-package com.reajason.javaweb.memshell.springwebmvc.antsword;
+package com.reajason.javaweb.memshell.shelltool.antsword;
 
 import org.springframework.web.servlet.AsyncHandlerInterceptor;
 import org.springframework.web.servlet.ModelAndView;

memshell/src/main/java/com/reajason/javaweb/memshell/shelltool/behinder/BehinderControllerHandler.java

@@ -1,4 +1,4 @@
-package com.reajason.javaweb.memshell.springwebmvc.behinder;
+package com.reajason.javaweb.memshell.shelltool.behinder;
 
 import org.springframework.web.servlet.ModelAndView;
 import org.springframework.web.servlet.mvc.Controller;

memshell/src/main/java/com/reajason/javaweb/memshell/shelltool/behinder/BehinderInterceptor.java

@@ -1,4 +1,4 @@
-package com.reajason.javaweb.memshell.springwebmvc.behinder;
+package com.reajason.javaweb.memshell.shelltool.behinder;
 
 import org.springframework.web.servlet.AsyncHandlerInterceptor;
 import org.springframework.web.servlet.ModelAndView;

memshell/src/main/java/com/reajason/javaweb/memshell/shelltool/command/CommandControllerHandler.java

@@ -1,4 +1,4 @@
-package com.reajason.javaweb.memshell.springwebmvc.command;
+package com.reajason.javaweb.memshell.shelltool.command;
 
 import org.springframework.web.servlet.ModelAndView;
 import org.springframework.web.servlet.mvc.Controller;

memshell/src/main/java/com/reajason/javaweb/memshell/shelltool/command/CommandHandlerFunction.java

@@ -1,4 +1,4 @@
-package com.reajason.javaweb.memshell.springwebflux.command;
+package com.reajason.javaweb.memshell.shelltool.command;
 
 import org.springframework.web.reactive.function.server.HandlerFunction;
 import org.springframework.web.reactive.function.server.ServerRequest;

memshell/src/main/java/com/reajason/javaweb/memshell/shelltool/command/CommandHandlerMethod.java

@@ -1,4 +1,4 @@
-package com.reajason.javaweb.memshell.springwebflux.command;
+package com.reajason.javaweb.memshell.shelltool.command;
 
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.server.ServerWebExchange;

memshell/src/main/java/com/reajason/javaweb/memshell/shelltool/command/CommandInterceptor.java

@@ -1,4 +1,4 @@
-package com.reajason.javaweb.memshell.springwebmvc.command;
+package com.reajason.javaweb.memshell.shelltool.command;
 
 import org.springframework.web.servlet.AsyncHandlerInterceptor;
 import org.springframework.web.servlet.ModelAndView;

memshell/src/main/java/com/reajason/javaweb/memshell/shelltool/command/CommandNettyHandler.java

@@ -1,4 +1,4 @@
-package com.reajason.javaweb.memshell.springwebflux.command;
+package com.reajason.javaweb.memshell.shelltool.command;
 
 import io.netty.buffer.Unpooled;
 import io.netty.channel.ChannelDuplexHandler;

memshell/src/main/java/com/reajason/javaweb/memshell/shelltool/command/CommandWebFilter.java

@@ -1,4 +1,4 @@
-package com.reajason.javaweb.memshell.springwebflux.command;
+package com.reajason.javaweb.memshell.shelltool.command;
 
 import org.springframework.core.io.buffer.DataBuffer;
 import org.springframework.core.io.buffer.DefaultDataBufferFactory;

memshell/src/main/java/com/reajason/javaweb/memshell/shelltool/godzilla/GodzillaControllerHandler.java

@@ -1,4 +1,4 @@
-package com.reajason.javaweb.memshell.springwebmvc.godzilla;
+package com.reajason.javaweb.memshell.shelltool.godzilla;
 
 import org.springframework.web.servlet.ModelAndView;
 import org.springframework.web.servlet.mvc.Controller;

memshell/src/main/java/com/reajason/javaweb/memshell/shelltool/godzilla/GodzillaHandlerFunction.java

@@ -1,4 +1,4 @@
-package com.reajason.javaweb.memshell.springwebflux.godzilla;
+package com.reajason.javaweb.memshell.shelltool.godzilla;
 
 import org.springframework.web.reactive.function.server.HandlerFunction;
 import org.springframework.web.reactive.function.server.ServerRequest;

memshell/src/main/java/com/reajason/javaweb/memshell/shelltool/godzilla/GodzillaHandlerMethod.java

@@ -1,4 +1,4 @@
-package com.reajason.javaweb.memshell.springwebflux.godzilla;
+package com.reajason.javaweb.memshell.shelltool.godzilla;
 
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.server.ServerWebExchange;

memshell/src/main/java/com/reajason/javaweb/memshell/shelltool/godzilla/GodzillaInterceptor.java

@@ -1,4 +1,4 @@
-package com.reajason.javaweb.memshell.springwebmvc.godzilla;
+package com.reajason.javaweb.memshell.shelltool.godzilla;
 
 import org.springframework.web.servlet.AsyncHandlerInterceptor;
 import org.springframework.web.servlet.ModelAndView;

memshell/src/main/java/com/reajason/javaweb/memshell/shelltool/godzilla/GodzillaNettyHandler.java

@@ -1,4 +1,4 @@
-package com.reajason.javaweb.memshell.springwebflux.godzilla;
+package com.reajason.javaweb.memshell.shelltool.godzilla;
 
 import io.netty.buffer.Unpooled;
 import io.netty.channel.ChannelDuplexHandler;

memshell/src/main/java/com/reajason/javaweb/memshell/shelltool/godzilla/GodzillaWebFilter.java

@@ -1,4 +1,4 @@
-package com.reajason.javaweb.memshell.springwebflux.godzilla;
+package com.reajason.javaweb.memshell.shelltool.godzilla;
 
 import org.springframework.core.io.buffer.DataBuffer;
 import org.springframework.core.io.buffer.DefaultDataBufferFactory;

memshell/src/main/java/com/reajason/javaweb/memshell/shelltool/neoreg/NeoreGeorgControllerHandler.java

@@ -1,4 +1,4 @@
-package com.reajason.javaweb.memshell.springwebmvc.neoreg;
+package com.reajason.javaweb.memshell.shelltool.neoreg;
 
 import org.springframework.web.servlet.ModelAndView;
 import org.springframework.web.servlet.mvc.Controller;

memshell/src/main/java/com/reajason/javaweb/memshell/shelltool/neoreg/NeoreGeorgInterceptor.java

@@ -1,4 +1,4 @@
-package com.reajason.javaweb.memshell.springwebmvc.neoreg;
+package com.reajason.javaweb.memshell.shelltool.neoreg;
 
 import org.springframework.web.servlet.AsyncHandlerInterceptor;
 import org.springframework.web.servlet.ModelAndView;

memshell/src/main/java/com/reajason/javaweb/memshell/shelltool/suo5/Suo5ControllerHandler.java

@@ -1,4 +1,4 @@
-package com.reajason.javaweb.memshell.springwebmvc.suo5;
+package com.reajason.javaweb.memshell.shelltool.suo5;
 
 import org.springframework.web.servlet.ModelAndView;
 import org.springframework.web.servlet.mvc.Controller;

memshell/src/main/java/com/reajason/javaweb/memshell/shelltool/suo5/Suo5Interceptor.java

@@ -1,4 +1,4 @@
-package com.reajason.javaweb.memshell.springwebmvc.suo5;
+package com.reajason.javaweb.memshell.shelltool.suo5;
 
 import org.springframework.web.servlet.AsyncHandlerInterceptor;
 import org.springframework.web.servlet.ModelAndView;

memshell/src/main/java/com/reajason/javaweb/memshell/shelltool/suo5/Suo5WebFilter.java

@@ -1,4 +1,4 @@
-package com.reajason.javaweb.memshell.springwebflux.suo5;
+package com.reajason.javaweb.memshell.shelltool.suo5;
 
 import io.netty.channel.ChannelOption;
 import org.springframework.core.io.buffer.DataBuffer;

settings.gradle

@@ -14,7 +14,6 @@ include 'tools:suo5'
 include 'tools:ant-sword'
 
 include 'memshell'
-include 'memshell-java8'
 
 include 'deserialize'
 include 'boot'