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/06/27 15:27:59 UTC
[shardingsphere-elasticjob-lite] branch master updated: Modify
jobShardingStrategyType's init value from empty string to null (#851)
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-lite.git
The following commit(s) were added to refs/heads/master by this push:
new 72df2fd Modify jobShardingStrategyType's init value from empty string to null (#851)
72df2fd is described below
commit 72df2fd8e813dfbf861e22ae0b48ce23b32ff859
Author: Liang Zhang <te...@163.com>
AuthorDate: Sat Jun 27 23:27:50 2020 +0800
Modify jobShardingStrategyType's init value from empty string to null (#851)
---
.../elasticjob/lite/config/JobConfiguration.java | 8 ++++----
.../elasticjob/lite/config/JobConfigurationTest.java | 2 +-
.../lite/internal/config/JobConfigurationGsonFactoryTest.java | 11 ++++++-----
3 files changed, 11 insertions(+), 10 deletions(-)
diff --git a/elastic-job-lite-core/src/main/java/org/apache/shardingsphere/elasticjob/lite/config/JobConfiguration.java b/elastic-job-lite-core/src/main/java/org/apache/shardingsphere/elasticjob/lite/config/JobConfiguration.java
index ddf868f..cbd55d4 100644
--- a/elastic-job-lite-core/src/main/java/org/apache/shardingsphere/elasticjob/lite/config/JobConfiguration.java
+++ b/elastic-job-lite-core/src/main/java/org/apache/shardingsphere/elasticjob/lite/config/JobConfiguration.java
@@ -112,14 +112,14 @@ public final class JobConfiguration {
private int monitorPort = -1;
- private String jobShardingStrategyType = "";
+ private String jobShardingStrategyType;
private String jobExecutorServiceHandlerType;
private String jobErrorHandlerType;
private String description = "";
-
+
private final Properties props = new Properties();
private boolean disabled;
@@ -366,8 +366,8 @@ public final class JobConfiguration {
Preconditions.checkArgument(!Strings.isNullOrEmpty(cron), "cron can not be empty.");
Preconditions.checkArgument(shardingTotalCount > 0, "shardingTotalCount should larger than zero.");
return new JobConfiguration(jobName, jobType, cron, shardingTotalCount, shardingItemParameters, jobParameter,
- monitorExecution, failover, misfire, maxTimeDiffSeconds, reconcileIntervalMinutes, monitorPort, jobShardingStrategyType, jobExecutorServiceHandlerType, jobErrorHandlerType,
- description, props, disabled, overwrite);
+ monitorExecution, failover, misfire, maxTimeDiffSeconds, reconcileIntervalMinutes, monitorPort,
+ jobShardingStrategyType, jobExecutorServiceHandlerType, jobErrorHandlerType, description, props, disabled, overwrite);
}
}
}
diff --git a/elastic-job-lite-core/src/test/java/org/apache/shardingsphere/elasticjob/lite/config/JobConfigurationTest.java b/elastic-job-lite-core/src/test/java/org/apache/shardingsphere/elasticjob/lite/config/JobConfigurationTest.java
index a780f00..eed099f 100644
--- a/elastic-job-lite-core/src/test/java/org/apache/shardingsphere/elasticjob/lite/config/JobConfigurationTest.java
+++ b/elastic-job-lite-core/src/test/java/org/apache/shardingsphere/elasticjob/lite/config/JobConfigurationTest.java
@@ -73,7 +73,7 @@ public final class JobConfigurationTest {
assertThat(actual.getMaxTimeDiffSeconds(), is(-1));
assertThat(actual.getReconcileIntervalMinutes(), is(10));
assertThat(actual.getMonitorPort(), is(-1));
- assertThat(actual.getJobShardingStrategyType(), is(""));
+ assertNull(actual.getJobShardingStrategyType());
assertNull(actual.getJobExecutorServiceHandlerType());
assertNull(actual.getJobErrorHandlerType());
assertThat(actual.getDescription(), is(""));
diff --git a/elastic-job-lite-core/src/test/java/org/apache/shardingsphere/elasticjob/lite/internal/config/JobConfigurationGsonFactoryTest.java b/elastic-job-lite-core/src/test/java/org/apache/shardingsphere/elasticjob/lite/internal/config/JobConfigurationGsonFactoryTest.java
index 1cd8e68..6eab69f 100644
--- a/elastic-job-lite-core/src/test/java/org/apache/shardingsphere/elasticjob/lite/internal/config/JobConfigurationGsonFactoryTest.java
+++ b/elastic-job-lite-core/src/test/java/org/apache/shardingsphere/elasticjob/lite/internal/config/JobConfigurationGsonFactoryTest.java
@@ -26,6 +26,7 @@ import org.junit.Test;
import static org.hamcrest.CoreMatchers.is;
import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertThat;
import static org.junit.Assert.assertTrue;
@@ -42,13 +43,13 @@ public final class JobConfigurationGsonFactoryTest {
+ "\"shardingTotalCount\":3,\"shardingItemParameters\":\"\",\"jobParameter\":\"\",\"failover\":false,\"misfire\":true,"
+ "\"description\":\"\","
+ "\"streamingProcess\":true,"
- + "\"monitorExecution\":true,\"maxTimeDiffSeconds\":-1,\"monitorPort\":-1,\"jobShardingStrategyType\":\"\",\"reconcileIntervalMinutes\":10,\"disabled\":false,\"overwrite\":false}";
+ + "\"monitorExecution\":true,\"maxTimeDiffSeconds\":-1,\"monitorPort\":-1,\"reconcileIntervalMinutes\":10,\"disabled\":false,\"overwrite\":false}";
private String scriptJobJson = "{\"jobName\":\"test_job\",\"jobType\":\"SCRIPT\",\"cron\":\"0/1 * * * * ?\","
+ "\"shardingTotalCount\":3,\"shardingItemParameters\":\"\",\"jobParameter\":\"\",\"failover\":false,\"misfire\":true,"
+ "\"description\":\"\","
+ "\"scriptCommandLine\":\"test.sh\",\"monitorExecution\":true,\"maxTimeDiffSeconds\":-1,\"monitorPort\":-1,"
- + "\"jobShardingStrategyType\":\"\",\"reconcileIntervalMinutes\":10,\"disabled\":false,\"overwrite\":false}";
+ + "\"reconcileIntervalMinutes\":10,\"disabled\":false,\"overwrite\":false}";
@Test
public void assertToJsonForSimpleJob() {
@@ -66,7 +67,7 @@ public final class JobConfigurationGsonFactoryTest {
@Test
public void assertToJsonForScriptJob() {
JobConfiguration actual = JobConfiguration.newBuilder("test_job", JobType.SCRIPT, "0/1 * * * * ?", 3).setProperty(ScriptJobExecutor.SCRIPT_KEY, "test.sh").build();
- assertThat(JobConfigurationGsonFactory.toJson(actual), is(scriptJobJson));
+ assertThat(JobConfigurationGsonFactory.toJson(actual), is(scriptJobJson));
}
@Test
@@ -105,7 +106,7 @@ public final class JobConfigurationGsonFactoryTest {
assertTrue(actual.isMonitorExecution());
assertThat(actual.getMaxTimeDiffSeconds(), is(-1));
assertThat(actual.getMonitorPort(), is(-1));
- assertThat(actual.getJobShardingStrategyType(), is(""));
+ assertNull(actual.getJobShardingStrategyType());
assertThat(actual.getReconcileIntervalMinutes(), is(10));
assertFalse(actual.isDisabled());
assertFalse(actual.isOverwrite());
@@ -127,7 +128,7 @@ public final class JobConfigurationGsonFactoryTest {
assertTrue(actual.isMonitorExecution());
assertThat(actual.getMaxTimeDiffSeconds(), is(-1));
assertThat(actual.getMonitorPort(), is(-1));
- assertThat(actual.getJobShardingStrategyType(), is(""));
+ assertNull(actual.getJobShardingStrategyType());
assertThat(actual.getReconcileIntervalMinutes(), is(10));
assertFalse(actual.isDisabled());
assertFalse(actual.isOverwrite());