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/07/02 08:46:42 UTC
[shardingsphere-elasticjob-lite] branch master updated: Add apache
copyright and revise for code style (#897)
This is an automated email from the ASF dual-hosted git repository.
zhangliang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/shardingsphere-elasticjob-lite.git
The following commit(s) were added to refs/heads/master by this push:
new cd7b220 Add apache copyright and revise for code style (#897)
cd7b220 is described below
commit cd7b220ed39787bf829ee3fdda7b9506cd19f332
Author: Liang Zhang <te...@163.com>
AuthorDate: Thu Jul 2 16:46:33 2020 +0800
Add apache copyright and revise for code style (#897)
* Add apache license
* For code format
* Remove useless code
* For code style
* For code style
---
.../console/config/DynamicDataSourceConfig.java | 42 +++++++++++-----------
.../config/advice/ConsoleRestControllerAdvice.java | 6 ++--
.../controller/EventTraceHistoryController.java | 15 --------
.../console/controller/JobOperationController.java | 4 +--
.../controller/RegistryCenterController.java | 27 +++++++-------
.../dao/search/JobExecutionLogRepository.java | 3 +-
.../dao/search/JobStatusTraceLogRepository.java | 3 +-
.../JobRegisterStatisticsRepository.java | 5 ++-
.../statistics/JobRunningStatisticsRepository.java | 5 ++-
.../console/dao/statistics/StatisticInterval.java | 2 +-
.../statistics/TaskResultStatisticsRepository.java | 7 ++--
.../TaskRunningStatisticsRepository.java | 5 ++-
.../lite/console/domain/DataSourceFactory.java | 6 ++--
.../lite/console/domain/JobRegisterStatistics.java | 21 ++++++-----
.../lite/console/domain/JobRunningStatistics.java | 21 ++++++-----
.../lite/console/domain/TaskResultStatistics.java | 25 +++++++------
.../lite/console/domain/TaskRunningStatistics.java | 21 +++++------
.../lite/console/service/JobAPIService.java | 2 +-
...entTraceDataSourceConfigurationServiceImpl.java | 9 +++--
.../lite/console/util/HomeFolderUtils.java | 4 +--
.../SessionEventTraceDataSourceConfiguration.java | 9 -----
.../console/dao/search/RDBJobEventSearchTest.java | 5 ---
.../search/RDBJobEventSearchTestConfiguration.java | 18 +++++++++-
.../statistics/rdb/RDBStatisticRepositoryTest.java | 24 ++++++-------
.../lite/console/util/HomeFolderUtilsTest.java | 2 +-
25 files changed, 143 insertions(+), 148 deletions(-)
diff --git a/elastic-job-lite-console/src/main/java/org/apache/shardingsphere/elasticjob/lite/console/config/DynamicDataSourceConfig.java b/elastic-job-lite-console/src/main/java/org/apache/shardingsphere/elasticjob/lite/console/config/DynamicDataSourceConfig.java
index 99a1b31..cfcfe57 100644
--- a/elastic-job-lite-console/src/main/java/org/apache/shardingsphere/elasticjob/lite/console/config/DynamicDataSourceConfig.java
+++ b/elastic-job-lite-console/src/main/java/org/apache/shardingsphere/elasticjob/lite/console/config/DynamicDataSourceConfig.java
@@ -17,11 +17,6 @@
package org.apache.shardingsphere.elasticjob.lite.console.config;
-import java.util.HashMap;
-import java.util.Map;
-
-import javax.sql.DataSource;
-
import org.apache.commons.dbcp.BasicDataSource;
import org.springframework.boot.jdbc.DataSourceBuilder;
import org.springframework.context.annotation.Bean;
@@ -30,22 +25,26 @@ import org.springframework.context.annotation.Primary;
import org.springframework.core.env.Environment;
import org.springframework.jdbc.datasource.lookup.AbstractRoutingDataSource;
+import javax.sql.DataSource;
+import java.util.HashMap;
+import java.util.Map;
+
/**
* Dynamic datasource config.
*/
@Configuration
public class DynamicDataSourceConfig {
-
+
public static final String DRIVER_CLASS_NAME = "spring.datasource.default.driver-class-name";
-
+
public static final String DATASOURCE_URL = "spring.datasource.default.url";
-
+
public static final String DATASOURCE_USERNAME = "spring.datasource.default.username";
-
+
public static final String DATASOURCE_PASSWORD = "spring.datasource.default.password";
-
+
public static final String DEFAULT_DATASOURCE_NAME = "default";
-
+
/**
* Declare dynamicDataSource instead of default dataSource.
* @param environment spring environment
@@ -60,7 +59,7 @@ public class DynamicDataSourceConfig {
dynamicDataSource.setDefaultTargetDataSource(defaultDataSource);
return dynamicDataSource;
}
-
+
private DataSource createDefaultDataSource(final Environment environment) {
String driverName = environment.getProperty(DRIVER_CLASS_NAME);
String url = environment.getProperty(DATASOURCE_URL);
@@ -69,18 +68,19 @@ public class DynamicDataSourceConfig {
return DataSourceBuilder.create().driverClassName(driverName).type(BasicDataSource.class).url(url)
.username(username).password(password).build();
}
-
+
public static class DynamicDataSource extends AbstractRoutingDataSource {
-
+
private final Map<Object, Object> dataSourceMap = new HashMap<>(10);
-
+
@Override
protected Object determineCurrentLookupKey() {
return DynamicDataSourceContextHolder.getDataSourceName();
}
-
+
/**
* Add a data source.
+ *
* @param dataSourceName data source name
* @param dataSource data source
*/
@@ -90,21 +90,23 @@ public class DynamicDataSourceConfig {
afterPropertiesSet();
}
}
-
+
public static class DynamicDataSourceContextHolder {
-
+
private static final ThreadLocal<String> CONTEXT_HOLDER = new ThreadLocal<>();
-
+
/**
* Get the specify dataSource.
+ *
* @return data source name
*/
public static String getDataSourceName() {
return CONTEXT_HOLDER.get();
}
-
+
/**
* Specify a dataSource.
+ *
* @param dataSourceName data source name
*/
public static void setDataSourceName(final String dataSourceName) {
diff --git a/elastic-job-lite-console/src/main/java/org/apache/shardingsphere/elasticjob/lite/console/config/advice/ConsoleRestControllerAdvice.java b/elastic-job-lite-console/src/main/java/org/apache/shardingsphere/elasticjob/lite/console/config/advice/ConsoleRestControllerAdvice.java
index dccb44c..4c6a827 100644
--- a/elastic-job-lite-console/src/main/java/org/apache/shardingsphere/elasticjob/lite/console/config/advice/ConsoleRestControllerAdvice.java
+++ b/elastic-job-lite-console/src/main/java/org/apache/shardingsphere/elasticjob/lite/console/config/advice/ConsoleRestControllerAdvice.java
@@ -36,7 +36,7 @@ import org.springframework.web.servlet.mvc.method.annotation.ResponseBodyAdvice;
@RestControllerAdvice
@Slf4j
public final class ConsoleRestControllerAdvice implements ResponseBodyAdvice<Object> {
-
+
@Override
public boolean supports(final MethodParameter returnType, final Class<? extends HttpMessageConverter<?>> converterType) {
//only advice return void method.
@@ -45,14 +45,14 @@ public final class ConsoleRestControllerAdvice implements ResponseBodyAdvice<Obj
}
return void.class.isAssignableFrom(returnType.getMethod().getReturnType());
}
-
+
@Override
public Object beforeBodyWrite(final Object body, final MethodParameter returnType, final MediaType selectedContentType,
final Class<? extends HttpMessageConverter<?>> selectedConverterType, final ServerHttpRequest request, final ServerHttpResponse response) {
//if the method return void, then the value is true and returns.
return null == body ? true : body;
}
-
+
/**
* Handle exception.
*
diff --git a/elastic-job-lite-console/src/main/java/org/apache/shardingsphere/elasticjob/lite/console/controller/EventTraceHistoryController.java b/elastic-job-lite-console/src/main/java/org/apache/shardingsphere/elasticjob/lite/console/controller/EventTraceHistoryController.java
index 3e7a4ff..2f96691 100644
--- a/elastic-job-lite-console/src/main/java/org/apache/shardingsphere/elasticjob/lite/console/controller/EventTraceHistoryController.java
+++ b/elastic-job-lite-console/src/main/java/org/apache/shardingsphere/elasticjob/lite/console/controller/EventTraceHistoryController.java
@@ -18,13 +18,10 @@
package org.apache.shardingsphere.elasticjob.lite.console.controller;
import com.google.common.base.Strings;
-import org.apache.commons.dbcp.BasicDataSource;
import org.apache.shardingsphere.elasticjob.lite.console.dao.search.RDBJobEventSearch;
import org.apache.shardingsphere.elasticjob.lite.console.dao.search.RDBJobEventSearch.Condition;
import org.apache.shardingsphere.elasticjob.lite.console.dao.search.RDBJobEventSearch.Result;
-import org.apache.shardingsphere.elasticjob.lite.console.domain.EventTraceDataSourceConfiguration;
import org.apache.shardingsphere.elasticjob.lite.console.service.EventTraceDataSourceConfigurationService;
-import org.apache.shardingsphere.elasticjob.lite.console.util.SessionEventTraceDataSourceConfiguration;
import org.apache.shardingsphere.elasticjob.lite.tracing.event.JobExecutionEvent;
import org.apache.shardingsphere.elasticjob.lite.tracing.event.JobStatusTraceEvent;
import org.springframework.beans.factory.annotation.Autowired;
@@ -34,7 +31,6 @@ import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
-import javax.sql.DataSource;
import javax.ws.rs.core.MediaType;
import java.text.ParseException;
import java.text.SimpleDateFormat;
@@ -50,8 +46,6 @@ import java.util.Map;
@RequestMapping("/event-trace")
public final class EventTraceHistoryController {
- private EventTraceDataSourceConfiguration eventTraceDataSourceConfiguration = SessionEventTraceDataSourceConfiguration.getEventTraceDataSourceConfiguration();
-
private EventTraceDataSourceConfigurationService eventTraceDataSourceConfigurationService;
private final RDBJobEventSearch rdbJobEventSearch;
@@ -93,15 +87,6 @@ public final class EventTraceHistoryController {
return rdbJobEventSearch.findJobStatusTraceEvents(buildCondition(requestParams, new String[]{"jobName", "source", "executionType", "state"}));
}
- private DataSource setUpEventTraceDataSource() {
- BasicDataSource result = new BasicDataSource();
- result.setDriverClassName(eventTraceDataSourceConfiguration.getDriver());
- result.setUrl(eventTraceDataSourceConfiguration.getUrl());
- result.setUsername(eventTraceDataSourceConfiguration.getUsername());
- result.setPassword(eventTraceDataSourceConfiguration.getPassword());
- return result;
- }
-
private Condition buildCondition(final MultiValueMap<String, String> requestParams, final String[] params) throws ParseException {
int perPage = 10;
int page = 1;
diff --git a/elastic-job-lite-console/src/main/java/org/apache/shardingsphere/elasticjob/lite/console/controller/JobOperationController.java b/elastic-job-lite-console/src/main/java/org/apache/shardingsphere/elasticjob/lite/console/controller/JobOperationController.java
index e237535..484623b 100644
--- a/elastic-job-lite-console/src/main/java/org/apache/shardingsphere/elasticjob/lite/console/controller/JobOperationController.java
+++ b/elastic-job-lite-console/src/main/java/org/apache/shardingsphere/elasticjob/lite/console/controller/JobOperationController.java
@@ -114,7 +114,7 @@ public final class JobOperationController {
public Collection<ShardingInfo> getShardingInfo(@PathVariable("jobName") final String jobName) {
return jobAPIService.getShardingStatisticsAPI().getShardingInfo(jobName);
}
-
+
/**
* Disable sharding.
*
@@ -125,7 +125,7 @@ public final class JobOperationController {
public void disableSharding(@PathVariable("jobName") final String jobName, @PathVariable("item") final String item) {
jobAPIService.getShardingOperateAPI().disable(jobName, item);
}
-
+
/**
* Enable sharding.
*
diff --git a/elastic-job-lite-console/src/main/java/org/apache/shardingsphere/elasticjob/lite/console/controller/RegistryCenterController.java b/elastic-job-lite-console/src/main/java/org/apache/shardingsphere/elasticjob/lite/console/controller/RegistryCenterController.java
index a455f14..1c81b71 100644
--- a/elastic-job-lite-console/src/main/java/org/apache/shardingsphere/elasticjob/lite/console/controller/RegistryCenterController.java
+++ b/elastic-job-lite-console/src/main/java/org/apache/shardingsphere/elasticjob/lite/console/controller/RegistryCenterController.java
@@ -17,11 +17,6 @@
package org.apache.shardingsphere.elasticjob.lite.console.controller;
-import java.util.Collection;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpSession;
-import javax.ws.rs.core.Context;
-import javax.ws.rs.core.MediaType;
import org.apache.shardingsphere.elasticjob.lite.console.domain.RegistryCenterConfiguration;
import org.apache.shardingsphere.elasticjob.lite.console.service.RegistryCenterConfigurationService;
import org.apache.shardingsphere.elasticjob.lite.console.util.SessionRegistryCenterConfiguration;
@@ -35,17 +30,23 @@ import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpSession;
+import javax.ws.rs.core.Context;
+import javax.ws.rs.core.MediaType;
+import java.util.Collection;
+
/**
* Registry center RESTful API.
*/
@RestController
@RequestMapping("/registry-center")
public final class RegistryCenterController {
-
+
public static final String REG_CENTER_CONFIG_KEY = "reg_center_config_key";
-
+
private RegistryCenterConfigurationService regCenterService;
-
+
@Autowired
public RegistryCenterController(final RegistryCenterConfigurationService regCenterService) {
this.regCenterService = regCenterService;
@@ -60,7 +61,7 @@ public final class RegistryCenterController {
public boolean activated() {
return regCenterService.loadActivated().isPresent();
}
-
+
/**
* Load configuration from registry center.
*
@@ -72,7 +73,7 @@ public final class RegistryCenterController {
regCenterService.loadActivated().ifPresent(regCenterConfig -> setRegistryCenterNameToSession(regCenterConfig, request.getSession()));
return regCenterService.loadAll().getRegistryCenterConfiguration();
}
-
+
/**
* Add registry center.
*
@@ -83,7 +84,7 @@ public final class RegistryCenterController {
public boolean add(@RequestBody final RegistryCenterConfiguration config) {
return regCenterService.add(config);
}
-
+
/**
* Delete registry center.
*
@@ -93,7 +94,7 @@ public final class RegistryCenterController {
public void delete(@RequestBody final RegistryCenterConfiguration config) {
regCenterService.delete(config.getName());
}
-
+
/**
* Connect to registry center.
*
@@ -109,7 +110,7 @@ public final class RegistryCenterController {
}
return isConnected;
}
-
+
private boolean setRegistryCenterNameToSession(final RegistryCenterConfiguration regCenterConfig, final HttpSession session) {
session.setAttribute(REG_CENTER_CONFIG_KEY, regCenterConfig);
try {
diff --git a/elastic-job-lite-console/src/main/java/org/apache/shardingsphere/elasticjob/lite/console/dao/search/JobExecutionLogRepository.java b/elastic-job-lite-console/src/main/java/org/apache/shardingsphere/elasticjob/lite/console/dao/search/JobExecutionLogRepository.java
index c928d94..42db723 100644
--- a/elastic-job-lite-console/src/main/java/org/apache/shardingsphere/elasticjob/lite/console/dao/search/JobExecutionLogRepository.java
+++ b/elastic-job-lite-console/src/main/java/org/apache/shardingsphere/elasticjob/lite/console/dao/search/JobExecutionLogRepository.java
@@ -20,6 +20,5 @@ package org.apache.shardingsphere.elasticjob.lite.console.dao.search;
import org.springframework.data.jpa.repository.JpaRepository;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
-public interface JobExecutionLogRepository
- extends JpaRepository<JobExecutionLog, String>, JpaSpecificationExecutor<JobExecutionLog> {
+public interface JobExecutionLogRepository extends JpaRepository<JobExecutionLog, String>, JpaSpecificationExecutor<JobExecutionLog> {
}
diff --git a/elastic-job-lite-console/src/main/java/org/apache/shardingsphere/elasticjob/lite/console/dao/search/JobStatusTraceLogRepository.java b/elastic-job-lite-console/src/main/java/org/apache/shardingsphere/elasticjob/lite/console/dao/search/JobStatusTraceLogRepository.java
index c6858e6..0523fd7 100644
--- a/elastic-job-lite-console/src/main/java/org/apache/shardingsphere/elasticjob/lite/console/dao/search/JobStatusTraceLogRepository.java
+++ b/elastic-job-lite-console/src/main/java/org/apache/shardingsphere/elasticjob/lite/console/dao/search/JobStatusTraceLogRepository.java
@@ -20,6 +20,5 @@ package org.apache.shardingsphere.elasticjob.lite.console.dao.search;
import org.springframework.data.jpa.repository.JpaRepository;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
-public interface JobStatusTraceLogRepository
- extends JpaRepository<JobStatusTraceLog, String>, JpaSpecificationExecutor<JobStatusTraceLog> {
+public interface JobStatusTraceLogRepository extends JpaRepository<JobStatusTraceLog, String>, JpaSpecificationExecutor<JobStatusTraceLog> {
}
diff --git a/elastic-job-lite-console/src/main/java/org/apache/shardingsphere/elasticjob/lite/console/dao/statistics/JobRegisterStatisticsRepository.java b/elastic-job-lite-console/src/main/java/org/apache/shardingsphere/elasticjob/lite/console/dao/statistics/JobRegisterStatisticsRepository.java
index 6a3a9b8..873d35a 100644
--- a/elastic-job-lite-console/src/main/java/org/apache/shardingsphere/elasticjob/lite/console/dao/statistics/JobRegisterStatisticsRepository.java
+++ b/elastic-job-lite-console/src/main/java/org/apache/shardingsphere/elasticjob/lite/console/dao/statistics/JobRegisterStatisticsRepository.java
@@ -25,9 +25,12 @@ import org.springframework.data.jpa.repository.Query;
import org.springframework.data.repository.query.Param;
import org.springframework.stereotype.Repository;
+/**
+ * Job register statistics repository.
+ */
@Repository
public interface JobRegisterStatisticsRepository extends JpaRepository<JobRegisterStatistics, Long> {
-
+
/**
* Find job register statistics.
*
diff --git a/elastic-job-lite-console/src/main/java/org/apache/shardingsphere/elasticjob/lite/console/dao/statistics/JobRunningStatisticsRepository.java b/elastic-job-lite-console/src/main/java/org/apache/shardingsphere/elasticjob/lite/console/dao/statistics/JobRunningStatisticsRepository.java
index 0af5e5a..057ba38 100644
--- a/elastic-job-lite-console/src/main/java/org/apache/shardingsphere/elasticjob/lite/console/dao/statistics/JobRunningStatisticsRepository.java
+++ b/elastic-job-lite-console/src/main/java/org/apache/shardingsphere/elasticjob/lite/console/dao/statistics/JobRunningStatisticsRepository.java
@@ -25,9 +25,12 @@ import org.springframework.data.jpa.repository.Query;
import org.springframework.data.repository.query.Param;
import org.springframework.stereotype.Repository;
+/**
+ * Job running statistics repository.
+ */
@Repository
public interface JobRunningStatisticsRepository extends JpaRepository<JobRunningStatistics, Long> {
-
+
/**
* Find job running statistics.
*
diff --git a/elastic-job-lite-console/src/main/java/org/apache/shardingsphere/elasticjob/lite/console/dao/statistics/StatisticInterval.java b/elastic-job-lite-console/src/main/java/org/apache/shardingsphere/elasticjob/lite/console/dao/statistics/StatisticInterval.java
index ec2d86e..1695735 100644
--- a/elastic-job-lite-console/src/main/java/org/apache/shardingsphere/elasticjob/lite/console/dao/statistics/StatisticInterval.java
+++ b/elastic-job-lite-console/src/main/java/org/apache/shardingsphere/elasticjob/lite/console/dao/statistics/StatisticInterval.java
@@ -21,7 +21,7 @@ import lombok.Getter;
import lombok.RequiredArgsConstructor;
/**
- * statistic interval.
+ * Statistic interval.
*/
@Getter
@RequiredArgsConstructor
diff --git a/elastic-job-lite-console/src/main/java/org/apache/shardingsphere/elasticjob/lite/console/dao/statistics/TaskResultStatisticsRepository.java b/elastic-job-lite-console/src/main/java/org/apache/shardingsphere/elasticjob/lite/console/dao/statistics/TaskResultStatisticsRepository.java
index ba8eabf..837fbf9 100644
--- a/elastic-job-lite-console/src/main/java/org/apache/shardingsphere/elasticjob/lite/console/dao/statistics/TaskResultStatisticsRepository.java
+++ b/elastic-job-lite-console/src/main/java/org/apache/shardingsphere/elasticjob/lite/console/dao/statistics/TaskResultStatisticsRepository.java
@@ -25,9 +25,12 @@ import org.springframework.data.jpa.repository.Query;
import org.springframework.data.repository.query.Param;
import org.springframework.stereotype.Repository;
+/**
+ * Task result statistics repository.
+ */
@Repository
public interface TaskResultStatisticsRepository extends JpaRepository<TaskResultStatistics, Long> {
-
+
/**
* Find task result statistics.
*
@@ -37,7 +40,7 @@ public interface TaskResultStatisticsRepository extends JpaRepository<TaskResult
*/
@Query("FROM TaskResultStatistics WHERE statisticInterval = :statisticInterval AND statisticsTime >= :fromTime ORDER BY id ASC")
List<TaskResultStatistics> findTaskResultStatistics(@Param("fromTime") Date fromTime, @Param("statisticInterval") String statisticInterval);
-
+
/**
* Get summed task result statistics.
*
diff --git a/elastic-job-lite-console/src/main/java/org/apache/shardingsphere/elasticjob/lite/console/dao/statistics/TaskRunningStatisticsRepository.java b/elastic-job-lite-console/src/main/java/org/apache/shardingsphere/elasticjob/lite/console/dao/statistics/TaskRunningStatisticsRepository.java
index 4382498..6302c80 100644
--- a/elastic-job-lite-console/src/main/java/org/apache/shardingsphere/elasticjob/lite/console/dao/statistics/TaskRunningStatisticsRepository.java
+++ b/elastic-job-lite-console/src/main/java/org/apache/shardingsphere/elasticjob/lite/console/dao/statistics/TaskRunningStatisticsRepository.java
@@ -25,9 +25,12 @@ import org.springframework.data.jpa.repository.Query;
import org.springframework.data.repository.query.Param;
import org.springframework.stereotype.Repository;
+/**
+ * Task running statistics repository.
+ */
@Repository
public interface TaskRunningStatisticsRepository extends JpaRepository<TaskRunningStatistics, Long> {
-
+
/**
* Find task running statistics.
*
diff --git a/elastic-job-lite-console/src/main/java/org/apache/shardingsphere/elasticjob/lite/console/domain/DataSourceFactory.java b/elastic-job-lite-console/src/main/java/org/apache/shardingsphere/elasticjob/lite/console/domain/DataSourceFactory.java
index a25b7d4..be9f284 100644
--- a/elastic-job-lite-console/src/main/java/org/apache/shardingsphere/elasticjob/lite/console/domain/DataSourceFactory.java
+++ b/elastic-job-lite-console/src/main/java/org/apache/shardingsphere/elasticjob/lite/console/domain/DataSourceFactory.java
@@ -17,16 +17,16 @@
package org.apache.shardingsphere.elasticjob.lite.console.domain;
-import javax.sql.DataSource;
-
import org.apache.commons.dbcp.BasicDataSource;
import org.springframework.boot.jdbc.DataSourceBuilder;
+import javax.sql.DataSource;
+
/**
* Dynamic data source factory.
*/
public final class DataSourceFactory {
-
+
/**
* Create a DataSource.
* @param config event trace data source config
diff --git a/elastic-job-lite-console/src/main/java/org/apache/shardingsphere/elasticjob/lite/console/domain/JobRegisterStatistics.java b/elastic-job-lite-console/src/main/java/org/apache/shardingsphere/elasticjob/lite/console/domain/JobRegisterStatistics.java
index 087030c..d0d215d 100644
--- a/elastic-job-lite-console/src/main/java/org/apache/shardingsphere/elasticjob/lite/console/domain/JobRegisterStatistics.java
+++ b/elastic-job-lite-console/src/main/java/org/apache/shardingsphere/elasticjob/lite/console/domain/JobRegisterStatistics.java
@@ -17,7 +17,9 @@
package org.apache.shardingsphere.elasticjob.lite.console.domain;
-import java.util.Date;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
import javax.persistence.Column;
import javax.persistence.Entity;
@@ -25,10 +27,7 @@ import javax.persistence.GeneratedValue;
import javax.persistence.GenerationType;
import javax.persistence.Id;
import javax.persistence.Table;
-
-import lombok.AllArgsConstructor;
-import lombok.Getter;
-import lombok.NoArgsConstructor;
+import java.util.Date;
/**
* Job register statistics.
@@ -38,21 +37,21 @@ import lombok.NoArgsConstructor;
@AllArgsConstructor
@Entity
@Table(name = "JOB_REGISTER_STATISTICS")
-public class JobRegisterStatistics {
-
+public final class JobRegisterStatistics {
+
@Id
@GeneratedValue(strategy = GenerationType.IDENTITY)
private Long id;
-
+
@Column(name = "registered_count", length = 11)
private Integer registeredCount;
-
+
@Column(name = "statistics_time", nullable = false)
private Date statisticsTime;
-
+
@Column(name = "creation_time", nullable = false)
private Date creationTime = new Date();
-
+
public JobRegisterStatistics(final Integer registeredCount, final Date statisticsTime) {
this.registeredCount = registeredCount;
this.statisticsTime = statisticsTime;
diff --git a/elastic-job-lite-console/src/main/java/org/apache/shardingsphere/elasticjob/lite/console/domain/JobRunningStatistics.java b/elastic-job-lite-console/src/main/java/org/apache/shardingsphere/elasticjob/lite/console/domain/JobRunningStatistics.java
index d9fc8a7..c57bb37 100644
--- a/elastic-job-lite-console/src/main/java/org/apache/shardingsphere/elasticjob/lite/console/domain/JobRunningStatistics.java
+++ b/elastic-job-lite-console/src/main/java/org/apache/shardingsphere/elasticjob/lite/console/domain/JobRunningStatistics.java
@@ -17,7 +17,9 @@
package org.apache.shardingsphere.elasticjob.lite.console.domain;
-import java.util.Date;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
import javax.persistence.Column;
import javax.persistence.Entity;
@@ -25,10 +27,7 @@ import javax.persistence.GeneratedValue;
import javax.persistence.GenerationType;
import javax.persistence.Id;
import javax.persistence.Table;
-
-import lombok.AllArgsConstructor;
-import lombok.Getter;
-import lombok.NoArgsConstructor;
+import java.util.Date;
/**
* Job running statistics.
@@ -38,21 +37,21 @@ import lombok.NoArgsConstructor;
@AllArgsConstructor
@Entity
@Table(name = "JOB_RUNNING_STATISTICS")
-public class JobRunningStatistics {
-
+public final class JobRunningStatistics {
+
@Id
@GeneratedValue(strategy = GenerationType.IDENTITY)
private Long id;
-
+
@Column(name = "running_count", length = 11)
private Integer runningCount;
-
+
@Column(name = "statistics_time", nullable = false)
private Date statisticsTime;
-
+
@Column(name = "creation_time", nullable = false)
private Date creationTime = new Date();
-
+
public JobRunningStatistics(final Integer runningCount, final Date statisticsTime) {
this.runningCount = runningCount;
this.statisticsTime = statisticsTime;
diff --git a/elastic-job-lite-console/src/main/java/org/apache/shardingsphere/elasticjob/lite/console/domain/TaskResultStatistics.java b/elastic-job-lite-console/src/main/java/org/apache/shardingsphere/elasticjob/lite/console/domain/TaskResultStatistics.java
index 983b4e2..1e052b4 100644
--- a/elastic-job-lite-console/src/main/java/org/apache/shardingsphere/elasticjob/lite/console/domain/TaskResultStatistics.java
+++ b/elastic-job-lite-console/src/main/java/org/apache/shardingsphere/elasticjob/lite/console/domain/TaskResultStatistics.java
@@ -17,7 +17,9 @@
package org.apache.shardingsphere.elasticjob.lite.console.domain;
-import java.util.Date;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
import javax.persistence.Column;
import javax.persistence.Entity;
@@ -25,10 +27,7 @@ import javax.persistence.GeneratedValue;
import javax.persistence.GenerationType;
import javax.persistence.Id;
import javax.persistence.Table;
-
-import lombok.AllArgsConstructor;
-import lombok.Getter;
-import lombok.NoArgsConstructor;
+import java.util.Date;
/**
* Task result statistics.
@@ -39,31 +38,31 @@ import lombok.NoArgsConstructor;
@Entity
@Table(name = "TASK_RESULT_STATISTICS")
public final class TaskResultStatistics {
-
+
@Id
@GeneratedValue(strategy = GenerationType.IDENTITY)
private Long id;
-
+
@Column(name = "success_count", length = 11)
private Long successCount;
-
+
@Column(name = "failed_count", length = 11)
private Long failedCount;
-
+
@Column(name = "statistic_interval", length = 10)
private String statisticInterval;
-
+
@Column(name = "statistics_time", nullable = false)
private Date statisticsTime;
-
+
@Column(name = "creation_time", nullable = false)
private Date creationTime = new Date();
-
+
public TaskResultStatistics(final Long successCount, final Long failedCount) {
this.successCount = successCount;
this.failedCount = failedCount;
}
-
+
public TaskResultStatistics(final Long successCount, final Long failedCount, final String statisticInterval, final Date statisticsTime) {
this.successCount = successCount;
this.failedCount = failedCount;
diff --git a/elastic-job-lite-console/src/main/java/org/apache/shardingsphere/elasticjob/lite/console/domain/TaskRunningStatistics.java b/elastic-job-lite-console/src/main/java/org/apache/shardingsphere/elasticjob/lite/console/domain/TaskRunningStatistics.java
index 1669ee6..56a5db9 100644
--- a/elastic-job-lite-console/src/main/java/org/apache/shardingsphere/elasticjob/lite/console/domain/TaskRunningStatistics.java
+++ b/elastic-job-lite-console/src/main/java/org/apache/shardingsphere/elasticjob/lite/console/domain/TaskRunningStatistics.java
@@ -17,16 +17,17 @@
package org.apache.shardingsphere.elasticjob.lite.console.domain;
-import java.util.Date;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.GeneratedValue;
import javax.persistence.GenerationType;
import javax.persistence.Id;
import javax.persistence.Table;
-import lombok.AllArgsConstructor;
-import lombok.Getter;
-import lombok.NoArgsConstructor;
+import java.util.Date;
/**
* Task running statistics.
@@ -36,21 +37,21 @@ import lombok.NoArgsConstructor;
@AllArgsConstructor
@Entity
@Table(name = "TASK_RUNNING_STATISTICS")
-public class TaskRunningStatistics {
-
+public final class TaskRunningStatistics {
+
@Id
@GeneratedValue(strategy = GenerationType.IDENTITY)
private Long id;
-
+
@Column(name = "running_count", length = 11)
private Integer runningCount;
-
+
@Column(name = "statistics_time", nullable = false)
private Date statisticsTime;
-
+
@Column(name = "creation_time", nullable = false)
private Date creationTime = new Date();
-
+
public TaskRunningStatistics(final Integer runningCount, final Date statisticsTime) {
this.runningCount = runningCount;
this.statisticsTime = statisticsTime;
diff --git a/elastic-job-lite-console/src/main/java/org/apache/shardingsphere/elasticjob/lite/console/service/JobAPIService.java b/elastic-job-lite-console/src/main/java/org/apache/shardingsphere/elasticjob/lite/console/service/JobAPIService.java
index 389573e..c071f2e 100644
--- a/elastic-job-lite-console/src/main/java/org/apache/shardingsphere/elasticjob/lite/console/service/JobAPIService.java
+++ b/elastic-job-lite-console/src/main/java/org/apache/shardingsphere/elasticjob/lite/console/service/JobAPIService.java
@@ -32,7 +32,7 @@ public interface JobAPIService {
* @return job settings API
*/
JobSettingsAPI getJobSettingsAPI();
-
+
/**
* Job operate API.
*
diff --git a/elastic-job-lite-console/src/main/java/org/apache/shardingsphere/elasticjob/lite/console/service/impl/EventTraceDataSourceConfigurationServiceImpl.java b/elastic-job-lite-console/src/main/java/org/apache/shardingsphere/elasticjob/lite/console/service/impl/EventTraceDataSourceConfigurationServiceImpl.java
index 6ef8ff8..c631ad4 100644
--- a/elastic-job-lite-console/src/main/java/org/apache/shardingsphere/elasticjob/lite/console/service/impl/EventTraceDataSourceConfigurationServiceImpl.java
+++ b/elastic-job-lite-console/src/main/java/org/apache/shardingsphere/elasticjob/lite/console/service/impl/EventTraceDataSourceConfigurationServiceImpl.java
@@ -17,10 +17,6 @@
package org.apache.shardingsphere.elasticjob.lite.console.service.impl;
-import java.util.Optional;
-
-import javax.sql.DataSource;
-
import org.apache.shardingsphere.elasticjob.lite.console.config.DynamicDataSourceConfig.DynamicDataSource;
import org.apache.shardingsphere.elasticjob.lite.console.config.DynamicDataSourceConfig.DynamicDataSourceContextHolder;
import org.apache.shardingsphere.elasticjob.lite.console.domain.DataSourceFactory;
@@ -33,6 +29,9 @@ import org.apache.shardingsphere.elasticjob.lite.console.service.EventTraceDataS
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
+import javax.sql.DataSource;
+import java.util.Optional;
+
/**
* Event trace data source configuration service implementation.
*/
@@ -40,7 +39,7 @@ import org.springframework.stereotype.Service;
public final class EventTraceDataSourceConfigurationServiceImpl implements EventTraceDataSourceConfigurationService {
private ConfigurationsXmlRepository configurationsXmlRepository = new ConfigurationsXmlRepositoryImpl();
-
+
@Autowired
private DynamicDataSource dynamicDataSource;
diff --git a/elastic-job-lite-console/src/main/java/org/apache/shardingsphere/elasticjob/lite/console/util/HomeFolderUtils.java b/elastic-job-lite-console/src/main/java/org/apache/shardingsphere/elasticjob/lite/console/util/HomeFolderUtils.java
index 92ce6e6..5887955 100644
--- a/elastic-job-lite-console/src/main/java/org/apache/shardingsphere/elasticjob/lite/console/util/HomeFolderUtils.java
+++ b/elastic-job-lite-console/src/main/java/org/apache/shardingsphere/elasticjob/lite/console/util/HomeFolderUtils.java
@@ -30,8 +30,6 @@ public final class HomeFolderUtils {
private static final String USER_HOME = System.getProperty("user.home");
- private static final String FILE_SEPARATOR = System.getProperty("file.separator");
-
private static final String CONSOLE_ROOT_FOLDER = ".elastic-job-console";
/**
@@ -55,6 +53,6 @@ public final class HomeFolderUtils {
}
private static String getHomeFolder() {
- return String.format("%s%s%s%s", USER_HOME, FILE_SEPARATOR, CONSOLE_ROOT_FOLDER, FILE_SEPARATOR);
+ return String.format("%s%s%s%s", USER_HOME, System.lineSeparator(), CONSOLE_ROOT_FOLDER, System.lineSeparator());
}
}
diff --git a/elastic-job-lite-console/src/main/java/org/apache/shardingsphere/elasticjob/lite/console/util/SessionEventTraceDataSourceConfiguration.java b/elastic-job-lite-console/src/main/java/org/apache/shardingsphere/elasticjob/lite/console/util/SessionEventTraceDataSourceConfiguration.java
index ce26b1f..812338a 100644
--- a/elastic-job-lite-console/src/main/java/org/apache/shardingsphere/elasticjob/lite/console/util/SessionEventTraceDataSourceConfiguration.java
+++ b/elastic-job-lite-console/src/main/java/org/apache/shardingsphere/elasticjob/lite/console/util/SessionEventTraceDataSourceConfiguration.java
@@ -32,15 +32,6 @@ public final class SessionEventTraceDataSourceConfiguration {
private static EventTraceDataSourceConfiguration eventTraceDataSourceConfiguration;
/**
- * Get event trace data source configuration.
- *
- * @return event trace data source configuration
- */
- public static EventTraceDataSourceConfiguration getEventTraceDataSourceConfiguration() {
- return eventTraceDataSourceConfiguration;
- }
-
- /**
* Set event trace data source configuration.
*
* @param eventTraceDataSourceConfiguration event trace data source configuration
diff --git a/elastic-job-lite-console/src/test/java/org/apache/shardingsphere/elasticjob/lite/console/dao/search/RDBJobEventSearchTest.java b/elastic-job-lite-console/src/test/java/org/apache/shardingsphere/elasticjob/lite/console/dao/search/RDBJobEventSearchTest.java
index 113508f..b0f26d5 100644
--- a/elastic-job-lite-console/src/test/java/org/apache/shardingsphere/elasticjob/lite/console/dao/search/RDBJobEventSearchTest.java
+++ b/elastic-job-lite-console/src/test/java/org/apache/shardingsphere/elasticjob/lite/console/dao/search/RDBJobEventSearchTest.java
@@ -28,7 +28,6 @@ import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.context.annotation.Import;
import org.springframework.test.context.junit4.SpringRunner;
-import javax.sql.DataSource;
import java.util.Date;
import java.util.HashMap;
import java.util.Map;
@@ -44,9 +43,6 @@ public final class RDBJobEventSearchTest {
@Autowired
private RDBJobEventSearch repository;
- @Autowired
- private DataSource dataSource;
-
@Test
public void assertFindJobExecutionEventsWithPageSizeAndNumber() {
Result<JobExecutionEvent> result = repository.findJobExecutionEvents(new Condition(10, 1, null, null, null, null, null));
@@ -221,5 +217,4 @@ public final class RDBJobEventSearchTest {
assertThat(result.getTotal(), is(500L));
assertThat(result.getRows().size(), is(10));
}
-
}
diff --git a/elastic-job-lite-console/src/test/java/org/apache/shardingsphere/elasticjob/lite/console/dao/search/RDBJobEventSearchTestConfiguration.java b/elastic-job-lite-console/src/test/java/org/apache/shardingsphere/elasticjob/lite/console/dao/search/RDBJobEventSearchTestConfiguration.java
index 6b21c7f..c9dc0f2 100644
--- a/elastic-job-lite-console/src/test/java/org/apache/shardingsphere/elasticjob/lite/console/dao/search/RDBJobEventSearchTestConfiguration.java
+++ b/elastic-job-lite-console/src/test/java/org/apache/shardingsphere/elasticjob/lite/console/dao/search/RDBJobEventSearchTestConfiguration.java
@@ -1,3 +1,20 @@
+/*
+ * 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.
+ */
+
package org.apache.shardingsphere.elasticjob.lite.console.dao.search;
import org.apache.shardingsphere.elasticjob.lite.tracing.event.JobExecutionEvent;
@@ -47,5 +64,4 @@ public class RDBJobEventSearchTestConfiguration implements InitializingBean {
));
}
}
-
}
diff --git a/elastic-job-lite-console/src/test/java/org/apache/shardingsphere/elasticjob/lite/console/dao/statistics/rdb/RDBStatisticRepositoryTest.java b/elastic-job-lite-console/src/test/java/org/apache/shardingsphere/elasticjob/lite/console/dao/statistics/rdb/RDBStatisticRepositoryTest.java
index 10b6cfb..2b613cf 100644
--- a/elastic-job-lite-console/src/test/java/org/apache/shardingsphere/elasticjob/lite/console/dao/statistics/rdb/RDBStatisticRepositoryTest.java
+++ b/elastic-job-lite-console/src/test/java/org/apache/shardingsphere/elasticjob/lite/console/dao/statistics/rdb/RDBStatisticRepositoryTest.java
@@ -17,13 +17,6 @@
package org.apache.shardingsphere.elasticjob.lite.console.dao.statistics.rdb;
-import static org.hamcrest.CoreMatchers.is;
-import static org.hamcrest.CoreMatchers.nullValue;
-import static org.junit.Assert.assertThat;
-import static org.junit.Assert.assertTrue;
-
-import java.util.Date;
-
import org.apache.shardingsphere.elasticjob.lite.console.dao.statistics.JobRegisterStatisticsRepository;
import org.apache.shardingsphere.elasticjob.lite.console.dao.statistics.JobRunningStatisticsRepository;
import org.apache.shardingsphere.elasticjob.lite.console.dao.statistics.StatisticInterval;
@@ -39,22 +32,29 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+import java.util.Date;
+
+import static org.hamcrest.CoreMatchers.is;
+import static org.hamcrest.CoreMatchers.nullValue;
+import static org.junit.Assert.assertThat;
+import static org.junit.Assert.assertTrue;
+
@SpringBootTest
@RunWith(SpringJUnit4ClassRunner.class)
public class RDBStatisticRepositoryTest {
-
+
@Autowired
private TaskResultStatisticsRepository taskResultStatisticsRepository;
-
+
@Autowired
private TaskRunningStatisticsRepository taskRunningStatisticsRepository;
-
+
@Autowired
private JobRegisterStatisticsRepository jobRegisterStatisticsRepository;
-
+
@Autowired
private JobRunningStatisticsRepository jobRunningStatisticsRepository;
-
+
@Test
public void assertAddTaskResultStatistics() {
for (StatisticInterval each : StatisticInterval.values()) {
diff --git a/elastic-job-lite-console/src/test/java/org/apache/shardingsphere/elasticjob/lite/console/util/HomeFolderUtilsTest.java b/elastic-job-lite-console/src/test/java/org/apache/shardingsphere/elasticjob/lite/console/util/HomeFolderUtilsTest.java
index 310f613..afd9a71 100644
--- a/elastic-job-lite-console/src/test/java/org/apache/shardingsphere/elasticjob/lite/console/util/HomeFolderUtilsTest.java
+++ b/elastic-job-lite-console/src/test/java/org/apache/shardingsphere/elasticjob/lite/console/util/HomeFolderUtilsTest.java
@@ -24,7 +24,7 @@ import static org.junit.Assert.assertThat;
public final class HomeFolderUtilsTest {
- private static final String HOME_FOLDER = System.getProperty("user.home") + System.getProperty("file.separator") + ".elastic-job-console" + System.getProperty("file.separator");
+ private static final String HOME_FOLDER = System.getProperty("user.home") + System.lineSeparator() + ".elastic-job-console" + System.lineSeparator();
@Test
public void assertGetFilePathInHomeFolder() {