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/30 09:21:34 UTC
[shardingsphere-elasticjob] branch master updated: Fix
validateJobProperties (#1684)
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 8d53b9e Fix validateJobProperties (#1684)
8d53b9e is described below
commit 8d53b9e2baf936f8e771608fe8539260a1d1109e
Author: Yanjie Zhou <zh...@aliyun.com>
AuthorDate: Fri Oct 30 17:21:19 2020 +0800
Fix validateJobProperties (#1684)
---
.../elasticjob/lite/internal/schedule/JobScheduler.java | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/elasticjob-lite/elasticjob-lite-core/src/main/java/org/apache/shardingsphere/elasticjob/lite/internal/schedule/JobScheduler.java b/elasticjob-lite/elasticjob-lite-core/src/main/java/org/apache/shardingsphere/elasticjob/lite/internal/schedule/JobScheduler.java
index 57905b4..918ca77 100644
--- a/elasticjob-lite/elasticjob-lite-core/src/main/java/org/apache/shardingsphere/elasticjob/lite/internal/schedule/JobScheduler.java
+++ b/elasticjob-lite/elasticjob-lite-core/src/main/java/org/apache/shardingsphere/elasticjob/lite/internal/schedule/JobScheduler.java
@@ -82,10 +82,10 @@ public final class JobScheduler {
setUpFacade = new SetUpFacade(regCenter, jobConfig.getJobName(), jobListeners);
schedulerFacade = new SchedulerFacade(regCenter, jobConfig.getJobName());
jobFacade = new LiteJobFacade(regCenter, jobConfig.getJobName(), jobListeners, findTracingConfiguration(jobConfig).orElse(null));
+ validateJobProperties(jobConfig);
jobExecutor = new ElasticJobExecutor(elasticJob, jobConfig, jobFacade);
String jobClassName = JobClassNameProviderFactory.getProvider().getJobClassName(elasticJob);
this.jobConfig = setUpFacade.setUpJobConfiguration(jobClassName, jobConfig);
- validateJobProperties();
setGuaranteeServiceForElasticJobListeners(regCenter, jobListeners);
jobScheduleController = createJobScheduleController();
}
@@ -97,9 +97,9 @@ public final class JobScheduler {
setUpFacade = new SetUpFacade(regCenter, jobConfig.getJobName(), jobListeners);
schedulerFacade = new SchedulerFacade(regCenter, jobConfig.getJobName());
jobFacade = new LiteJobFacade(regCenter, jobConfig.getJobName(), jobListeners, findTracingConfiguration(jobConfig).orElse(null));
+ validateJobProperties(jobConfig);
jobExecutor = new ElasticJobExecutor(elasticJobType, jobConfig, jobFacade);
this.jobConfig = setUpFacade.setUpJobConfiguration(elasticJobType, jobConfig);
- validateJobProperties();
setGuaranteeServiceForElasticJobListeners(regCenter, jobListeners);
jobScheduleController = createJobScheduleController();
}
@@ -114,11 +114,11 @@ public final class JobScheduler {
return jobConfig.getExtraConfigurations().stream().filter(each -> each instanceof TracingConfiguration).findFirst().map(extraConfig -> (TracingConfiguration<?>) extraConfig);
}
- private void validateJobProperties() {
- validateJobErrorHandlerProperties();
+ private void validateJobProperties(final JobConfiguration jobConfig) {
+ validateJobErrorHandlerProperties(jobConfig);
}
- private void validateJobErrorHandlerProperties() {
+ private void validateJobErrorHandlerProperties(final JobConfiguration jobConfig) {
if (null != jobConfig.getJobErrorHandlerType()) {
ElasticJobServiceLoader.newTypedServiceInstance(JobErrorHandlerPropertiesValidator.class, jobConfig.getJobErrorHandlerType(), jobConfig.getProps())
.ifPresent(validator -> validator.validate(jobConfig.getProps()));