Revise #1967 (#1975)
diff --git a/elasticjob-lite/elasticjob-lite-spring/elasticjob-lite-spring-boot-starter/src/main/java/org/apache/shardingsphere/elasticjob/lite/spring/boot/job/ElasticJobBootstrapConfiguration.java b/elasticjob-lite/elasticjob-lite-spring/elasticjob-lite-spring-boot-starter/src/main/java/org/apache/shardingsphere/elasticjob/lite/spring/boot/job/ElasticJobBootstrapConfiguration.java
index 317dfa3..438720a 100644
--- a/elasticjob-lite/elasticjob-lite-spring/elasticjob-lite-spring-boot-starter/src/main/java/org/apache/shardingsphere/elasticjob/lite/spring/boot/job/ElasticJobBootstrapConfiguration.java
+++ b/elasticjob-lite/elasticjob-lite-spring/elasticjob-lite-spring-boot-starter/src/main/java/org/apache/shardingsphere/elasticjob/lite/spring/boot/job/ElasticJobBootstrapConfiguration.java
@@ -95,29 +95,6 @@
}
}
- private void jobExtraConfigurations(final JobConfiguration jobConfig, final TracingConfiguration<?> tracingConfig) {
- if (null == tracingConfig) {
- return;
- }
- TracingProperties tracingProperties = applicationContext.getBean(TracingProperties.class);
- Preconditions.checkArgument(null == tracingProperties.getIncludeJobNames()
- || null == tracingProperties.getExcludeJobNames(),
- "[tracing.includeJobNames] and [tracing.excludeJobNames] are mutually exclusive.");
- if (null == tracingProperties.getIncludeJobNames() && null == tracingProperties.getExcludeJobNames()) {
- jobConfig.getExtraConfigurations().add(tracingConfig);
- return;
- }
- if (null != tracingProperties.getIncludeJobNames()) {
- if (tracingProperties.getIncludeJobNames().contains(jobConfig.getJobName())) {
- jobConfig.getExtraConfigurations().add(tracingConfig);
- }
- return;
- }
- if (!tracingProperties.getExcludeJobNames().contains(jobConfig.getJobName())) {
- jobConfig.getExtraConfigurations().add(tracingConfig);
- }
- }
-
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);
@@ -144,4 +121,17 @@
singletonBeanRegistry.registerSingleton(beanName, new ScheduleJobBootstrap(registryCenter, jobConfigurationProperties.getElasticJobType(), jobConfig));
}
}
+
+ private void jobExtraConfigurations(final JobConfiguration jobConfig, final TracingConfiguration<?> tracingConfig) {
+ if (null == tracingConfig) {
+ return;
+ }
+ TracingProperties tracingProperties = applicationContext.getBean(TracingProperties.class);
+ Preconditions.checkArgument(tracingProperties.getIncludeJobNames().isEmpty() || tracingProperties.getExcludeJobNames().isEmpty(),
+ "[tracing.includeJobNames] and [tracing.excludeJobNames] are mutually exclusive.");
+ if ((tracingProperties.getIncludeJobNames().isEmpty() || tracingProperties.getIncludeJobNames().contains(jobConfig.getJobName()))
+ && !tracingProperties.getExcludeJobNames().contains(jobConfig.getJobName())) {
+ jobConfig.getExtraConfigurations().add(tracingConfig);
+ }
+ }
}
diff --git a/elasticjob-lite/elasticjob-lite-spring/elasticjob-lite-spring-boot-starter/src/main/java/org/apache/shardingsphere/elasticjob/lite/spring/boot/tracing/TracingProperties.java b/elasticjob-lite/elasticjob-lite-spring/elasticjob-lite-spring-boot-starter/src/main/java/org/apache/shardingsphere/elasticjob/lite/spring/boot/tracing/TracingProperties.java
index 77c5532..8cf604d 100644
--- a/elasticjob-lite/elasticjob-lite-spring/elasticjob-lite-spring-boot-starter/src/main/java/org/apache/shardingsphere/elasticjob/lite/spring/boot/tracing/TracingProperties.java
+++ b/elasticjob-lite/elasticjob-lite-spring/elasticjob-lite-spring-boot-starter/src/main/java/org/apache/shardingsphere/elasticjob/lite/spring/boot/tracing/TracingProperties.java
@@ -17,11 +17,13 @@
package org.apache.shardingsphere.elasticjob.lite.spring.boot.tracing;
-import java.util.Set;
import lombok.Getter;
import lombok.Setter;
import org.springframework.boot.context.properties.ConfigurationProperties;
+import java.util.HashSet;
+import java.util.Set;
+
@Getter
@Setter
@ConfigurationProperties(prefix = "elasticjob.tracing")
@@ -29,8 +31,7 @@
private String type;
- private Set<String> includeJobNames;
+ private Set<String> includeJobNames = new HashSet<>();
- private Set<String> excludeJobNames;
-
+ private Set<String> excludeJobNames = new HashSet<>();
}
diff --git a/elasticjob-lite/elasticjob-lite-spring/elasticjob-lite-spring-boot-starter/src/test/java/org/apache/shardingsphere/elasticjob/lite/spring/boot/job/ElasticJobSpringBootTest.java b/elasticjob-lite/elasticjob-lite-spring/elasticjob-lite-spring-boot-starter/src/test/java/org/apache/shardingsphere/elasticjob/lite/spring/boot/job/ElasticJobSpringBootTest.java
index 1efcaa5..6ded070 100644
--- a/elasticjob-lite/elasticjob-lite-spring/elasticjob-lite-spring-boot-starter/src/test/java/org/apache/shardingsphere/elasticjob/lite/spring/boot/job/ElasticJobSpringBootTest.java
+++ b/elasticjob-lite/elasticjob-lite-spring/elasticjob-lite-spring-boot-starter/src/test/java/org/apache/shardingsphere/elasticjob/lite/spring/boot/job/ElasticJobSpringBootTest.java
@@ -97,7 +97,7 @@
assertNotNull(applicationContext);
TracingProperties tracingProperties = applicationContext.getBean(TracingProperties.class);
assertNotNull(tracingProperties);
- assertNull(tracingProperties.getIncludeJobNames());
+ assertTrue(tracingProperties.getIncludeJobNames().isEmpty());
Set<String> excludeJobNames = new HashSet<>();
excludeJobNames.add("customTestJob");
assertThat(tracingProperties.getExcludeJobNames(), is(excludeJobNames));
