From 4b580bdef9b94dcbe7e00f10ba1855ef1dfa0d4c Mon Sep 17 00:00:00 2001
From: Liang Zhang <zhangliang@apache.org>
Date: Sat, 28 Oct 2023 20:59:43 +0800
Subject: [PATCH] Refactor executor module (#2327)

---
 .../executor/{type => }/dataflow/pom.xml      |  2 +-
 .../executor/DataflowJobExecutor.java         |  0
 .../elasticjob/dataflow/job/DataflowJob.java  |  0
 .../dataflow/props/DataflowJobProperties.java |  0
 ...elasticjob.spi.type.ClassedJobItemExecutor |  0
 .../executor/DataflowJobExecutorTest.java     |  0
 ecosystem/executor/{type => }/http/pom.xml    |  2 +-
 .../http/executor/HttpJobExecutor.java        |  0
 .../elasticjob/http/pojo/HttpParam.java       |  0
 .../http/props/HttpJobProperties.java         |  0
 ...e.elasticjob.spi.type.TypedJobItemExecutor |  0
 .../http/executor/HttpJobExecutorTest.java    |  0
 .../executor/fixture/InternalController.java  |  0
 ecosystem/executor/pom.xml                    |  5 ++-
 ecosystem/executor/{type => }/script/pom.xml  |  2 +-
 .../script/executor/ScriptJobExecutor.java    |  0
 .../script/props/ScriptJobProperties.java     |  0
 ...e.elasticjob.spi.type.TypedJobItemExecutor |  0
 .../script/ScriptJobExecutorTest.java         |  0
 ecosystem/executor/{type => }/simple/pom.xml  |  2 +-
 .../simple/executor/SimpleJobExecutor.java    |  0
 .../elasticjob/simple/job/SimpleJob.java      |  0
 ...elasticjob.spi.type.ClassedJobItemExecutor |  0
 .../executor/SimpleJobExecutorTest.java       |  0
 .../elasticjob/simple/job/FooSimpleJob.java   |  0
 ecosystem/executor/type/pom.xml               | 36 -------------------
 26 files changed, 8 insertions(+), 41 deletions(-)
 rename ecosystem/executor/{type => }/dataflow/pom.xml (96%)
 rename ecosystem/executor/{type => }/dataflow/src/main/java/org/apache/shardingsphere/elasticjob/dataflow/executor/DataflowJobExecutor.java (100%)
 rename ecosystem/executor/{type => }/dataflow/src/main/java/org/apache/shardingsphere/elasticjob/dataflow/job/DataflowJob.java (100%)
 rename ecosystem/executor/{type => }/dataflow/src/main/java/org/apache/shardingsphere/elasticjob/dataflow/props/DataflowJobProperties.java (100%)
 rename ecosystem/executor/{type => }/dataflow/src/main/resources/META-INF/services/org.apache.shardingsphere.elasticjob.spi.type.ClassedJobItemExecutor (100%)
 rename ecosystem/executor/{type => }/dataflow/src/test/java/org/apache/shardingsphere/elasticjob/dataflow/executor/DataflowJobExecutorTest.java (100%)
 rename ecosystem/executor/{type => }/http/pom.xml (97%)
 rename ecosystem/executor/{type => }/http/src/main/java/org/apache/shardingsphere/elasticjob/http/executor/HttpJobExecutor.java (100%)
 rename ecosystem/executor/{type => }/http/src/main/java/org/apache/shardingsphere/elasticjob/http/pojo/HttpParam.java (100%)
 rename ecosystem/executor/{type => }/http/src/main/java/org/apache/shardingsphere/elasticjob/http/props/HttpJobProperties.java (100%)
 rename ecosystem/executor/{type => }/http/src/main/resources/META-INF/services/org.apache.shardingsphere.elasticjob.spi.type.TypedJobItemExecutor (100%)
 rename ecosystem/executor/{type => }/http/src/test/java/org/apache/shardingsphere/elasticjob/http/executor/HttpJobExecutorTest.java (100%)
 rename ecosystem/executor/{type => }/http/src/test/java/org/apache/shardingsphere/elasticjob/http/executor/fixture/InternalController.java (100%)
 rename ecosystem/executor/{type => }/script/pom.xml (96%)
 rename ecosystem/executor/{type => }/script/src/main/java/org/apache/shardingsphere/elasticjob/script/executor/ScriptJobExecutor.java (100%)
 rename ecosystem/executor/{type => }/script/src/main/java/org/apache/shardingsphere/elasticjob/script/props/ScriptJobProperties.java (100%)
 rename ecosystem/executor/{type => }/script/src/main/resources/META-INF/services/org.apache.shardingsphere.elasticjob.spi.type.TypedJobItemExecutor (100%)
 rename ecosystem/executor/{type => }/script/src/test/java/org/apache/shardingsphere/elasticjob/script/ScriptJobExecutorTest.java (100%)
 rename ecosystem/executor/{type => }/simple/pom.xml (96%)
 rename ecosystem/executor/{type => }/simple/src/main/java/org/apache/shardingsphere/elasticjob/simple/executor/SimpleJobExecutor.java (100%)
 rename ecosystem/executor/{type => }/simple/src/main/java/org/apache/shardingsphere/elasticjob/simple/job/SimpleJob.java (100%)
 rename ecosystem/executor/{type => }/simple/src/main/resources/META-INF/services/org.apache.shardingsphere.elasticjob.spi.type.ClassedJobItemExecutor (100%)
 rename ecosystem/executor/{type => }/simple/src/test/java/org/apache/shardingsphere/elasticjob/simple/executor/SimpleJobExecutorTest.java (100%)
 rename ecosystem/executor/{type => }/simple/src/test/java/org/apache/shardingsphere/elasticjob/simple/job/FooSimpleJob.java (100%)
 delete mode 100644 ecosystem/executor/type/pom.xml

diff --git a/ecosystem/executor/type/dataflow/pom.xml b/ecosystem/executor/dataflow/pom.xml
similarity index 96%
rename from ecosystem/executor/type/dataflow/pom.xml
rename to ecosystem/executor/dataflow/pom.xml
index 0aea857214..582eab26e1 100644
--- a/ecosystem/executor/type/dataflow/pom.xml
+++ b/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/ecosystem/executor/type/dataflow/src/main/java/org/apache/shardingsphere/elasticjob/dataflow/executor/DataflowJobExecutor.java b/ecosystem/executor/dataflow/src/main/java/org/apache/shardingsphere/elasticjob/dataflow/executor/DataflowJobExecutor.java
similarity index 100%
rename from ecosystem/executor/type/dataflow/src/main/java/org/apache/shardingsphere/elasticjob/dataflow/executor/DataflowJobExecutor.java
rename to ecosystem/executor/dataflow/src/main/java/org/apache/shardingsphere/elasticjob/dataflow/executor/DataflowJobExecutor.java
diff --git a/ecosystem/executor/type/dataflow/src/main/java/org/apache/shardingsphere/elasticjob/dataflow/job/DataflowJob.java b/ecosystem/executor/dataflow/src/main/java/org/apache/shardingsphere/elasticjob/dataflow/job/DataflowJob.java
similarity index 100%
rename from ecosystem/executor/type/dataflow/src/main/java/org/apache/shardingsphere/elasticjob/dataflow/job/DataflowJob.java
rename to ecosystem/executor/dataflow/src/main/java/org/apache/shardingsphere/elasticjob/dataflow/job/DataflowJob.java
diff --git a/ecosystem/executor/type/dataflow/src/main/java/org/apache/shardingsphere/elasticjob/dataflow/props/DataflowJobProperties.java b/ecosystem/executor/dataflow/src/main/java/org/apache/shardingsphere/elasticjob/dataflow/props/DataflowJobProperties.java
similarity index 100%
rename from ecosystem/executor/type/dataflow/src/main/java/org/apache/shardingsphere/elasticjob/dataflow/props/DataflowJobProperties.java
rename to ecosystem/executor/dataflow/src/main/java/org/apache/shardingsphere/elasticjob/dataflow/props/DataflowJobProperties.java
diff --git a/ecosystem/executor/type/dataflow/src/main/resources/META-INF/services/org.apache.shardingsphere.elasticjob.spi.type.ClassedJobItemExecutor b/ecosystem/executor/dataflow/src/main/resources/META-INF/services/org.apache.shardingsphere.elasticjob.spi.type.ClassedJobItemExecutor
similarity index 100%
rename from ecosystem/executor/type/dataflow/src/main/resources/META-INF/services/org.apache.shardingsphere.elasticjob.spi.type.ClassedJobItemExecutor
rename to ecosystem/executor/dataflow/src/main/resources/META-INF/services/org.apache.shardingsphere.elasticjob.spi.type.ClassedJobItemExecutor
diff --git a/ecosystem/executor/type/dataflow/src/test/java/org/apache/shardingsphere/elasticjob/dataflow/executor/DataflowJobExecutorTest.java b/ecosystem/executor/dataflow/src/test/java/org/apache/shardingsphere/elasticjob/dataflow/executor/DataflowJobExecutorTest.java
similarity index 100%
rename from ecosystem/executor/type/dataflow/src/test/java/org/apache/shardingsphere/elasticjob/dataflow/executor/DataflowJobExecutorTest.java
rename to ecosystem/executor/dataflow/src/test/java/org/apache/shardingsphere/elasticjob/dataflow/executor/DataflowJobExecutorTest.java
diff --git a/ecosystem/executor/type/http/pom.xml b/ecosystem/executor/http/pom.xml
similarity index 97%
rename from ecosystem/executor/type/http/pom.xml
rename to ecosystem/executor/http/pom.xml
index 147e53570e..7a27436cec 100644
--- a/ecosystem/executor/type/http/pom.xml
+++ b/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/ecosystem/executor/type/http/src/main/java/org/apache/shardingsphere/elasticjob/http/executor/HttpJobExecutor.java b/ecosystem/executor/http/src/main/java/org/apache/shardingsphere/elasticjob/http/executor/HttpJobExecutor.java
similarity index 100%
rename from ecosystem/executor/type/http/src/main/java/org/apache/shardingsphere/elasticjob/http/executor/HttpJobExecutor.java
rename to ecosystem/executor/http/src/main/java/org/apache/shardingsphere/elasticjob/http/executor/HttpJobExecutor.java
diff --git a/ecosystem/executor/type/http/src/main/java/org/apache/shardingsphere/elasticjob/http/pojo/HttpParam.java b/ecosystem/executor/http/src/main/java/org/apache/shardingsphere/elasticjob/http/pojo/HttpParam.java
similarity index 100%
rename from ecosystem/executor/type/http/src/main/java/org/apache/shardingsphere/elasticjob/http/pojo/HttpParam.java
rename to ecosystem/executor/http/src/main/java/org/apache/shardingsphere/elasticjob/http/pojo/HttpParam.java
diff --git a/ecosystem/executor/type/http/src/main/java/org/apache/shardingsphere/elasticjob/http/props/HttpJobProperties.java b/ecosystem/executor/http/src/main/java/org/apache/shardingsphere/elasticjob/http/props/HttpJobProperties.java
similarity index 100%
rename from ecosystem/executor/type/http/src/main/java/org/apache/shardingsphere/elasticjob/http/props/HttpJobProperties.java
rename to ecosystem/executor/http/src/main/java/org/apache/shardingsphere/elasticjob/http/props/HttpJobProperties.java
diff --git a/ecosystem/executor/type/http/src/main/resources/META-INF/services/org.apache.shardingsphere.elasticjob.spi.type.TypedJobItemExecutor b/ecosystem/executor/http/src/main/resources/META-INF/services/org.apache.shardingsphere.elasticjob.spi.type.TypedJobItemExecutor
similarity index 100%
rename from ecosystem/executor/type/http/src/main/resources/META-INF/services/org.apache.shardingsphere.elasticjob.spi.type.TypedJobItemExecutor
rename to ecosystem/executor/http/src/main/resources/META-INF/services/org.apache.shardingsphere.elasticjob.spi.type.TypedJobItemExecutor
diff --git a/ecosystem/executor/type/http/src/test/java/org/apache/shardingsphere/elasticjob/http/executor/HttpJobExecutorTest.java b/ecosystem/executor/http/src/test/java/org/apache/shardingsphere/elasticjob/http/executor/HttpJobExecutorTest.java
similarity index 100%
rename from ecosystem/executor/type/http/src/test/java/org/apache/shardingsphere/elasticjob/http/executor/HttpJobExecutorTest.java
rename to ecosystem/executor/http/src/test/java/org/apache/shardingsphere/elasticjob/http/executor/HttpJobExecutorTest.java
diff --git a/ecosystem/executor/type/http/src/test/java/org/apache/shardingsphere/elasticjob/http/executor/fixture/InternalController.java b/ecosystem/executor/http/src/test/java/org/apache/shardingsphere/elasticjob/http/executor/fixture/InternalController.java
similarity index 100%
rename from ecosystem/executor/type/http/src/test/java/org/apache/shardingsphere/elasticjob/http/executor/fixture/InternalController.java
rename to ecosystem/executor/http/src/test/java/org/apache/shardingsphere/elasticjob/http/executor/fixture/InternalController.java
diff --git a/ecosystem/executor/pom.xml b/ecosystem/executor/pom.xml
index 602069602e..201992c57a 100644
--- 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 b/ecosystem/executor/script/pom.xml
similarity index 96%
rename from ecosystem/executor/type/script/pom.xml
rename to ecosystem/executor/script/pom.xml
index a3eb8be61e..977417bfb5 100644
--- a/ecosystem/executor/type/script/pom.xml
+++ b/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/ecosystem/executor/type/script/src/main/java/org/apache/shardingsphere/elasticjob/script/executor/ScriptJobExecutor.java b/ecosystem/executor/script/src/main/java/org/apache/shardingsphere/elasticjob/script/executor/ScriptJobExecutor.java
similarity index 100%
rename from ecosystem/executor/type/script/src/main/java/org/apache/shardingsphere/elasticjob/script/executor/ScriptJobExecutor.java
rename to ecosystem/executor/script/src/main/java/org/apache/shardingsphere/elasticjob/script/executor/ScriptJobExecutor.java
diff --git a/ecosystem/executor/type/script/src/main/java/org/apache/shardingsphere/elasticjob/script/props/ScriptJobProperties.java b/ecosystem/executor/script/src/main/java/org/apache/shardingsphere/elasticjob/script/props/ScriptJobProperties.java
similarity index 100%
rename from ecosystem/executor/type/script/src/main/java/org/apache/shardingsphere/elasticjob/script/props/ScriptJobProperties.java
rename to ecosystem/executor/script/src/main/java/org/apache/shardingsphere/elasticjob/script/props/ScriptJobProperties.java
diff --git a/ecosystem/executor/type/script/src/main/resources/META-INF/services/org.apache.shardingsphere.elasticjob.spi.type.TypedJobItemExecutor b/ecosystem/executor/script/src/main/resources/META-INF/services/org.apache.shardingsphere.elasticjob.spi.type.TypedJobItemExecutor
similarity index 100%
rename from ecosystem/executor/type/script/src/main/resources/META-INF/services/org.apache.shardingsphere.elasticjob.spi.type.TypedJobItemExecutor
rename to ecosystem/executor/script/src/main/resources/META-INF/services/org.apache.shardingsphere.elasticjob.spi.type.TypedJobItemExecutor
diff --git a/ecosystem/executor/type/script/src/test/java/org/apache/shardingsphere/elasticjob/script/ScriptJobExecutorTest.java b/ecosystem/executor/script/src/test/java/org/apache/shardingsphere/elasticjob/script/ScriptJobExecutorTest.java
similarity index 100%
rename from ecosystem/executor/type/script/src/test/java/org/apache/shardingsphere/elasticjob/script/ScriptJobExecutorTest.java
rename to ecosystem/executor/script/src/test/java/org/apache/shardingsphere/elasticjob/script/ScriptJobExecutorTest.java
diff --git a/ecosystem/executor/type/simple/pom.xml b/ecosystem/executor/simple/pom.xml
similarity index 96%
rename from ecosystem/executor/type/simple/pom.xml
rename to ecosystem/executor/simple/pom.xml
index a32dc8efc4..372e7aa8f0 100644
--- a/ecosystem/executor/type/simple/pom.xml
+++ b/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/ecosystem/executor/type/simple/src/main/java/org/apache/shardingsphere/elasticjob/simple/executor/SimpleJobExecutor.java b/ecosystem/executor/simple/src/main/java/org/apache/shardingsphere/elasticjob/simple/executor/SimpleJobExecutor.java
similarity index 100%
rename from ecosystem/executor/type/simple/src/main/java/org/apache/shardingsphere/elasticjob/simple/executor/SimpleJobExecutor.java
rename to ecosystem/executor/simple/src/main/java/org/apache/shardingsphere/elasticjob/simple/executor/SimpleJobExecutor.java
diff --git a/ecosystem/executor/type/simple/src/main/java/org/apache/shardingsphere/elasticjob/simple/job/SimpleJob.java b/ecosystem/executor/simple/src/main/java/org/apache/shardingsphere/elasticjob/simple/job/SimpleJob.java
similarity index 100%
rename from ecosystem/executor/type/simple/src/main/java/org/apache/shardingsphere/elasticjob/simple/job/SimpleJob.java
rename to ecosystem/executor/simple/src/main/java/org/apache/shardingsphere/elasticjob/simple/job/SimpleJob.java
diff --git a/ecosystem/executor/type/simple/src/main/resources/META-INF/services/org.apache.shardingsphere.elasticjob.spi.type.ClassedJobItemExecutor b/ecosystem/executor/simple/src/main/resources/META-INF/services/org.apache.shardingsphere.elasticjob.spi.type.ClassedJobItemExecutor
similarity index 100%
rename from ecosystem/executor/type/simple/src/main/resources/META-INF/services/org.apache.shardingsphere.elasticjob.spi.type.ClassedJobItemExecutor
rename to ecosystem/executor/simple/src/main/resources/META-INF/services/org.apache.shardingsphere.elasticjob.spi.type.ClassedJobItemExecutor
diff --git a/ecosystem/executor/type/simple/src/test/java/org/apache/shardingsphere/elasticjob/simple/executor/SimpleJobExecutorTest.java b/ecosystem/executor/simple/src/test/java/org/apache/shardingsphere/elasticjob/simple/executor/SimpleJobExecutorTest.java
similarity index 100%
rename from ecosystem/executor/type/simple/src/test/java/org/apache/shardingsphere/elasticjob/simple/executor/SimpleJobExecutorTest.java
rename to ecosystem/executor/simple/src/test/java/org/apache/shardingsphere/elasticjob/simple/executor/SimpleJobExecutorTest.java
diff --git a/ecosystem/executor/type/simple/src/test/java/org/apache/shardingsphere/elasticjob/simple/job/FooSimpleJob.java b/ecosystem/executor/simple/src/test/java/org/apache/shardingsphere/elasticjob/simple/job/FooSimpleJob.java
similarity index 100%
rename from ecosystem/executor/type/simple/src/test/java/org/apache/shardingsphere/elasticjob/simple/job/FooSimpleJob.java
rename to ecosystem/executor/simple/src/test/java/org/apache/shardingsphere/elasticjob/simple/job/FooSimpleJob.java
diff --git a/ecosystem/executor/type/pom.xml b/ecosystem/executor/type/pom.xml
deleted file mode 100644
index 66f974728e..0000000000
--- a/ecosystem/executor/type/pom.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  ~ Licensed to the Apache Software Foundation (ASF) under one or more
-  ~ contributor license agreements.  See the NOTICE file distributed with
-  ~ this work for additional information regarding copyright ownership.
-  ~ The ASF licenses this file to You under the Apache License, Version 2.0
-  ~ (the "License"); you may not use this file except in compliance with
-  ~ the License.  You may obtain a copy of the License at
-  ~
-  ~     http://www.apache.org/licenses/LICENSE-2.0
-  ~  
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License.
-  -->
-
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <groupId>org.apache.shardingsphere.elasticjob</groupId>
-        <artifactId>elasticjob-executor</artifactId>
-        <version>3.1.0-SNAPSHOT</version>
-    </parent>
-    <artifactId>elasticjob-executor-type</artifactId>
-    <packaging>pom</packaging>
-    <name>${project.artifactId}</name>
-    
-    <modules>
-        <module>simple</module>
-        <module>dataflow</module>
-        <module>script</module>
-        <module>http</module>
-    </modules>
-</project>