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/08/18 03:54:53 UTC
[shardingsphere-elasticjob] branch dag updated: Minor updates for
code format and style (#1379) (#1380)
This is an automated email from the ASF dual-hosted git repository.
zhangliang pushed a commit to branch dag
in repository https://gitbox.apache.org/repos/asf/shardingsphere-elasticjob.git
The following commit(s) were added to refs/heads/dag by this push:
new 7fd92db Minor updates for code format and style (#1379) (#1380)
7fd92db is described below
commit 7fd92dbfa06e47d594263c3d0517b43b240bad49
Author: Tboy <gu...@immomo.com>
AuthorDate: Tue Aug 18 11:54:41 2020 +0800
Minor updates for code format and style (#1379) (#1380)
---
.../shardingsphere/elasticjob/api/JobDagConfiguration.java | 2 +-
.../shardingsphere/elasticjob/executor/ElasticJobExecutor.java | 4 ++--
.../elasticjob/infra/exception/DagRuntimeException.java | 2 +-
.../elasticjob/tracing/event/DagJobExecutionEvent.java | 2 +-
.../elasticjob/lite/internal/dag/DagNodeStorage.java | 10 +++++-----
.../shardingsphere/elasticjob/lite/internal/dag/DagStates.java | 1 -
.../elasticjob/lite/internal/dag/JobRetryTrigger.java | 7 +++----
.../elasticjob/lite/internal/sharding/ExecutionService.java | 1 -
.../elasticjob/lite/internal/state/JobStateEnum.java | 1 -
.../elasticjob/lite/internal/state/JobStateNode.java | 2 +-
.../elasticjob/lite/lifecycle/domain/DagBriefInfo.java | 2 +-
11 files changed, 15 insertions(+), 19 deletions(-)
diff --git a/elasticjob-api/src/main/java/org/apache/shardingsphere/elasticjob/api/JobDagConfiguration.java b/elasticjob-api/src/main/java/org/apache/shardingsphere/elasticjob/api/JobDagConfiguration.java
index 5f31600..414538d 100644
--- a/elasticjob-api/src/main/java/org/apache/shardingsphere/elasticjob/api/JobDagConfiguration.java
+++ b/elasticjob-api/src/main/java/org/apache/shardingsphere/elasticjob/api/JobDagConfiguration.java
@@ -30,7 +30,7 @@ import lombok.ToString;
@NoArgsConstructor
@Data
@ToString
-public class JobDagConfiguration {
+public final class JobDagConfiguration {
/** DAG name. */
private String dagName;
diff --git a/elasticjob-executor/elasticjob-executor-kernel/src/main/java/org/apache/shardingsphere/elasticjob/executor/ElasticJobExecutor.java b/elasticjob-executor/elasticjob-executor-kernel/src/main/java/org/apache/shardingsphere/elasticjob/executor/ElasticJobExecutor.java
index d65f478..14a4d28 100644
--- a/elasticjob-executor/elasticjob-executor-kernel/src/main/java/org/apache/shardingsphere/elasticjob/executor/ElasticJobExecutor.java
+++ b/elasticjob-executor/elasticjob-executor-kernel/src/main/java/org/apache/shardingsphere/elasticjob/executor/ElasticJobExecutor.java
@@ -92,9 +92,9 @@ public final class ElasticJobExecutor {
jobFacade.dagStatesCheck();
jobFacade.dagJobDependenciesCheck();
//CHECKSTYLE:OFF
- } catch (Exception e) {
+ } catch (final Exception ex) {
//CHECKSTYLE:ON
- log.error("DAG job - {} exception! Check !", jobConfig.getJobName(), e);
+ log.error("DAG job - {} exception! Check !", jobConfig.getJobName(), ex);
return;
}
}
diff --git a/elasticjob-infra/elasticjob-infra-common/src/main/java/org/apache/shardingsphere/elasticjob/infra/exception/DagRuntimeException.java b/elasticjob-infra/elasticjob-infra-common/src/main/java/org/apache/shardingsphere/elasticjob/infra/exception/DagRuntimeException.java
index c744e22..26c918c 100644
--- a/elasticjob-infra/elasticjob-infra-common/src/main/java/org/apache/shardingsphere/elasticjob/infra/exception/DagRuntimeException.java
+++ b/elasticjob-infra/elasticjob-infra-common/src/main/java/org/apache/shardingsphere/elasticjob/infra/exception/DagRuntimeException.java
@@ -21,7 +21,7 @@ package org.apache.shardingsphere.elasticjob.infra.exception;
* Dag runtime exception.
*
**/
-public class DagRuntimeException extends RuntimeException {
+public final class DagRuntimeException extends RuntimeException {
private static final long serialVersionUID = 3244908974343209468L;
public DagRuntimeException(final String errorMessage, final Object... args) {
diff --git a/elasticjob-infra/elasticjob-tracing/elasticjob-tracing-api/src/main/java/org/apache/shardingsphere/elasticjob/tracing/event/DagJobExecutionEvent.java b/elasticjob-infra/elasticjob-tracing/elasticjob-tracing-api/src/main/java/org/apache/shardingsphere/elasticjob/tracing/event/DagJobExecutionEvent.java
index d974502..00d05f6 100644
--- a/elasticjob-infra/elasticjob-tracing/elasticjob-tracing-api/src/main/java/org/apache/shardingsphere/elasticjob/tracing/event/DagJobExecutionEvent.java
+++ b/elasticjob-infra/elasticjob-tracing/elasticjob-tracing-api/src/main/java/org/apache/shardingsphere/elasticjob/tracing/event/DagJobExecutionEvent.java
@@ -31,7 +31,7 @@ import java.util.UUID;
**/
@Getter
@ToString
-public class DagJobExecutionEvent implements JobEvent {
+public final class DagJobExecutionEvent implements JobEvent {
private String id;
private String dagName;
diff --git a/elasticjob-lite/elasticjob-lite-core/src/main/java/org/apache/shardingsphere/elasticjob/lite/internal/dag/DagNodeStorage.java b/elasticjob-lite/elasticjob-lite-core/src/main/java/org/apache/shardingsphere/elasticjob/lite/internal/dag/DagNodeStorage.java
index 5df835f..b40969c 100644
--- a/elasticjob-lite/elasticjob-lite-core/src/main/java/org/apache/shardingsphere/elasticjob/lite/internal/dag/DagNodeStorage.java
+++ b/elasticjob-lite/elasticjob-lite-core/src/main/java/org/apache/shardingsphere/elasticjob/lite/internal/dag/DagNodeStorage.java
@@ -52,7 +52,7 @@ import java.util.stream.Collectors;
* retry/ {jobName}
*/
@Slf4j
-public class DagNodeStorage {
+public final class DagNodeStorage {
private static final String DAG_ROOT = "/dag/%s";
@@ -406,7 +406,7 @@ public class DagNodeStorage {
}
rawClient.transaction().forOperations(opList);
//CHECKSTYLE:OFF
- } catch (Exception exp) {
+ } catch (final Exception exp) {
//CHECKSTYLE:ON
log.debug("Dag-{}[{}] trigger job in transaction Exception！", dagName, job, exp);
}
@@ -472,11 +472,11 @@ public class DagNodeStorage {
* Add dag retry job times.
* Persist jobName to path '/dag/dagName/retry'
*
- * @param i retry times.
+ * @param retryTimes retry times.
*/
- public void updateJobRetryTimes(final int i) {
+ public void updateJobRetryTimes(final int retryTimes) {
regCenter.persist(pathOfDagRetryJob(jobName), "");
- regCenter.persist(pathOfDagGraphJobRetryTimes(), "" + i);
+ regCenter.persist(pathOfDagGraphJobRetryTimes(), "" + retryTimes);
}
/**
diff --git a/elasticjob-lite/elasticjob-lite-core/src/main/java/org/apache/shardingsphere/elasticjob/lite/internal/dag/DagStates.java b/elasticjob-lite/elasticjob-lite-core/src/main/java/org/apache/shardingsphere/elasticjob/lite/internal/dag/DagStates.java
index 2b1d68d..30717f8 100644
--- a/elasticjob-lite/elasticjob-lite-core/src/main/java/org/apache/shardingsphere/elasticjob/lite/internal/dag/DagStates.java
+++ b/elasticjob-lite/elasticjob-lite-core/src/main/java/org/apache/shardingsphere/elasticjob/lite/internal/dag/DagStates.java
@@ -63,5 +63,4 @@ public enum DagStates {
public String getValue() {
return value;
}
-
}
diff --git a/elasticjob-lite/elasticjob-lite-core/src/main/java/org/apache/shardingsphere/elasticjob/lite/internal/dag/JobRetryTrigger.java b/elasticjob-lite/elasticjob-lite-core/src/main/java/org/apache/shardingsphere/elasticjob/lite/internal/dag/JobRetryTrigger.java
index 85c70b6..a9c89fb 100644
--- a/elasticjob-lite/elasticjob-lite-core/src/main/java/org/apache/shardingsphere/elasticjob/lite/internal/dag/JobRetryTrigger.java
+++ b/elasticjob-lite/elasticjob-lite-core/src/main/java/org/apache/shardingsphere/elasticjob/lite/internal/dag/JobRetryTrigger.java
@@ -47,13 +47,13 @@ public class JobRetryTrigger implements QueueConsumer<String> {
// message format: dagName||jobName
// trigger the job only when dag state is running
if (StringUtils.isEmpty(message)) {
- log.info("Dag-{} Retry job Receive message is empty, return!", dagName);
+ log.warn("Dag-{} Retry job Receive message is empty, return!", dagName);
return;
}
List<String> strings = Splitter.on("||").splitToList(message);
if (strings.size() != 2) {
- log.info("Dag-{} Retry job message format not right! {}", dagName, message);
+ log.warn("Dag-{} Retry job message format not right! {}", dagName, message);
return;
}
@@ -63,7 +63,7 @@ public class JobRetryTrigger implements QueueConsumer<String> {
DagStates dagState = DagStates.of(dagNodeStorage.currentDagStates());
if (dagState != DagStates.RUNNING) {
- log.info("Dag-{} retry job, dag state-{} not RUNNING, quit!", dagName, jobName, dagState);
+ log.warn("Dag-{} retry job, dag state-{} not RUNNING, quit!", dagName, jobName, dagState);
return;
}
@@ -74,5 +74,4 @@ public class JobRetryTrigger implements QueueConsumer<String> {
public void stateChanged(final CuratorFramework client, final ConnectionState newState) {
}
-
}
diff --git a/elasticjob-lite/elasticjob-lite-core/src/main/java/org/apache/shardingsphere/elasticjob/lite/internal/sharding/ExecutionService.java b/elasticjob-lite/elasticjob-lite-core/src/main/java/org/apache/shardingsphere/elasticjob/lite/internal/sharding/ExecutionService.java
index 34169ff..2a4b165 100644
--- a/elasticjob-lite/elasticjob-lite-core/src/main/java/org/apache/shardingsphere/elasticjob/lite/internal/sharding/ExecutionService.java
+++ b/elasticjob-lite/elasticjob-lite-core/src/main/java/org/apache/shardingsphere/elasticjob/lite/internal/sharding/ExecutionService.java
@@ -127,7 +127,6 @@ public final class ExecutionService {
jobNodeStorage.removeJobNodeIfExisted(JobStateNode.getRooProcFail());
jobNodeStorage.removeJobNodeIfExisted(JobStateNode.getRooProcSucc());
}
-
}
/**
diff --git a/elasticjob-lite/elasticjob-lite-core/src/main/java/org/apache/shardingsphere/elasticjob/lite/internal/state/JobStateEnum.java b/elasticjob-lite/elasticjob-lite-core/src/main/java/org/apache/shardingsphere/elasticjob/lite/internal/state/JobStateEnum.java
index c2068b6..2d4a215 100644
--- a/elasticjob-lite/elasticjob-lite-core/src/main/java/org/apache/shardingsphere/elasticjob/lite/internal/state/JobStateEnum.java
+++ b/elasticjob-lite/elasticjob-lite-core/src/main/java/org/apache/shardingsphere/elasticjob/lite/internal/state/JobStateEnum.java
@@ -63,5 +63,4 @@ public enum JobStateEnum {
public String getValue() {
return value;
}
-
}
diff --git a/elasticjob-lite/elasticjob-lite-core/src/main/java/org/apache/shardingsphere/elasticjob/lite/internal/state/JobStateNode.java b/elasticjob-lite/elasticjob-lite-core/src/main/java/org/apache/shardingsphere/elasticjob/lite/internal/state/JobStateNode.java
index dbf648c..7750d9f 100644
--- a/elasticjob-lite/elasticjob-lite-core/src/main/java/org/apache/shardingsphere/elasticjob/lite/internal/state/JobStateNode.java
+++ b/elasticjob-lite/elasticjob-lite-core/src/main/java/org/apache/shardingsphere/elasticjob/lite/internal/state/JobStateNode.java
@@ -23,7 +23,7 @@ import org.apache.shardingsphere.elasticjob.lite.internal.storage.JobNodePath;
* Job state state node path.
*
**/
-public class JobStateNode {
+public final class JobStateNode {
public static final String ROOT_STATE = "state/state";
public static final String ROOT_STATE_FOR_CACHE = "state";
diff --git a/elasticjob-lite/elasticjob-lite-lifecycle/src/main/java/org/apache/shardingsphere/elasticjob/lite/lifecycle/domain/DagBriefInfo.java b/elasticjob-lite/elasticjob-lite-lifecycle/src/main/java/org/apache/shardingsphere/elasticjob/lite/lifecycle/domain/DagBriefInfo.java
index 84a8ce4..d08997d 100644
--- a/elasticjob-lite/elasticjob-lite-lifecycle/src/main/java/org/apache/shardingsphere/elasticjob/lite/lifecycle/domain/DagBriefInfo.java
+++ b/elasticjob-lite/elasticjob-lite-lifecycle/src/main/java/org/apache/shardingsphere/elasticjob/lite/lifecycle/domain/DagBriefInfo.java
@@ -26,7 +26,7 @@ import lombok.ToString;
**/
@Data
@ToString
-public class DagBriefInfo {
+public final class DagBriefInfo {
private String dagName;
private String jobName;