This is an automated email from the ASF dual-hosted git repository.
technoboy pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/shardingsphere-elasticjob.git.
from 77d49ff Refactor JobItemExecutorFactory (#1558)
add 67bafbe Refactor the configuration of error handler (#1550)
No new revisions were added by this update.
Summary of changes:
.../elasticjob/error/handler/JobErrorHandler.java | 5 +-
.../elasticjob-error-handler-dingtalk/pom.xml | 5 ++
.../handler/dingtalk/DingtalkConfiguration.java | 15 ++++
...lkConfiguration.java => DingtalkConstants.java} | 23 +++---
.../handler/dingtalk/DingtalkJobErrorHandler.java | 43 ++++-------
.../resources/conf/error-handler-dingtalk.yaml | 23 ------
.../dingtalk/DingtalkJobErrorHandlerTest.java | 65 +++++++++++-----
.../resources/conf/error-handler-dingtalk.yaml | 25 -------
.../elasticjob-error-handler-email/pom.xml | 26 ++++++-
.../error/handler/email/EmailConfiguration.java | 29 +++++++-
.../handler/email/EmailConfigurationLoader.java | 49 ------------
.../error/handler/email/EmailConstants.java | 49 ++++++++++++
.../error/handler/email/EmailJobErrorHandler.java | 71 ++++++++++--------
.../main/resources/conf/error-handler-email.yaml | 29 --------
.../handler/email/EmailJobErrorHandlerTest.java | 86 +++++++++++-----------
.../test/resources/conf/error-handler-email.yaml | 30 --------
.../handler/general/IgnoreJobErrorHandler.java | 3 +-
.../error/handler/general/LogJobErrorHandler.java | 5 +-
.../handler/general/ThrowJobErrorHandler.java | 3 +-
.../handler/general/IgnoreJobErrorHandlerTest.java | 4 +-
.../handler/general/LogJobErrorHandlerTest.java | 3 +-
.../handler/general/ThrowJobErrorHandlerTest.java | 4 +-
.../elasticjob-error-handler-wechat/pom.xml | 5 ++
.../error/handler/wechat/WechatConfiguration.java | 32 +++-----
.../error/handler/wechat/WechatConstants.java | 24 ++----
.../handler/wechat/WechatJobErrorHandler.java | 59 +++++----------
...sphere.elasticjob.error.handler.JobErrorHandler | 0
.../main/resources/conf/error-handler-wechat.yaml | 21 ------
.../handler/wechat/WechatJobErrorHandlerTest.java | 39 ++++++----
.../elasticjob/executor/ElasticJobExecutor.java | 8 +-
examples/elasticjob-example-lite-java/pom.xml | 10 +++
.../elasticjob/lite/example/JavaMain.java | 54 +++++++++++++-
.../resources/conf/error-handler-dingtalk.yaml | 25 -------
.../main/resources/conf/error-handler-email.yaml | 27 -------
.../main/resources/conf/error-handler-wechat.yaml | 21 ------
examples/elasticjob-example-lite-spring/pom.xml | 15 ++++
.../main/resources/META-INF/applicationContext.xml | 50 +++++++++++++
.../src/main/resources/conf/job.properties | 33 +++++++++
.../elasticjob-example-lite-springboot/pom.xml | 15 ++++
.../example/controller/OneOffJobController.java | 36 ++++++++-
.../SpringBootOccurErrorNoticeDingtlakJob.java} | 8 +-
.../job/SpringBootOccurErrorNoticeEmailJob.java} | 8 +-
.../job/SpringBootOccurErrorNoticeWechatJob.java} | 8 +-
.../src/main/resources/application.yml | 51 ++++++++++++-
44 files changed, 636 insertions(+), 508 deletions(-)
copy
elasticjob-error-handler/elasticjob-error-handler-type/elasticjob-error-handler-dingtalk/src/main/java/org/apache/shardingsphere/elasticjob/error/handler/dingtalk/{DingtalkConfiguration.java
=> DingtalkConstants.java} (59%)
delete mode 100644
elasticjob-error-handler/elasticjob-error-handler-type/elasticjob-error-handler-dingtalk/src/main/resources/conf/error-handler-dingtalk.yaml
delete mode 100644
elasticjob-error-handler/elasticjob-error-handler-type/elasticjob-error-handler-dingtalk/src/test/resources/conf/error-handler-dingtalk.yaml
delete mode 100644
elasticjob-error-handler/elasticjob-error-handler-type/elasticjob-error-handler-email/src/main/java/org/apache/shardingsphere/elasticjob/error/handler/email/EmailConfigurationLoader.java
create mode 100644
elasticjob-error-handler/elasticjob-error-handler-type/elasticjob-error-handler-email/src/main/java/org/apache/shardingsphere/elasticjob/error/handler/email/EmailConstants.java
delete mode 100644
elasticjob-error-handler/elasticjob-error-handler-type/elasticjob-error-handler-email/src/main/resources/conf/error-handler-email.yaml
delete mode 100644
elasticjob-error-handler/elasticjob-error-handler-type/elasticjob-error-handler-email/src/test/resources/conf/error-handler-email.yaml
copy
elasticjob-executor/elasticjob-executor-type/elasticjob-http-executor/src/main/java/org/apache/shardingsphere/elasticjob/http/pojo/HttpParam.java
=>
elasticjob-error-handler/elasticjob-error-handler-type/elasticjob-error-handler-wechat/src/main/java/org/apache/shardingsphere/elasticjob/error/handler/wechat/WechatConstants.java
(61%)
rename
elasticjob-error-handler/elasticjob-error-handler-type/elasticjob-error-handler-wechat/src/main/resources/{META-INF.services
=>
META-INF/services}/org.apache.shardingsphere.elasticjob.error.handler.JobErrorHandler
(100%)
delete mode 100644
elasticjob-error-handler/elasticjob-error-handler-type/elasticjob-error-handler-wechat/src/main/resources/conf/error-handler-wechat.yaml
delete mode 100644
examples/elasticjob-example-lite-java/src/main/resources/conf/error-handler-dingtalk.yaml
delete mode 100644
examples/elasticjob-example-lite-java/src/main/resources/conf/error-handler-email.yaml
delete mode 100644
examples/elasticjob-example-lite-java/src/main/resources/conf/error-handler-wechat.yaml
copy
examples/{elasticjob-example-jobs/src/main/java/org/apache/shardingsphere/elasticjob/lite/example/job/simple/JavaOccurErrorJob.java
=>
elasticjob-example-lite-springboot/src/main/java/org/apache/shardingsphere/elasticjob/lite/example/job/SpringBootOccurErrorNoticeDingtlakJob.java}
(81%)
copy
examples/{elasticjob-example-jobs/src/main/java/org/apache/shardingsphere/elasticjob/lite/example/job/simple/JavaOccurErrorJob.java
=>
elasticjob-example-lite-springboot/src/main/java/org/apache/shardingsphere/elasticjob/lite/example/job/SpringBootOccurErrorNoticeEmailJob.java}
(81%)
copy
examples/{elasticjob-example-jobs/src/main/java/org/apache/shardingsphere/elasticjob/lite/example/job/simple/JavaOccurErrorJob.java
=>
elasticjob-example-lite-springboot/src/main/java/org/apache/shardingsphere/elasticjob/lite/example/job/SpringBootOccurErrorNoticeWechatJob.java}
(81%)
