Refactor executor module (#2327)

apache · Oct 28, 2023 · 4b580bd · 4b580bd
1 parent e4a89f3
commit 4b580bd
Show file tree

Hide file tree

Showing 26 changed files with 8 additions and 41 deletions.
diff --git a/ecosystem/executor/type/dataflow/pom.xml → ecosystem/executor/dataflow/pom.xml b/ecosystem/executor/type/dataflow/pom.xml → ecosystem/executor/dataflow/pom.xml
@@ -20,7 +20,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.apache.shardingsphere.elasticjob</groupId>
-        <artifactId>elasticjob-executor-type</artifactId>
+        <artifactId>elasticjob-executor</artifactId>
         <version>3.1.0-SNAPSHOT</version>
     </parent>
     <artifactId>elasticjob-dataflow-executor</artifactId>

diff --git a/...ataflow/executor/DataflowJobExecutor.java → ...ataflow/executor/DataflowJobExecutor.java b/...ataflow/executor/DataflowJobExecutor.java → ...ataflow/executor/DataflowJobExecutor.java
diff --git a/.../elasticjob/dataflow/job/DataflowJob.java → .../elasticjob/dataflow/job/DataflowJob.java b/.../elasticjob/dataflow/job/DataflowJob.java → .../elasticjob/dataflow/job/DataflowJob.java
diff --git a/...dataflow/props/DataflowJobProperties.java → ...dataflow/props/DataflowJobProperties.java b/...dataflow/props/DataflowJobProperties.java → ...dataflow/props/DataflowJobProperties.java
diff --git a/...lasticjob.spi.type.ClassedJobItemExecutor → ...lasticjob.spi.type.ClassedJobItemExecutor b/...lasticjob.spi.type.ClassedJobItemExecutor → ...lasticjob.spi.type.ClassedJobItemExecutor
diff --git a/...low/executor/DataflowJobExecutorTest.java → ...low/executor/DataflowJobExecutorTest.java b/...low/executor/DataflowJobExecutorTest.java → ...low/executor/DataflowJobExecutorTest.java
diff --git a/ecosystem/executor/type/http/pom.xml → ecosystem/executor/http/pom.xml b/ecosystem/executor/type/http/pom.xml → ecosystem/executor/http/pom.xml
@@ -20,7 +20,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.apache.shardingsphere.elasticjob</groupId>
-        <artifactId>elasticjob-executor-type</artifactId>
+        <artifactId>elasticjob-executor</artifactId>
         <version>3.1.0-SNAPSHOT</version>
     </parent>
     <artifactId>elasticjob-http-executor</artifactId>

diff --git a/...ticjob/http/executor/HttpJobExecutor.java → ...ticjob/http/executor/HttpJobExecutor.java b/...ticjob/http/executor/HttpJobExecutor.java → ...ticjob/http/executor/HttpJobExecutor.java
diff --git a/...phere/elasticjob/http/pojo/HttpParam.java → ...phere/elasticjob/http/pojo/HttpParam.java b/...phere/elasticjob/http/pojo/HttpParam.java → ...phere/elasticjob/http/pojo/HttpParam.java
diff --git a/...sticjob/http/props/HttpJobProperties.java → ...sticjob/http/props/HttpJobProperties.java b/...sticjob/http/props/HttpJobProperties.java → ...sticjob/http/props/HttpJobProperties.java
diff --git a/....elasticjob.spi.type.TypedJobItemExecutor → ....elasticjob.spi.type.TypedJobItemExecutor b/....elasticjob.spi.type.TypedJobItemExecutor → ....elasticjob.spi.type.TypedJobItemExecutor
diff --git a/...ob/http/executor/HttpJobExecutorTest.java → ...ob/http/executor/HttpJobExecutorTest.java b/...ob/http/executor/HttpJobExecutorTest.java → ...ob/http/executor/HttpJobExecutorTest.java
diff --git a/.../executor/fixture/InternalController.java → .../executor/fixture/InternalController.java b/.../executor/fixture/InternalController.java → .../executor/fixture/InternalController.java
diff --git a/ecosystem/executor/pom.xml b/ecosystem/executor/pom.xml
@@ -28,6 +28,9 @@
     <name>${project.artifactId}</name>
 
     <modules>
-        <module>type</module>
+        <module>simple</module>
+        <module>dataflow</module>
+        <module>script</module>
+        <module>http</module>
     </modules>
 </project>
diff --git a/ecosystem/executor/type/script/pom.xml → ecosystem/executor/script/pom.xml b/ecosystem/executor/type/script/pom.xml → ecosystem/executor/script/pom.xml
@@ -20,7 +20,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.apache.shardingsphere.elasticjob</groupId>
-        <artifactId>elasticjob-executor-type</artifactId>
+        <artifactId>elasticjob-executor</artifactId>
         <version>3.1.0-SNAPSHOT</version>
     </parent>
     <artifactId>elasticjob-script-executor</artifactId>

diff --git a/...ob/script/executor/ScriptJobExecutor.java → ...ob/script/executor/ScriptJobExecutor.java b/...ob/script/executor/ScriptJobExecutor.java → ...ob/script/executor/ScriptJobExecutor.java
diff --git a/...job/script/props/ScriptJobProperties.java → ...job/script/props/ScriptJobProperties.java b/...job/script/props/ScriptJobProperties.java → ...job/script/props/ScriptJobProperties.java
diff --git a/....elasticjob.spi.type.TypedJobItemExecutor → ....elasticjob.spi.type.TypedJobItemExecutor b/....elasticjob.spi.type.TypedJobItemExecutor → ....elasticjob.spi.type.TypedJobItemExecutor
diff --git a/...sticjob/script/ScriptJobExecutorTest.java → ...sticjob/script/ScriptJobExecutorTest.java b/...sticjob/script/ScriptJobExecutorTest.java → ...sticjob/script/ScriptJobExecutorTest.java
diff --git a/ecosystem/executor/type/simple/pom.xml → ecosystem/executor/simple/pom.xml b/ecosystem/executor/type/simple/pom.xml → ecosystem/executor/simple/pom.xml
@@ -20,7 +20,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.apache.shardingsphere.elasticjob</groupId>
-        <artifactId>elasticjob-executor-type</artifactId>
+        <artifactId>elasticjob-executor</artifactId>
         <version>3.1.0-SNAPSHOT</version>
     </parent>
     <artifactId>elasticjob-simple-executor</artifactId>

diff --git a/...ob/simple/executor/SimpleJobExecutor.java → ...ob/simple/executor/SimpleJobExecutor.java b/...ob/simple/executor/SimpleJobExecutor.java → ...ob/simple/executor/SimpleJobExecutor.java
diff --git a/...here/elasticjob/simple/job/SimpleJob.java → ...here/elasticjob/simple/job/SimpleJob.java b/...here/elasticjob/simple/job/SimpleJob.java → ...here/elasticjob/simple/job/SimpleJob.java
diff --git a/...lasticjob.spi.type.ClassedJobItemExecutor → ...lasticjob.spi.type.ClassedJobItemExecutor b/...lasticjob.spi.type.ClassedJobItemExecutor → ...lasticjob.spi.type.ClassedJobItemExecutor
diff --git a/...imple/executor/SimpleJobExecutorTest.java → ...imple/executor/SimpleJobExecutorTest.java b/...imple/executor/SimpleJobExecutorTest.java → ...imple/executor/SimpleJobExecutorTest.java
diff --git a/...e/elasticjob/simple/job/FooSimpleJob.java → ...e/elasticjob/simple/job/FooSimpleJob.java b/...e/elasticjob/simple/job/FooSimpleJob.java → ...e/elasticjob/simple/job/FooSimpleJob.java
diff --git a/ecosystem/executor/type/pom.xml b/ecosystem/executor/type/pom.xml