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/22 02:01:07 UTC
[shardingsphere-elasticjob] branch master updated: Polish module
elasticjob-lite-spring-boot-starter (#1633)
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 5e87226 Polish module elasticjob-lite-spring-boot-starter (#1633)
5e87226 is described below
commit 5e872264d938f8142a57b994f8a99a5be20bc9ad
Author: 吴伟杰 <ro...@me.com>
AuthorDate: Thu Oct 22 09:52:23 2020 +0800
Polish module elasticjob-lite-spring-boot-starter (#1633)
---
.../boot/job/ElasticJobConfigurationProperties.java | 4 +---
.../spring/boot/job/ElasticJobLiteAutoConfiguration.java | 15 +++------------
.../boot/tracing/ElasticJobTracingConfiguration.java | 2 +-
3 files changed, 5 insertions(+), 16 deletions(-)
diff --git a/elasticjob-lite/elasticjob-lite-spring/elasticjob-lite-spring-boot-starter/src/main/java/org/apache/shardingsphere/elasticjob/lite/spring/boot/job/ElasticJobConfigurationProperties.java b/elasticjob-lite/elasticjob-lite-spring/elasticjob-lite-spring-boot-starter/src/main/java/org/apache/shardingsphere/elasticjob/lite/spring/boot/job/ElasticJobConfigurationProperties.java
index 87240d6..50e1f27 100644
--- a/elasticjob-lite/elasticjob-lite-spring/elasticjob-lite-spring-boot-starter/src/main/java/org/apache/shardingsphere/elasticjob/lite/spring/boot/job/ElasticJobConfigurationProperties.java
+++ b/elasticjob-lite/elasticjob-lite-spring/elasticjob-lite-spring-boot-starter/src/main/java/org/apache/shardingsphere/elasticjob/lite/spring/boot/job/ElasticJobConfigurationProperties.java
@@ -82,9 +82,7 @@ public final class ElasticJobConfigurationProperties {
.maxTimeDiffSeconds(maxTimeDiffSeconds).reconcileIntervalMinutes(reconcileIntervalMinutes)
.jobShardingStrategyType(jobShardingStrategyType).jobExecutorServiceHandlerType(jobExecutorServiceHandlerType).jobErrorHandlerType(jobErrorHandlerType)
.description(description).disabled(disabled).overwrite(overwrite).build();
- for (Object each : props.keySet()) {
- result.getProps().setProperty(each.toString(), props.get(each.toString()).toString());
- }
+ props.stringPropertyNames().forEach(each -> result.getProps().setProperty(each, props.getProperty(each)));
return result;
}
}
diff --git a/elasticjob-lite/elasticjob-lite-spring/elasticjob-lite-spring-boot-starter/src/main/java/org/apache/shardingsphere/elasticjob/lite/spring/boot/job/ElasticJobLiteAutoConfiguration.java b/elasticjob-lite/elasticjob-lite-spring/elasticjob-lite-spring-boot-starter/src/main/java/org/apache/shardingsphere/elasticjob/lite/spring/boot/job/ElasticJobLiteAutoConfiguration.java
index 759ec80..f6b65fc 100644
--- a/elasticjob-lite/elasticjob-lite-spring/elasticjob-lite-spring-boot-starter/src/main/java/org/apache/shardingsphere/elasticjob/lite/spring/boot/job/ElasticJobLiteAutoConfiguration.java
+++ b/elasticjob-lite/elasticjob-lite-spring/elasticjob-lite-spring-boot-starter/src/main/java/org/apache/shardingsphere/elasticjob/lite/spring/boot/job/ElasticJobLiteAutoConfiguration.java
@@ -44,6 +44,7 @@ import org.springframework.context.annotation.Import;
import javax.annotation.PostConstruct;
import java.util.Map;
import java.util.Map.Entry;
+import java.util.Optional;
/**
* ElasticJob-Lite auto configuration.
@@ -105,19 +106,14 @@ public class ElasticJobLiteAutoConfiguration implements ApplicationContextAware
private void registerClassedJob(final String jobName, final String jobBootstrapBeanName, final SingletonBeanRegistry singletonBeanRegistry, final CoordinatorRegistryCenter registryCenter,
final TracingConfiguration<?> tracingConfig, final ElasticJobConfigurationProperties jobConfigurationProperties) {
JobConfiguration jobConfig = jobConfigurationProperties.toJobConfiguration(jobName);
+ Optional.ofNullable(tracingConfig).ifPresent(jobConfig.getExtraConfigurations()::add);
ElasticJob elasticJob = applicationContext.getBean(jobConfigurationProperties.getElasticJobClass());
if (Strings.isNullOrEmpty(jobConfig.getCron())) {
Preconditions.checkArgument(!Strings.isNullOrEmpty(jobBootstrapBeanName), "The property [jobBootstrapBeanName] is required for one off job.");
- if (null != tracingConfig) {
- jobConfig.getExtraConfigurations().add(tracingConfig);
- }
singletonBeanRegistry.registerSingleton(jobBootstrapBeanName,
new OneOffJobBootstrap(registryCenter, elasticJob, jobConfig));
} else {
String beanName = !Strings.isNullOrEmpty(jobBootstrapBeanName) ? jobBootstrapBeanName : jobConfig.getJobName() + "ScheduleJobBootstrap";
- if (null != tracingConfig) {
- jobConfig.getExtraConfigurations().add(tracingConfig);
- }
singletonBeanRegistry.registerSingleton(beanName,
new ScheduleJobBootstrap(registryCenter, elasticJob, jobConfig));
}
@@ -126,18 +122,13 @@ public class ElasticJobLiteAutoConfiguration implements ApplicationContextAware
private void registerTypedJob(final String jobName, final String jobBootstrapBeanName, final SingletonBeanRegistry singletonBeanRegistry, final CoordinatorRegistryCenter registryCenter,
final TracingConfiguration<?> tracingConfig, final ElasticJobConfigurationProperties jobConfigurationProperties) {
JobConfiguration jobConfig = jobConfigurationProperties.toJobConfiguration(jobName);
+ Optional.ofNullable(tracingConfig).ifPresent(jobConfig.getExtraConfigurations()::add);
if (Strings.isNullOrEmpty(jobConfig.getCron())) {
Preconditions.checkArgument(!Strings.isNullOrEmpty(jobBootstrapBeanName), "The property [jobBootstrapBeanName] is required for one off job.");
- if (null != tracingConfig) {
- jobConfig.getExtraConfigurations().add(tracingConfig);
- }
singletonBeanRegistry.registerSingleton(jobBootstrapBeanName,
new OneOffJobBootstrap(registryCenter, jobConfigurationProperties.getElasticJobType(), jobConfig));
} else {
String beanName = !Strings.isNullOrEmpty(jobBootstrapBeanName) ? jobBootstrapBeanName : jobConfig.getJobName() + "ScheduleJobBootstrap";
- if (null != tracingConfig) {
- jobConfig.getExtraConfigurations().add(tracingConfig);
- }
singletonBeanRegistry.registerSingleton(beanName,
new ScheduleJobBootstrap(registryCenter, jobConfigurationProperties.getElasticJobType(), jobConfig));
}
diff --git a/elasticjob-lite/elasticjob-lite-spring/elasticjob-lite-spring-boot-starter/src/main/java/org/apache/shardingsphere/elasticjob/lite/spring/boot/tracing/ElasticJobTracingConfiguration.java b/elasticjob-lite/elasticjob-lite-spring/elasticjob-lite-spring-boot-starter/src/main/java/org/apache/shardingsphere/elasticjob/lite/spring/boot/tracing/ElasticJobTracingConfiguration.java
index dea2c6f..4cb0e28 100644
--- a/elasticjob-lite/elasticjob-lite-spring/elasticjob-lite-spring-boot-starter/src/main/java/org/apache/shardingsphere/elasticjob/lite/spring/boot/tracing/ElasticJobTracingConfiguration.java
+++ b/elasticjob-lite/elasticjob-lite-spring/elasticjob-lite-spring-boot-starter/src/main/java/org/apache/shardingsphere/elasticjob/lite/spring/boot/tracing/ElasticJobTracingConfiguration.java
@@ -38,7 +38,7 @@ public class ElasticJobTracingConfiguration {
@Bean
@ConditionalOnBean(DataSource.class)
@ConditionalOnProperty(name = "elasticjob.tracing.type", havingValue = "RDB")
- public TracingConfiguration<?> tracingConfiguration(final DataSource dataSource) {
+ public TracingConfiguration<DataSource> tracingConfiguration(final DataSource dataSource) {
return new TracingConfiguration<>("RDB", dataSource);
}
}