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/18 11:48:15 UTC
[shardingsphere-elasticjob] branch master updated: For code format
(#1570)
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 95e3ded For code format (#1570)
95e3ded is described below
commit 95e3ded7c3bdfd050d0f09ab72548b2ac5b8bab1
Author: Liang Zhang <te...@163.com>
AuthorDate: Sun Oct 18 19:48:06 2020 +0800
For code format (#1570)
* Remove empty SPI introduce
* Fix duplicate copyright
* For code format
---
.../elasticjob/api/JobConfiguration.java | 2 +-
.../controller/search/JobEventRdbSearch.java | 12 +++---
.../elasticjob/error/handler/JobErrorHandler.java | 6 +--
.../handler/dingtalk/DingtalkConfiguration.java | 9 +++--
.../error/handler/dingtalk/DingtalkConstants.java | 3 ++
.../handler/dingtalk/DingtalkJobErrorHandler.java | 10 ++---
.../fixture/DingtalkInternalController.java | 5 +--
.../error/handler/email/EmailConfiguration.java | 34 ++++++++---------
.../error/handler/email/EmailConstants.java | 3 ++
.../error/handler/email/EmailJobErrorHandler.java | 11 +++---
.../handler/general/IgnoreJobErrorHandler.java | 2 +-
.../error/handler/general/LogJobErrorHandler.java | 4 +-
.../handler/general/ThrowJobErrorHandler.java | 2 +-
.../error/handler/wechat/WechatConfiguration.java | 9 +++--
.../error/handler/wechat/WechatConstants.java | 3 ++
.../wechat/fixture/WechatInternalController.java | 4 +-
.../test/resources/conf/error-handler-wechat.yaml | 2 -
.../elasticjob/executor/JobFacade.java | 2 +-
.../executor/item/JobItemExecutorFactory.java | 1 +
.../http/executor/fixture/InternalController.java | 8 ++--
.../elasticjob/infra/concurrent/BlockUtils.java | 4 +-
.../elasticjob/infra/context/ExecutionType.java | 4 +-
.../elasticjob/infra/context/TaskContext.java | 12 +++---
.../infra/spi/ElasticJobServiceLoader.java | 35 +++++++++---------
.../elasticjob/infra/yaml/YamlEngine.java | 1 +
...re.elasticjob.infra.listener.ElasticJobListener | 17 ---------
.../listener/ElasticJobListenerFactoryTest.java | 4 +-
.../listener/fixture/FooElasticJobListener.java | 2 +-
...re.elasticjob.infra.listener.ElasticJobListener | 17 ---------
.../elasticjob/restful/RestfulController.java | 2 +-
.../elasticjob/restful/RestfulService.java | 4 +-
.../restful/handler/ExceptionHandleResult.java | 2 +-
.../restful/handler/HandlerMappingRegistry.java | 10 ++---
.../elasticjob/restful/mapping/MappingContext.java | 12 +++---
.../elasticjob/restful/mapping/PathMatcher.java | 12 +++---
.../restful/mapping/RegexPathMatcher.java | 6 +--
.../elasticjob/restful/mapping/UrlPatternMap.java | 14 +++----
.../restful/pipeline/ExceptionHandling.java | 2 +-
.../restful/pipeline/HandlerParameterDecoder.java | 6 +--
.../restful/pipeline/HttpRequestDispatcher.java | 2 +-
.../restful/serializer/ResponseBodySerializer.java | 2 +-
.../serializer/ResponseBodySerializerFactory.java | 2 +-
.../serializer/factory/SerializerFactory.java | 2 +-
.../restful/wrapper/QueryParameterMap.java | 16 ++++----
.../restful/controller/JobController.java | 34 ++++++++---------
.../elasticjob/restful/pipeline/HttpClient.java | 10 ++---
.../internal/reg/RegistryCenterFactory.java | 6 +--
.../internal/statistics/JobStatisticsAPIImpl.java | 10 ++---
.../operate/ShardingOperateAPIImplTest.java | 3 +-
.../job/ElasticJobConfigurationProperties.java | 43 ++++++++++++----------
.../boot/job/ElasticJobLiteAutoConfiguration.java | 10 ++---
.../lite/spring/boot/job/ElasticJobProperties.java | 2 +-
.../reg/ElasticJobRegistryCenterConfiguration.java | 8 +++-
.../lite/spring/boot/reg/ZookeeperProperties.java | 38 +++++++++----------
.../ElasticJobSnapshotServiceConfiguration.java | 8 ++--
.../reg/snapshot/SnapshotServiceProperties.java | 5 ++-
.../tracing/ElasticJobTracingConfiguration.java | 2 +-
.../job/executor/CustomClassedJobExecutor.java | 9 ++---
.../spring/boot/job/executor/PrintJobExecutor.java | 9 ++---
.../boot/job/executor/PrintJobProperties.java | 4 +-
.../boot/job/fixture/EmbedTestingServer.java | 8 ++--
.../spring/boot/job/fixture/job/CustomJob.java | 2 +-
.../boot/job/fixture/job/impl/CustomTestJob.java | 4 +-
.../spring/boot/job/repository/BarRepository.java | 6 +--
.../job/repository/impl/BarRepositoryImpl.java | 4 +-
...icjob.executor.item.impl.ClassedJobItemExecutor | 1 +
...sticjob.executor.item.impl.TypedJobItemExecutor | 1 +
.../resources/META-INF/namespace/elasticjob.xsd | 1 -
.../resources/META-INF/job/oneOffWithJobType.xml | 2 +-
.../test/resources/META-INF/job/withJobType.xml | 2 +-
.../META-INF/snapshot/snapshotDisabled.xml | 6 +--
.../META-INF/snapshot/snapshotEnabled.xml | 8 ++--
pom.xml | 2 +-
73 files changed, 275 insertions(+), 295 deletions(-)
diff --git a/elasticjob-api/src/main/java/org/apache/shardingsphere/elasticjob/api/JobConfiguration.java b/elasticjob-api/src/main/java/org/apache/shardingsphere/elasticjob/api/JobConfiguration.java
index 9668ffb..326cf01 100644
--- a/elasticjob-api/src/main/java/org/apache/shardingsphere/elasticjob/api/JobConfiguration.java
+++ b/elasticjob-api/src/main/java/org/apache/shardingsphere/elasticjob/api/JobConfiguration.java
@@ -283,7 +283,7 @@ public final class JobConfiguration {
this.jobErrorHandlerType = jobErrorHandlerType;
return this;
}
-
+
/**
* Set job listener types.
*
diff --git a/elasticjob-cloud/elasticjob-cloud-scheduler/src/main/java/org/apache/shardingsphere/elasticjob/cloud/console/controller/search/JobEventRdbSearch.java b/elasticjob-cloud/elasticjob-cloud-scheduler/src/main/java/org/apache/shardingsphere/elasticjob/cloud/console/controller/search/JobEventRdbSearch.java
index bd775df..0cd6577 100755
--- a/elasticjob-cloud/elasticjob-cloud-scheduler/src/main/java/org/apache/shardingsphere/elasticjob/cloud/console/controller/search/JobEventRdbSearch.java
+++ b/elasticjob-cloud/elasticjob-cloud-scheduler/src/main/java/org/apache/shardingsphere/elasticjob/cloud/console/controller/search/JobEventRdbSearch.java
@@ -136,16 +136,16 @@ public final class JobEventRdbSearch {
private PreparedStatement createDataPreparedStatement(final Connection conn, final String tableName, final Collection<String> tableFields, final Condition condition) throws SQLException {
String sql = buildDataSql(tableName, tableFields, condition);
- PreparedStatement preparedStatement = conn.prepareStatement(sql);
- setBindValue(preparedStatement, tableFields, condition);
- return preparedStatement;
+ PreparedStatement result = conn.prepareStatement(sql);
+ setBindValue(result, tableFields, condition);
+ return result;
}
private PreparedStatement createCountPreparedStatement(final Connection conn, final String tableName, final Collection<String> tableFields, final Condition condition) throws SQLException {
String sql = buildCountSql(tableName, tableFields, condition);
- PreparedStatement preparedStatement = conn.prepareStatement(sql);
- setBindValue(preparedStatement, tableFields, condition);
- return preparedStatement;
+ PreparedStatement result = conn.prepareStatement(sql);
+ setBindValue(result, tableFields, condition);
+ return result;
}
private String buildDataSql(final String tableName, final Collection<String> tableFields, final Condition condition) {
diff --git a/elasticjob-error-handler/elasticjob-error-handler-spi/src/main/java/org/apache/shardingsphere/elasticjob/error/handler/JobErrorHandler.java b/elasticjob-error-handler/elasticjob-error-handler-spi/src/main/java/org/apache/shardingsphere/elasticjob/error/handler/JobErrorHandler.java
index 66ad96b..11973d7 100644
--- a/elasticjob-error-handler/elasticjob-error-handler-spi/src/main/java/org/apache/shardingsphere/elasticjob/error/handler/JobErrorHandler.java
+++ b/elasticjob-error-handler/elasticjob-error-handler-spi/src/main/java/org/apache/shardingsphere/elasticjob/error/handler/JobErrorHandler.java
@@ -28,8 +28,8 @@ public interface JobErrorHandler extends TypedSPI {
/**
* Handle exception.
*
- * @param jobConfiguration job config
- * @param cause cause
+ * @param jobConfig job configuration
+ * @param cause failure cause
*/
- void handleException(JobConfiguration jobConfiguration, Throwable cause);
+ void handleException(JobConfiguration jobConfig, Throwable cause);
}
diff --git a/elasticjob-error-handler/elasticjob-error-handler-type/elasticjob-error-handler-dingtalk/src/main/java/org/apache/shardingsphere/elasticjob/error/handler/dingtalk/DingtalkConfiguration.java b/elasticjob-error-handler/elasticjob-error-handler-type/elasticjob-error-handler-dingtalk/src/main/java/org/apache/shardingsphere/elasticjob/error/handler/dingtalk/DingtalkConfiguration.java
index 46df5f9..64ef17c 100644
--- a/elasticjob-error-handler/elasticjob-error-handler-type/elasticjob-error-handler-dingtalk/src/main/java/org/apache/shardingsphere/elasticjob/error/handler/dingtalk/DingtalkConfiguration.java
+++ b/elasticjob-error-handler/elasticjob-error-handler-type/elasticjob-error-handler-dingtalk/src/main/java/org/apache/shardingsphere/elasticjob/error/handler/dingtalk/DingtalkConfiguration.java
@@ -22,6 +22,9 @@ import lombok.RequiredArgsConstructor;
import java.util.Properties;
+/**
+ * Dingtalk configuration.
+ */
@Getter
@RequiredArgsConstructor
public final class DingtalkConfiguration {
@@ -37,10 +40,10 @@ public final class DingtalkConfiguration {
private final Integer readTimeout;
/**
- * Get dingtalk config.
+ * Get dingtalk configuration.
*
- * @param props props
- * @return dingtalk config.
+ * @param props properties
+ * @return dingtalk configuration.
*/
public static DingtalkConfiguration getByProps(final Properties props) {
return new DingtalkConfiguration(props.getProperty(DingtalkConstants.DINGTALK_WEBHOOK),
diff --git a/elasticjob-error-handler/elasticjob-error-handler-type/elasticjob-error-handler-dingtalk/src/main/java/org/apache/shardingsphere/elasticjob/error/handler/dingtalk/DingtalkConstants.java b/elasticjob-error-handler/elasticjob-error-handler-type/elasticjob-error-handler-dingtalk/src/main/java/org/apache/shardingsphere/elasticjob/error/handler/dingtalk/DingtalkConstants.java
index b6bcfa6..9cc9b74 100644
--- a/elasticjob-error-handler/elasticjob-error-handler-type/elasticjob-error-handler-dingtalk/src/main/java/org/apache/shardingsphere/elasticjob/error/handler/dingtalk/DingtalkConstants.java
+++ b/elasticjob-error-handler/elasticjob-error-handler-type/elasticjob-error-handler-dingtalk/src/main/java/org/apache/shardingsphere/elasticjob/error/handler/dingtalk/DingtalkConstants.java
@@ -17,6 +17,9 @@
package org.apache.shardingsphere.elasticjob.error.handler.dingtalk;
+/**
+ * Dingtalk constants.
+ */
public final class DingtalkConstants {
public static final String PREFIX = "dingtalk.";
diff --git a/elasticjob-error-handler/elasticjob-error-handler-type/elasticjob-error-handler-dingtalk/src/main/java/org/apache/shardingsphere/elasticjob/error/handler/dingtalk/DingtalkJobErrorHandler.java b/elasticjob-error-handler/elasticjob-error-handler-type/elasticjob-error-handler-dingtalk/src/main/java/org/apache/shardingsphere/elasticjob/error/handler/dingtalk/DingtalkJobErrorHandler.java
index c607ca8..bcebd00 100644
--- a/elasticjob-error-handler/elasticjob-error-handler-type/elasticjob-error-handler-dingtalk/src/main/java/org/apache/shardingsphere/elasticjob/error/handler/dingtalk/DingtalkJobErrorHandler.java
+++ b/elasticjob-error-handler/elasticjob-error-handler-type/elasticjob-error-handler-dingtalk/src/main/java/org/apache/shardingsphere/elasticjob/error/handler/dingtalk/DingtalkJobErrorHandler.java
@@ -68,7 +68,7 @@ public final class DingtalkJobErrorHandler implements JobErrorHandler {
.setConnectTimeout(dingtalkConfiguration.getConnectTimeout())
.setSocketTimeout(dingtalkConfiguration.getReadTimeout()).build();
httpPost.setConfig(requestConfig);
- String paramJson = getParamJson(getMsg(jobConfig.getJobName(), dingtalkConfiguration, cause));
+ String paramJson = getParamJson(getMessage(jobConfig.getJobName(), dingtalkConfiguration, cause));
StringEntity entity = new StringEntity(paramJson, StandardCharsets.UTF_8);
entity.setContentEncoding(StandardCharsets.UTF_8.name());
entity.setContentType("application/json");
@@ -95,14 +95,14 @@ public final class DingtalkJobErrorHandler implements JobErrorHandler {
return GsonFactory.getGson().toJson(ImmutableMap.of("msgtype", "text", "text", Collections.singletonMap("content", msg)));
}
- private String getMsg(final String jobName, final DingtalkConfiguration dingtalkConfiguration, final Throwable cause) {
+ private String getMessage(final String jobName, final DingtalkConfiguration dingtalkConfiguration, final Throwable cause) {
StringWriter sw = new StringWriter();
cause.printStackTrace(new PrintWriter(sw, true));
- String msg = String.format("Job '%s' exception occur in job processing, caused by %s", jobName, sw.toString());
+ String result = String.format("Job '%s' exception occur in job processing, caused by %s", jobName, sw.toString());
if (!Strings.isNullOrEmpty(dingtalkConfiguration.getKeyword())) {
- msg = dingtalkConfiguration.getKeyword().concat(msg);
+ result = dingtalkConfiguration.getKeyword().concat(result);
}
- return msg;
+ return result;
}
private String getUrl(final DingtalkConfiguration dingtalkConfiguration) {
diff --git a/elasticjob-error-handler/elasticjob-error-handler-type/elasticjob-error-handler-dingtalk/src/test/java/org/apache/shardingsphere/elasticjob/error/handler/dingtalk/fixture/DingtalkInternalController.java b/elasticjob-error-handler/elasticjob-error-handler-type/elasticjob-error-handler-dingtalk/src/test/java/org/apache/shardingsphere/elasticjob/error/handler/dingtalk/fixture/DingtalkInternalController.java
index 2c99106..eb5d01e 100644
--- a/elasticjob-error-handler/elasticjob-error-handler-type/elasticjob-error-handler-dingtalk/src/test/java/org/apache/shardingsphere/elasticjob/error/handler/dingtalk/fixture/DingtalkInternalController.java
+++ b/elasticjob-error-handler/elasticjob-error-handler-type/elasticjob-error-handler-dingtalk/src/test/java/org/apache/shardingsphere/elasticjob/error/handler/dingtalk/fixture/DingtalkInternalController.java
@@ -21,7 +21,6 @@ import com.google.common.base.Preconditions;
import com.google.common.base.Strings;
import com.google.common.collect.ImmutableMap;
import lombok.SneakyThrows;
-import lombok.extern.slf4j.Slf4j;
import org.apache.shardingsphere.elasticjob.infra.json.GsonFactory;
import org.apache.shardingsphere.elasticjob.restful.Http;
import org.apache.shardingsphere.elasticjob.restful.RestfulController;
@@ -39,7 +38,6 @@ import java.security.NoSuchAlgorithmException;
import java.util.Base64;
import java.util.Map;
-@Slf4j
public final class DingtalkInternalController implements RestfulController {
private static final String ACCESS_TOKEN = "42eead064e81ce81fc6af2c107fbe10a4339a3d40a7db8abf5b34d8261527a3f";
@@ -55,7 +53,7 @@ public final class DingtalkInternalController implements RestfulController {
* @param timestamp timestamp
* @param sign sign
* @param body body
- * @return Send Result.
+ * @return send Result
*/
@SneakyThrows
@Mapping(method = Http.POST, path = "/send")
@@ -82,7 +80,6 @@ public final class DingtalkInternalController implements RestfulController {
private String sign(final Long timestamp) throws NoSuchAlgorithmException, UnsupportedEncodingException, InvalidKeyException {
String stringToSign = timestamp + "\n" + SECRET;
- System.out.println(stringToSign);
Mac mac = Mac.getInstance("HmacSHA256");
mac.init(new SecretKeySpec(SECRET.getBytes(StandardCharsets.UTF_8), "HmacSHA256"));
byte[] signData = mac.doFinal(stringToSign.getBytes(StandardCharsets.UTF_8));
diff --git a/elasticjob-error-handler/elasticjob-error-handler-type/elasticjob-error-handler-email/src/main/java/org/apache/shardingsphere/elasticjob/error/handler/email/EmailConfiguration.java b/elasticjob-error-handler/elasticjob-error-handler-type/elasticjob-error-handler-email/src/main/java/org/apache/shardingsphere/elasticjob/error/handler/email/EmailConfiguration.java
index 23b0212..c44f05e 100644
--- a/elasticjob-error-handler/elasticjob-error-handler-type/elasticjob-error-handler-email/src/main/java/org/apache/shardingsphere/elasticjob/error/handler/email/EmailConfiguration.java
+++ b/elasticjob-error-handler/elasticjob-error-handler-type/elasticjob-error-handler-email/src/main/java/org/apache/shardingsphere/elasticjob/error/handler/email/EmailConfiguration.java
@@ -23,7 +23,7 @@ import lombok.Setter;
import java.util.Properties;
/**
- * Email configuration POJO.
+ * Email configuration.
*/
@Getter
@Setter
@@ -52,24 +52,24 @@ public final class EmailConfiguration {
private boolean debug;
/**
- * Get email config.
+ * Get email configuration.
*
- * @param props props
- * @return email config.
+ * @param props properties
+ * @return email configuration
*/
public static EmailConfiguration getByProps(final Properties props) {
- EmailConfiguration configuration = new EmailConfiguration();
- configuration.setHost(props.getProperty(EmailConstants.EMAIL_HOST));
- configuration.setPort(Integer.parseInt(props.getProperty(EmailConstants.EMAIL_PORT)));
- configuration.setUsername(props.getProperty(EmailConstants.EMAIL_USERNAME));
- configuration.setPassword(props.getProperty(EmailConstants.EMAIL_PASSWORD));
- configuration.setUseSsl(Boolean.parseBoolean(props.getOrDefault(EmailConstants.EMAIL_USE_SSL, Boolean.FALSE.toString()).toString()));
- configuration.setSubject(props.getOrDefault(EmailConstants.EMAIL_SUBJECT, EmailConstants.DEFAULT_EMAIL_SUBJECT).toString());
- configuration.setFrom(props.getProperty(EmailConstants.EMAIL_FROM));
- configuration.setTo(props.getProperty(EmailConstants.EMAIL_TO));
- configuration.setCc(props.getProperty(EmailConstants.EMAIL_CC));
- configuration.setBcc(props.getProperty(EmailConstants.EMAIL_BCC));
- configuration.setDebug(Boolean.parseBoolean(props.getOrDefault(EmailConstants.EMAIL_DEBUG, Boolean.FALSE.toString()).toString()));
- return configuration;
+ EmailConfiguration result = new EmailConfiguration();
+ result.setHost(props.getProperty(EmailConstants.EMAIL_HOST));
+ result.setPort(Integer.parseInt(props.getProperty(EmailConstants.EMAIL_PORT)));
+ result.setUsername(props.getProperty(EmailConstants.EMAIL_USERNAME));
+ result.setPassword(props.getProperty(EmailConstants.EMAIL_PASSWORD));
+ result.setUseSsl(Boolean.parseBoolean(props.getOrDefault(EmailConstants.EMAIL_USE_SSL, Boolean.FALSE.toString()).toString()));
+ result.setSubject(props.getOrDefault(EmailConstants.EMAIL_SUBJECT, EmailConstants.DEFAULT_EMAIL_SUBJECT).toString());
+ result.setFrom(props.getProperty(EmailConstants.EMAIL_FROM));
+ result.setTo(props.getProperty(EmailConstants.EMAIL_TO));
+ result.setCc(props.getProperty(EmailConstants.EMAIL_CC));
+ result.setBcc(props.getProperty(EmailConstants.EMAIL_BCC));
+ result.setDebug(Boolean.parseBoolean(props.getOrDefault(EmailConstants.EMAIL_DEBUG, Boolean.FALSE.toString()).toString()));
+ return result;
}
}
diff --git a/elasticjob-error-handler/elasticjob-error-handler-type/elasticjob-error-handler-email/src/main/java/org/apache/shardingsphere/elasticjob/error/handler/email/EmailConstants.java b/elasticjob-error-handler/elasticjob-error-handler-type/elasticjob-error-handler-email/src/main/java/org/apache/shardingsphere/elasticjob/error/handler/email/EmailConstants.java
index 47b3980..bc4f069 100644
--- a/elasticjob-error-handler/elasticjob-error-handler-type/elasticjob-error-handler-email/src/main/java/org/apache/shardingsphere/elasticjob/error/handler/email/EmailConstants.java
+++ b/elasticjob-error-handler/elasticjob-error-handler-type/elasticjob-error-handler-email/src/main/java/org/apache/shardingsphere/elasticjob/error/handler/email/EmailConstants.java
@@ -17,6 +17,9 @@
package org.apache.shardingsphere.elasticjob.error.handler.email;
+/**
+ * Email constants.
+ */
public final class EmailConstants {
public static final String PREFIX = "email.";
diff --git a/elasticjob-error-handler/elasticjob-error-handler-type/elasticjob-error-handler-email/src/main/java/org/apache/shardingsphere/elasticjob/error/handler/email/EmailJobErrorHandler.java b/elasticjob-error-handler/elasticjob-error-handler-type/elasticjob-error-handler-email/src/main/java/org/apache/shardingsphere/elasticjob/error/handler/email/EmailJobErrorHandler.java
index 13568e3..ff3da77 100644
--- a/elasticjob-error-handler/elasticjob-error-handler-type/elasticjob-error-handler-email/src/main/java/org/apache/shardingsphere/elasticjob/error/handler/email/EmailJobErrorHandler.java
+++ b/elasticjob-error-handler/elasticjob-error-handler-type/elasticjob-error-handler-email/src/main/java/org/apache/shardingsphere/elasticjob/error/handler/email/EmailJobErrorHandler.java
@@ -71,6 +71,7 @@ public final class EmailJobErrorHandler implements JobErrorHandler {
private Authenticator getSessionAuthenticator(final EmailConfiguration emailConfiguration) {
return new Authenticator() {
+
@Override
public PasswordAuthentication getPasswordAuthentication() {
return new PasswordAuthentication(emailConfiguration.getUsername(), emailConfiguration.getPassword());
@@ -79,15 +80,15 @@ public final class EmailJobErrorHandler implements JobErrorHandler {
}
@Override
- public void handleException(final JobConfiguration jobConfiguration, final Throwable cause) {
- EmailConfiguration emailConfiguration = EmailConfiguration.getByProps(jobConfiguration.getProps());
- String errorContext = createErrorContext(jobConfiguration.getJobName(), cause);
+ public void handleException(final JobConfiguration jobConfig, final Throwable cause) {
+ EmailConfiguration emailConfiguration = EmailConfiguration.getByProps(jobConfig.getProps());
+ String errorContext = createErrorContext(jobConfig.getJobName(), cause);
try {
sendMessage(createMessage(errorContext, emailConfiguration), emailConfiguration);
- log.error("An exception has occurred in Job '{}', Notification to email was successful..", jobConfiguration.getJobName(), cause);
+ log.error("An exception has occurred in Job '{}', Notification to email was successful..", jobConfig.getJobName(), cause);
} catch (final MessagingException ex) {
cause.addSuppressed(ex);
- log.error("An exception has occurred in Job '{}', But failed to send alert by email because of", jobConfiguration.getJobName(), cause);
+ log.error("An exception has occurred in Job '{}', But failed to send alert by email because of", jobConfig.getJobName(), cause);
}
}
diff --git a/elasticjob-error-handler/elasticjob-error-handler-type/elasticjob-error-handler-general/src/main/java/org/apache/shardingsphere/elasticjob/error/handler/general/IgnoreJobErrorHandler.java b/elasticjob-error-handler/elasticjob-error-handler-type/elasticjob-error-handler-general/src/main/java/org/apache/shardingsphere/elasticjob/error/handler/general/IgnoreJobErrorHandler.java
index 08d2e60..0f361b0 100644
--- a/elasticjob-error-handler/elasticjob-error-handler-type/elasticjob-error-handler-general/src/main/java/org/apache/shardingsphere/elasticjob/error/handler/general/IgnoreJobErrorHandler.java
+++ b/elasticjob-error-handler/elasticjob-error-handler-type/elasticjob-error-handler-general/src/main/java/org/apache/shardingsphere/elasticjob/error/handler/general/IgnoreJobErrorHandler.java
@@ -26,7 +26,7 @@ import org.apache.shardingsphere.elasticjob.error.handler.JobErrorHandler;
public final class IgnoreJobErrorHandler implements JobErrorHandler {
@Override
- public void handleException(final JobConfiguration jobConfiguration, final Throwable cause) {
+ public void handleException(final JobConfiguration jobConfig, final Throwable cause) {
}
@Override
diff --git a/elasticjob-error-handler/elasticjob-error-handler-type/elasticjob-error-handler-general/src/main/java/org/apache/shardingsphere/elasticjob/error/handler/general/LogJobErrorHandler.java b/elasticjob-error-handler/elasticjob-error-handler-type/elasticjob-error-handler-general/src/main/java/org/apache/shardingsphere/elasticjob/error/handler/general/LogJobErrorHandler.java
index 59ca177..8833c19 100644
--- a/elasticjob-error-handler/elasticjob-error-handler-type/elasticjob-error-handler-general/src/main/java/org/apache/shardingsphere/elasticjob/error/handler/general/LogJobErrorHandler.java
+++ b/elasticjob-error-handler/elasticjob-error-handler-type/elasticjob-error-handler-general/src/main/java/org/apache/shardingsphere/elasticjob/error/handler/general/LogJobErrorHandler.java
@@ -28,8 +28,8 @@ import org.apache.shardingsphere.elasticjob.error.handler.JobErrorHandler;
public final class LogJobErrorHandler implements JobErrorHandler {
@Override
- public void handleException(final JobConfiguration jobConfiguration, final Throwable cause) {
- log.error(String.format("Job '%s' exception occur in job processing", jobConfiguration.getJobName()), cause);
+ public void handleException(final JobConfiguration jobConfig, final Throwable cause) {
+ log.error(String.format("Job '%s' exception occur in job processing", jobConfig.getJobName()), cause);
}
@Override
diff --git a/elasticjob-error-handler/elasticjob-error-handler-type/elasticjob-error-handler-general/src/main/java/org/apache/shardingsphere/elasticjob/error/handler/general/ThrowJobErrorHandler.java b/elasticjob-error-handler/elasticjob-error-handler-type/elasticjob-error-handler-general/src/main/java/org/apache/shardingsphere/elasticjob/error/handler/general/ThrowJobErrorHandler.java
index 6379d75..9d3e12d 100644
--- a/elasticjob-error-handler/elasticjob-error-handler-type/elasticjob-error-handler-general/src/main/java/org/apache/shardingsphere/elasticjob/error/handler/general/ThrowJobErrorHandler.java
+++ b/elasticjob-error-handler/elasticjob-error-handler-type/elasticjob-error-handler-general/src/main/java/org/apache/shardingsphere/elasticjob/error/handler/general/ThrowJobErrorHandler.java
@@ -27,7 +27,7 @@ import org.apache.shardingsphere.elasticjob.infra.exception.JobSystemException;
public final class ThrowJobErrorHandler implements JobErrorHandler {
@Override
- public void handleException(final JobConfiguration jobConfiguration, final Throwable cause) {
+ public void handleException(final JobConfiguration jobConfig, final Throwable cause) {
throw new JobSystemException(cause);
}
diff --git a/elasticjob-error-handler/elasticjob-error-handler-type/elasticjob-error-handler-wechat/src/main/java/org/apache/shardingsphere/elasticjob/error/handler/wechat/WechatConfiguration.java b/elasticjob-error-handler/elasticjob-error-handler-type/elasticjob-error-handler-wechat/src/main/java/org/apache/shardingsphere/elasticjob/error/handler/wechat/WechatConfiguration.java
index 812c04b..a1cfb59 100644
--- a/elasticjob-error-handler/elasticjob-error-handler-type/elasticjob-error-handler-wechat/src/main/java/org/apache/shardingsphere/elasticjob/error/handler/wechat/WechatConfiguration.java
+++ b/elasticjob-error-handler/elasticjob-error-handler-type/elasticjob-error-handler-wechat/src/main/java/org/apache/shardingsphere/elasticjob/error/handler/wechat/WechatConfiguration.java
@@ -22,6 +22,9 @@ import lombok.RequiredArgsConstructor;
import java.util.Properties;
+/**
+ * Wechat configuration.
+ */
@Getter
@RequiredArgsConstructor
public final class WechatConfiguration {
@@ -33,10 +36,10 @@ public final class WechatConfiguration {
private final Integer readTimeout;
/**
- * Get wechat config.
+ * Get wechat configuration.
*
- * @param props props
- * @return wechat config.
+ * @param props properties
+ * @return wechat configuration
*/
public static WechatConfiguration getByProps(final Properties props) {
return new WechatConfiguration(props.getProperty(WechatConstants.WECHAT_WEBHOOK),
diff --git a/elasticjob-error-handler/elasticjob-error-handler-type/elasticjob-error-handler-wechat/src/main/java/org/apache/shardingsphere/elasticjob/error/handler/wechat/WechatConstants.java b/elasticjob-error-handler/elasticjob-error-handler-type/elasticjob-error-handler-wechat/src/main/java/org/apache/shardingsphere/elasticjob/error/handler/wechat/WechatConstants.java
index b5e3822..bb1318b 100644
--- a/elasticjob-error-handler/elasticjob-error-handler-type/elasticjob-error-handler-wechat/src/main/java/org/apache/shardingsphere/elasticjob/error/handler/wechat/WechatConstants.java
+++ b/elasticjob-error-handler/elasticjob-error-handler-type/elasticjob-error-handler-wechat/src/main/java/org/apache/shardingsphere/elasticjob/error/handler/wechat/WechatConstants.java
@@ -17,6 +17,9 @@
package org.apache.shardingsphere.elasticjob.error.handler.wechat;
+/**
+ * Wechat constants.
+ */
public final class WechatConstants {
public static final String PREFIX = "wechat.";
diff --git a/elasticjob-error-handler/elasticjob-error-handler-type/elasticjob-error-handler-wechat/src/test/java/org/apache/shardingsphere/elasticjob/error/handler/wechat/fixture/WechatInternalController.java b/elasticjob-error-handler/elasticjob-error-handler-type/elasticjob-error-handler-wechat/src/test/java/org/apache/shardingsphere/elasticjob/error/handler/wechat/fixture/WechatInternalController.java
index 17a6477..60df88f 100644
--- a/elasticjob-error-handler/elasticjob-error-handler-type/elasticjob-error-handler-wechat/src/test/java/org/apache/shardingsphere/elasticjob/error/handler/wechat/fixture/WechatInternalController.java
+++ b/elasticjob-error-handler/elasticjob-error-handler-type/elasticjob-error-handler-wechat/src/test/java/org/apache/shardingsphere/elasticjob/error/handler/wechat/fixture/WechatInternalController.java
@@ -19,7 +19,6 @@ package org.apache.shardingsphere.elasticjob.error.handler.wechat.fixture;
import com.google.common.collect.ImmutableMap;
import lombok.SneakyThrows;
-import lombok.extern.slf4j.Slf4j;
import org.apache.shardingsphere.elasticjob.infra.json.GsonFactory;
import org.apache.shardingsphere.elasticjob.restful.Http;
import org.apache.shardingsphere.elasticjob.restful.RestfulController;
@@ -27,7 +26,6 @@ import org.apache.shardingsphere.elasticjob.restful.annotation.Mapping;
import org.apache.shardingsphere.elasticjob.restful.annotation.Param;
import org.apache.shardingsphere.elasticjob.restful.annotation.ParamSource;
-@Slf4j
public final class WechatInternalController implements RestfulController {
private static final String KEY = "TLQEC0cPivqV1MkT0IPMtzunTBBVyIV3";
@@ -36,7 +34,7 @@ public final class WechatInternalController implements RestfulController {
* Send wechat message.
*
* @param key access token
- * @return Send Result.
+ * @return send Result
*/
@SneakyThrows
@Mapping(method = Http.POST, path = "/send")
diff --git a/elasticjob-error-handler/elasticjob-error-handler-type/elasticjob-error-handler-wechat/src/test/resources/conf/error-handler-wechat.yaml b/elasticjob-error-handler/elasticjob-error-handler-type/elasticjob-error-handler-wechat/src/test/resources/conf/error-handler-wechat.yaml
index cef9ce0..17bd40d 100644
--- a/elasticjob-error-handler/elasticjob-error-handler-type/elasticjob-error-handler-wechat/src/test/resources/conf/error-handler-wechat.yaml
+++ b/elasticjob-error-handler/elasticjob-error-handler-type/elasticjob-error-handler-wechat/src/test/resources/conf/error-handler-wechat.yaml
@@ -19,5 +19,3 @@ wechat:
webhook: http://localhost:9876/send?key=TLQEC0cPivqV1MkT0IPMtzunTBBVyIV3
connectTimeout: 5000
readTimeout: 3000
-
-
diff --git a/elasticjob-executor/elasticjob-executor-kernel/src/main/java/org/apache/shardingsphere/elasticjob/executor/JobFacade.java b/elasticjob-executor/elasticjob-executor-kernel/src/main/java/org/apache/shardingsphere/elasticjob/executor/JobFacade.java
index 1e89f63..03fb1c6 100644
--- a/elasticjob-executor/elasticjob-executor-kernel/src/main/java/org/apache/shardingsphere/elasticjob/executor/JobFacade.java
+++ b/elasticjob-executor/elasticjob-executor-kernel/src/main/java/org/apache/shardingsphere/elasticjob/executor/JobFacade.java
@@ -39,7 +39,7 @@ public interface JobFacade {
JobConfiguration loadJobConfiguration(boolean fromCache);
/**
- * check job execution environment.
+ * Check job execution environment.
*
* @throws JobExecutionEnvironmentException job execution environment exception
*/
diff --git a/elasticjob-executor/elasticjob-executor-kernel/src/main/java/org/apache/shardingsphere/elasticjob/executor/item/JobItemExecutorFactory.java b/elasticjob-executor/elasticjob-executor-kernel/src/main/java/org/apache/shardingsphere/elasticjob/executor/item/JobItemExecutorFactory.java
index 2d758f3..af02b4d 100644
--- a/elasticjob-executor/elasticjob-executor-kernel/src/main/java/org/apache/shardingsphere/elasticjob/executor/item/JobItemExecutorFactory.java
+++ b/elasticjob-executor/elasticjob-executor-kernel/src/main/java/org/apache/shardingsphere/elasticjob/executor/item/JobItemExecutorFactory.java
@@ -33,6 +33,7 @@ import java.util.ServiceLoader;
/**
* Job item executor factory.
*/
+@SuppressWarnings("rawtypes")
@NoArgsConstructor(access = AccessLevel.PRIVATE)
public final class JobItemExecutorFactory {
diff --git a/elasticjob-executor/elasticjob-executor-type/elasticjob-http-executor/src/test/java/org/apache/shardingsphere/elasticjob/http/executor/fixture/InternalController.java b/elasticjob-executor/elasticjob-executor-type/elasticjob-http-executor/src/test/java/org/apache/shardingsphere/elasticjob/http/executor/fixture/InternalController.java
index 9c3edee..6c58132 100644
--- a/elasticjob-executor/elasticjob-executor-type/elasticjob-http-executor/src/test/java/org/apache/shardingsphere/elasticjob/http/executor/fixture/InternalController.java
+++ b/elasticjob-executor/elasticjob-executor-type/elasticjob-http-executor/src/test/java/org/apache/shardingsphere/elasticjob/http/executor/fixture/InternalController.java
@@ -32,7 +32,7 @@ public final class InternalController implements RestfulController {
/**
* Get name.
*
- * @return "ejob"
+ * @return control name
*/
@Mapping(method = Http.GET, path = "/getName")
public String getName() {
@@ -42,8 +42,8 @@ public final class InternalController implements RestfulController {
/**
* Get sharding context.
*
- * @param shardingContext the shardingContext
- * @return shardingContext
+ * @param shardingContext sharding context
+ * @return sharding context
*/
@Mapping(method = Http.GET, path = "/getShardingContext")
public String getShardingContext(@Param(name = "shardingContext", source = ParamSource.HEADER) final String shardingContext) {
@@ -55,7 +55,7 @@ public final class InternalController implements RestfulController {
* Update name.
*
* @param updateName the name
- * @return the updated name
+ * @return updated name
*/
@Mapping(method = Http.POST, path = "/{updateName}")
public String postName(@Param(name = "updateName", source = ParamSource.PATH) final String updateName) {
diff --git a/elasticjob-infra/elasticjob-infra-common/src/main/java/org/apache/shardingsphere/elasticjob/infra/concurrent/BlockUtils.java b/elasticjob-infra/elasticjob-infra-common/src/main/java/org/apache/shardingsphere/elasticjob/infra/concurrent/BlockUtils.java
index 2040442..6cce9c2 100644
--- a/elasticjob-infra/elasticjob-infra-common/src/main/java/org/apache/shardingsphere/elasticjob/infra/concurrent/BlockUtils.java
+++ b/elasticjob-infra/elasticjob-infra-common/src/main/java/org/apache/shardingsphere/elasticjob/infra/concurrent/BlockUtils.java
@@ -25,14 +25,14 @@ import lombok.NoArgsConstructor;
*/
@NoArgsConstructor(access = AccessLevel.PRIVATE)
public final class BlockUtils {
-
+
/**
* Wait short time.
*/
public static void waitingShortTime() {
sleep(100L);
}
-
+
/**
* Sleep for the specified number of milliseconds.
*
diff --git a/elasticjob-infra/elasticjob-infra-common/src/main/java/org/apache/shardingsphere/elasticjob/infra/context/ExecutionType.java b/elasticjob-infra/elasticjob-infra-common/src/main/java/org/apache/shardingsphere/elasticjob/infra/context/ExecutionType.java
index a39fc74..4f9b291 100755
--- a/elasticjob-infra/elasticjob-infra-common/src/main/java/org/apache/shardingsphere/elasticjob/infra/context/ExecutionType.java
+++ b/elasticjob-infra/elasticjob-infra-common/src/main/java/org/apache/shardingsphere/elasticjob/infra/context/ExecutionType.java
@@ -21,12 +21,12 @@ package org.apache.shardingsphere.elasticjob.infra.context;
* Execution type.
*/
public enum ExecutionType {
-
+
/**
* Ready of execute.
*/
READY,
-
+
/**
* Failover execution.
*/
diff --git a/elasticjob-infra/elasticjob-infra-common/src/main/java/org/apache/shardingsphere/elasticjob/infra/context/TaskContext.java b/elasticjob-infra/elasticjob-infra-common/src/main/java/org/apache/shardingsphere/elasticjob/infra/context/TaskContext.java
index 7e09a93..f03b311 100755
--- a/elasticjob-infra/elasticjob-infra-common/src/main/java/org/apache/shardingsphere/elasticjob/infra/context/TaskContext.java
+++ b/elasticjob-infra/elasticjob-infra-common/src/main/java/org/apache/shardingsphere/elasticjob/infra/context/TaskContext.java
@@ -70,7 +70,7 @@ public final class TaskContext {
this.type = type;
this.slaveId = slaveId;
}
-
+
/**
* Get task context via task ID.
*
@@ -82,7 +82,7 @@ public final class TaskContext {
Preconditions.checkState(5 == result.length);
return new TaskContext(id, MetaInfo.from(result[0] + DELIMITER + result[1]), ExecutionType.valueOf(result[2]), result[3]);
}
-
+
/**
* Get unassigned task ID before job execute.
*
@@ -92,7 +92,7 @@ public final class TaskContext {
public static String getIdForUnassignedSlave(final String id) {
return id.replaceAll(TaskContext.from(id).getSlaveId(), UNASSIGNED_SLAVE_ID);
}
-
+
/**
* Set job server ID.
*
@@ -102,7 +102,7 @@ public final class TaskContext {
id = id.replaceAll(this.slaveId, slaveId);
this.slaveId = slaveId;
}
-
+
/**
* Get task name.
*
@@ -111,7 +111,7 @@ public final class TaskContext {
public String getTaskName() {
return String.join(DELIMITER, metaInfo.toString(), type.toString(), slaveId);
}
-
+
/**
* Get executor ID.
*
@@ -121,7 +121,7 @@ public final class TaskContext {
public String getExecutorId(final String appName) {
return String.join(DELIMITER, appName, slaveId);
}
-
+
/**
* Task meta data.
*/
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 06b3575..e5a478b 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
@@ -40,9 +40,9 @@ public final class ElasticJobServiceLoader {
private static final ConcurrentMap<Class<?>, Collection<Class<?>>> SERVICES = new ConcurrentHashMap<>();
private static final ConcurrentMap<Class<?>, ConcurrentMap<String, TypedSPI>> TYPED_SERVICES = new ConcurrentHashMap<>();
-
+
private static final ConcurrentMap<Class<?>, ConcurrentMap<String, Class<?>>> TYPED_SERVICE_CLASSES = new ConcurrentHashMap<>();
-
+
/**
* Register SPI service.
*
@@ -81,7 +81,7 @@ public final class ElasticJobServiceLoader {
throw new ServiceLoaderInstantiationException(clazz, ex.getCause());
}
}
-
+
/**
* Register typeSPI service.
*
@@ -97,36 +97,38 @@ public final class ElasticJobServiceLoader {
}
ServiceLoader.load(typedService).forEach(each -> registerTypedServiceClass(typedService, (TypedSPI) each));
}
-
+
private static <T> 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 instance.
*
- * @param typedService service type
- * @param type specific service type
- * @param <T> specific type of service
+ * @param typedService typed service
+ * @param type type
+ * @param <T> class of service
* @return cached service instance
*/
+ @SuppressWarnings("unchecked")
public static <T extends TypedSPI> T getCachedInstance(final Class<T> typedService, final String type) {
- T instance = TYPED_SERVICES.containsKey(typedService) ? (T) TYPED_SERVICES.get(typedService).get(type) : null;
- if (null == instance) {
+ T result = TYPED_SERVICES.containsKey(typedService) ? (T) TYPED_SERVICES.get(typedService).get(type) : null;
+ if (null == result) {
throw new JobConfigurationException("Cannot find a cached typed service instance by the interface: @" + typedService.getName() + "and type: " + type);
}
- return instance;
+ return result;
}
-
+
/**
* New typed instance.
*
- * @param typedService service type
- * @param type specific service type
- * @param <T> specific type of service
- * @return specific typed service instance
+ * @param typedService typed service
+ * @param type type
+ * @param <T> class of service
+ * @return new service instance
*/
+ @SuppressWarnings("unchecked")
public static <T extends TypedSPI> T newTypedServiceInstance(final Class<T> typedService, final String type) {
Class<?> instanceClass = TYPED_SERVICE_CLASSES.containsKey(typedService) ? TYPED_SERVICE_CLASSES.get(typedService).get(type) : null;
if (null == instanceClass) {
@@ -134,5 +136,4 @@ public final class ElasticJobServiceLoader {
}
return (T) newServiceInstance(instanceClass);
}
-
}
diff --git a/elasticjob-infra/elasticjob-infra-common/src/main/java/org/apache/shardingsphere/elasticjob/infra/yaml/YamlEngine.java b/elasticjob-infra/elasticjob-infra-common/src/main/java/org/apache/shardingsphere/elasticjob/infra/yaml/YamlEngine.java
index 0ee19a5..3f0e92b 100644
--- a/elasticjob-infra/elasticjob-infra-common/src/main/java/org/apache/shardingsphere/elasticjob/infra/yaml/YamlEngine.java
+++ b/elasticjob-infra/elasticjob-infra-common/src/main/java/org/apache/shardingsphere/elasticjob/infra/yaml/YamlEngine.java
@@ -64,6 +64,7 @@ public final class YamlEngine {
* @param <T> type of class
* @return object from YAML
*/
+ @SuppressWarnings({"unchecked", "rawtypes"})
public static <T> T unmarshal(final String prefix, final InputStream configFileInput, final Class<T> classType) {
Map<String, Object> configDataMap = new Yaml().loadAs(configFileInput, Map.class);
if (null != configDataMap && StringUtils.isNotBlank(prefix)) {
diff --git a/elasticjob-infra/elasticjob-infra-common/src/main/resources/META-INF/services/org.apache.shardingsphere.elasticjob.infra.listener.ElasticJobListener b/elasticjob-infra/elasticjob-infra-common/src/main/resources/META-INF/services/org.apache.shardingsphere.elasticjob.infra.listener.ElasticJobListener
deleted file mode 100644
index 6222972..0000000
--- a/elasticjob-infra/elasticjob-infra-common/src/main/resources/META-INF/services/org.apache.shardingsphere.elasticjob.infra.listener.ElasticJobListener
+++ /dev/null
@@ -1,17 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements. See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
diff --git a/elasticjob-infra/elasticjob-infra-common/src/test/java/org/apache/shardingsphere/elasticjob/infra/listener/ElasticJobListenerFactoryTest.java b/elasticjob-infra/elasticjob-infra-common/src/test/java/org/apache/shardingsphere/elasticjob/infra/listener/ElasticJobListenerFactoryTest.java
index e25ebb9..45795aa 100644
--- a/elasticjob-infra/elasticjob-infra-common/src/test/java/org/apache/shardingsphere/elasticjob/infra/listener/ElasticJobListenerFactoryTest.java
+++ b/elasticjob-infra/elasticjob-infra-common/src/test/java/org/apache/shardingsphere/elasticjob/infra/listener/ElasticJobListenerFactoryTest.java
@@ -25,12 +25,12 @@ import static org.hamcrest.CoreMatchers.instanceOf;
import static org.junit.Assert.assertThat;
public final class ElasticJobListenerFactoryTest {
-
+
@Test(expected = JobConfigurationException.class)
public void assertCreateInvalidJobListener() {
ElasticJobListenerFactory.createListener("INVALID").orElseThrow(() -> new JobConfigurationException("Invalid elastic job listener!"));
}
-
+
@Test
public void assertCreatJobListener() {
assertThat(ElasticJobListenerFactory.createListener("fooElasticJobListener").orElse(null), instanceOf(FooElasticJobListener.class));
diff --git a/elasticjob-infra/elasticjob-infra-common/src/test/java/org/apache/shardingsphere/elasticjob/infra/listener/fixture/FooElasticJobListener.java b/elasticjob-infra/elasticjob-infra-common/src/test/java/org/apache/shardingsphere/elasticjob/infra/listener/fixture/FooElasticJobListener.java
index d09c6aa..5f19fb6 100644
--- a/elasticjob-infra/elasticjob-infra-common/src/test/java/org/apache/shardingsphere/elasticjob/infra/listener/fixture/FooElasticJobListener.java
+++ b/elasticjob-infra/elasticjob-infra-common/src/test/java/org/apache/shardingsphere/elasticjob/infra/listener/fixture/FooElasticJobListener.java
@@ -29,7 +29,7 @@ public final class FooElasticJobListener implements ElasticJobListener {
@Override
public void afterJobExecuted(final ShardingContexts shardingContexts) {
}
-
+
@Override
public String getType() {
return "fooElasticJobListener";
diff --git a/elasticjob-infra/elasticjob-infra-common/src/test/resources/META-INF/services/org.apache.shardingsphere.elasticjob.infra.listener.ElasticJobListener b/elasticjob-infra/elasticjob-infra-common/src/test/resources/META-INF/services/org.apache.shardingsphere.elasticjob.infra.listener.ElasticJobListener
index 7da098d..f968a91 100644
--- a/elasticjob-infra/elasticjob-infra-common/src/test/resources/META-INF/services/org.apache.shardingsphere.elasticjob.infra.listener.ElasticJobListener
+++ b/elasticjob-infra/elasticjob-infra-common/src/test/resources/META-INF/services/org.apache.shardingsphere.elasticjob.infra.listener.ElasticJobListener
@@ -15,21 +15,4 @@
# limitations under the License.
#
-#
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements. See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
org.apache.shardingsphere.elasticjob.infra.listener.fixture.FooElasticJobListener
diff --git a/elasticjob-infra/elasticjob-restful/src/main/java/org/apache/shardingsphere/elasticjob/restful/RestfulController.java b/elasticjob-infra/elasticjob-restful/src/main/java/org/apache/shardingsphere/elasticjob/restful/RestfulController.java
index a12688f..130ab81 100644
--- a/elasticjob-infra/elasticjob-restful/src/main/java/org/apache/shardingsphere/elasticjob/restful/RestfulController.java
+++ b/elasticjob-infra/elasticjob-restful/src/main/java/org/apache/shardingsphere/elasticjob/restful/RestfulController.java
@@ -18,7 +18,7 @@
package org.apache.shardingsphere.elasticjob.restful;
/**
- * Mark a class as RestfulController.
+ * RESTFul controller.
*/
public interface RestfulController {
}
diff --git a/elasticjob-infra/elasticjob-restful/src/main/java/org/apache/shardingsphere/elasticjob/restful/RestfulService.java b/elasticjob-infra/elasticjob-restful/src/main/java/org/apache/shardingsphere/elasticjob/restful/RestfulService.java
index 2abb8bf..bad682d 100644
--- a/elasticjob-infra/elasticjob-restful/src/main/java/org/apache/shardingsphere/elasticjob/restful/RestfulService.java
+++ b/elasticjob-infra/elasticjob-restful/src/main/java/org/apache/shardingsphere/elasticjob/restful/RestfulService.java
@@ -23,12 +23,12 @@ package org.apache.shardingsphere.elasticjob.restful;
public interface RestfulService {
/**
- * Start Restful Service.
+ * Start RESTFul service.
*/
void startup();
/**
- * Shutdown Restful Service.
+ * Shutdown RESTFul service.
*/
void shutdown();
}
diff --git a/elasticjob-infra/elasticjob-restful/src/main/java/org/apache/shardingsphere/elasticjob/restful/handler/ExceptionHandleResult.java b/elasticjob-infra/elasticjob-restful/src/main/java/org/apache/shardingsphere/elasticjob/restful/handler/ExceptionHandleResult.java
index 2b6e8c6..57cf5b2 100644
--- a/elasticjob-infra/elasticjob-restful/src/main/java/org/apache/shardingsphere/elasticjob/restful/handler/ExceptionHandleResult.java
+++ b/elasticjob-infra/elasticjob-restful/src/main/java/org/apache/shardingsphere/elasticjob/restful/handler/ExceptionHandleResult.java
@@ -24,7 +24,7 @@ import org.apache.shardingsphere.elasticjob.restful.Http;
@Builder
@Getter
public final class ExceptionHandleResult {
-
+
private final Object result;
@Builder.Default
diff --git a/elasticjob-infra/elasticjob-restful/src/main/java/org/apache/shardingsphere/elasticjob/restful/handler/HandlerMappingRegistry.java b/elasticjob-infra/elasticjob-restful/src/main/java/org/apache/shardingsphere/elasticjob/restful/handler/HandlerMappingRegistry.java
index 33b001e..a4e81e5 100644
--- a/elasticjob-infra/elasticjob-restful/src/main/java/org/apache/shardingsphere/elasticjob/restful/handler/HandlerMappingRegistry.java
+++ b/elasticjob-infra/elasticjob-restful/src/main/java/org/apache/shardingsphere/elasticjob/restful/handler/HandlerMappingRegistry.java
@@ -38,8 +38,8 @@ public final class HandlerMappingRegistry {
/**
* Get a MappingContext with Handler for the request.
*
- * @param httpRequest Http request
- * @return A MappingContext if matched. Return null if mismatched.
+ * @param httpRequest HTTP request
+ * @return A MappingContext if matched, return null if mismatched.
*/
public MappingContext<Handler> getMappingContext(final HttpRequest httpRequest) {
UrlPatternMap<Handler> urlPatternMap = mappings.get(httpRequest.method());
@@ -52,9 +52,9 @@ public final class HandlerMappingRegistry {
/**
* Add a Handler for a path pattern.
*
- * @param method HTTP method
- * @param pathPattern Path pattern
- * @param handler Handler
+ * @param method HTTP method
+ * @param pathPattern path pattern
+ * @param handler handler
*/
public void addMapping(final HttpMethod method, final String pathPattern, final Handler handler) {
mappings.computeIfAbsent(method, httpMethod -> new RegexUrlPatternMap<>());
diff --git a/elasticjob-infra/elasticjob-restful/src/main/java/org/apache/shardingsphere/elasticjob/restful/mapping/MappingContext.java b/elasticjob-infra/elasticjob-restful/src/main/java/org/apache/shardingsphere/elasticjob/restful/mapping/MappingContext.java
index 4b4e2b5..68928a6 100644
--- a/elasticjob-infra/elasticjob-restful/src/main/java/org/apache/shardingsphere/elasticjob/restful/mapping/MappingContext.java
+++ b/elasticjob-infra/elasticjob-restful/src/main/java/org/apache/shardingsphere/elasticjob/restful/mapping/MappingContext.java
@@ -18,23 +18,23 @@
package org.apache.shardingsphere.elasticjob.restful.mapping;
/**
- * MappingContext will hold a path pattern and a payload.
+ * Mapping context will hold a path pattern and a payload.
*
- * @param <T> Payload type
+ * @param <T> payload type
*/
public interface MappingContext<T> {
/**
- * The path pattern of this MappingContext.
+ * The path pattern of mapping context.
*
- * @return Path pattern
+ * @return path pattern
*/
String pattern();
/**
- * Payload of this MappingContext.
+ * Payload of mapping context.
*
- * @return Payload
+ * @return payload
*/
T payload();
}
diff --git a/elasticjob-infra/elasticjob-restful/src/main/java/org/apache/shardingsphere/elasticjob/restful/mapping/PathMatcher.java b/elasticjob-infra/elasticjob-restful/src/main/java/org/apache/shardingsphere/elasticjob/restful/mapping/PathMatcher.java
index 7588d27..a9c6226 100644
--- a/elasticjob-infra/elasticjob-restful/src/main/java/org/apache/shardingsphere/elasticjob/restful/mapping/PathMatcher.java
+++ b/elasticjob-infra/elasticjob-restful/src/main/java/org/apache/shardingsphere/elasticjob/restful/mapping/PathMatcher.java
@@ -34,17 +34,17 @@ public interface PathMatcher {
* Capture actual values of placeholder.
* The format of Path pattern likes <code>/app/{jobName}/{status}</code>.
*
- * @param pathPattern Path pattern contains templates
- * @param path Actual path
- * @return Map from template name to actual value
+ * @param pathPattern path pattern contains templates
+ * @param path actual path
+ * @return map from template name to actual value
*/
Map<String, String> captureVariables(String pathPattern, String path);
/**
* Check if the path pattern matches the given path.
*
- * @param pathPattern Path pattern
- * @param path The path to check
+ * @param pathPattern path pattern
+ * @param path the path to check
* @return true if matched, or else false
*/
boolean matches(String pathPattern, String path);
@@ -52,7 +52,7 @@ public interface PathMatcher {
/**
* Check if the given string is a valid path pattern.
*
- * @param pathPattern Path pattern to check
+ * @param pathPattern path pattern to check
* @return true if valid, or else false
*/
boolean isValidPathPattern(String pathPattern);
diff --git a/elasticjob-infra/elasticjob-restful/src/main/java/org/apache/shardingsphere/elasticjob/restful/mapping/RegexPathMatcher.java b/elasticjob-infra/elasticjob-restful/src/main/java/org/apache/shardingsphere/elasticjob/restful/mapping/RegexPathMatcher.java
index 53c2e55..8458737 100644
--- a/elasticjob-infra/elasticjob-restful/src/main/java/org/apache/shardingsphere/elasticjob/restful/mapping/RegexPathMatcher.java
+++ b/elasticjob-infra/elasticjob-restful/src/main/java/org/apache/shardingsphere/elasticjob/restful/mapping/RegexPathMatcher.java
@@ -78,15 +78,15 @@ public final class RegexPathMatcher implements PathMatcher {
private List<String> extractTemplateNames(final String pathPattern) {
String[] pathFragments = pathPattern.split(PATH_SEPARATOR);
- List<String> names = new ArrayList<>();
+ List<String> result = new ArrayList<>();
for (String fragment : pathFragments) {
int start = fragment.indexOf('{');
int end = fragment.lastIndexOf('}');
if (-1 != start && -1 != end) {
- names.add(fragment.substring(start + 1, end));
+ result.add(fragment.substring(start + 1, end));
}
}
- return names;
+ return result;
}
private String trimUriQuery(final String uri) {
diff --git a/elasticjob-infra/elasticjob-restful/src/main/java/org/apache/shardingsphere/elasticjob/restful/mapping/UrlPatternMap.java b/elasticjob-infra/elasticjob-restful/src/main/java/org/apache/shardingsphere/elasticjob/restful/mapping/UrlPatternMap.java
index cd96c46..361caca 100644
--- a/elasticjob-infra/elasticjob-restful/src/main/java/org/apache/shardingsphere/elasticjob/restful/mapping/UrlPatternMap.java
+++ b/elasticjob-infra/elasticjob-restful/src/main/java/org/apache/shardingsphere/elasticjob/restful/mapping/UrlPatternMap.java
@@ -18,7 +18,7 @@
package org.apache.shardingsphere.elasticjob.restful.mapping;
/**
- * UrlPatternMap is used for path pattern storage and path matching.
+ * URL pattern map is used for path pattern storage and path matching.
* {@link MappingContext} is an object holding path pattern and payload.
*
* @param <V> Type of payload
@@ -26,18 +26,18 @@ package org.apache.shardingsphere.elasticjob.restful.mapping;
public interface UrlPatternMap<V> {
/**
- * Add a path pattern and value to UrlPatternMap.
+ * Add a path pattern and value to URL pattern map.
*
- * @param pathPattern Path pattern
- * @param value Payload of the path pattern
+ * @param pathPattern path pattern
+ * @param value payload of the path pattern
*/
void put(String pathPattern, V value);
/**
- * Find a proper MappingContext for current path.
+ * Find a proper mapping context for current path.
*
- * @param path A path to match.
- * @return A MappingContext if the path matched a pattern. Return null if mismatched.
+ * @param path a path to match.
+ * @return a mapping context if the path matched a pattern, return null if mismatched.
*/
MappingContext<V> match(String path);
}
diff --git a/elasticjob-infra/elasticjob-restful/src/main/java/org/apache/shardingsphere/elasticjob/restful/pipeline/ExceptionHandling.java b/elasticjob-infra/elasticjob-restful/src/main/java/org/apache/shardingsphere/elasticjob/restful/pipeline/ExceptionHandling.java
index e280c1f..a1b1903 100644
--- a/elasticjob-infra/elasticjob-restful/src/main/java/org/apache/shardingsphere/elasticjob/restful/pipeline/ExceptionHandling.java
+++ b/elasticjob-infra/elasticjob-restful/src/main/java/org/apache/shardingsphere/elasticjob/restful/pipeline/ExceptionHandling.java
@@ -40,7 +40,7 @@ import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
/**
- * Catch exceptions and look for a ExceptionHandler.
+ * Catch exceptions and look for exception handler.
*/
@Slf4j
@Sharable
diff --git a/elasticjob-infra/elasticjob-restful/src/main/java/org/apache/shardingsphere/elasticjob/restful/pipeline/HandlerParameterDecoder.java b/elasticjob-infra/elasticjob-restful/src/main/java/org/apache/shardingsphere/elasticjob/restful/pipeline/HandlerParameterDecoder.java
index 0616141..d0e8cf2 100644
--- a/elasticjob-infra/elasticjob-restful/src/main/java/org/apache/shardingsphere/elasticjob/restful/pipeline/HandlerParameterDecoder.java
+++ b/elasticjob-infra/elasticjob-restful/src/main/java/org/apache/shardingsphere/elasticjob/restful/pipeline/HandlerParameterDecoder.java
@@ -68,7 +68,7 @@ public final class HandlerParameterDecoder extends ChannelInboundHandlerAdapter
List<HandlerParameter> handlerParameters = handler.getHandlerParameters();
Map<String, List<String>> queryParameters = parseQuery(httpRequest.uri());
Map<String, String> templateVariables = pathMatcher.captureVariables(mappingContext.pattern(), httpRequest.uri());
- Object[] args = new Object[handlerParameters.size()];
+ Object[] result = new Object[handlerParameters.size()];
boolean requestBodyAlreadyParsed = false;
for (int i = 0; i < handlerParameters.size(); i++) {
HandlerParameter handlerParameter = handlerParameters.get(i);
@@ -115,9 +115,9 @@ public final class HandlerParameterDecoder extends ChannelInboundHandlerAdapter
break;
default:
}
- args[i] = parsedValue;
+ result[i] = parsedValue;
}
- return args;
+ return result;
}
private Map<String, List<String>> parseQuery(final String uri) {
diff --git a/elasticjob-infra/elasticjob-restful/src/main/java/org/apache/shardingsphere/elasticjob/restful/pipeline/HttpRequestDispatcher.java b/elasticjob-infra/elasticjob-restful/src/main/java/org/apache/shardingsphere/elasticjob/restful/pipeline/HttpRequestDispatcher.java
index 52a8e2e..b927d98 100644
--- a/elasticjob-infra/elasticjob-restful/src/main/java/org/apache/shardingsphere/elasticjob/restful/pipeline/HttpRequestDispatcher.java
+++ b/elasticjob-infra/elasticjob-restful/src/main/java/org/apache/shardingsphere/elasticjob/restful/pipeline/HttpRequestDispatcher.java
@@ -37,7 +37,7 @@ import java.util.List;
import java.util.Optional;
/**
- * If a HTTP request reached, HttpRequestDispatcher would lookup a proper Handler for the request.
+ * If a HTTP request reached, HTTP request dispatcher would lookup a proper Handler for the request.
* Assemble a {@link HandleContext} with HTTP request and {@link MappingContext}, then pass it to the next in-bound handler.
*/
@Sharable
diff --git a/elasticjob-infra/elasticjob-restful/src/main/java/org/apache/shardingsphere/elasticjob/restful/serializer/ResponseBodySerializer.java b/elasticjob-infra/elasticjob-restful/src/main/java/org/apache/shardingsphere/elasticjob/restful/serializer/ResponseBodySerializer.java
index 6c5c22d..2aefd3c 100644
--- a/elasticjob-infra/elasticjob-restful/src/main/java/org/apache/shardingsphere/elasticjob/restful/serializer/ResponseBodySerializer.java
+++ b/elasticjob-infra/elasticjob-restful/src/main/java/org/apache/shardingsphere/elasticjob/restful/serializer/ResponseBodySerializer.java
@@ -32,7 +32,7 @@ public interface ResponseBodySerializer {
/**
* Serialize object to bytes.
*
- * @param responseBody Object to be serialized
+ * @param responseBody object to be serialized
* @return bytes
*/
byte[] serialize(Object responseBody);
diff --git a/elasticjob-infra/elasticjob-restful/src/main/java/org/apache/shardingsphere/elasticjob/restful/serializer/ResponseBodySerializerFactory.java b/elasticjob-infra/elasticjob-restful/src/main/java/org/apache/shardingsphere/elasticjob/restful/serializer/ResponseBodySerializerFactory.java
index 63a2bb4..1387480 100644
--- a/elasticjob-infra/elasticjob-restful/src/main/java/org/apache/shardingsphere/elasticjob/restful/serializer/ResponseBodySerializerFactory.java
+++ b/elasticjob-infra/elasticjob-restful/src/main/java/org/apache/shardingsphere/elasticjob/restful/serializer/ResponseBodySerializerFactory.java
@@ -72,7 +72,7 @@ public final class ResponseBodySerializerFactory {
* </p>
*
* @param contentType HTTP content type
- * @return Serializer
+ * @return serializer
*/
public static ResponseBodySerializer getResponseBodySerializer(final String contentType) {
ResponseBodySerializer result = RESPONSE_BODY_SERIALIZERS.get(contentType);
diff --git a/elasticjob-infra/elasticjob-restful/src/main/java/org/apache/shardingsphere/elasticjob/restful/serializer/factory/SerializerFactory.java b/elasticjob-infra/elasticjob-restful/src/main/java/org/apache/shardingsphere/elasticjob/restful/serializer/factory/SerializerFactory.java
index 3591fff..4f10d92 100644
--- a/elasticjob-infra/elasticjob-restful/src/main/java/org/apache/shardingsphere/elasticjob/restful/serializer/factory/SerializerFactory.java
+++ b/elasticjob-infra/elasticjob-restful/src/main/java/org/apache/shardingsphere/elasticjob/restful/serializer/factory/SerializerFactory.java
@@ -37,7 +37,7 @@ public interface SerializerFactory {
/**
* Serializer factory method.
*
- * @return Instance of serializer
+ * @return instance of serializer
*/
ResponseBodySerializer createSerializer();
}
diff --git a/elasticjob-infra/elasticjob-restful/src/main/java/org/apache/shardingsphere/elasticjob/restful/wrapper/QueryParameterMap.java b/elasticjob-infra/elasticjob-restful/src/main/java/org/apache/shardingsphere/elasticjob/restful/wrapper/QueryParameterMap.java
index f78b2d4..2902d9f 100644
--- a/elasticjob-infra/elasticjob-restful/src/main/java/org/apache/shardingsphere/elasticjob/restful/wrapper/QueryParameterMap.java
+++ b/elasticjob-infra/elasticjob-restful/src/main/java/org/apache/shardingsphere/elasticjob/restful/wrapper/QueryParameterMap.java
@@ -43,8 +43,8 @@ public final class QueryParameterMap extends AbstractMap<String, List<String>> {
/**
* Get values by parameter name.
*
- * @param parameterName Parameter name
- * @return Values
+ * @param parameterName parameter name
+ * @return values
*/
public List<String> get(final String parameterName) {
return queryMap.get(parameterName);
@@ -53,8 +53,8 @@ public final class QueryParameterMap extends AbstractMap<String, List<String>> {
/**
* Get the first from values.
*
- * @param parameterName Parameter name
- * @return The first value
+ * @param parameterName parameter name
+ * @return first value
*/
public String getFirst(final String parameterName) {
String firstValue = null;
@@ -76,10 +76,10 @@ public final class QueryParameterMap extends AbstractMap<String, List<String>> {
}
/**
- * Add a value.
+ * Add value.
*
- * @param parameterName Parameter name
- * @param value Value
+ * @param parameterName parameter name
+ * @param value value
*/
public void add(final String parameterName, final String value) {
List<String> values = queryMap.get(parameterName);
@@ -98,7 +98,7 @@ public final class QueryParameterMap extends AbstractMap<String, List<String>> {
/**
* Convert to a single value map, abandon values except the first of each parameter.
*
- * @return Single value map
+ * @return single value map
*/
public Map<String, String> toSingleValueMap() {
return queryMap.entrySet().stream().collect(Collectors.toMap(Map.Entry::getKey, entry -> entry.getValue().get(0)));
diff --git a/elasticjob-infra/elasticjob-restful/src/test/java/org/apache/shardingsphere/elasticjob/restful/controller/JobController.java b/elasticjob-infra/elasticjob-restful/src/test/java/org/apache/shardingsphere/elasticjob/restful/controller/JobController.java
index 7e1eee4..3ea5b60 100644
--- a/elasticjob-infra/elasticjob-restful/src/test/java/org/apache/shardingsphere/elasticjob/restful/controller/JobController.java
+++ b/elasticjob-infra/elasticjob-restful/src/test/java/org/apache/shardingsphere/elasticjob/restful/controller/JobController.java
@@ -35,27 +35,27 @@ public final class JobController implements RestfulController {
/**
* Pretend to create a job.
*
- * @param group Group
- * @param jobName Job name
- * @param cron Job cron
- * @param description Job description
- * @return Result
+ * @param group group
+ * @param jobName job name
+ * @param cron job cron
+ * @param description job description
+ * @return result
*/
@Mapping(method = Http.POST, path = "/{group}/{jobName}")
public JobPojo createJob(@Param(name = "group", source = ParamSource.PATH) final String group,
@Param(name = "jobName", source = ParamSource.PATH) final String jobName,
@Param(name = "cron", source = ParamSource.QUERY) final String cron,
@RequestBody final String description) {
- JobPojo jobPojo = new JobPojo();
- jobPojo.setName(jobName);
- jobPojo.setCron(cron);
- jobPojo.setGroup(group);
- jobPojo.setDescription(description);
- return jobPojo;
+ JobPojo result = new JobPojo();
+ result.setName(jobName);
+ result.setCron(cron);
+ result.setGroup(group);
+ result.setDescription(description);
+ return result;
}
/**
- * Throw an IllegalStateException.
+ * Throw an illegal state exception.
*
* @param message Exception message
* @return None
@@ -66,10 +66,10 @@ public final class JobController implements RestfulController {
}
/**
- * Throw an IllegalArgumentException.
+ * Throw an illegal argument exception.
*
- * @param message Exception message
- * @return None
+ * @param message exception message
+ * @return none
*/
@Mapping(method = Http.GET, path = "/throw/IllegalArgument")
public Object throwIllegalArgumentException(@Param(name = "Exception-Message", source = ParamSource.HEADER) final String message) {
@@ -79,8 +79,8 @@ public final class JobController implements RestfulController {
/**
* Return 204.
*
- * @param noop Useless
- * @return None
+ * @param noop useless
+ * @return none
*/
@Mapping(method = Http.GET, path = "/code/204")
@Returning(code = 204)
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 1e8c2f1..70753af 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
@@ -43,11 +43,11 @@ public final class HttpClient {
/**
* Send a HTTP request and invoke consumer when server response.
*
- * @param host Server host
- * @param port Server port
- * @param request HTTP request
- * @param consumer HTTP response consumer
- * @param timeoutSeconds Wait for consume
+ * @param host server host
+ * @param port server port
+ * @param request HTTP request
+ * @param consumer HTTP response consumer
+ * @param timeoutSeconds wait for consume
* @throws InterruptedException interrupted
*/
@SneakyThrows
diff --git a/elasticjob-lite/elasticjob-lite-lifecycle/src/main/java/org/apache/shardingsphere/elasticjob/lite/lifecycle/internal/reg/RegistryCenterFactory.java b/elasticjob-lite/elasticjob-lite-lifecycle/src/main/java/org/apache/shardingsphere/elasticjob/lite/lifecycle/internal/reg/RegistryCenterFactory.java
index d94ef23..79058cc 100644
--- a/elasticjob-lite/elasticjob-lite-lifecycle/src/main/java/org/apache/shardingsphere/elasticjob/lite/lifecycle/internal/reg/RegistryCenterFactory.java
+++ b/elasticjob-lite/elasticjob-lite-lifecycle/src/main/java/org/apache/shardingsphere/elasticjob/lite/lifecycle/internal/reg/RegistryCenterFactory.java
@@ -55,9 +55,9 @@ public final class RegistryCenterFactory {
}
HashCode hashCode = hasher.hash();
return REG_CENTER_REGISTRY.computeIfAbsent(hashCode, unused -> {
- final CoordinatorRegistryCenter coordinatorRegistryCenter = newCoordinatorRegistryCenter(connectString, namespace, digest);
- coordinatorRegistryCenter.init();
- return coordinatorRegistryCenter;
+ CoordinatorRegistryCenter result = newCoordinatorRegistryCenter(connectString, namespace, digest);
+ result.init();
+ return result;
});
}
diff --git a/elasticjob-lite/elasticjob-lite-lifecycle/src/main/java/org/apache/shardingsphere/elasticjob/lite/lifecycle/internal/statistics/JobStatisticsAPIImpl.java b/elasticjob-lite/elasticjob-lite-lifecycle/src/main/java/org/apache/shardingsphere/elasticjob/lite/lifecycle/internal/statistics/JobStatisticsAPIImpl.java
index f58d9d8..f410a86 100644
--- a/elasticjob-lite/elasticjob-lite-lifecycle/src/main/java/org/apache/shardingsphere/elasticjob/lite/lifecycle/internal/statistics/JobStatisticsAPIImpl.java
+++ b/elasticjob-lite/elasticjob-lite-lifecycle/src/main/java/org/apache/shardingsphere/elasticjob/lite/lifecycle/internal/statistics/JobStatisticsAPIImpl.java
@@ -140,7 +140,7 @@ public final class JobStatisticsAPIImpl implements JobStatisticsAPI {
JobBriefInfo result = new JobBriefInfo();
result.setJobName(jobName);
result.setStatus(getJobStatusByJobNameAndIp(jobName, ip));
- result.setInstanceCount(getJobInstanceCountByJobNameAndIp(jobName, ip));
+ result.setInstanceCount(getJobInstanceCountByJobNameAndIP(jobName, ip));
return result;
}
@@ -154,15 +154,15 @@ public final class JobStatisticsAPIImpl implements JobStatisticsAPI {
}
}
- private int getJobInstanceCountByJobNameAndIp(final String jobName, final String ip) {
- int instanceCount = 0;
+ private int getJobInstanceCountByJobNameAndIP(final String jobName, final String ip) {
+ int result = 0;
JobNodePath jobNodePath = new JobNodePath(jobName);
List<String> instances = regCenter.getChildrenKeys(jobNodePath.getInstancesNodePath());
for (String each : instances) {
if (ip.equals(each.split("@-@")[0])) {
- instanceCount++;
+ result++;
}
}
- return instanceCount;
+ return result;
}
}
diff --git a/elasticjob-lite/elasticjob-lite-lifecycle/src/test/java/org/apache/shardingsphere/elasticjob/lite/lifecycle/internal/operate/ShardingOperateAPIImplTest.java b/elasticjob-lite/elasticjob-lite-lifecycle/src/test/java/org/apache/shardingsphere/elasticjob/lite/lifecycle/internal/operate/ShardingOperateAPIImplTest.java
index be3eb55..9fc3656 100644
--- a/elasticjob-lite/elasticjob-lite-lifecycle/src/test/java/org/apache/shardingsphere/elasticjob/lite/lifecycle/internal/operate/ShardingOperateAPIImplTest.java
+++ b/elasticjob-lite/elasticjob-lite-lifecycle/src/test/java/org/apache/shardingsphere/elasticjob/lite/lifecycle/internal/operate/ShardingOperateAPIImplTest.java
@@ -45,11 +45,10 @@ public final class ShardingOperateAPIImplTest {
shardingOperateAPI.disable("test_job", "0");
verify(regCenter).persist("/test_job/sharding/0/disabled", "");
}
-
+
@Test
public void assertEnableSharding() {
shardingOperateAPI.enable("test_job", "0");
verify(regCenter).remove("/test_job/sharding/0/disabled");
}
-
}
diff --git a/elasticjob-lite/elasticjob-lite-spring/elasticjob-lite-spring-boot-starter/src/main/java/org/apache/shardingsphere/elasticjob/lite/spring/boot/job/ElasticJobConfigurationProperties.java b/elasticjob-lite/elasticjob-lite-spring/elasticjob-lite-spring-boot-starter/src/main/java/org/apache/shardingsphere/elasticjob/lite/spring/boot/job/ElasticJobConfigurationProperties.java
index ba9348d..87240d6 100644
--- a/elasticjob-lite/elasticjob-lite-spring/elasticjob-lite-spring-boot-starter/src/main/java/org/apache/shardingsphere/elasticjob/lite/spring/boot/job/ElasticJobConfigurationProperties.java
+++ b/elasticjob-lite/elasticjob-lite-spring/elasticjob-lite-spring-boot-starter/src/main/java/org/apache/shardingsphere/elasticjob/lite/spring/boot/job/ElasticJobConfigurationProperties.java
@@ -24,48 +24,51 @@ import org.apache.shardingsphere.elasticjob.api.JobConfiguration;
import java.util.Properties;
+/**
+ * ElasticJob configuration properties.
+ */
@Getter
@Setter
-public class ElasticJobConfigurationProperties {
-
+public final class ElasticJobConfigurationProperties {
+
private Class<? extends ElasticJob> elasticJobClass;
-
+
private String elasticJobType;
-
+
private String cron;
private String jobBootstrapBeanName;
-
+
private int shardingTotalCount;
-
+
private String shardingItemParameters;
-
+
private String jobParameter;
-
+
private boolean monitorExecution;
-
+
private boolean failover;
-
+
private boolean misfire;
-
+
private int maxTimeDiffSeconds = -1;
-
+
private int reconcileIntervalMinutes;
-
+
private String jobShardingStrategyType;
-
+
private String jobExecutorServiceHandlerType;
-
+
private String jobErrorHandlerType;
-
+
private String description;
-
+
private Properties props = new Properties();
-
+
private boolean disabled;
-
+
private boolean overwrite;
-
+
/**
* Convert to job configuration.
*
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 b068080..7db0f90 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
@@ -57,7 +57,7 @@ import java.util.Map.Entry;
public class ElasticJobLiteAutoConfiguration implements ApplicationContextAware {
private ApplicationContext applicationContext;
-
+
/**
* Create job bootstrap instances and register them into container.
*/
@@ -69,7 +69,7 @@ public class ElasticJobLiteAutoConfiguration implements ApplicationContextAware
TracingConfiguration tracingConfiguration = getTracingConfiguration();
constructJobBootstraps(elasticJobProperties, singletonBeanRegistry, registryCenter, tracingConfiguration);
}
-
+
private TracingConfiguration getTracingConfiguration() {
Map<String, TracingConfiguration> tracingConfigurationBeans = applicationContext.getBeansOfType(TracingConfiguration.class);
if (tracingConfigurationBeans.isEmpty()) {
@@ -82,7 +82,7 @@ public class ElasticJobLiteAutoConfiguration implements ApplicationContextAware
"More than one [org.apache.shardingsphere.elasticjob.tracing.api.TracingConfiguration] beans found. "
+ "Consider disabling [org.apache.shardingsphere.elasticjob.tracing.boot.ElasticJobTracingAutoConfiguration].");
}
-
+
private void constructJobBootstraps(final ElasticJobProperties elasticJobProperties, final SingletonBeanRegistry singletonBeanRegistry,
final CoordinatorRegistryCenter registryCenter, final TracingConfiguration tracingConfiguration) {
for (Entry<String, ElasticJobConfigurationProperties> entry : elasticJobProperties.getJobs().entrySet()) {
@@ -100,7 +100,7 @@ public class ElasticJobLiteAutoConfiguration implements ApplicationContextAware
}
}
}
-
+
private void registerClassedJob(final String jobName, final String jobBootstrapBeanName, final SingletonBeanRegistry singletonBeanRegistry, final CoordinatorRegistryCenter registryCenter,
final TracingConfiguration tracingConfiguration, final ElasticJobConfigurationProperties jobConfigurationProperties) {
JobConfiguration jobConfiguration = jobConfigurationProperties.toJobConfiguration(jobName);
@@ -115,7 +115,7 @@ public class ElasticJobLiteAutoConfiguration implements ApplicationContextAware
new ScheduleJobBootstrap(registryCenter, elasticJob, jobConfiguration, tracingConfiguration));
}
}
-
+
private void registerTypedJob(final String jobName, final String jobBootstrapBeanName, final SingletonBeanRegistry singletonBeanRegistry, final CoordinatorRegistryCenter registryCenter,
final TracingConfiguration tracingConfiguration, final ElasticJobConfigurationProperties jobConfigurationProperties) {
JobConfiguration jobConfiguration = jobConfigurationProperties.toJobConfiguration(jobName);
diff --git a/elasticjob-lite/elasticjob-lite-spring/elasticjob-lite-spring-boot-starter/src/main/java/org/apache/shardingsphere/elasticjob/lite/spring/boot/job/ElasticJobProperties.java b/elasticjob-lite/elasticjob-lite-spring/elasticjob-lite-spring-boot-starter/src/main/java/org/apache/shardingsphere/elasticjob/lite/spring/boot/job/ElasticJobProperties.java
index 82254d2..e925555 100644
--- a/elasticjob-lite/elasticjob-lite-spring/elasticjob-lite-spring-boot-starter/src/main/java/org/apache/shardingsphere/elasticjob/lite/spring/boot/job/ElasticJobProperties.java
+++ b/elasticjob-lite/elasticjob-lite-spring/elasticjob-lite-spring-boot-starter/src/main/java/org/apache/shardingsphere/elasticjob/lite/spring/boot/job/ElasticJobProperties.java
@@ -31,6 +31,6 @@ import java.util.Map;
@Setter
@ConfigurationProperties(prefix = "elasticjob")
public class ElasticJobProperties {
-
+
private Map<String, ElasticJobConfigurationProperties> jobs = new LinkedHashMap<>();
}
diff --git a/elasticjob-lite/elasticjob-lite-spring/elasticjob-lite-spring-boot-starter/src/main/java/org/apache/shardingsphere/elasticjob/lite/spring/boot/reg/ElasticJobRegistryCenterConfiguration.java b/elasticjob-lite/elasticjob-lite-spring/elasticjob-lite-spring-boot-starter/src/main/java/org/apache/shardingsphere/elasticjob/lite/spring/boot/reg/ElasticJobRegistryCenterConfiguration.java
index ea2a4ec..e75008b 100644
--- a/elasticjob-lite/elasticjob-lite-spring/elasticjob-lite-spring-boot-starter/src/main/java/org/apache/shardingsphere/elasticjob/lite/spring/boot/reg/ElasticJobRegistryCenterConfiguration.java
+++ b/elasticjob-lite/elasticjob-lite-spring/elasticjob-lite-spring-boot-starter/src/main/java/org/apache/shardingsphere/elasticjob/lite/spring/boot/reg/ElasticJobRegistryCenterConfiguration.java
@@ -21,13 +21,17 @@ import org.apache.shardingsphere.elasticjob.reg.zookeeper.ZookeeperRegistryCente
import org.springframework.boot.context.properties.EnableConfigurationProperties;
import org.springframework.context.annotation.Bean;
+/**
+ * ElasticJob registry center configuration.
+ */
@EnableConfigurationProperties(ZookeeperProperties.class)
public class ElasticJobRegistryCenterConfiguration {
+
/**
- * Create a ZookeeperRegistryCenter bean via factory.
+ * Create a zookeeper registry center bean via factory.
*
* @param zookeeperProperties factory
- * @return ZookeeperRegistryCenter
+ * @return zookeeper registry center
*/
@Bean(initMethod = "init")
public ZookeeperRegistryCenter zookeeperRegistryCenter(final ZookeeperProperties zookeeperProperties) {
diff --git a/elasticjob-lite/elasticjob-lite-spring/elasticjob-lite-spring-boot-starter/src/main/java/org/apache/shardingsphere/elasticjob/lite/spring/boot/reg/ZookeeperProperties.java b/elasticjob-lite/elasticjob-lite-spring/elasticjob-lite-spring-boot-starter/src/main/java/org/apache/shardingsphere/elasticjob/lite/spring/boot/reg/ZookeeperProperties.java
index e81f379..1f421a1 100644
--- a/elasticjob-lite/elasticjob-lite-spring/elasticjob-lite-spring-boot-starter/src/main/java/org/apache/shardingsphere/elasticjob/lite/spring/boot/reg/ZookeeperProperties.java
+++ b/elasticjob-lite/elasticjob-lite-spring/elasticjob-lite-spring-boot-starter/src/main/java/org/apache/shardingsphere/elasticjob/lite/spring/boot/reg/ZookeeperProperties.java
@@ -26,7 +26,7 @@ import org.springframework.boot.context.properties.ConfigurationProperties;
@Setter
@ConfigurationProperties(prefix = "elasticjob.reg-center")
public class ZookeeperProperties {
-
+
/**
* Server list of ZooKeeper.
*
@@ -37,55 +37,55 @@ public class ZookeeperProperties {
* </p>
*/
private String serverLists;
-
+
/**
* Namespace.
*/
private String namespace;
-
+
/**
* Base sleep time milliseconds.
*/
private int baseSleepTimeMilliseconds = 1000;
-
+
/**
* Max sleep time milliseconds.
*/
private int maxSleepTimeMilliseconds = 3000;
-
+
/**
* Max retry times.
*/
private int maxRetries = 3;
-
+
/**
* Session timeout milliseconds.
*/
private int sessionTimeoutMilliseconds;
-
+
/**
* Connection timeout milliseconds.
*/
private int connectionTimeoutMilliseconds;
-
+
/**
* Zookeeper digest.
*/
private String digest;
-
+
/**
- * Create a ZookeeperConfiguration.
+ * Create ZooKeeper configuration.
*
- * @return Instance of ZookeeperConfiguration
+ * @return instance of ZooKeeper configuration
*/
public ZookeeperConfiguration toZookeeperConfiguration() {
- ZookeeperConfiguration zookeeperConfiguration = new ZookeeperConfiguration(serverLists, namespace);
- zookeeperConfiguration.setBaseSleepTimeMilliseconds(baseSleepTimeMilliseconds);
- zookeeperConfiguration.setMaxSleepTimeMilliseconds(maxSleepTimeMilliseconds);
- zookeeperConfiguration.setMaxRetries(maxRetries);
- zookeeperConfiguration.setSessionTimeoutMilliseconds(sessionTimeoutMilliseconds);
- zookeeperConfiguration.setConnectionTimeoutMilliseconds(connectionTimeoutMilliseconds);
- zookeeperConfiguration.setDigest(digest);
- return zookeeperConfiguration;
+ ZookeeperConfiguration result = new ZookeeperConfiguration(serverLists, namespace);
+ result.setBaseSleepTimeMilliseconds(baseSleepTimeMilliseconds);
+ result.setMaxSleepTimeMilliseconds(maxSleepTimeMilliseconds);
+ result.setMaxRetries(maxRetries);
+ result.setSessionTimeoutMilliseconds(sessionTimeoutMilliseconds);
+ result.setConnectionTimeoutMilliseconds(connectionTimeoutMilliseconds);
+ result.setDigest(digest);
+ return result;
}
}
diff --git a/elasticjob-lite/elasticjob-lite-spring/elasticjob-lite-spring-boot-starter/src/main/java/org/apache/shardingsphere/elasticjob/lite/spring/boot/reg/snapshot/ElasticJobSnapshotServiceConfiguration.java b/elasticjob-lite/elasticjob-lite-spring/elasticjob-lite-spring-boot-starter/src/main/java/org/apache/shardingsphere/elasticjob/lite/spring/boot/reg/snapshot/ElasticJobSnapshotServiceConfiguration.java
index ce1e464..8a295eb 100644
--- a/elasticjob-lite/elasticjob-lite-spring/elasticjob-lite-spring-boot-starter/src/main/java/org/apache/shardingsphere/elasticjob/lite/spring/boot/reg/snapshot/ElasticJobSnapshotServiceConfiguration.java
+++ b/elasticjob-lite/elasticjob-lite-spring/elasticjob-lite-spring-boot-starter/src/main/java/org/apache/shardingsphere/elasticjob/lite/spring/boot/reg/snapshot/ElasticJobSnapshotServiceConfiguration.java
@@ -29,13 +29,13 @@ import org.springframework.context.annotation.Bean;
@ConditionalOnProperty(name = "elasticjob.dump.enabled", havingValue = "true", matchIfMissing = true)
@EnableConfigurationProperties(SnapshotServiceProperties.class)
public class ElasticJobSnapshotServiceConfiguration {
-
+
/**
- * Create a SnapshotService bean and start listening.
+ * Create a Snapshot service bean and start listening.
*
- * @param registryCenter registry center
+ * @param registryCenter registry center
* @param snapshotServiceProperties snapshot service properties
- * @return a bean of SnapshotService
+ * @return a bean of snapshot service
*/
@ConditionalOnProperty(name = "elasticjob.dump.port")
@Bean(initMethod = "listen", destroyMethod = "close")
diff --git a/elasticjob-lite/elasticjob-lite-spring/elasticjob-lite-spring-boot-starter/src/main/java/org/apache/shardingsphere/elasticjob/lite/spring/boot/reg/snapshot/SnapshotServiceProperties.java b/elasticjob-lite/elasticjob-lite-spring/elasticjob-lite-spring-boot-starter/src/main/java/org/apache/shardingsphere/elasticjob/lite/spring/boot/reg/snapshot/SnapshotServiceProperties.java
index 20a10d7..cf8254c 100644
--- a/elasticjob-lite/elasticjob-lite-spring/elasticjob-lite-spring-boot-starter/src/main/java/org/apache/shardingsphere/elasticjob/lite/spring/boot/reg/snapshot/SnapshotServiceProperties.java
+++ b/elasticjob-lite/elasticjob-lite-spring/elasticjob-lite-spring-boot-starter/src/main/java/org/apache/shardingsphere/elasticjob/lite/spring/boot/reg/snapshot/SnapshotServiceProperties.java
@@ -21,10 +21,13 @@ import lombok.Getter;
import lombok.Setter;
import org.springframework.boot.context.properties.ConfigurationProperties;
+/**
+ * Snapshot service properties.
+ */
@Getter
@Setter
@ConfigurationProperties(prefix = "elasticjob.dump")
public class SnapshotServiceProperties {
-
+
private int port;
}
diff --git a/elasticjob-lite/elasticjob-lite-spring/elasticjob-lite-spring-boot-starter/src/main/java/org/apache/shardingsphere/elasticjob/lite/spring/boot/tracing/ElasticJobTracingConfiguration.java b/elasticjob-lite/elasticjob-lite-spring/elasticjob-lite-spring-boot-starter/src/main/java/org/apache/shardingsphere/elasticjob/lite/spring/boot/tracing/ElasticJobTracingConfiguration.java
index 7188ed1..dea2c6f 100644
--- a/elasticjob-lite/elasticjob-lite-spring/elasticjob-lite-spring-boot-starter/src/main/java/org/apache/shardingsphere/elasticjob/lite/spring/boot/tracing/ElasticJobTracingConfiguration.java
+++ b/elasticjob-lite/elasticjob-lite-spring/elasticjob-lite-spring-boot-starter/src/main/java/org/apache/shardingsphere/elasticjob/lite/spring/boot/tracing/ElasticJobTracingConfiguration.java
@@ -28,7 +28,7 @@ import javax.sql.DataSource;
* ElasticJob tracing auto configuration.
*/
public class ElasticJobTracingConfiguration {
-
+
/**
* Create a bean of tracing configuration.
*
diff --git a/elasticjob-lite/elasticjob-lite-spring/elasticjob-lite-spring-boot-starter/src/test/java/org/apache/shardingsphere/elasticjob/lite/spring/boot/job/executor/CustomClassedJobExecutor.java b/elasticjob-lite/elasticjob-lite-spring/elasticjob-lite-spring-boot-starter/src/test/java/org/apache/shardingsphere/elasticjob/lite/spring/boot/job/executor/CustomClassedJobExecutor.java
index ef794df..5cc0576 100644
--- a/elasticjob-lite/elasticjob-lite-spring/elasticjob-lite-spring-boot-starter/src/test/java/org/apache/shardingsphere/elasticjob/lite/spring/boot/job/executor/CustomClassedJobExecutor.java
+++ b/elasticjob-lite/elasticjob-lite-spring/elasticjob-lite-spring-boot-starter/src/test/java/org/apache/shardingsphere/elasticjob/lite/spring/boot/job/executor/CustomClassedJobExecutor.java
@@ -23,16 +23,13 @@ import org.apache.shardingsphere.elasticjob.executor.JobFacade;
import org.apache.shardingsphere.elasticjob.executor.item.impl.ClassedJobItemExecutor;
import org.apache.shardingsphere.elasticjob.lite.spring.boot.job.fixture.job.CustomJob;
-/**
- * Custom Classed Executor.
- */
-public class CustomClassedJobExecutor implements ClassedJobItemExecutor<CustomJob> {
-
+public final class CustomClassedJobExecutor implements ClassedJobItemExecutor<CustomJob> {
+
@Override
public void process(final CustomJob elasticJob, final JobConfiguration jobConfig, final JobFacade jobFacade, final ShardingContext shardingContext) {
elasticJob.execute(shardingContext);
}
-
+
@Override
public Class<CustomJob> getElasticJobClass() {
return CustomJob.class;
diff --git a/elasticjob-lite/elasticjob-lite-spring/elasticjob-lite-spring-boot-starter/src/test/java/org/apache/shardingsphere/elasticjob/lite/spring/boot/job/executor/PrintJobExecutor.java b/elasticjob-lite/elasticjob-lite-spring/elasticjob-lite-spring-boot-starter/src/test/java/org/apache/shardingsphere/elasticjob/lite/spring/boot/job/executor/PrintJobExecutor.java
index bf26976..578337d 100644
--- a/elasticjob-lite/elasticjob-lite-spring/elasticjob-lite-spring-boot-starter/src/test/java/org/apache/shardingsphere/elasticjob/lite/spring/boot/job/executor/PrintJobExecutor.java
+++ b/elasticjob-lite/elasticjob-lite-spring/elasticjob-lite-spring-boot-starter/src/test/java/org/apache/shardingsphere/elasticjob/lite/spring/boot/job/executor/PrintJobExecutor.java
@@ -24,17 +24,14 @@ import org.apache.shardingsphere.elasticjob.api.ShardingContext;
import org.apache.shardingsphere.elasticjob.executor.JobFacade;
import org.apache.shardingsphere.elasticjob.executor.item.impl.TypedJobItemExecutor;
-/**
- * Print Job Executor.
- */
@Slf4j
-public class PrintJobExecutor implements TypedJobItemExecutor {
-
+public final class PrintJobExecutor implements TypedJobItemExecutor {
+
@Override
public void process(final ElasticJob elasticJob, final JobConfiguration jobConfig, final JobFacade jobFacade, final ShardingContext shardingContext) {
log.info(jobConfig.getProps().getProperty(PrintJobProperties.CONTENT_KEY));
}
-
+
@Override
public String getType() {
return "PRINT";
diff --git a/elasticjob-lite/elasticjob-lite-spring/elasticjob-lite-spring-boot-starter/src/test/java/org/apache/shardingsphere/elasticjob/lite/spring/boot/job/executor/PrintJobProperties.java b/elasticjob-lite/elasticjob-lite-spring/elasticjob-lite-spring-boot-starter/src/test/java/org/apache/shardingsphere/elasticjob/lite/spring/boot/job/executor/PrintJobProperties.java
index 121c826..40ed3d2 100644
--- a/elasticjob-lite/elasticjob-lite-spring/elasticjob-lite-spring-boot-starter/src/test/java/org/apache/shardingsphere/elasticjob/lite/spring/boot/job/executor/PrintJobProperties.java
+++ b/elasticjob-lite/elasticjob-lite-spring/elasticjob-lite-spring-boot-starter/src/test/java/org/apache/shardingsphere/elasticjob/lite/spring/boot/job/executor/PrintJobProperties.java
@@ -17,7 +17,7 @@
package org.apache.shardingsphere.elasticjob.lite.spring.boot.job.executor;
-public class PrintJobProperties {
-
+public final class PrintJobProperties {
+
public static final String CONTENT_KEY = "print.content";
}
diff --git a/elasticjob-lite/elasticjob-lite-spring/elasticjob-lite-spring-boot-starter/src/test/java/org/apache/shardingsphere/elasticjob/lite/spring/boot/job/fixture/EmbedTestingServer.java b/elasticjob-lite/elasticjob-lite-spring/elasticjob-lite-spring-boot-starter/src/test/java/org/apache/shardingsphere/elasticjob/lite/spring/boot/job/fixture/EmbedTestingServer.java
index bb91d21..799202d 100644
--- a/elasticjob-lite/elasticjob-lite-spring/elasticjob-lite-spring-boot-starter/src/test/java/org/apache/shardingsphere/elasticjob/lite/spring/boot/job/fixture/EmbedTestingServer.java
+++ b/elasticjob-lite/elasticjob-lite-spring/elasticjob-lite-spring-boot-starter/src/test/java/org/apache/shardingsphere/elasticjob/lite/spring/boot/job/fixture/EmbedTestingServer.java
@@ -27,11 +27,11 @@ import java.io.IOException;
@NoArgsConstructor(access = AccessLevel.PRIVATE)
public final class EmbedTestingServer {
-
+
private static final int PORT = 18181;
-
+
private static volatile TestingServer testingServer;
-
+
/**
* Get the connection string.
*
@@ -40,7 +40,7 @@ public final class EmbedTestingServer {
public static String getConnectionString() {
return "localhost:" + PORT;
}
-
+
/**
* Start the server.
*/
diff --git a/elasticjob-lite/elasticjob-lite-spring/elasticjob-lite-spring-boot-starter/src/test/java/org/apache/shardingsphere/elasticjob/lite/spring/boot/job/fixture/job/CustomJob.java b/elasticjob-lite/elasticjob-lite-spring/elasticjob-lite-spring-boot-starter/src/test/java/org/apache/shardingsphere/elasticjob/lite/spring/boot/job/fixture/job/CustomJob.java
index af271b6..c172cb9 100644
--- a/elasticjob-lite/elasticjob-lite-spring/elasticjob-lite-spring-boot-starter/src/test/java/org/apache/shardingsphere/elasticjob/lite/spring/boot/job/fixture/job/CustomJob.java
+++ b/elasticjob-lite/elasticjob-lite-spring/elasticjob-lite-spring-boot-starter/src/test/java/org/apache/shardingsphere/elasticjob/lite/spring/boot/job/fixture/job/CustomJob.java
@@ -21,7 +21,7 @@ import org.apache.shardingsphere.elasticjob.api.ElasticJob;
import org.apache.shardingsphere.elasticjob.api.ShardingContext;
public interface CustomJob extends ElasticJob {
-
+
/**
* Execute custom 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/fixture/job/impl/CustomTestJob.java b/elasticjob-lite/elasticjob-lite-spring/elasticjob-lite-spring-boot-starter/src/test/java/org/apache/shardingsphere/elasticjob/lite/spring/boot/job/fixture/job/impl/CustomTestJob.java
index b14d675..c050721 100644
--- a/elasticjob-lite/elasticjob-lite-spring/elasticjob-lite-spring-boot-starter/src/test/java/org/apache/shardingsphere/elasticjob/lite/spring/boot/job/fixture/job/impl/CustomTestJob.java
+++ b/elasticjob-lite/elasticjob-lite-spring/elasticjob-lite-spring-boot-starter/src/test/java/org/apache/shardingsphere/elasticjob/lite/spring/boot/job/fixture/job/impl/CustomTestJob.java
@@ -30,10 +30,10 @@ import java.util.List;
@Component
@Slf4j
public class CustomTestJob implements CustomJob {
-
+
@Autowired
private BarRepository barRepository;
-
+
@Override
public void execute(final ShardingContext shardingContext) {
int i = shardingContext.getShardingItem();
diff --git a/elasticjob-lite/elasticjob-lite-spring/elasticjob-lite-spring-boot-starter/src/test/java/org/apache/shardingsphere/elasticjob/lite/spring/boot/job/repository/BarRepository.java b/elasticjob-lite/elasticjob-lite-spring/elasticjob-lite-spring-boot-starter/src/test/java/org/apache/shardingsphere/elasticjob/lite/spring/boot/job/repository/BarRepository.java
index fc47330..e501bac 100644
--- a/elasticjob-lite/elasticjob-lite-spring/elasticjob-lite-spring-boot-starter/src/test/java/org/apache/shardingsphere/elasticjob/lite/spring/boot/job/repository/BarRepository.java
+++ b/elasticjob-lite/elasticjob-lite-spring/elasticjob-lite-spring-boot-starter/src/test/java/org/apache/shardingsphere/elasticjob/lite/spring/boot/job/repository/BarRepository.java
@@ -21,11 +21,11 @@ package org.apache.shardingsphere.elasticjob.lite.spring.boot.job.repository;
* Bar Repository.
*/
public interface BarRepository {
-
+
/**
- * Get data by id.
+ * Get data by ID.
*
- * @param id id
+ * @param id ID
* @return data
*/
String getById(int id);
diff --git a/elasticjob-lite/elasticjob-lite-spring/elasticjob-lite-spring-boot-starter/src/test/java/org/apache/shardingsphere/elasticjob/lite/spring/boot/job/repository/impl/BarRepositoryImpl.java b/elasticjob-lite/elasticjob-lite-spring/elasticjob-lite-spring-boot-starter/src/test/java/org/apache/shardingsphere/elasticjob/lite/spring/boot/job/repository/impl/BarRepositoryImpl.java
index 88d49aa..3c16b88 100644
--- a/elasticjob-lite/elasticjob-lite-spring/elasticjob-lite-spring-boot-starter/src/test/java/org/apache/shardingsphere/elasticjob/lite/spring/boot/job/repository/impl/BarRepositoryImpl.java
+++ b/elasticjob-lite/elasticjob-lite-spring/elasticjob-lite-spring-boot-starter/src/test/java/org/apache/shardingsphere/elasticjob/lite/spring/boot/job/repository/impl/BarRepositoryImpl.java
@@ -22,9 +22,9 @@ import org.springframework.stereotype.Repository;
@Repository
public class BarRepositoryImpl implements BarRepository {
-
+
private static final String[] DATA = {"zero", "one", "two", "three", "four", "five", "six", "seven", "eight", "nine"};
-
+
@Override
public String getById(final int id) {
return id >= 0 && id < DATA.length ? DATA[id] : null;
diff --git a/elasticjob-lite/elasticjob-lite-spring/elasticjob-lite-spring-boot-starter/src/test/resources/META-INF/services/org.apache.shardingsphere.elasticjob.executor.item.impl.ClassedJobItemExecutor b/elasticjob-lite/elasticjob-lite-spring/elasticjob-lite-spring-boot-starter/src/test/resources/META-INF/services/org.apache.shardingsphere.elasticjob.executor.item.impl.ClassedJobItemExecutor
index 326c084..b3895f3 100644
--- a/elasticjob-lite/elasticjob-lite-spring/elasticjob-lite-spring-boot-starter/src/test/resources/META-INF/services/org.apache.shardingsphere.elasticjob.executor.item.impl.ClassedJobItemExecutor
+++ b/elasticjob-lite/elasticjob-lite-spring/elasticjob-lite-spring-boot-starter/src/test/resources/META-INF/services/org.apache.shardingsphere.elasticjob.executor.item.impl.ClassedJobItemExecutor
@@ -14,4 +14,5 @@
# See the License for the specific language governing permissions and
# limitations under the License.
#
+
org.apache.shardingsphere.elasticjob.lite.spring.boot.job.executor.CustomClassedJobExecutor
diff --git a/elasticjob-lite/elasticjob-lite-spring/elasticjob-lite-spring-boot-starter/src/test/resources/META-INF/services/org.apache.shardingsphere.elasticjob.executor.item.impl.TypedJobItemExecutor b/elasticjob-lite/elasticjob-lite-spring/elasticjob-lite-spring-boot-starter/src/test/resources/META-INF/services/org.apache.shardingsphere.elasticjob.executor.item.impl.TypedJobItemExecutor
index a113f2b..b8f15da 100644
--- a/elasticjob-lite/elasticjob-lite-spring/elasticjob-lite-spring-boot-starter/src/test/resources/META-INF/services/org.apache.shardingsphere.elasticjob.executor.item.impl.TypedJobItemExecutor
+++ b/elasticjob-lite/elasticjob-lite-spring/elasticjob-lite-spring-boot-starter/src/test/resources/META-INF/services/org.apache.shardingsphere.elasticjob.executor.item.impl.TypedJobItemExecutor
@@ -14,4 +14,5 @@
# See the License for the specific language governing permissions and
# limitations under the License.
#
+
org.apache.shardingsphere.elasticjob.lite.spring.boot.job.executor.PrintJobExecutor
diff --git a/elasticjob-lite/elasticjob-lite-spring/elasticjob-lite-spring-namespace/src/main/resources/META-INF/namespace/elasticjob.xsd b/elasticjob-lite/elasticjob-lite-spring/elasticjob-lite-spring-namespace/src/main/resources/META-INF/namespace/elasticjob.xsd
index b61f075..e40c07c 100644
--- a/elasticjob-lite/elasticjob-lite-spring/elasticjob-lite-spring-namespace/src/main/resources/META-INF/namespace/elasticjob.xsd
+++ b/elasticjob-lite/elasticjob-lite-spring/elasticjob-lite-spring-namespace/src/main/resources/META-INF/namespace/elasticjob.xsd
@@ -21,7 +21,6 @@
xmlns:beans="http://www.springframework.org/schema/beans"
targetNamespace="http://shardingsphere.apache.org/schema/elasticjob"
elementFormDefault="qualified">
-
<xsd:import namespace="http://www.springframework.org/schema/beans" schemaLocation="http://www.springframework.org/schema/beans/spring-beans.xsd" />
<xsd:element name="job">
diff --git a/elasticjob-lite/elasticjob-lite-spring/elasticjob-lite-spring-namespace/src/test/resources/META-INF/job/oneOffWithJobType.xml b/elasticjob-lite/elasticjob-lite-spring/elasticjob-lite-spring-namespace/src/test/resources/META-INF/job/oneOffWithJobType.xml
index 0be22cf..9e3a337 100644
--- a/elasticjob-lite/elasticjob-lite-spring/elasticjob-lite-spring-namespace/src/test/resources/META-INF/job/oneOffWithJobType.xml
+++ b/elasticjob-lite/elasticjob-lite-spring/elasticjob-lite-spring-namespace/src/test/resources/META-INF/job/oneOffWithJobType.xml
@@ -25,7 +25,7 @@
http://shardingsphere.apache.org/schema/elasticjob/elasticjob.xsd
">
<import resource="base.xml"/>
-
+
<elasticjob:job id="oneOffScriptElasticJob_job_type" job-type="SCRIPT" registry-center-ref="regCenter"
sharding-total-count="${simpleJob.shardingTotalCount}" sharding-item-parameters="${simpleJob.shardingItemParameters}"
disabled="${simpleJob.disabled}" overwrite="${simpleJob.overwrite}" job-executor-service-handler-type="SINGLE_THREAD" >
diff --git a/elasticjob-lite/elasticjob-lite-spring/elasticjob-lite-spring-namespace/src/test/resources/META-INF/job/withJobType.xml b/elasticjob-lite/elasticjob-lite-spring/elasticjob-lite-spring-namespace/src/test/resources/META-INF/job/withJobType.xml
index 4b087cc..6dbdfed 100644
--- a/elasticjob-lite/elasticjob-lite-spring/elasticjob-lite-spring-namespace/src/test/resources/META-INF/job/withJobType.xml
+++ b/elasticjob-lite/elasticjob-lite-spring/elasticjob-lite-spring-namespace/src/test/resources/META-INF/job/withJobType.xml
@@ -25,7 +25,7 @@
http://shardingsphere.apache.org/schema/elasticjob/elasticjob.xsd
">
<import resource="base.xml"/>
-
+
<elasticjob:job id="scriptElasticJob_job_type" job-type="SCRIPT" registry-center-ref="regCenter"
cron="${simpleJob.cron}" sharding-total-count="${simpleJob.shardingTotalCount}" sharding-item-parameters="${simpleJob.shardingItemParameters}"
disabled="${simpleJob.disabled}" overwrite="${simpleJob.overwrite}" job-executor-service-handler-type="SINGLE_THREAD" >
diff --git a/elasticjob-lite/elasticjob-lite-spring/elasticjob-lite-spring-namespace/src/test/resources/META-INF/snapshot/snapshotDisabled.xml b/elasticjob-lite/elasticjob-lite-spring/elasticjob-lite-spring-namespace/src/test/resources/META-INF/snapshot/snapshotDisabled.xml
index d2b5a52..3439a1d 100644
--- a/elasticjob-lite/elasticjob-lite-spring/elasticjob-lite-spring-namespace/src/test/resources/META-INF/snapshot/snapshotDisabled.xml
+++ b/elasticjob-lite/elasticjob-lite-spring/elasticjob-lite-spring-namespace/src/test/resources/META-INF/snapshot/snapshotDisabled.xml
@@ -27,12 +27,12 @@
http://shardingsphere.apache.org/schema/elasticjob
http://shardingsphere.apache.org/schema/elasticjob/elasticjob.xsd
">
+ <context:property-placeholder location="classpath:conf/reg/conf.properties" ignore-unresolvable="true" />
- <context:property-placeholder location="classpath:conf/reg/conf.properties" ignore-unresolvable="true"/>
<elasticjob:zookeeper id="regCenter1" server-lists="${regCenter1.serverLists}" namespace="${regCenter1.namespace}"
base-sleep-time-milliseconds="${regCenter1.baseSleepTimeMilliseconds}"
max-sleep-time-milliseconds="${regCenter1.maxSleepTimeMilliseconds}"
- max-retries="${regCenter1.maxRetries}"/>
+ max-retries="${regCenter1.maxRetries}" />
- <elasticjob:snapshot id="jobSnapshotDisabled" registry-center-ref="regCenter1" dump-port="9987"/>
+ <elasticjob:snapshot id="jobSnapshotDisabled" registry-center-ref="regCenter1" dump-port="9987" />
</beans>
diff --git a/elasticjob-lite/elasticjob-lite-spring/elasticjob-lite-spring-namespace/src/test/resources/META-INF/snapshot/snapshotEnabled.xml b/elasticjob-lite/elasticjob-lite-spring/elasticjob-lite-spring-namespace/src/test/resources/META-INF/snapshot/snapshotEnabled.xml
index 7ec3f39..6c4a057 100644
--- a/elasticjob-lite/elasticjob-lite-spring/elasticjob-lite-spring-namespace/src/test/resources/META-INF/snapshot/snapshotEnabled.xml
+++ b/elasticjob-lite/elasticjob-lite-spring/elasticjob-lite-spring-namespace/src/test/resources/META-INF/snapshot/snapshotEnabled.xml
@@ -27,14 +27,12 @@
http://shardingsphere.apache.org/schema/elasticjob
http://shardingsphere.apache.org/schema/elasticjob/elasticjob.xsd
">
-
- <context:property-placeholder location="classpath:conf/job/conf.properties" ignore-unresolvable="true"/>
+ <context:property-placeholder location="classpath:conf/job/conf.properties" ignore-unresolvable="true" />
<elasticjob:zookeeper id="regCenter" server-lists="${regCenter.serverLists}" namespace="${regCenter.namespace}"
base-sleep-time-milliseconds="${regCenter.baseSleepTimeMilliseconds}"
max-sleep-time-milliseconds="${regCenter.maxSleepTimeMilliseconds}"
- max-retries="${regCenter.maxRetries}"/>
+ max-retries="${regCenter.maxRetries}" />
- <elasticjob:snapshot id="jobSnapshotEnabled" registry-center-ref="regCenter" dump-port="9988"/>
-
+ <elasticjob:snapshot id="jobSnapshotEnabled" registry-center-ref="regCenter" dump-port="9988" />
</beans>
diff --git a/pom.xml b/pom.xml
index c525742..7136887 100644
--- a/pom.xml
+++ b/pom.xml
@@ -44,7 +44,7 @@
<maven.version.range>[3.0.4,)</maven.version.range>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.build.locale>zh_CN</project.build.locale>
-
+
<guava.version>29.0-jre</guava.version>
<commons-lang3.version>3.4</commons-lang3.version>
<quartz.version>2.3.2</quartz.version>