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/19 12:53:02 UTC
[shardingsphere-elasticjob] branch master updated: For checkstyle &
fix typo (#1608)
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 250b16e For checkstyle & fix typo (#1608)
250b16e is described below
commit 250b16e1082593636d1487ced191f831b505359e
Author: Liang Zhang <te...@163.com>
AuthorDate: Mon Oct 19 20:52:53 2020 +0800
For checkstyle & fix typo (#1608)
* Fix typo
* For checkstyle
---
docs/content/features/elastic.en.md | 4 ++--
.../cloud/scheduler/env/BootstrapEnvironment.java | 6 +++---
.../scheduler/exception/HttpClientException.java | 2 ++
.../scheduler/mesos/AppConstraintEvaluator.java | 2 ++
.../infra/spi/ElasticJobServiceLoader.java | 10 +++++-----
.../infra/pojo/JobConfigurationPOJOTest.java | 4 ++--
.../infra/spi/ElasticJobServiceLoaderTest.java | 20 ++++++++++----------
.../RequestBodyDeserializerNotFoundException.java | 2 ++
.../restful/handler/HandlerNotFoundException.java | 2 ++
.../mapping/AmbiguousPathPatternException.java | 2 ++
.../ResponseBodySerializerNotFoundException.java | 2 ++
.../elasticjob/restful/pipeline/HttpClient.java | 1 -
.../lite/example/job/dataflow/JavaDataflowJob.java | 8 ++++----
.../lite/example/job/dataflow/SpringDataflowJob.java | 8 ++++----
.../lite/example/job/simple/JavaSimpleJob.java | 4 ++--
.../lite/example/job/simple/SpringSimpleJob.java | 4 ++--
.../main/resources/META-INF/applicationContext.xml | 12 ++++++------
.../src/main/resources/conf/job.properties | 20 ++++++++++----------
.../lite/example/controller/OneOffJobController.java | 9 ++++-----
...va => SpringBootOccurErrorNoticeDingtalkJob.java} | 4 ++--
.../job/SpringBootOccurErrorNoticeEmailJob.java | 2 +-
.../job/SpringBootOccurErrorNoticeWechatJob.java | 2 +-
.../lite/example/job/SpringBootSimpleJob.java | 2 +-
.../src/main/resources/application.yml | 6 +++---
24 files changed, 74 insertions(+), 64 deletions(-)
diff --git a/docs/content/features/elastic.en.md b/docs/content/features/elastic.en.md
index ef76631..ae3ab67 100644
--- a/docs/content/features/elastic.en.md
+++ b/docs/content/features/elastic.en.md
@@ -14,7 +14,7 @@ ElasticJob is aware of the number of servers in an almost-real-time manner, with
To execute the job in distributed servers, a job will be divided into multiple individual job items, one or some of which will be executed by the distributed servers.
-For example, if a job is divided into 4 slices, and there're two servers to execute the job, then each server is assigned 2 slices, undertaking 50% of the workload, as follows.
+For example, if a job is divided into 4 slices, and there are two servers to execute the job, then each server is assigned 2 slices, undertaking 50% of the workload, as follows.
@@ -40,7 +40,7 @@ When new job server joins, ElasticJob will be aware of it from the registry, and
Configuring a larger number of sharding items than the number of servers, or better, a multiplier of the number of servers, makes it more reasonably for the job to leverage the resources, and assign the sharding items dynamically.
-For example, we have 10 sharding items and there're 3 servers, the number of sharding items are server A = 0,1,2; server B = 3,4,5; server C = 6,7,8,9.
+For example, we have 10 sharding items and there are 3 servers, the number of sharding items are server A = 0,1,2; server B = 3,4,5; server C = 6,7,8,9.
If the server C is down, then server A = 0,1,2,3,4 and B = 5,6,7,8,9, maximizing the throughput without losing any sharding item.
## High Availability
diff --git a/elasticjob-cloud/elasticjob-cloud-scheduler/src/main/java/org/apache/shardingsphere/elasticjob/cloud/scheduler/env/BootstrapEnvironment.java b/elasticjob-cloud/elasticjob-cloud-scheduler/src/main/java/org/apache/shardingsphere/elasticjob/cloud/scheduler/env/BootstrapEnvironment.java
index 34a7f19..2ecd8b3 100755
--- a/elasticjob-cloud/elasticjob-cloud-scheduler/src/main/java/org/apache/shardingsphere/elasticjob/cloud/scheduler/env/BootstrapEnvironment.java
+++ b/elasticjob-cloud/elasticjob-cloud-scheduler/src/main/java/org/apache/shardingsphere/elasticjob/cloud/scheduler/env/BootstrapEnvironment.java
@@ -90,11 +90,11 @@ public final class BootstrapEnvironment {
}
/**
- * Get zookeeper config.
+ * Get zookeeper configuration.
*
- * @return zookeeper config
+ * @return zookeeper configuration
*/
- // TODO Other zkConfig values are configurable
+ // TODO Other zkConfig values are configurable
public ZookeeperConfiguration getZookeeperConfiguration() {
ZookeeperConfiguration result = new ZookeeperConfiguration(getValue(EnvironmentArgument.ZOOKEEPER_SERVERS), getValue(EnvironmentArgument.ZOOKEEPER_NAMESPACE));
String digest = getValue(EnvironmentArgument.ZOOKEEPER_DIGEST);
diff --git a/elasticjob-cloud/elasticjob-cloud-scheduler/src/main/java/org/apache/shardingsphere/elasticjob/cloud/scheduler/exception/HttpClientException.java b/elasticjob-cloud/elasticjob-cloud-scheduler/src/main/java/org/apache/shardingsphere/elasticjob/cloud/scheduler/exception/HttpClientException.java
index 88e7760..a33c258 100644
--- a/elasticjob-cloud/elasticjob-cloud-scheduler/src/main/java/org/apache/shardingsphere/elasticjob/cloud/scheduler/exception/HttpClientException.java
+++ b/elasticjob-cloud/elasticjob-cloud-scheduler/src/main/java/org/apache/shardingsphere/elasticjob/cloud/scheduler/exception/HttpClientException.java
@@ -22,6 +22,8 @@ package org.apache.shardingsphere.elasticjob.cloud.scheduler.exception;
*/
public class HttpClientException extends RuntimeException {
+ private static final long serialVersionUID = 6769285134744353127L;
+
public HttpClientException(final Exception cause) {
super(cause);
}
diff --git a/elasticjob-cloud/elasticjob-cloud-scheduler/src/main/java/org/apache/shardingsphere/elasticjob/cloud/scheduler/mesos/AppConstraintEvaluator.java b/elasticjob-cloud/elasticjob-cloud-scheduler/src/main/java/org/apache/shardingsphere/elasticjob/cloud/scheduler/mesos/AppConstraintEvaluator.java
index 0cfe09b..960d9b5 100755
--- a/elasticjob-cloud/elasticjob-cloud-scheduler/src/main/java/org/apache/shardingsphere/elasticjob/cloud/scheduler/mesos/AppConstraintEvaluator.java
+++ b/elasticjob-cloud/elasticjob-cloud-scheduler/src/main/java/org/apache/shardingsphere/elasticjob/cloud/scheduler/mesos/AppConstraintEvaluator.java
@@ -155,6 +155,8 @@ public final class AppConstraintEvaluator implements ConstraintEvaluator {
private static class LackConfigException extends Exception {
+ private static final long serialVersionUID = -3340824363577154813L;
+
LackConfigException(final String scope, final String configName) {
super(String.format("Lack %s's config %s", scope, configName));
}
diff --git a/elasticjob-infra/elasticjob-infra-common/src/main/java/org/apache/shardingsphere/elasticjob/infra/spi/ElasticJobServiceLoader.java b/elasticjob-infra/elasticjob-infra-common/src/main/java/org/apache/shardingsphere/elasticjob/infra/spi/ElasticJobServiceLoader.java
index e9afcb6..849d225 100644
--- a/elasticjob-infra/elasticjob-infra-common/src/main/java/org/apache/shardingsphere/elasticjob/infra/spi/ElasticJobServiceLoader.java
+++ b/elasticjob-infra/elasticjob-infra-common/src/main/java/org/apache/shardingsphere/elasticjob/infra/spi/ElasticJobServiceLoader.java
@@ -34,7 +34,7 @@ import java.util.concurrent.ConcurrentMap;
public final class ElasticJobServiceLoader {
private static final ConcurrentMap<Class<? extends TypedSPI>, ConcurrentMap<String, TypedSPI>> TYPED_SERVICES = new ConcurrentHashMap<>();
-
+
private static final ConcurrentMap<Class<? extends TypedSPI>, ConcurrentMap<String, Class<? extends TypedSPI>>> TYPED_SERVICE_CLASSES = new ConcurrentHashMap<>();
/**
@@ -49,12 +49,12 @@ public final class ElasticJobServiceLoader {
}
ServiceLoader.load(typedService).forEach(each -> registerTypedServiceClass(typedService, each));
}
-
+
private static <T extends TypedSPI> void registerTypedServiceClass(final Class<T> typedService, final TypedSPI instance) {
TYPED_SERVICES.computeIfAbsent(typedService, unused -> new ConcurrentHashMap<>()).putIfAbsent(instance.getType(), instance);
TYPED_SERVICE_CLASSES.computeIfAbsent(typedService, unused -> new ConcurrentHashMap<>()).putIfAbsent(instance.getType(), instance.getClass());
}
-
+
/**
* Get cached typed instance.
*
@@ -66,7 +66,7 @@ public final class ElasticJobServiceLoader {
public static <T extends TypedSPI> Optional<T> getCachedTypedServiceInstance(final Class<T> typedServiceInterface, final String type) {
return Optional.ofNullable(TYPED_SERVICES.get(typedServiceInterface)).map(services -> (T) services.get(type));
}
-
+
/**
* New typed instance.
*
@@ -80,7 +80,7 @@ public final class ElasticJobServiceLoader {
.map(serviceClasses -> serviceClasses.get(type))
.map(clazz -> (T) newServiceInstance(clazz));
}
-
+
private static Object newServiceInstance(final Class<?> clazz) {
try {
return clazz.getConstructor().newInstance();
diff --git a/elasticjob-infra/elasticjob-infra-common/src/test/java/org/apache/shardingsphere/elasticjob/infra/pojo/JobConfigurationPOJOTest.java b/elasticjob-infra/elasticjob-infra-common/src/test/java/org/apache/shardingsphere/elasticjob/infra/pojo/JobConfigurationPOJOTest.java
index 9409fec..b7b50ab 100644
--- a/elasticjob-infra/elasticjob-infra-common/src/test/java/org/apache/shardingsphere/elasticjob/infra/pojo/JobConfigurationPOJOTest.java
+++ b/elasticjob-infra/elasticjob-infra-common/src/test/java/org/apache/shardingsphere/elasticjob/infra/pojo/JobConfigurationPOJOTest.java
@@ -21,7 +21,7 @@ import org.apache.shardingsphere.elasticjob.api.JobConfiguration;
import org.apache.shardingsphere.elasticjob.infra.yaml.YamlEngine;
import org.junit.Test;
-import java.util.Arrays;
+import java.util.Collections;
import static org.hamcrest.CoreMatchers.hasItem;
import static org.hamcrest.CoreMatchers.is;
@@ -76,7 +76,7 @@ public final class JobConfigurationPOJOTest {
pojo.setJobShardingStrategyType("AVG_ALLOCATION");
pojo.setJobExecutorServiceHandlerType("CPU");
pojo.setJobErrorHandlerType("IGNORE");
- pojo.setJobListenerTypes(Arrays.asList("LOG"));
+ pojo.setJobListenerTypes(Collections.singletonList("LOG"));
pojo.setDescription("Job description");
pojo.getProps().setProperty("key", "value");
pojo.setDisabled(true);
diff --git a/elasticjob-infra/elasticjob-infra-common/src/test/java/org/apache/shardingsphere/elasticjob/infra/spi/ElasticJobServiceLoaderTest.java b/elasticjob-infra/elasticjob-infra-common/src/test/java/org/apache/shardingsphere/elasticjob/infra/spi/ElasticJobServiceLoaderTest.java
index 89e3032..026afe2 100644
--- a/elasticjob-infra/elasticjob-infra-common/src/test/java/org/apache/shardingsphere/elasticjob/infra/spi/ElasticJobServiceLoaderTest.java
+++ b/elasticjob-infra/elasticjob-infra-common/src/test/java/org/apache/shardingsphere/elasticjob/infra/spi/ElasticJobServiceLoaderTest.java
@@ -26,39 +26,39 @@ import static org.hamcrest.CoreMatchers.instanceOf;
import static org.junit.Assert.assertThat;
public final class ElasticJobServiceLoaderTest {
-
+
@BeforeClass
public static void register() {
ElasticJobServiceLoader.registerTypedService(TypedFooService.class);
}
-
+
@Test
public void assertGetCacheTypedService() {
assertThat(ElasticJobServiceLoader.getCachedTypedServiceInstance(TypedFooService.class, "typedFooServiceImpl").orElse(null), instanceOf(TypedFooService.class));
}
-
+
@Test
public void assertNewTypedServiceInstance() {
assertThat(ElasticJobServiceLoader.getCachedTypedServiceInstance(TypedFooService.class, "typedFooServiceImpl").orElse(null), instanceOf(TypedFooService.class));
}
-
+
@Test(expected = IllegalArgumentException.class)
public void assertGetCacheTypedServiceFailureWithUnRegisteredServiceInterface() {
- ElasticJobServiceLoader.getCachedTypedServiceInstance(UnRegisteredTypedFooService.class, "unRegisteredTypedFooServiceImpl").orElseThrow(() -> new IllegalArgumentException());
+ ElasticJobServiceLoader.getCachedTypedServiceInstance(UnRegisteredTypedFooService.class, "unRegisteredTypedFooServiceImpl").orElseThrow(IllegalArgumentException::new);
}
@Test(expected = IllegalArgumentException.class)
public void assertGetCacheTypedServiceFailureWithInvalidType() {
- ElasticJobServiceLoader.getCachedTypedServiceInstance(TypedFooService.class, "INVALID").orElseThrow(() -> new IllegalArgumentException());
+ ElasticJobServiceLoader.getCachedTypedServiceInstance(TypedFooService.class, "INVALID").orElseThrow(IllegalArgumentException::new);
}
-
+
@Test(expected = IllegalArgumentException.class)
public void assertNewTypedServiceInstanceFailureWithUnRegisteredServiceInterface() {
- ElasticJobServiceLoader.newTypedServiceInstance(UnRegisteredTypedFooService.class, "unRegisteredTypedFooServiceImpl").orElseThrow(() -> new IllegalArgumentException());
+ ElasticJobServiceLoader.newTypedServiceInstance(UnRegisteredTypedFooService.class, "unRegisteredTypedFooServiceImpl").orElseThrow(IllegalArgumentException::new);
}
-
+
@Test(expected = IllegalArgumentException.class)
public void assertNewTypedServiceInstanceFailureWithInvalidType() {
- ElasticJobServiceLoader.newTypedServiceInstance(TypedFooService.class, "INVALID").orElseThrow(() -> new IllegalArgumentException());
+ ElasticJobServiceLoader.newTypedServiceInstance(TypedFooService.class, "INVALID").orElseThrow(IllegalArgumentException::new);
}
}
diff --git a/elasticjob-infra/elasticjob-restful/src/main/java/org/apache/shardingsphere/elasticjob/restful/deserializer/RequestBodyDeserializerNotFoundException.java b/elasticjob-infra/elasticjob-restful/src/main/java/org/apache/shardingsphere/elasticjob/restful/deserializer/RequestBodyDeserializerNotFoundException.java
index ce7db53..69c5d6c 100644
--- a/elasticjob-infra/elasticjob-restful/src/main/java/org/apache/shardingsphere/elasticjob/restful/deserializer/RequestBodyDeserializerNotFoundException.java
+++ b/elasticjob-infra/elasticjob-restful/src/main/java/org/apache/shardingsphere/elasticjob/restful/deserializer/RequestBodyDeserializerNotFoundException.java
@@ -24,6 +24,8 @@ import java.text.MessageFormat;
*/
public final class RequestBodyDeserializerNotFoundException extends RuntimeException {
+ private static final long serialVersionUID = 828418332240856770L;
+
public RequestBodyDeserializerNotFoundException(final String mimeType) {
super(MessageFormat.format("RequestBodySerializer not found for [{0}]", mimeType));
}
diff --git a/elasticjob-infra/elasticjob-restful/src/main/java/org/apache/shardingsphere/elasticjob/restful/handler/HandlerNotFoundException.java b/elasticjob-infra/elasticjob-restful/src/main/java/org/apache/shardingsphere/elasticjob/restful/handler/HandlerNotFoundException.java
index f8f45a9..e3ac94b 100644
--- a/elasticjob-infra/elasticjob-restful/src/main/java/org/apache/shardingsphere/elasticjob/restful/handler/HandlerNotFoundException.java
+++ b/elasticjob-infra/elasticjob-restful/src/main/java/org/apache/shardingsphere/elasticjob/restful/handler/HandlerNotFoundException.java
@@ -21,6 +21,8 @@ import java.text.MessageFormat;
public final class HandlerNotFoundException extends RuntimeException {
+ private static final long serialVersionUID = 7316145545440327554L;
+
private final String path;
public HandlerNotFoundException(final String path) {
diff --git a/elasticjob-infra/elasticjob-restful/src/main/java/org/apache/shardingsphere/elasticjob/restful/mapping/AmbiguousPathPatternException.java b/elasticjob-infra/elasticjob-restful/src/main/java/org/apache/shardingsphere/elasticjob/restful/mapping/AmbiguousPathPatternException.java
index 0567184..1f53d2d 100644
--- a/elasticjob-infra/elasticjob-restful/src/main/java/org/apache/shardingsphere/elasticjob/restful/mapping/AmbiguousPathPatternException.java
+++ b/elasticjob-infra/elasticjob-restful/src/main/java/org/apache/shardingsphere/elasticjob/restful/mapping/AmbiguousPathPatternException.java
@@ -22,6 +22,8 @@ package org.apache.shardingsphere.elasticjob.restful.mapping;
*/
public final class AmbiguousPathPatternException extends RuntimeException {
+ private static final long serialVersionUID = -7109813692538597236L;
+
public AmbiguousPathPatternException(final String message) {
super(message);
}
diff --git a/elasticjob-infra/elasticjob-restful/src/main/java/org/apache/shardingsphere/elasticjob/restful/serializer/ResponseBodySerializerNotFoundException.java b/elasticjob-infra/elasticjob-restful/src/main/java/org/apache/shardingsphere/elasticjob/restful/serializer/ResponseBodySerializerNotFoundException.java
index 1345087..415c5e2 100644
--- a/elasticjob-infra/elasticjob-restful/src/main/java/org/apache/shardingsphere/elasticjob/restful/serializer/ResponseBodySerializerNotFoundException.java
+++ b/elasticjob-infra/elasticjob-restful/src/main/java/org/apache/shardingsphere/elasticjob/restful/serializer/ResponseBodySerializerNotFoundException.java
@@ -24,6 +24,8 @@ import java.text.MessageFormat;
*/
public final class ResponseBodySerializerNotFoundException extends RuntimeException {
+ private static final long serialVersionUID = 3201288074956273247L;
+
public ResponseBodySerializerNotFoundException(final String mimeType) {
super(MessageFormat.format("ResponseBodySerializer not found for [{0}]", mimeType));
}
diff --git a/elasticjob-infra/elasticjob-restful/src/test/java/org/apache/shardingsphere/elasticjob/restful/pipeline/HttpClient.java b/elasticjob-infra/elasticjob-restful/src/test/java/org/apache/shardingsphere/elasticjob/restful/pipeline/HttpClient.java
index 70753af..73ae1d5 100644
--- a/elasticjob-infra/elasticjob-restful/src/test/java/org/apache/shardingsphere/elasticjob/restful/pipeline/HttpClient.java
+++ b/elasticjob-infra/elasticjob-restful/src/test/java/org/apache/shardingsphere/elasticjob/restful/pipeline/HttpClient.java
@@ -48,7 +48,6 @@ public final class HttpClient {
* @param request HTTP request
* @param consumer HTTP response consumer
* @param timeoutSeconds wait for consume
- * @throws InterruptedException interrupted
*/
@SneakyThrows
public static void request(final String host, final int port, final FullHttpRequest request, final Consumer<FullHttpResponse> consumer, final Long timeoutSeconds) {
diff --git a/examples/elasticjob-example-jobs/src/main/java/org/apache/shardingsphere/elasticjob/lite/example/job/dataflow/JavaDataflowJob.java b/examples/elasticjob-example-jobs/src/main/java/org/apache/shardingsphere/elasticjob/lite/example/job/dataflow/JavaDataflowJob.java
index b731588..b8ffe46 100644
--- a/examples/elasticjob-example-jobs/src/main/java/org/apache/shardingsphere/elasticjob/lite/example/job/dataflow/JavaDataflowJob.java
+++ b/examples/elasticjob-example-jobs/src/main/java/org/apache/shardingsphere/elasticjob/lite/example/job/dataflow/JavaDataflowJob.java
@@ -33,15 +33,15 @@ public class JavaDataflowJob implements DataflowJob<Foo> {
@Override
public List<Foo> fetchData(final ShardingContext shardingContext) {
- System.out.println(String.format("Item: %s | Time: %s | Thread: %s | %s",
- shardingContext.getShardingItem(), new SimpleDateFormat("HH:mm:ss").format(new Date()), Thread.currentThread().getId(), "DATAFLOW FETCH"));
+ System.out.printf("Item: %s | Time: %s | Thread: %s | %s%n",
+ shardingContext.getShardingItem(), new SimpleDateFormat("HH:mm:ss").format(new Date()), Thread.currentThread().getId(), "DATAFLOW FETCH");
return fooRepository.findTodoData(shardingContext.getShardingParameter(), 10);
}
@Override
public void processData(final ShardingContext shardingContext, final List<Foo> data) {
- System.out.println(String.format("Item: %s | Time: %s | Thread: %s | %s",
- shardingContext.getShardingItem(), new SimpleDateFormat("HH:mm:ss").format(new Date()), Thread.currentThread().getId(), "DATAFLOW PROCESS"));
+ System.out.printf("Item: %s | Time: %s | Thread: %s | %s%n",
+ shardingContext.getShardingItem(), new SimpleDateFormat("HH:mm:ss").format(new Date()), Thread.currentThread().getId(), "DATAFLOW PROCESS");
for (Foo each : data) {
fooRepository.setCompleted(each.getId());
}
diff --git a/examples/elasticjob-example-jobs/src/main/java/org/apache/shardingsphere/elasticjob/lite/example/job/dataflow/SpringDataflowJob.java b/examples/elasticjob-example-jobs/src/main/java/org/apache/shardingsphere/elasticjob/lite/example/job/dataflow/SpringDataflowJob.java
index 322d146..d322116 100644
--- a/examples/elasticjob-example-jobs/src/main/java/org/apache/shardingsphere/elasticjob/lite/example/job/dataflow/SpringDataflowJob.java
+++ b/examples/elasticjob-example-jobs/src/main/java/org/apache/shardingsphere/elasticjob/lite/example/job/dataflow/SpringDataflowJob.java
@@ -34,15 +34,15 @@ public class SpringDataflowJob implements DataflowJob<Foo> {
@Override
public List<Foo> fetchData(final ShardingContext shardingContext) {
- System.out.println(String.format("Item: %s | Time: %s | Thread: %s | %s",
- shardingContext.getShardingItem(), new SimpleDateFormat("HH:mm:ss").format(new Date()), Thread.currentThread().getId(), "DATAFLOW FETCH"));
+ System.out.printf("Item: %s | Time: %s | Thread: %s | %s%n",
+ shardingContext.getShardingItem(), new SimpleDateFormat("HH:mm:ss").format(new Date()), Thread.currentThread().getId(), "DATAFLOW FETCH");
return fooRepository.findTodoData(shardingContext.getShardingParameter(), 10);
}
@Override
public void processData(final ShardingContext shardingContext, final List<Foo> data) {
- System.out.println(String.format("Item: %s | Time: %s | Thread: %s | %s",
- shardingContext.getShardingItem(), new SimpleDateFormat("HH:mm:ss").format(new Date()), Thread.currentThread().getId(), "DATAFLOW PROCESS"));
+ System.out.printf("Item: %s | Time: %s | Thread: %s | %s%n",
+ shardingContext.getShardingItem(), new SimpleDateFormat("HH:mm:ss").format(new Date()), Thread.currentThread().getId(), "DATAFLOW PROCESS");
for (Foo each : data) {
fooRepository.setCompleted(each.getId());
}
diff --git a/examples/elasticjob-example-jobs/src/main/java/org/apache/shardingsphere/elasticjob/lite/example/job/simple/JavaSimpleJob.java b/examples/elasticjob-example-jobs/src/main/java/org/apache/shardingsphere/elasticjob/lite/example/job/simple/JavaSimpleJob.java
index a2cbed4..68a711b 100644
--- a/examples/elasticjob-example-jobs/src/main/java/org/apache/shardingsphere/elasticjob/lite/example/job/simple/JavaSimpleJob.java
+++ b/examples/elasticjob-example-jobs/src/main/java/org/apache/shardingsphere/elasticjob/lite/example/job/simple/JavaSimpleJob.java
@@ -33,8 +33,8 @@ public class JavaSimpleJob implements SimpleJob {
@Override
public void execute(final ShardingContext shardingContext) {
- System.out.println(String.format("Item: %s | Time: %s | Thread: %s | %s",
- shardingContext.getShardingItem(), new SimpleDateFormat("HH:mm:ss").format(new Date()), Thread.currentThread().getId(), "SIMPLE"));
+ System.out.printf("Item: %s | Time: %s | Thread: %s | %s%n",
+ shardingContext.getShardingItem(), new SimpleDateFormat("HH:mm:ss").format(new Date()), Thread.currentThread().getId(), "SIMPLE");
List<Foo> data = fooRepository.findTodoData(shardingContext.getShardingParameter(), 10);
for (Foo each : data) {
fooRepository.setCompleted(each.getId());
diff --git a/examples/elasticjob-example-jobs/src/main/java/org/apache/shardingsphere/elasticjob/lite/example/job/simple/SpringSimpleJob.java b/examples/elasticjob-example-jobs/src/main/java/org/apache/shardingsphere/elasticjob/lite/example/job/simple/SpringSimpleJob.java
index c7fbc81..d4eba69 100644
--- a/examples/elasticjob-example-jobs/src/main/java/org/apache/shardingsphere/elasticjob/lite/example/job/simple/SpringSimpleJob.java
+++ b/examples/elasticjob-example-jobs/src/main/java/org/apache/shardingsphere/elasticjob/lite/example/job/simple/SpringSimpleJob.java
@@ -34,8 +34,8 @@ public class SpringSimpleJob implements SimpleJob {
@Override
public void execute(final ShardingContext shardingContext) {
- System.out.println(String.format("Item: %s | Time: %s | Thread: %s | %s",
- shardingContext.getShardingItem(), new SimpleDateFormat("HH:mm:ss").format(new Date()), Thread.currentThread().getId(), "SIMPLE"));
+ System.out.printf("Item: %s | Time: %s | Thread: %s | %s%n",
+ shardingContext.getShardingItem(), new SimpleDateFormat("HH:mm:ss").format(new Date()), Thread.currentThread().getId(), "SIMPLE");
List<Foo> data = fooRepository.findTodoData(shardingContext.getShardingParameter(), 10);
for (Foo each : data) {
fooRepository.setCompleted(each.getId());
diff --git a/examples/elasticjob-example-lite-spring/src/main/resources/META-INF/applicationContext.xml b/examples/elasticjob-example-lite-spring/src/main/resources/META-INF/applicationContext.xml
index 32393ae..970d988 100644
--- a/examples/elasticjob-example-lite-spring/src/main/resources/META-INF/applicationContext.xml
+++ b/examples/elasticjob-example-lite-spring/src/main/resources/META-INF/applicationContext.xml
@@ -66,13 +66,13 @@
<!--</props>-->
<!--</elasticjob:job>-->
- <bean id="occurErrorNoticeDingtlakJob" class="org.apache.shardingsphere.elasticjob.lite.example.job.simple.JavaOccurErrorJob" />
+ <bean id="occurErrorNoticeDingtalkJob" class="org.apache.shardingsphere.elasticjob.lite.example.job.simple.JavaOccurErrorJob" />
- <elasticjob:job id="${occurErrorNoticeDingtlakJob.id}" job-ref="occurErrorNoticeDingtlakJob" registry-center-ref="regCenter" tracing-ref="elasticJobTrace"
- sharding-total-count="${occurErrorNoticeDingtlakJob.shardingTotalCount}" cron="${occurErrorNoticeDingtlakJob.cron}" sharding-item-parameters="${occurErrorNoticeDingtlakJob.shardingItemParameters}"
- monitor-execution="${occurErrorNoticeDingtlakJob.monitorExecution}" failover="${occurErrorNoticeDingtlakJob.failover}" description="${occurErrorNoticeDingtlakJob.description}"
- job-error-handler-type="${occurErrorNoticeDingtlakJob.jobErrorHandlerType}"
- disabled="${occurErrorNoticeDingtlakJob.disabled}" overwrite="${occurErrorNoticeDingtlakJob.overwrite}" >
+ <elasticjob:job id="${occurErrorNoticeDingtalkJob.id}" job-ref="occurErrorNoticeDingtalkJob" registry-center-ref="regCenter" tracing-ref="elasticJobTrace"
+ sharding-total-count="${occurErrorNoticeDingtalkJob.shardingTotalCount}" cron="${occurErrorNoticeDingtalkJob.cron}" sharding-item-parameters="${occurErrorNoticeDingtalkJob.shardingItemParameters}"
+ monitor-execution="${occurErrorNoticeDingtalkJob.monitorExecution}" failover="${occurErrorNoticeDingtalkJob.failover}" description="${occurErrorNoticeDingtalkJob.description}"
+ job-error-handler-type="${occurErrorNoticeDingtalkJob.jobErrorHandlerType}"
+ disabled="${occurErrorNoticeDingtalkJob.disabled}" overwrite="${occurErrorNoticeDingtalkJob.overwrite}" >
<props>
<prop key="dingtalk.webhook">https://oapi.dingtalk.com/robot/send?access_token=42eead064e81ce81fc6af2c107fbe10a4339a3d40a7db8abf5b34d8261527a3f</prop>
<prop key="dingtalk.keyword">keyword</prop>
diff --git a/examples/elasticjob-example-lite-spring/src/main/resources/conf/job.properties b/examples/elasticjob-example-lite-spring/src/main/resources/conf/job.properties
index 0901ebd..3a5d8db 100644
--- a/examples/elasticjob-example-lite-spring/src/main/resources/conf/job.properties
+++ b/examples/elasticjob-example-lite-spring/src/main/resources/conf/job.properties
@@ -53,16 +53,16 @@ script.shardingItemParameters=0=Beijing,1=Shanghai,2=Guangzhou
script.description=Script Job
script.overwrite=true
-occurErrorNoticeDingtlakJob.id=occurErrorNoticeDingtlakJob
-occurErrorNoticeDingtlakJob.cron=0/5 * * * * ?
-occurErrorNoticeDingtlakJob.shardingTotalCount=3
-occurErrorNoticeDingtlakJob.shardingItemParameters=0=Beijing,1=Shanghai,2=Guangzhou
-occurErrorNoticeDingtlakJob.monitorExecution=false
-occurErrorNoticeDingtlakJob.failover=true
-occurErrorNoticeDingtlakJob.disabled=false
-occurErrorNoticeDingtlakJob.overwrite=true
-occurErrorNoticeDingtlakJob.description=\u53d1\u751f\u5f02\u5e38\u901a\u77e5\u9489\u9489\u793a\u4f8b
-occurErrorNoticeDingtlakJob.jobErrorHandlerType=DINGTALK
+occurErrorNoticeDingtalkJob.id=occurErrorNoticeDingtalkJob
+occurErrorNoticeDingtalkJob.cron=0/5 * * * * ?
+occurErrorNoticeDingtalkJob.shardingTotalCount=3
+occurErrorNoticeDingtalkJob.shardingItemParameters=0=Beijing,1=Shanghai,2=Guangzhou
+occurErrorNoticeDingtalkJob.monitorExecution=false
+occurErrorNoticeDingtalkJob.failover=true
+occurErrorNoticeDingtalkJob.disabled=false
+occurErrorNoticeDingtalkJob.overwrite=true
+occurErrorNoticeDingtalkJob.description=\u53d1\u751f\u5f02\u5e38\u901a\u77e5\u9489\u9489\u793a\u4f8b
+occurErrorNoticeDingtalkJob.jobErrorHandlerType=DINGTALK
occurErrorNoticeWechatJob.id=occurErrorNoticeWechatJob
occurErrorNoticeWechatJob.cron=0/5 * * * * ?
diff --git a/examples/elasticjob-example-lite-springboot/src/main/java/org/apache/shardingsphere/elasticjob/lite/example/controller/OneOffJobController.java b/examples/elasticjob-example-lite-springboot/src/main/java/org/apache/shardingsphere/elasticjob/lite/example/controller/OneOffJobController.java
index a9f2c5c..de4f7b1 100644
--- a/examples/elasticjob-example-lite-springboot/src/main/java/org/apache/shardingsphere/elasticjob/lite/example/controller/OneOffJobController.java
+++ b/examples/elasticjob-example-lite-springboot/src/main/java/org/apache/shardingsphere/elasticjob/lite/example/controller/OneOffJobController.java
@@ -33,8 +33,8 @@ public class OneOffJobController {
@Resource(name = "manualScriptJobBean")
private OneOffJobBootstrap manualScriptJob;
- @Resource(name = "occurErrorNoticeDingtlakBean")
- private OneOffJobBootstrap occurErrorNoticeDingtlakJob;
+ @Resource(name = "occurErrorNoticeDingtalkBean")
+ private OneOffJobBootstrap occurErrorNoticeDingtalkJob;
@Resource(name = "occurErrorNoticeWechatBean")
private OneOffJobBootstrap occurErrorNoticeWechatJob;
@@ -42,16 +42,15 @@ public class OneOffJobController {
@Resource(name = "occurErrorNoticeEmailBean")
private OneOffJobBootstrap occurErrorNoticeEmailJob;
-
@GetMapping("/execute/manualScriptJob")
public String executeManualScriptJob() {
manualScriptJob.execute();
return RES_TEXT;
}
- @GetMapping("/execute/occurErrorNoticeDingtlakJob")
+ @GetMapping("/execute/occurErrorNoticeDingtalkJob")
public String executeOneOffJob() {
- occurErrorNoticeDingtlakJob.execute();
+ occurErrorNoticeDingtalkJob.execute();
return RES_TEXT;
}
diff --git a/examples/elasticjob-example-lite-springboot/src/main/java/org/apache/shardingsphere/elasticjob/lite/example/job/SpringBootOccurErrorNoticeDingtlakJob.java b/examples/elasticjob-example-lite-springboot/src/main/java/org/apache/shardingsphere/elasticjob/lite/example/job/SpringBootOccurErrorNoticeDingtalkJob.java
similarity index 90%
rename from examples/elasticjob-example-lite-springboot/src/main/java/org/apache/shardingsphere/elasticjob/lite/example/job/SpringBootOccurErrorNoticeDingtlakJob.java
rename to examples/elasticjob-example-lite-springboot/src/main/java/org/apache/shardingsphere/elasticjob/lite/example/job/SpringBootOccurErrorNoticeDingtalkJob.java
index f138df0..6669cf2 100644
--- a/examples/elasticjob-example-lite-springboot/src/main/java/org/apache/shardingsphere/elasticjob/lite/example/job/SpringBootOccurErrorNoticeDingtlakJob.java
+++ b/examples/elasticjob-example-lite-springboot/src/main/java/org/apache/shardingsphere/elasticjob/lite/example/job/SpringBootOccurErrorNoticeDingtalkJob.java
@@ -22,10 +22,10 @@ import org.apache.shardingsphere.elasticjob.simple.job.SimpleJob;
import org.springframework.stereotype.Component;
@Component
-public class SpringBootOccurErrorNoticeDingtlakJob implements SimpleJob {
+public class SpringBootOccurErrorNoticeDingtalkJob implements SimpleJob {
@Override
- public void execute(ShardingContext shardingContext) {
+ public void execute(final ShardingContext shardingContext) {
throw new RuntimeException(String.format("An exception has occurred in Job, The parameter is %s", shardingContext.getShardingParameter()));
}
}
diff --git a/examples/elasticjob-example-lite-springboot/src/main/java/org/apache/shardingsphere/elasticjob/lite/example/job/SpringBootOccurErrorNoticeEmailJob.java b/examples/elasticjob-example-lite-springboot/src/main/java/org/apache/shardingsphere/elasticjob/lite/example/job/SpringBootOccurErrorNoticeEmailJob.java
index 8446647..4687e69 100644
--- a/examples/elasticjob-example-lite-springboot/src/main/java/org/apache/shardingsphere/elasticjob/lite/example/job/SpringBootOccurErrorNoticeEmailJob.java
+++ b/examples/elasticjob-example-lite-springboot/src/main/java/org/apache/shardingsphere/elasticjob/lite/example/job/SpringBootOccurErrorNoticeEmailJob.java
@@ -25,7 +25,7 @@ import org.springframework.stereotype.Component;
public class SpringBootOccurErrorNoticeEmailJob implements SimpleJob {
@Override
- public void execute(ShardingContext shardingContext) {
+ public void execute(final ShardingContext shardingContext) {
throw new RuntimeException(String.format("An exception has occurred in Job, The parameter is %s", shardingContext.getShardingParameter()));
}
}
diff --git a/examples/elasticjob-example-lite-springboot/src/main/java/org/apache/shardingsphere/elasticjob/lite/example/job/SpringBootOccurErrorNoticeWechatJob.java b/examples/elasticjob-example-lite-springboot/src/main/java/org/apache/shardingsphere/elasticjob/lite/example/job/SpringBootOccurErrorNoticeWechatJob.java
index eebf545..965d443 100644
--- a/examples/elasticjob-example-lite-springboot/src/main/java/org/apache/shardingsphere/elasticjob/lite/example/job/SpringBootOccurErrorNoticeWechatJob.java
+++ b/examples/elasticjob-example-lite-springboot/src/main/java/org/apache/shardingsphere/elasticjob/lite/example/job/SpringBootOccurErrorNoticeWechatJob.java
@@ -25,7 +25,7 @@ import org.springframework.stereotype.Component;
public class SpringBootOccurErrorNoticeWechatJob implements SimpleJob {
@Override
- public void execute(ShardingContext shardingContext) {
+ public void execute(final ShardingContext shardingContext) {
throw new RuntimeException(String.format("An exception has occurred in Job, The parameter is %s", shardingContext.getShardingParameter()));
}
}
diff --git a/examples/elasticjob-example-lite-springboot/src/main/java/org/apache/shardingsphere/elasticjob/lite/example/job/SpringBootSimpleJob.java b/examples/elasticjob-example-lite-springboot/src/main/java/org/apache/shardingsphere/elasticjob/lite/example/job/SpringBootSimpleJob.java
index 416202a..8208d5c 100644
--- a/examples/elasticjob-example-lite-springboot/src/main/java/org/apache/shardingsphere/elasticjob/lite/example/job/SpringBootSimpleJob.java
+++ b/examples/elasticjob-example-lite-springboot/src/main/java/org/apache/shardingsphere/elasticjob/lite/example/job/SpringBootSimpleJob.java
@@ -39,7 +39,7 @@ public class SpringBootSimpleJob implements SimpleJob {
private FooRepository fooRepository;
@Override
- public void execute(ShardingContext shardingContext) {
+ public void execute(final ShardingContext shardingContext) {
logger.info("Item: {} | Time: {} | Thread: {} | {}",
shardingContext.getShardingItem(), new SimpleDateFormat("HH:mm:ss").format(new Date()), Thread.currentThread().getId(), "SIMPLE");
List<Foo> data = fooRepository.findTodoData(shardingContext.getShardingParameter(), 10);
diff --git a/examples/elasticjob-example-lite-springboot/src/main/resources/application.yml b/examples/elasticjob-example-lite-springboot/src/main/resources/application.yml
index c2ef290..e479242 100644
--- a/examples/elasticjob-example-lite-springboot/src/main/resources/application.yml
+++ b/examples/elasticjob-example-lite-springboot/src/main/resources/application.yml
@@ -31,13 +31,13 @@ elasticjob:
shardingTotalCount: 9
props:
script.command.line: "echo Manual SCRIPT Job: "
- occurErrorNoticeDingtlakJob:
- elasticJobClass: org.apache.shardingsphere.elasticjob.lite.example.job.SpringBootOccurErrorNoticeDingtlakJob
+ occurErrorNoticeDingtalkJob:
+ elasticJobClass: org.apache.shardingsphere.elasticjob.lite.example.job.SpringBootOccurErrorNoticeDingtalkJob
overwrite: true
shardingTotalCount: 3
shardingItemParameters: 0=Beijing,1=Shanghai,2=Guangzhou
jobErrorHandlerType: DINGTALK
- jobBootstrapBeanName: occurErrorNoticeDingtlakBean
+ jobBootstrapBeanName: occurErrorNoticeDingtalkBean
props:
dingtalk:
webhook: https://oapi.dingtalk.com/robot/send?access_token=42eead064e81ce81fc6af2c107fbe10a4339a3d40a7db8abf5b34d8261527a3f