You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@shardingsphere.apache.org by zh...@apache.org on 2020/10/02 15:34:25 UTC
[shardingsphere-elasticjob] branch master updated: Rename module
elasticjob-error-handler-impl to elasticjob-error-handler-type (#1538)
This is an automated email from the ASF dual-hosted git repository.
zhangliang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/shardingsphere-elasticjob.git
The following commit(s) were added to refs/heads/master by this push:
new c45576b Rename module elasticjob-error-handler-impl to elasticjob-error-handler-type (#1538)
c45576b is described below
commit c45576bb7f533bb507e06eec7a5966e42503ab0a
Author: Liang Zhang <te...@163.com>
AuthorDate: Fri Oct 2 23:31:03 2020 +0800
Rename module elasticjob-error-handler-impl to elasticjob-error-handler-type (#1538)
---
.../elasticjob-error-handler-dingtalk/pom.xml | 2 +-
.../error/handler/dingtalk/DingtalkConfiguration.java | 0
.../error/handler/dingtalk/DingtalkJobErrorHandler.java | 0
...he.shardingsphere.elasticjob.error.handler.JobErrorHandler | 0
.../src/main/resources/conf/error-handler-dingtalk.yaml | 0
.../error/handler/dingtalk/DingtalkJobErrorHandlerTest.java | 2 +-
.../handler/dingtalk/fixture/DingtalkInternalController.java | 0
...he.shardingsphere.elasticjob.error.handler.JobErrorHandler | 0
.../src/test/resources/conf/error-handler-dingtalk.yaml | 0
.../elasticjob-error-handler-email/pom.xml | 2 +-
.../elasticjob/error/handler/email/EmailConfiguration.java | 0
.../error/handler/email/EmailConfigurationLoader.java | 0
.../elasticjob/error/handler/email/EmailJobErrorHandler.java | 0
...he.shardingsphere.elasticjob.error.handler.JobErrorHandler | 0
.../src/main/resources/conf/error-handler-email.yaml | 0
.../error/handler/email/EmailJobErrorHandlerTest.java | 2 +-
...he.shardingsphere.elasticjob.error.handler.JobErrorHandler | 0
.../src/test/resources/conf/error-handler-email.yaml | 0
.../elasticjob-error-handler-general/pom.xml | 2 +-
.../elasticjob/error/handler/JobErrorHandlerFactory.java | 0
.../error/handler/general/IgnoreJobErrorHandler.java | 0
.../elasticjob/error/handler/general/LogJobErrorHandler.java | 0
.../error/handler/general/ThrowJobErrorHandler.java | 0
...he.shardingsphere.elasticjob.error.handler.JobErrorHandler | 0
.../elasticjob/error/handler/JobErrorHandlerFactoryTest.java | 0
.../error/handler/general/IgnoreJobErrorHandlerTest.java | 0
.../error/handler/general/LogJobErrorHandlerTest.java | 0
.../error/handler/general/ThrowJobErrorHandlerTest.java | 0
...he.shardingsphere.elasticjob.error.handler.JobErrorHandler | 0
.../elasticjob-error-handler-sms/pom.xml | 2 +-
.../elasticjob-error-handler-wechat/pom.xml | 2 +-
.../elasticjob/error/handler/wechat/WechatConfiguration.java | 0
.../error/handler/wechat/WechatJobErrorHandler.java | 0
...he.shardingsphere.elasticjob.error.handler.JobErrorHandler | 0
.../src/main/resources/conf/error-handler-wechat.yaml | 0
.../error/handler/wechat/WechatJobErrorHandlerTest.java | 11 +++++------
.../handler/wechat/fixture/WechatInternalController.java | 0
...he.shardingsphere.elasticjob.error.handler.JobErrorHandler | 0
.../src/test/resources/conf/error-handler-wechat.yaml | 0
.../pom.xml | 2 +-
elasticjob-error-handler/pom.xml | 2 +-
41 files changed, 14 insertions(+), 15 deletions(-)
diff --git a/elasticjob-error-handler/elasticjob-error-handler-impl/elasticjob-error-handler-dingtalk/pom.xml b/elasticjob-error-handler/elasticjob-error-handler-type/elasticjob-error-handler-dingtalk/pom.xml
similarity index 98%
rename from elasticjob-error-handler/elasticjob-error-handler-impl/elasticjob-error-handler-dingtalk/pom.xml
rename to elasticjob-error-handler/elasticjob-error-handler-type/elasticjob-error-handler-dingtalk/pom.xml
index 072a493..ccef5e2 100644
--- a/elasticjob-error-handler/elasticjob-error-handler-impl/elasticjob-error-handler-dingtalk/pom.xml
+++ b/elasticjob-error-handler/elasticjob-error-handler-type/elasticjob-error-handler-dingtalk/pom.xml
@@ -22,7 +22,7 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.shardingsphere.elasticjob</groupId>
- <artifactId>elasticjob-error-handler-impl</artifactId>
+ <artifactId>elasticjob-error-handler-type</artifactId>
<version>3.0.0-beta-SNAPSHOT</version>
</parent>
<artifactId>elasticjob-error-handler-dingtalk</artifactId>
diff --git a/elasticjob-error-handler/elasticjob-error-handler-impl/elasticjob-error-handler-dingtalk/src/main/java/org/apache/shardingsphere/elasticjob/error/handler/dingtalk/DingtalkConfiguration.java b/elasticjob-error-handler/elasticjob-error-handler-type/elasticjob-error-handler-dingtalk/src/main/java/org/apache/shardingsphere/elasticjob/error/handler/dingtalk/DingtalkConfiguration.java
similarity index 100%
rename from elasticjob-error-handler/elasticjob-error-handler-impl/elasticjob-error-handler-dingtalk/src/main/java/org/apache/shardingsphere/elasticjob/error/handler/dingtalk/DingtalkConfiguration.java
rename to elasticjob-error-handler/elasticjob-error-handler-type/elasticjob-error-handler-dingtalk/src/main/java/org/apache/shardingsphere/elasticjob/error/handler/dingtalk/DingtalkConfiguration.java
diff --git a/elasticjob-error-handler/elasticjob-error-handler-impl/elasticjob-error-handler-dingtalk/src/main/java/org/apache/shardingsphere/elasticjob/error/handler/dingtalk/DingtalkJobErrorHandler.java b/elasticjob-error-handler/elasticjob-error-handler-type/elasticjob-error-handler-dingtalk/src/main/java/org/apache/shardingsphere/elasticjob/error/handler/dingtalk/DingtalkJobErrorHandler.java
similarity index 100%
rename from elasticjob-error-handler/elasticjob-error-handler-impl/elasticjob-error-handler-dingtalk/src/main/java/org/apache/shardingsphere/elasticjob/error/handler/dingtalk/DingtalkJobErrorHandler.java
rename to elasticjob-error-handler/elasticjob-error-handler-type/elasticjob-error-handler-dingtalk/src/main/java/org/apache/shardingsphere/elasticjob/error/handler/dingtalk/DingtalkJobErrorHandler.java
diff --git a/elasticjob-error-handler/elasticjob-error-handler-impl/elasticjob-error-handler-dingtalk/src/test/resources/META-INF.services/org.apache.shardingsphere.elasticjob.error.handler.JobErrorHandler b/elasticjob-error-handler/elasticjob-error-handler-type/elasticjob-error-handler-dingtalk/src/main/resources/META-INF/services/org.apache.shardingsphere.elasticjob.error.handler.JobErrorHandler
similarity index 100%
rename from elasticjob-error-handler/elasticjob-error-handler-impl/elasticjob-error-handler-dingtalk/src/test/resources/META-INF.services/org.apache.shardingsphere.elasticjob.error.handler.JobErrorHandler
rename to elasticjob-error-handler/elasticjob-error-handler-type/elasticjob-error-handler-dingtalk/src/main/resources/META-INF/services/org.apache.shardingsphere.elasticjob.error.handler.JobErrorHandler
diff --git a/elasticjob-error-handler/elasticjob-error-handler-impl/elasticjob-error-handler-dingtalk/src/main/resources/conf/error-handler-dingtalk.yaml b/elasticjob-error-handler/elasticjob-error-handler-type/elasticjob-error-handler-dingtalk/src/main/resources/conf/error-handler-dingtalk.yaml
similarity index 100%
rename from elasticjob-error-handler/elasticjob-error-handler-impl/elasticjob-error-handler-dingtalk/src/main/resources/conf/error-handler-dingtalk.yaml
rename to elasticjob-error-handler/elasticjob-error-handler-type/elasticjob-error-handler-dingtalk/src/main/resources/conf/error-handler-dingtalk.yaml
diff --git a/elasticjob-error-handler/elasticjob-error-handler-impl/elasticjob-error-handler-dingtalk/src/test/java/org/apache/shardingsphere/elasticjob/error/handler/dingtalk/DingtalkJobErrorHandlerTest.java b/elasticjob-error-handler/elasticjob-error-handler-type/elasticjob-error-handler-dingtalk/src/test/java/org/apache/shardingsphere/elasticjob/error/handler/dingtalk/DingtalkJobErrorHandlerTest.java
similarity index 98%
rename from elasticjob-error-handler/elasticjob-error-handler-impl/elasticjob-error-handler-dingtalk/src/test/java/org/apache/shardingsphere/elasticjob/error/handler/dingtalk/DingtalkJobErrorHandlerTest.java
rename to elasticjob-error-handler/elasticjob-error-handler-type/elasticjob-error-handler-dingtalk/src/test/java/org/apache/shardingsphere/elasticjob/error/handler/dingtalk/DingtalkJobErrorHandlerTest.java
index 9e69711..3297c64 100644
--- a/elasticjob-error-handler/elasticjob-error-handler-impl/elasticjob-error-handler-dingtalk/src/test/java/org/apache/shardingsphere/elasticjob/error/handler/dingtalk/DingtalkJobErrorHandlerTest.java
+++ b/elasticjob-error-handler/elasticjob-error-handler-type/elasticjob-error-handler-dingtalk/src/test/java/org/apache/shardingsphere/elasticjob/error/handler/dingtalk/DingtalkJobErrorHandlerTest.java
@@ -116,7 +116,7 @@ public final class DingtalkJobErrorHandlerTest {
private DingtalkJobErrorHandler getDingtalkJobErrorHandler() {
for (JobErrorHandler each : ServiceLoader.load(JobErrorHandler.class)) {
- if (null != each && each instanceof DingtalkJobErrorHandler) {
+ if (each instanceof DingtalkJobErrorHandler) {
return (DingtalkJobErrorHandler) each;
}
}
diff --git a/elasticjob-error-handler/elasticjob-error-handler-impl/elasticjob-error-handler-dingtalk/src/test/java/org/apache/shardingsphere/elasticjob/error/handler/dingtalk/fixture/DingtalkInternalController.java b/elasticjob-error-handler/elasticjob-error-handler-type/elasticjob-error-handler-dingtalk/src/test/java/org/apache/shardingsphere/elasticjob/error/handler/dingtalk/fixture/DingtalkInternalController.java
similarity index 100%
rename from elasticjob-error-handler/elasticjob-error-handler-impl/elasticjob-error-handler-dingtalk/src/test/java/org/apache/shardingsphere/elasticjob/error/handler/dingtalk/fixture/DingtalkInternalController.java
rename to elasticjob-error-handler/elasticjob-error-handler-type/elasticjob-error-handler-dingtalk/src/test/java/org/apache/shardingsphere/elasticjob/error/handler/dingtalk/fixture/DingtalkInternalController.java
diff --git a/elasticjob-error-handler/elasticjob-error-handler-impl/elasticjob-error-handler-dingtalk/src/main/resources/META-INF/services/org.apache.shardingsphere.elasticjob.error.handler.JobErrorHandler b/elasticjob-error-handler/elasticjob-error-handler-type/elasticjob-error-handler-dingtalk/src/test/resources/META-INF.services/org.apache.shardingsphere.elasticjob.error.handler.JobErrorHandler
similarity index 100%
rename from elasticjob-error-handler/elasticjob-error-handler-impl/elasticjob-error-handler-dingtalk/src/main/resources/META-INF/services/org.apache.shardingsphere.elasticjob.error.handler.JobErrorHandler
rename to elasticjob-error-handler/elasticjob-error-handler-type/elasticjob-error-handler-dingtalk/src/test/resources/META-INF.services/org.apache.shardingsphere.elasticjob.error.handler.JobErrorHandler
diff --git a/elasticjob-error-handler/elasticjob-error-handler-impl/elasticjob-error-handler-dingtalk/src/test/resources/conf/error-handler-dingtalk.yaml b/elasticjob-error-handler/elasticjob-error-handler-type/elasticjob-error-handler-dingtalk/src/test/resources/conf/error-handler-dingtalk.yaml
similarity index 100%
rename from elasticjob-error-handler/elasticjob-error-handler-impl/elasticjob-error-handler-dingtalk/src/test/resources/conf/error-handler-dingtalk.yaml
rename to elasticjob-error-handler/elasticjob-error-handler-type/elasticjob-error-handler-dingtalk/src/test/resources/conf/error-handler-dingtalk.yaml
diff --git a/elasticjob-error-handler/elasticjob-error-handler-impl/elasticjob-error-handler-email/pom.xml b/elasticjob-error-handler/elasticjob-error-handler-type/elasticjob-error-handler-email/pom.xml
similarity index 97%
rename from elasticjob-error-handler/elasticjob-error-handler-impl/elasticjob-error-handler-email/pom.xml
rename to elasticjob-error-handler/elasticjob-error-handler-type/elasticjob-error-handler-email/pom.xml
index 5dcfd16..039603a 100644
--- a/elasticjob-error-handler/elasticjob-error-handler-impl/elasticjob-error-handler-email/pom.xml
+++ b/elasticjob-error-handler/elasticjob-error-handler-type/elasticjob-error-handler-email/pom.xml
@@ -22,7 +22,7 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.shardingsphere.elasticjob</groupId>
- <artifactId>elasticjob-error-handler-impl</artifactId>
+ <artifactId>elasticjob-error-handler-type</artifactId>
<version>3.0.0-beta-SNAPSHOT</version>
</parent>
<artifactId>elasticjob-error-handler-email</artifactId>
diff --git a/elasticjob-error-handler/elasticjob-error-handler-impl/elasticjob-error-handler-email/src/main/java/org/apache/shardingsphere/elasticjob/error/handler/email/EmailConfiguration.java b/elasticjob-error-handler/elasticjob-error-handler-type/elasticjob-error-handler-email/src/main/java/org/apache/shardingsphere/elasticjob/error/handler/email/EmailConfiguration.java
similarity index 100%
rename from elasticjob-error-handler/elasticjob-error-handler-impl/elasticjob-error-handler-email/src/main/java/org/apache/shardingsphere/elasticjob/error/handler/email/EmailConfiguration.java
rename to elasticjob-error-handler/elasticjob-error-handler-type/elasticjob-error-handler-email/src/main/java/org/apache/shardingsphere/elasticjob/error/handler/email/EmailConfiguration.java
diff --git a/elasticjob-error-handler/elasticjob-error-handler-impl/elasticjob-error-handler-email/src/main/java/org/apache/shardingsphere/elasticjob/error/handler/email/EmailConfigurationLoader.java b/elasticjob-error-handler/elasticjob-error-handler-type/elasticjob-error-handler-email/src/main/java/org/apache/shardingsphere/elasticjob/error/handler/email/EmailConfigurationLoader.java
similarity index 100%
rename from elasticjob-error-handler/elasticjob-error-handler-impl/elasticjob-error-handler-email/src/main/java/org/apache/shardingsphere/elasticjob/error/handler/email/EmailConfigurationLoader.java
rename to elasticjob-error-handler/elasticjob-error-handler-type/elasticjob-error-handler-email/src/main/java/org/apache/shardingsphere/elasticjob/error/handler/email/EmailConfigurationLoader.java
diff --git a/elasticjob-error-handler/elasticjob-error-handler-impl/elasticjob-error-handler-email/src/main/java/org/apache/shardingsphere/elasticjob/error/handler/email/EmailJobErrorHandler.java b/elasticjob-error-handler/elasticjob-error-handler-type/elasticjob-error-handler-email/src/main/java/org/apache/shardingsphere/elasticjob/error/handler/email/EmailJobErrorHandler.java
similarity index 100%
rename from elasticjob-error-handler/elasticjob-error-handler-impl/elasticjob-error-handler-email/src/main/java/org/apache/shardingsphere/elasticjob/error/handler/email/EmailJobErrorHandler.java
rename to elasticjob-error-handler/elasticjob-error-handler-type/elasticjob-error-handler-email/src/main/java/org/apache/shardingsphere/elasticjob/error/handler/email/EmailJobErrorHandler.java
diff --git a/elasticjob-error-handler/elasticjob-error-handler-impl/elasticjob-error-handler-email/src/test/resources/META-INF.services/org.apache.shardingsphere.elasticjob.error.handler.JobErrorHandler b/elasticjob-error-handler/elasticjob-error-handler-type/elasticjob-error-handler-email/src/main/resources/META-INF/services/org.apache.shardingsphere.elasticjob.error.handler.JobErrorHandler
similarity index 100%
rename from elasticjob-error-handler/elasticjob-error-handler-impl/elasticjob-error-handler-email/src/test/resources/META-INF.services/org.apache.shardingsphere.elasticjob.error.handler.JobErrorHandler
rename to elasticjob-error-handler/elasticjob-error-handler-type/elasticjob-error-handler-email/src/main/resources/META-INF/services/org.apache.shardingsphere.elasticjob.error.handler.JobErrorHandler
diff --git a/elasticjob-error-handler/elasticjob-error-handler-impl/elasticjob-error-handler-email/src/main/resources/conf/error-handler-email.yaml b/elasticjob-error-handler/elasticjob-error-handler-type/elasticjob-error-handler-email/src/main/resources/conf/error-handler-email.yaml
similarity index 100%
rename from elasticjob-error-handler/elasticjob-error-handler-impl/elasticjob-error-handler-email/src/main/resources/conf/error-handler-email.yaml
rename to elasticjob-error-handler/elasticjob-error-handler-type/elasticjob-error-handler-email/src/main/resources/conf/error-handler-email.yaml
diff --git a/elasticjob-error-handler/elasticjob-error-handler-impl/elasticjob-error-handler-email/src/test/java/org/apache/shardingsphere/elasticjob/error/handler/email/EmailJobErrorHandlerTest.java b/elasticjob-error-handler/elasticjob-error-handler-type/elasticjob-error-handler-email/src/test/java/org/apache/shardingsphere/elasticjob/error/handler/email/EmailJobErrorHandlerTest.java
similarity index 98%
rename from elasticjob-error-handler/elasticjob-error-handler-impl/elasticjob-error-handler-email/src/test/java/org/apache/shardingsphere/elasticjob/error/handler/email/EmailJobErrorHandlerTest.java
rename to elasticjob-error-handler/elasticjob-error-handler-type/elasticjob-error-handler-email/src/test/java/org/apache/shardingsphere/elasticjob/error/handler/email/EmailJobErrorHandlerTest.java
index 220f4ca..23aaed4 100644
--- a/elasticjob-error-handler/elasticjob-error-handler-impl/elasticjob-error-handler-email/src/test/java/org/apache/shardingsphere/elasticjob/error/handler/email/EmailJobErrorHandlerTest.java
+++ b/elasticjob-error-handler/elasticjob-error-handler-type/elasticjob-error-handler-email/src/test/java/org/apache/shardingsphere/elasticjob/error/handler/email/EmailJobErrorHandlerTest.java
@@ -71,7 +71,7 @@ public final class EmailJobErrorHandlerTest {
private EmailJobErrorHandler getEmailJobErrorHandler() {
for (JobErrorHandler each : ServiceLoader.load(JobErrorHandler.class)) {
- if (null != each && each instanceof EmailJobErrorHandler) {
+ if (each instanceof EmailJobErrorHandler) {
return (EmailJobErrorHandler) each;
}
}
diff --git a/elasticjob-error-handler/elasticjob-error-handler-impl/elasticjob-error-handler-email/src/main/resources/META-INF/services/org.apache.shardingsphere.elasticjob.error.handler.JobErrorHandler b/elasticjob-error-handler/elasticjob-error-handler-type/elasticjob-error-handler-email/src/test/resources/META-INF.services/org.apache.shardingsphere.elasticjob.error.handler.JobErrorHandler
similarity index 100%
rename from elasticjob-error-handler/elasticjob-error-handler-impl/elasticjob-error-handler-email/src/main/resources/META-INF/services/org.apache.shardingsphere.elasticjob.error.handler.JobErrorHandler
rename to elasticjob-error-handler/elasticjob-error-handler-type/elasticjob-error-handler-email/src/test/resources/META-INF.services/org.apache.shardingsphere.elasticjob.error.handler.JobErrorHandler
diff --git a/elasticjob-error-handler/elasticjob-error-handler-impl/elasticjob-error-handler-email/src/test/resources/conf/error-handler-email.yaml b/elasticjob-error-handler/elasticjob-error-handler-type/elasticjob-error-handler-email/src/test/resources/conf/error-handler-email.yaml
similarity index 100%
rename from elasticjob-error-handler/elasticjob-error-handler-impl/elasticjob-error-handler-email/src/test/resources/conf/error-handler-email.yaml
rename to elasticjob-error-handler/elasticjob-error-handler-type/elasticjob-error-handler-email/src/test/resources/conf/error-handler-email.yaml
diff --git a/elasticjob-error-handler/elasticjob-error-handler-impl/elasticjob-error-handler-general/pom.xml b/elasticjob-error-handler/elasticjob-error-handler-type/elasticjob-error-handler-general/pom.xml
similarity index 97%
rename from elasticjob-error-handler/elasticjob-error-handler-impl/elasticjob-error-handler-general/pom.xml
rename to elasticjob-error-handler/elasticjob-error-handler-type/elasticjob-error-handler-general/pom.xml
index 769f012..be60bba 100644
--- a/elasticjob-error-handler/elasticjob-error-handler-impl/elasticjob-error-handler-general/pom.xml
+++ b/elasticjob-error-handler/elasticjob-error-handler-type/elasticjob-error-handler-general/pom.xml
@@ -22,7 +22,7 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.shardingsphere.elasticjob</groupId>
- <artifactId>elasticjob-error-handler-impl</artifactId>
+ <artifactId>elasticjob-error-handler-type</artifactId>
<version>3.0.0-beta-SNAPSHOT</version>
</parent>
<artifactId>elasticjob-error-handler-general</artifactId>
diff --git a/elasticjob-error-handler/elasticjob-error-handler-impl/elasticjob-error-handler-general/src/main/java/org/apache/shardingsphere/elasticjob/error/handler/JobErrorHandlerFactory.java b/elasticjob-error-handler/elasticjob-error-handler-type/elasticjob-error-handler-general/src/main/java/org/apache/shardingsphere/elasticjob/error/handler/JobErrorHandlerFactory.java
similarity index 100%
rename from elasticjob-error-handler/elasticjob-error-handler-impl/elasticjob-error-handler-general/src/main/java/org/apache/shardingsphere/elasticjob/error/handler/JobErrorHandlerFactory.java
rename to elasticjob-error-handler/elasticjob-error-handler-type/elasticjob-error-handler-general/src/main/java/org/apache/shardingsphere/elasticjob/error/handler/JobErrorHandlerFactory.java
diff --git a/elasticjob-error-handler/elasticjob-error-handler-impl/elasticjob-error-handler-general/src/main/java/org/apache/shardingsphere/elasticjob/error/handler/general/IgnoreJobErrorHandler.java b/elasticjob-error-handler/elasticjob-error-handler-type/elasticjob-error-handler-general/src/main/java/org/apache/shardingsphere/elasticjob/error/handler/general/IgnoreJobErrorHandler.java
similarity index 100%
rename from elasticjob-error-handler/elasticjob-error-handler-impl/elasticjob-error-handler-general/src/main/java/org/apache/shardingsphere/elasticjob/error/handler/general/IgnoreJobErrorHandler.java
rename to elasticjob-error-handler/elasticjob-error-handler-type/elasticjob-error-handler-general/src/main/java/org/apache/shardingsphere/elasticjob/error/handler/general/IgnoreJobErrorHandler.java
diff --git a/elasticjob-error-handler/elasticjob-error-handler-impl/elasticjob-error-handler-general/src/main/java/org/apache/shardingsphere/elasticjob/error/handler/general/LogJobErrorHandler.java b/elasticjob-error-handler/elasticjob-error-handler-type/elasticjob-error-handler-general/src/main/java/org/apache/shardingsphere/elasticjob/error/handler/general/LogJobErrorHandler.java
similarity index 100%
rename from elasticjob-error-handler/elasticjob-error-handler-impl/elasticjob-error-handler-general/src/main/java/org/apache/shardingsphere/elasticjob/error/handler/general/LogJobErrorHandler.java
rename to elasticjob-error-handler/elasticjob-error-handler-type/elasticjob-error-handler-general/src/main/java/org/apache/shardingsphere/elasticjob/error/handler/general/LogJobErrorHandler.java
diff --git a/elasticjob-error-handler/elasticjob-error-handler-impl/elasticjob-error-handler-general/src/main/java/org/apache/shardingsphere/elasticjob/error/handler/general/ThrowJobErrorHandler.java b/elasticjob-error-handler/elasticjob-error-handler-type/elasticjob-error-handler-general/src/main/java/org/apache/shardingsphere/elasticjob/error/handler/general/ThrowJobErrorHandler.java
similarity index 100%
rename from elasticjob-error-handler/elasticjob-error-handler-impl/elasticjob-error-handler-general/src/main/java/org/apache/shardingsphere/elasticjob/error/handler/general/ThrowJobErrorHandler.java
rename to elasticjob-error-handler/elasticjob-error-handler-type/elasticjob-error-handler-general/src/main/java/org/apache/shardingsphere/elasticjob/error/handler/general/ThrowJobErrorHandler.java
diff --git a/elasticjob-error-handler/elasticjob-error-handler-impl/elasticjob-error-handler-general/src/test/resources/META-INF/services/org.apache.shardingsphere.elasticjob.error.handler.JobErrorHandler b/elasticjob-error-handler/elasticjob-error-handler-type/elasticjob-error-handler-general/src/main/resources/META-INF/services/org.apache.shardingsphere.elasticjob.error.handler.JobErrorHandler
similarity index 100%
rename from elasticjob-error-handler/elasticjob-error-handler-impl/elasticjob-error-handler-general/src/test/resources/META-INF/services/org.apache.shardingsphere.elasticjob.error.handler.JobErrorHandler
rename to elasticjob-error-handler/elasticjob-error-handler-type/elasticjob-error-handler-general/src/main/resources/META-INF/services/org.apache.shardingsphere.elasticjob.error.handler.JobErrorHandler
diff --git a/elasticjob-error-handler/elasticjob-error-handler-impl/elasticjob-error-handler-general/src/test/java/org/apache/shardingsphere/elasticjob/error/handler/JobErrorHandlerFactoryTest.java b/elasticjob-error-handler/elasticjob-error-handler-type/elasticjob-error-handler-general/src/test/java/org/apache/shardingsphere/elasticjob/error/handler/JobErrorHandlerFactoryTest.java
similarity index 100%
rename from elasticjob-error-handler/elasticjob-error-handler-impl/elasticjob-error-handler-general/src/test/java/org/apache/shardingsphere/elasticjob/error/handler/JobErrorHandlerFactoryTest.java
rename to elasticjob-error-handler/elasticjob-error-handler-type/elasticjob-error-handler-general/src/test/java/org/apache/shardingsphere/elasticjob/error/handler/JobErrorHandlerFactoryTest.java
diff --git a/elasticjob-error-handler/elasticjob-error-handler-impl/elasticjob-error-handler-general/src/test/java/org/apache/shardingsphere/elasticjob/error/handler/general/IgnoreJobErrorHandlerTest.java b/elasticjob-error-handler/elasticjob-error-handler-type/elasticjob-error-handler-general/src/test/java/org/apache/shardingsphere/elasticjob/error/handler/general/IgnoreJobErrorHandlerTest.java
similarity index 100%
rename from elasticjob-error-handler/elasticjob-error-handler-impl/elasticjob-error-handler-general/src/test/java/org/apache/shardingsphere/elasticjob/error/handler/general/IgnoreJobErrorHandlerTest.java
rename to elasticjob-error-handler/elasticjob-error-handler-type/elasticjob-error-handler-general/src/test/java/org/apache/shardingsphere/elasticjob/error/handler/general/IgnoreJobErrorHandlerTest.java
diff --git a/elasticjob-error-handler/elasticjob-error-handler-impl/elasticjob-error-handler-general/src/test/java/org/apache/shardingsphere/elasticjob/error/handler/general/LogJobErrorHandlerTest.java b/elasticjob-error-handler/elasticjob-error-handler-type/elasticjob-error-handler-general/src/test/java/org/apache/shardingsphere/elasticjob/error/handler/general/LogJobErrorHandlerTest.java
similarity index 100%
rename from elasticjob-error-handler/elasticjob-error-handler-impl/elasticjob-error-handler-general/src/test/java/org/apache/shardingsphere/elasticjob/error/handler/general/LogJobErrorHandlerTest.java
rename to elasticjob-error-handler/elasticjob-error-handler-type/elasticjob-error-handler-general/src/test/java/org/apache/shardingsphere/elasticjob/error/handler/general/LogJobErrorHandlerTest.java
diff --git a/elasticjob-error-handler/elasticjob-error-handler-impl/elasticjob-error-handler-general/src/test/java/org/apache/shardingsphere/elasticjob/error/handler/general/ThrowJobErrorHandlerTest.java b/elasticjob-error-handler/elasticjob-error-handler-type/elasticjob-error-handler-general/src/test/java/org/apache/shardingsphere/elasticjob/error/handler/general/ThrowJobErrorHandlerTest.java
similarity index 100%
rename from elasticjob-error-handler/elasticjob-error-handler-impl/elasticjob-error-handler-general/src/test/java/org/apache/shardingsphere/elasticjob/error/handler/general/ThrowJobErrorHandlerTest.java
rename to elasticjob-error-handler/elasticjob-error-handler-type/elasticjob-error-handler-general/src/test/java/org/apache/shardingsphere/elasticjob/error/handler/general/ThrowJobErrorHandlerTest.java
diff --git a/elasticjob-error-handler/elasticjob-error-handler-impl/elasticjob-error-handler-general/src/main/resources/META-INF/services/org.apache.shardingsphere.elasticjob.error.handler.JobErrorHandler b/elasticjob-error-handler/elasticjob-error-handler-type/elasticjob-error-handler-general/src/test/resources/META-INF/services/org.apache.shardingsphere.elasticjob.error.handler.JobErrorHandler
similarity index 100%
rename from elasticjob-error-handler/elasticjob-error-handler-impl/elasticjob-error-handler-general/src/main/resources/META-INF/services/org.apache.shardingsphere.elasticjob.error.handler.JobErrorHandler
rename to elasticjob-error-handler/elasticjob-error-handler-type/elasticjob-error-handler-general/src/test/resources/META-INF/services/org.apache.shardingsphere.elasticjob.error.handler.JobErrorHandler
diff --git a/elasticjob-error-handler/elasticjob-error-handler-impl/elasticjob-error-handler-sms/pom.xml b/elasticjob-error-handler/elasticjob-error-handler-type/elasticjob-error-handler-sms/pom.xml
similarity index 96%
rename from elasticjob-error-handler/elasticjob-error-handler-impl/elasticjob-error-handler-sms/pom.xml
rename to elasticjob-error-handler/elasticjob-error-handler-type/elasticjob-error-handler-sms/pom.xml
index 5477a16..2733ce2 100644
--- a/elasticjob-error-handler/elasticjob-error-handler-impl/elasticjob-error-handler-sms/pom.xml
+++ b/elasticjob-error-handler/elasticjob-error-handler-type/elasticjob-error-handler-sms/pom.xml
@@ -22,7 +22,7 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.shardingsphere.elasticjob</groupId>
- <artifactId>elasticjob-error-handler-impl</artifactId>
+ <artifactId>elasticjob-error-handler-type</artifactId>
<version>3.0.0-beta-SNAPSHOT</version>
</parent>
<artifactId>elasticjob-error-handler-sms</artifactId>
diff --git a/elasticjob-error-handler/elasticjob-error-handler-impl/elasticjob-error-handler-wechat/pom.xml b/elasticjob-error-handler/elasticjob-error-handler-type/elasticjob-error-handler-wechat/pom.xml
similarity index 98%
rename from elasticjob-error-handler/elasticjob-error-handler-impl/elasticjob-error-handler-wechat/pom.xml
rename to elasticjob-error-handler/elasticjob-error-handler-type/elasticjob-error-handler-wechat/pom.xml
index 30d5b06..80426b1 100644
--- a/elasticjob-error-handler/elasticjob-error-handler-impl/elasticjob-error-handler-wechat/pom.xml
+++ b/elasticjob-error-handler/elasticjob-error-handler-type/elasticjob-error-handler-wechat/pom.xml
@@ -22,7 +22,7 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.shardingsphere.elasticjob</groupId>
- <artifactId>elasticjob-error-handler-impl</artifactId>
+ <artifactId>elasticjob-error-handler-type</artifactId>
<version>3.0.0-beta-SNAPSHOT</version>
</parent>
<artifactId>elasticjob-error-handler-wechat</artifactId>
diff --git a/elasticjob-error-handler/elasticjob-error-handler-impl/elasticjob-error-handler-wechat/src/main/java/org/apache/shardingsphere/elasticjob/error/handler/wechat/WechatConfiguration.java b/elasticjob-error-handler/elasticjob-error-handler-type/elasticjob-error-handler-wechat/src/main/java/org/apache/shardingsphere/elasticjob/error/handler/wechat/WechatConfiguration.java
similarity index 100%
rename from elasticjob-error-handler/elasticjob-error-handler-impl/elasticjob-error-handler-wechat/src/main/java/org/apache/shardingsphere/elasticjob/error/handler/wechat/WechatConfiguration.java
rename to elasticjob-error-handler/elasticjob-error-handler-type/elasticjob-error-handler-wechat/src/main/java/org/apache/shardingsphere/elasticjob/error/handler/wechat/WechatConfiguration.java
diff --git a/elasticjob-error-handler/elasticjob-error-handler-impl/elasticjob-error-handler-wechat/src/main/java/org/apache/shardingsphere/elasticjob/error/handler/wechat/WechatJobErrorHandler.java b/elasticjob-error-handler/elasticjob-error-handler-type/elasticjob-error-handler-wechat/src/main/java/org/apache/shardingsphere/elasticjob/error/handler/wechat/WechatJobErrorHandler.java
similarity index 100%
rename from elasticjob-error-handler/elasticjob-error-handler-impl/elasticjob-error-handler-wechat/src/main/java/org/apache/shardingsphere/elasticjob/error/handler/wechat/WechatJobErrorHandler.java
rename to elasticjob-error-handler/elasticjob-error-handler-type/elasticjob-error-handler-wechat/src/main/java/org/apache/shardingsphere/elasticjob/error/handler/wechat/WechatJobErrorHandler.java
diff --git a/elasticjob-error-handler/elasticjob-error-handler-impl/elasticjob-error-handler-wechat/src/test/resources/META-INF.services/org.apache.shardingsphere.elasticjob.error.handler.JobErrorHandler b/elasticjob-error-handler/elasticjob-error-handler-type/elasticjob-error-handler-wechat/src/main/resources/META-INF.services/org.apache.shardingsphere.elasticjob.error.handler.JobErrorHandler
similarity index 100%
rename from elasticjob-error-handler/elasticjob-error-handler-impl/elasticjob-error-handler-wechat/src/test/resources/META-INF.services/org.apache.shardingsphere.elasticjob.error.handler.JobErrorHandler
rename to elasticjob-error-handler/elasticjob-error-handler-type/elasticjob-error-handler-wechat/src/main/resources/META-INF.services/org.apache.shardingsphere.elasticjob.error.handler.JobErrorHandler
diff --git a/elasticjob-error-handler/elasticjob-error-handler-impl/elasticjob-error-handler-wechat/src/main/resources/conf/error-handler-wechat.yaml b/elasticjob-error-handler/elasticjob-error-handler-type/elasticjob-error-handler-wechat/src/main/resources/conf/error-handler-wechat.yaml
similarity index 100%
rename from elasticjob-error-handler/elasticjob-error-handler-impl/elasticjob-error-handler-wechat/src/main/resources/conf/error-handler-wechat.yaml
rename to elasticjob-error-handler/elasticjob-error-handler-type/elasticjob-error-handler-wechat/src/main/resources/conf/error-handler-wechat.yaml
diff --git a/elasticjob-error-handler/elasticjob-error-handler-impl/elasticjob-error-handler-wechat/src/test/java/org/apache/shardingsphere/elasticjob/error/handler/wechat/WechatJobErrorHandlerTest.java b/elasticjob-error-handler/elasticjob-error-handler-type/elasticjob-error-handler-wechat/src/test/java/org/apache/shardingsphere/elasticjob/error/handler/wechat/WechatJobErrorHandlerTest.java
similarity index 98%
rename from elasticjob-error-handler/elasticjob-error-handler-impl/elasticjob-error-handler-wechat/src/test/java/org/apache/shardingsphere/elasticjob/error/handler/wechat/WechatJobErrorHandlerTest.java
rename to elasticjob-error-handler/elasticjob-error-handler-type/elasticjob-error-handler-wechat/src/test/java/org/apache/shardingsphere/elasticjob/error/handler/wechat/WechatJobErrorHandlerTest.java
index 2d6d6d7..12d9e41 100644
--- a/elasticjob-error-handler/elasticjob-error-handler-impl/elasticjob-error-handler-wechat/src/test/java/org/apache/shardingsphere/elasticjob/error/handler/wechat/WechatJobErrorHandlerTest.java
+++ b/elasticjob-error-handler/elasticjob-error-handler-type/elasticjob-error-handler-wechat/src/test/java/org/apache/shardingsphere/elasticjob/error/handler/wechat/WechatJobErrorHandlerTest.java
@@ -19,6 +19,10 @@ package org.apache.shardingsphere.elasticjob.error.handler.wechat;
import lombok.SneakyThrows;
import org.apache.shardingsphere.elasticjob.error.handler.JobErrorHandler;
+import org.apache.shardingsphere.elasticjob.error.handler.wechat.fixture.WechatInternalController;
+import org.apache.shardingsphere.elasticjob.restful.NettyRestfulService;
+import org.apache.shardingsphere.elasticjob.restful.NettyRestfulServiceConfiguration;
+import org.apache.shardingsphere.elasticjob.restful.RestfulService;
import org.junit.AfterClass;
import org.junit.BeforeClass;
import org.junit.Test;
@@ -31,11 +35,6 @@ import java.lang.reflect.Field;
import java.lang.reflect.Modifier;
import java.util.ServiceLoader;
-import org.apache.shardingsphere.elasticjob.error.handler.wechat.fixture.WechatInternalController;
-import org.apache.shardingsphere.elasticjob.restful.NettyRestfulService;
-import org.apache.shardingsphere.elasticjob.restful.NettyRestfulServiceConfiguration;
-import org.apache.shardingsphere.elasticjob.restful.RestfulService;
-
import static org.hamcrest.CoreMatchers.is;
import static org.junit.Assert.assertThat;
import static org.mockito.Mockito.verify;
@@ -112,7 +111,7 @@ public final class WechatJobErrorHandlerTest {
private WechatJobErrorHandler getWechatJobErrorHandler() {
for (JobErrorHandler each : ServiceLoader.load(JobErrorHandler.class)) {
- if (null != each && each instanceof WechatJobErrorHandler) {
+ if (each instanceof WechatJobErrorHandler) {
return (WechatJobErrorHandler) each;
}
}
diff --git a/elasticjob-error-handler/elasticjob-error-handler-impl/elasticjob-error-handler-wechat/src/test/java/org/apache/shardingsphere/elasticjob/error/handler/wechat/fixture/WechatInternalController.java b/elasticjob-error-handler/elasticjob-error-handler-type/elasticjob-error-handler-wechat/src/test/java/org/apache/shardingsphere/elasticjob/error/handler/wechat/fixture/WechatInternalController.java
similarity index 100%
rename from elasticjob-error-handler/elasticjob-error-handler-impl/elasticjob-error-handler-wechat/src/test/java/org/apache/shardingsphere/elasticjob/error/handler/wechat/fixture/WechatInternalController.java
rename to elasticjob-error-handler/elasticjob-error-handler-type/elasticjob-error-handler-wechat/src/test/java/org/apache/shardingsphere/elasticjob/error/handler/wechat/fixture/WechatInternalController.java
diff --git a/elasticjob-error-handler/elasticjob-error-handler-impl/elasticjob-error-handler-wechat/src/main/resources/META-INF.services/org.apache.shardingsphere.elasticjob.error.handler.JobErrorHandler b/elasticjob-error-handler/elasticjob-error-handler-type/elasticjob-error-handler-wechat/src/test/resources/META-INF.services/org.apache.shardingsphere.elasticjob.error.handler.JobErrorHandler
similarity index 100%
rename from elasticjob-error-handler/elasticjob-error-handler-impl/elasticjob-error-handler-wechat/src/main/resources/META-INF.services/org.apache.shardingsphere.elasticjob.error.handler.JobErrorHandler
rename to elasticjob-error-handler/elasticjob-error-handler-type/elasticjob-error-handler-wechat/src/test/resources/META-INF.services/org.apache.shardingsphere.elasticjob.error.handler.JobErrorHandler
diff --git a/elasticjob-error-handler/elasticjob-error-handler-impl/elasticjob-error-handler-wechat/src/test/resources/conf/error-handler-wechat.yaml b/elasticjob-error-handler/elasticjob-error-handler-type/elasticjob-error-handler-wechat/src/test/resources/conf/error-handler-wechat.yaml
similarity index 100%
rename from elasticjob-error-handler/elasticjob-error-handler-impl/elasticjob-error-handler-wechat/src/test/resources/conf/error-handler-wechat.yaml
rename to elasticjob-error-handler/elasticjob-error-handler-type/elasticjob-error-handler-wechat/src/test/resources/conf/error-handler-wechat.yaml
diff --git a/elasticjob-error-handler/elasticjob-error-handler-impl/pom.xml b/elasticjob-error-handler/elasticjob-error-handler-type/pom.xml
similarity index 96%
rename from elasticjob-error-handler/elasticjob-error-handler-impl/pom.xml
rename to elasticjob-error-handler/elasticjob-error-handler-type/pom.xml
index 115851e..f61884d 100644
--- a/elasticjob-error-handler/elasticjob-error-handler-impl/pom.xml
+++ b/elasticjob-error-handler/elasticjob-error-handler-type/pom.xml
@@ -25,7 +25,7 @@
<artifactId>elasticjob-error-handler</artifactId>
<version>3.0.0-beta-SNAPSHOT</version>
</parent>
- <artifactId>elasticjob-error-handler-impl</artifactId>
+ <artifactId>elasticjob-error-handler-type</artifactId>
<packaging>pom</packaging>
<modules>
diff --git a/elasticjob-error-handler/pom.xml b/elasticjob-error-handler/pom.xml
index 230e507..fac11fc 100644
--- a/elasticjob-error-handler/pom.xml
+++ b/elasticjob-error-handler/pom.xml
@@ -30,6 +30,6 @@
<modules>
<module>elasticjob-error-handler-spi</module>
- <module>elasticjob-error-handler-impl</module>
+ <module>elasticjob-error-handler-type</module>
</modules>
</project>