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 695bc2c Add generic type with refactor (#1616)
695bc2c is described below
commit 695bc2cd21b8450d79349bb07c7eaa1ba42d3493
Author: Liang Zhang <[email protected]>
AuthorDate: Mon Oct 19 22:42:20 2020 +0800
Add generic type with refactor (#1616)
* Revise test cases
* Add generic type
---
.../cloud/scheduler/env/BootstrapEnvironmentTest.java | 4 +---
.../lite/spring/boot/job/ElasticJobLiteAutoConfiguration.java | 11 ++++++-----
.../lite/spring/boot/job/ElasticJobSpringBootTest.java | 10 +++++-----
3 files changed, 12 insertions(+), 13 deletions(-)
diff --git
a/elasticjob-cloud/elasticjob-cloud-scheduler/src/test/java/org/apache/shardingsphere/elasticjob/cloud/scheduler/env/BootstrapEnvironmentTest.java
b/elasticjob-cloud/elasticjob-cloud-scheduler/src/test/java/org/apache/shardingsphere/elasticjob/cloud/scheduler/env/BootstrapEnvironmentTest.java
index 15a1578..bbb58b5 100755
---
a/elasticjob-cloud/elasticjob-cloud-scheduler/src/test/java/org/apache/shardingsphere/elasticjob/cloud/scheduler/env/BootstrapEnvironmentTest.java
+++
b/elasticjob-cloud/elasticjob-cloud-scheduler/src/test/java/org/apache/shardingsphere/elasticjob/cloud/scheduler/env/BootstrapEnvironmentTest.java
@@ -20,7 +20,6 @@ package
org.apache.shardingsphere.elasticjob.cloud.scheduler.env;
import org.apache.commons.dbcp.BasicDataSource;
import org.apache.shardingsphere.elasticjob.cloud.ReflectionUtils;
import
org.apache.shardingsphere.elasticjob.reg.zookeeper.ZookeeperConfiguration;
-import org.apache.shardingsphere.elasticjob.tracing.api.TracingConfiguration;
import org.junit.Test;
import java.util.Map;
@@ -75,8 +74,7 @@ public final class BootstrapEnvironmentTest {
properties.setProperty(BootstrapEnvironment.EnvironmentArgument.EVENT_TRACE_RDB_USERNAME.getKey(),
"sa");
properties.setProperty(BootstrapEnvironment.EnvironmentArgument.EVENT_TRACE_RDB_PASSWORD.getKey(),
"password");
ReflectionUtils.setFieldValue(bootstrapEnvironment, "properties",
properties);
- Optional<TracingConfiguration<?>> tracingConfiguration =
bootstrapEnvironment.getTracingConfiguration();
- tracingConfiguration.ifPresent(tracingConfiguration1 ->
assertThat(tracingConfiguration1.getStorage(),
instanceOf(BasicDataSource.class)));
+ bootstrapEnvironment.getTracingConfiguration().ifPresent(tracingConfig
-> assertThat(tracingConfig.getStorage(), instanceOf(BasicDataSource.class)));
}
@Test
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 ab293b5..759ec80 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
@@ -66,11 +66,12 @@ public class ElasticJobLiteAutoConfiguration implements
ApplicationContextAware
ElasticJobProperties elasticJobProperties =
applicationContext.getBean(ElasticJobProperties.class);
SingletonBeanRegistry singletonBeanRegistry =
((ConfigurableApplicationContext) applicationContext).getBeanFactory();
CoordinatorRegistryCenter registryCenter =
applicationContext.getBean(CoordinatorRegistryCenter.class);
- TracingConfiguration tracingConfig = getTracingConfiguration();
+ TracingConfiguration<?> tracingConfig = getTracingConfiguration();
constructJobBootstraps(elasticJobProperties, singletonBeanRegistry,
registryCenter, tracingConfig);
}
- private TracingConfiguration getTracingConfiguration() {
+ @SuppressWarnings("rawtypes")
+ private TracingConfiguration<?> getTracingConfiguration() {
Map<String, TracingConfiguration> tracingConfigurationBeans =
applicationContext.getBeansOfType(TracingConfiguration.class);
if (tracingConfigurationBeans.isEmpty()) {
return null;
@@ -84,7 +85,7 @@ public class ElasticJobLiteAutoConfiguration implements
ApplicationContextAware
}
private void constructJobBootstraps(final ElasticJobProperties
elasticJobProperties, final SingletonBeanRegistry singletonBeanRegistry,
- final CoordinatorRegistryCenter
registryCenter, final TracingConfiguration tracingConfig) {
+ final CoordinatorRegistryCenter
registryCenter, final TracingConfiguration<?> tracingConfig) {
for (Entry<String, ElasticJobConfigurationProperties> entry :
elasticJobProperties.getJobs().entrySet()) {
ElasticJobConfigurationProperties jobConfigurationProperties =
entry.getValue();
Preconditions.checkArgument(null !=
jobConfigurationProperties.getElasticJobClass()
@@ -102,7 +103,7 @@ 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) {
+ final TracingConfiguration<?>
tracingConfig, final ElasticJobConfigurationProperties
jobConfigurationProperties) {
JobConfiguration jobConfig =
jobConfigurationProperties.toJobConfiguration(jobName);
ElasticJob elasticJob =
applicationContext.getBean(jobConfigurationProperties.getElasticJobClass());
if (Strings.isNullOrEmpty(jobConfig.getCron())) {
@@ -123,7 +124,7 @@ 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) {
+ final TracingConfiguration<?> tracingConfig,
final ElasticJobConfigurationProperties jobConfigurationProperties) {
JobConfiguration jobConfig =
jobConfigurationProperties.toJobConfiguration(jobName);
if (Strings.isNullOrEmpty(jobConfig.getCron())) {
Preconditions.checkArgument(!Strings.isNullOrEmpty(jobBootstrapBeanName), "The
property [jobBootstrapBeanName] is required for one off job.");
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 51e6623..00c039c 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
@@ -72,11 +72,11 @@ public class ElasticJobSpringBootTest extends
AbstractJUnit4SpringContextTests {
@Test
public void assertTracingConfigurationCreation() throws SQLException {
assertNotNull(applicationContext);
- TracingConfiguration<?> tracingConfiguration =
applicationContext.getBean(TracingConfiguration.class);
- assertNotNull(tracingConfiguration);
- assertThat(tracingConfiguration.getType(), is("RDB"));
- assertTrue(tracingConfiguration.getStorage() instanceof DataSource);
- DataSource dataSource = (DataSource) tracingConfiguration.getStorage();
+ TracingConfiguration<?> tracingConfig =
applicationContext.getBean(TracingConfiguration.class);
+ assertNotNull(tracingConfig);
+ assertThat(tracingConfig.getType(), is("RDB"));
+ assertTrue(tracingConfig.getStorage() instanceof DataSource);
+ DataSource dataSource = (DataSource) tracingConfig.getStorage();
assertNotNull(dataSource.getConnection());
}
