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/31 05:51:40 UTC
[shardingsphere-elasticjob-ui] branch master updated: For checkstyle
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-ui.git
The following commit(s) were added to refs/heads/master by this push:
new 84df845 For checkstyle
84df845 is described below
commit 84df845a80d0b585504ef8c1c15059efd025d399
Author: terrymanu <te...@163.com>
AuthorDate: Fri Jul 31 13:51:07 2020 +0800
For checkstyle
---
.../cloud/ui/config/FilterConfiguration.java | 1 -
.../repository/impl/AbstractXmlRepositoryImpl.java | 2 +-
.../cloud/ui/security/AuthenticationResult.java | 1 -
.../cloud/ui/service/RegistryCenterFactory.java | 26 ----------------------
.../ui/web/controller/CloudAppController.java | 10 ++++-----
.../ui/web/controller/CloudJobController.java | 4 ++--
.../web/controller/search/JobEventRdbSearch.java | 15 +++++--------
.../elasticjob/lite/ui/config/OpenJPAConfig.java | 1 -
.../type/job/JobExecutionTypeStatistics.java | 8 +++----
.../dao/statistics/type/job/JobTypeStatistics.java | 10 ++++-----
.../lite/ui/domain/EventTraceDataSource.java | 12 +++++-----
.../lite/ui/domain/JobRegisterStatistics.java | 2 +-
.../lite/ui/domain/JobRunningStatistics.java | 2 +-
.../lite/ui/domain/TaskResultStatistics.java | 4 ++--
.../lite/ui/domain/TaskRunningStatistics.java | 2 +-
.../repository/impl/AbstractXmlRepositoryImpl.java | 2 +-
.../lite/ui/security/AuthenticationResult.java | 1 -
.../elasticjob/lite/ui/util/BeanUtils.java | 24 --------------------
.../controller/EventTraceHistoryController.java | 5 ++---
.../statistics/rdb/RDBStatisticRepositoryTest.java | 9 ++++----
20 files changed, 39 insertions(+), 102 deletions(-)
diff --git a/shardingsphere-elasticjob-cloud-ui/shardingsphere-elasticjob-cloud-ui-backend/src/main/java/org/apache/shardingsphere/elasticjob/cloud/ui/config/FilterConfiguration.java b/shardingsphere-elasticjob-cloud-ui/shardingsphere-elasticjob-cloud-ui-backend/src/main/java/org/apache/shardingsphere/elasticjob/cloud/ui/config/FilterConfiguration.java
index 0fa73bb..c475ffb 100644
--- a/shardingsphere-elasticjob-cloud-ui/shardingsphere-elasticjob-cloud-ui-backend/src/main/java/org/apache/shardingsphere/elasticjob/cloud/ui/config/FilterConfiguration.java
+++ b/shardingsphere-elasticjob-cloud-ui/shardingsphere-elasticjob-cloud-ui-backend/src/main/java/org/apache/shardingsphere/elasticjob/cloud/ui/config/FilterConfiguration.java
@@ -69,5 +69,4 @@ public class FilterConfiguration {
filterRegBean.setUrlPatterns(urlPatterns);
return filterRegBean;
}
-
}
diff --git a/shardingsphere-elasticjob-cloud-ui/shardingsphere-elasticjob-cloud-ui-backend/src/main/java/org/apache/shardingsphere/elasticjob/cloud/ui/repository/impl/AbstractXmlRepositoryImpl.java b/shardingsphere-elasticjob-cloud-ui/shardingsphere-elasticjob-cloud-ui-backend/src/main/java/org/apache/shardingsphere/elasticjob/cloud/ui/repository/impl/AbstractXmlRepositoryImpl.java
index 14f4884..f64b347 100644
--- a/shardingsphere-elasticjob-cloud-ui/shardingsphere-elasticjob-cloud-ui-backend/src/main/java/org/apache/shardingsphere/elasticjob/cloud/ui/repository/impl/AbstractXmlRepositoryImpl.java
+++ b/shardingsphere-elasticjob-cloud-ui/shardingsphere-elasticjob-cloud-ui-backend/src/main/java/org/apache/shardingsphere/elasticjob/cloud/ui/repository/impl/AbstractXmlRepositoryImpl.java
@@ -37,7 +37,7 @@ public abstract class AbstractXmlRepositoryImpl<E> implements XmlRepository<E> {
private final Class<E> clazz;
- private JAXBContext jaxbContext;
+ private final JAXBContext jaxbContext;
protected AbstractXmlRepositoryImpl(final String fileName, final Class<E> clazz) {
file = new File(HomeFolderUtils.getFilePathInHomeFolder(fileName));
diff --git a/shardingsphere-elasticjob-cloud-ui/shardingsphere-elasticjob-cloud-ui-backend/src/main/java/org/apache/shardingsphere/elasticjob/cloud/ui/security/AuthenticationResult.java b/shardingsphere-elasticjob-cloud-ui/shardingsphere-elasticjob-cloud-ui-backend/src/main/java/org/apache/shardingsphere/elasticjob/cloud/ui/security/AuthenticationResult.java
index 3df11f7..13d2cb4 100644
--- a/shardingsphere-elasticjob-cloud-ui/shardingsphere-elasticjob-cloud-ui-backend/src/main/java/org/apache/shardingsphere/elasticjob/cloud/ui/security/AuthenticationResult.java
+++ b/shardingsphere-elasticjob-cloud-ui/shardingsphere-elasticjob-cloud-ui-backend/src/main/java/org/apache/shardingsphere/elasticjob/cloud/ui/security/AuthenticationResult.java
@@ -19,7 +19,6 @@ package org.apache.shardingsphere.elasticjob.cloud.ui.security;
import lombok.Getter;
import lombok.RequiredArgsConstructor;
-import lombok.Setter;
/**
* Authentication result.
diff --git a/shardingsphere-elasticjob-cloud-ui/shardingsphere-elasticjob-cloud-ui-backend/src/main/java/org/apache/shardingsphere/elasticjob/cloud/ui/service/RegistryCenterFactory.java b/shardingsphere-elasticjob-cloud-ui/shardingsphere-elasticjob-cloud-ui-backend/src/main/java/org/apache/shardingsphere/elasticjob/cloud/ui/service/RegistryCenterFactory.java
index d29ccc7..22755be 100644
--- a/shardingsphere-elasticjob-cloud-ui/shardingsphere-elasticjob-cloud-ui-backend/src/main/java/org/apache/shardingsphere/elasticjob/cloud/ui/service/RegistryCenterFactory.java
+++ b/shardingsphere-elasticjob-cloud-ui/shardingsphere-elasticjob-cloud-ui-backend/src/main/java/org/apache/shardingsphere/elasticjob/cloud/ui/service/RegistryCenterFactory.java
@@ -24,8 +24,6 @@ import com.google.common.hash.Hasher;
import com.google.common.hash.Hashing;
import lombok.AccessLevel;
import lombok.NoArgsConstructor;
-import org.apache.shardingsphere.elasticjob.cloud.ui.domain.RegistryCenterConfiguration;
-import org.apache.shardingsphere.elasticjob.cloud.ui.util.SessionRegistryCenterConfiguration;
import org.apache.shardingsphere.elasticjob.reg.base.CoordinatorRegistryCenter;
import org.apache.shardingsphere.elasticjob.reg.zookeeper.ZookeeperConfiguration;
import org.apache.shardingsphere.elasticjob.reg.zookeeper.ZookeeperRegistryCenter;
@@ -67,28 +65,4 @@ public final class RegistryCenterFactory {
REG_CENTER_REGISTRY.put(hashCode, result);
return result;
}
-
- public static CoordinatorRegistryCenter getRegistryCenter() {
- RegistryCenterConfiguration registryCenterConfiguration = SessionRegistryCenterConfiguration.getRegistryCenterConfiguration();
- String connectString = registryCenterConfiguration.getZkAddressList();
- String namespace = registryCenterConfiguration.getNamespace();
- String digest = registryCenterConfiguration.getDigest();
- Hasher hasher = Hashing.sha256().newHasher().putString(connectString, Charsets.UTF_8).putString(namespace, Charsets.UTF_8);
- if (!Strings.isNullOrEmpty(digest)) {
- hasher.putString(digest, Charsets.UTF_8);
- }
- HashCode hashCode = hasher.hash();
- CoordinatorRegistryCenter result = REG_CENTER_REGISTRY.get(hashCode);
- if (null != result) {
- return result;
- }
- ZookeeperConfiguration zkConfig = new ZookeeperConfiguration(connectString, namespace);
- if (!Strings.isNullOrEmpty(digest)) {
- zkConfig.setDigest(digest);
- }
- result = new ZookeeperRegistryCenter(zkConfig);
- result.init();
- REG_CENTER_REGISTRY.put(hashCode, result);
- return result;
- }
}
diff --git a/shardingsphere-elasticjob-cloud-ui/shardingsphere-elasticjob-cloud-ui-backend/src/main/java/org/apache/shardingsphere/elasticjob/cloud/ui/web/controller/CloudAppController.java b/shardingsphere-elasticjob-cloud-ui/shardingsphere-elasticjob-cloud-ui-backend/src/main/java/org/apache/shardingsphere/elasticjob/cloud/ui/web/controller/CloudAppController.java
index 6e80059..10562b8 100644
--- a/shardingsphere-elasticjob-cloud-ui/shardingsphere-elasticjob-cloud-ui-backend/src/main/java/org/apache/shardingsphere/elasticjob/cloud/ui/web/controller/CloudAppController.java
+++ b/shardingsphere-elasticjob-cloud-ui/shardingsphere-elasticjob-cloud-ui-backend/src/main/java/org/apache/shardingsphere/elasticjob/cloud/ui/web/controller/CloudAppController.java
@@ -194,13 +194,13 @@ public final class CloudAppController {
}
private Collection<CloudAppConfiguration> build(final Collection<CloudAppConfigurationPOJO> cloudAppConfigurationPOJOS) {
- return cloudAppConfigurationPOJOS.stream().map(each -> convert(each)).collect(Collectors.toList());
+ return cloudAppConfigurationPOJOS.stream().map(this::convert).collect(Collectors.toList());
}
private CloudAppConfiguration convert(final CloudAppConfigurationPOJO cloudAppConfigurationPOJO) {
- CloudAppConfiguration cloudAppConfiguration = new CloudAppConfiguration();
- BeanUtils.copyProperties(cloudAppConfigurationPOJO, cloudAppConfiguration);
- cloudAppConfiguration.setDisabled(disableAppService.isDisabled(cloudAppConfigurationPOJO.getAppName()));
- return cloudAppConfiguration;
+ CloudAppConfiguration result = new CloudAppConfiguration();
+ BeanUtils.copyProperties(cloudAppConfigurationPOJO, result);
+ result.setDisabled(disableAppService.isDisabled(cloudAppConfigurationPOJO.getAppName()));
+ return result;
}
}
diff --git a/shardingsphere-elasticjob-cloud-ui/shardingsphere-elasticjob-cloud-ui-backend/src/main/java/org/apache/shardingsphere/elasticjob/cloud/ui/web/controller/CloudJobController.java b/shardingsphere-elasticjob-cloud-ui/shardingsphere-elasticjob-cloud-ui-backend/src/main/java/org/apache/shardingsphere/elasticjob/cloud/ui/web/controller/CloudJobController.java
index e40a5e0..0170fdd 100644
--- a/shardingsphere-elasticjob-cloud-ui/shardingsphere-elasticjob-cloud-ui-backend/src/main/java/org/apache/shardingsphere/elasticjob/cloud/ui/web/controller/CloudJobController.java
+++ b/shardingsphere-elasticjob-cloud-ui/shardingsphere-elasticjob-cloud-ui-backend/src/main/java/org/apache/shardingsphere/elasticjob/cloud/ui/web/controller/CloudJobController.java
@@ -242,7 +242,7 @@ public final class CloudJobController {
@PostMapping("/events/executions")
public ResponseResult<JobEventRdbSearch.Result<JobExecutionEvent>> findJobExecutionEvents(@RequestParam final MultiValueMap<String, String> requestParams) throws ParseException {
if (!isRdbConfigured()) {
- return ResponseResultUtil.build(new JobEventRdbSearch.Result<>(0, Collections.<JobExecutionEvent>emptyList()));
+ return ResponseResultUtil.build(new JobEventRdbSearch.Result<>(0, Collections.emptyList()));
}
return ResponseResultUtil.build(jobEventRdbSearch.findJobExecutionEvents(buildCondition(requestParams, new String[]{"jobName", "taskId", "ip", "isSuccess"})));
}
@@ -256,7 +256,7 @@ public final class CloudJobController {
@PostMapping("/events/statusTraces")
public ResponseResult<JobEventRdbSearch.Result<JobStatusTraceEvent>> findJobStatusTraceEvents(@RequestParam final MultiValueMap<String, String> requestParams) throws ParseException {
if (!isRdbConfigured()) {
- return ResponseResultUtil.build(new JobEventRdbSearch.Result<>(0, Collections.<JobStatusTraceEvent>emptyList()));
+ return ResponseResultUtil.build(new JobEventRdbSearch.Result<>(0, Collections.emptyList()));
}
return ResponseResultUtil.build(jobEventRdbSearch.findJobStatusTraceEvents(buildCondition(requestParams, new String[]{"jobName", "taskId", "slaveId", "source", "executionType", "state"})));
}
diff --git a/shardingsphere-elasticjob-cloud-ui/shardingsphere-elasticjob-cloud-ui-backend/src/main/java/org/apache/shardingsphere/elasticjob/cloud/ui/web/controller/search/JobEventRdbSearch.java b/shardingsphere-elasticjob-cloud-ui/shardingsphere-elasticjob-cloud-ui-backend/src/main/java/org/apache/shardingsphere/elasticjob/cloud/ui/web/controller/search/JobEventRdbSearch.java
index 9666b16..a7945da 100644
--- a/shardingsphere-elasticjob-cloud-ui/shardingsphere-elasticjob-cloud-ui-backend/src/main/java/org/apache/shardingsphere/elasticjob/cloud/ui/web/controller/search/JobEventRdbSearch.java
+++ b/shardingsphere-elasticjob-cloud-ui/shardingsphere-elasticjob-cloud-ui-backend/src/main/java/org/apache/shardingsphere/elasticjob/cloud/ui/web/controller/search/JobEventRdbSearch.java
@@ -89,7 +89,7 @@ public final class JobEventRdbSearch {
) {
while (resultSet.next()) {
JobExecutionEvent jobExecutionEvent = new JobExecutionEvent(resultSet.getString(1), resultSet.getString(2), resultSet.getString(3), resultSet.getString(4),
- resultSet.getString(5), JobExecutionEvent.ExecutionSource.valueOf(resultSet.getString(6)), Integer.valueOf(resultSet.getString(7)),
+ resultSet.getString(5), JobExecutionEvent.ExecutionSource.valueOf(resultSet.getString(6)), Integer.parseInt(resultSet.getString(7)),
new Date(resultSet.getTimestamp(8).getTime()), resultSet.getTimestamp(9) == null ? null : new Date(resultSet.getTimestamp(9).getTime()),
resultSet.getBoolean(10), resultSet.getString(11));
result.add(jobExecutionEvent);
@@ -242,15 +242,10 @@ public final class JobEventRdbSearch {
}
StringBuilder sqlBuilder = new StringBuilder();
sqlBuilder.append(" ORDER BY ").append(lowerUnderscore);
- switch (sortOrder.toUpperCase()) {
- case "ASC":
- sqlBuilder.append(" ASC");
- break;
- case "DESC":
- sqlBuilder.append(" DESC");
- break;
- default :
- sqlBuilder.append(" ASC");
+ if ("DESC".equals(sortOrder.toUpperCase())) {
+ sqlBuilder.append(" DESC");
+ } else {
+ sqlBuilder.append(" ASC");
}
return sqlBuilder.toString();
}
diff --git a/shardingsphere-elasticjob-lite-ui/shardingsphere-elasticjob-lite-ui-backend/src/main/java/org/apache/shardingsphere/elasticjob/lite/ui/config/OpenJPAConfig.java b/shardingsphere-elasticjob-lite-ui/shardingsphere-elasticjob-lite-ui-backend/src/main/java/org/apache/shardingsphere/elasticjob/lite/ui/config/OpenJPAConfig.java
index 4917b96..fc552af 100644
--- a/shardingsphere-elasticjob-lite-ui/shardingsphere-elasticjob-lite-ui-backend/src/main/java/org/apache/shardingsphere/elasticjob/lite/ui/config/OpenJPAConfig.java
+++ b/shardingsphere-elasticjob-lite-ui/shardingsphere-elasticjob-lite-ui-backend/src/main/java/org/apache/shardingsphere/elasticjob/lite/ui/config/OpenJPAConfig.java
@@ -56,5 +56,4 @@ public class OpenJPAConfig extends JpaBaseConfiguration {
result.put("openjpa.RuntimeUnenhancedClasses", "supported");
return result;
}
-
}
\ No newline at end of file
diff --git a/shardingsphere-elasticjob-lite-ui/shardingsphere-elasticjob-lite-ui-backend/src/main/java/org/apache/shardingsphere/elasticjob/lite/ui/dao/statistics/type/job/JobExecutionTypeStatistics.java b/shardingsphere-elasticjob-lite-ui/shardingsphere-elasticjob-lite-ui-backend/src/main/java/org/apache/shardingsphere/elasticjob/lite/ui/dao/statistics/type/job/JobExecutionTypeStatistics.java
index 051c7cc..74593dd 100644
--- a/shardingsphere-elasticjob-lite-ui/shardingsphere-elasticjob-lite-ui-backend/src/main/java/org/apache/shardingsphere/elasticjob/lite/ui/dao/statistics/type/job/JobExecutionTypeStatistics.java
+++ b/shardingsphere-elasticjob-lite-ui/shardingsphere-elasticjob-lite-ui-backend/src/main/java/org/apache/shardingsphere/elasticjob/lite/ui/dao/statistics/type/job/JobExecutionTypeStatistics.java
@@ -17,17 +17,17 @@
package org.apache.shardingsphere.elasticjob.lite.ui.dao.statistics.type.job;
-import lombok.AllArgsConstructor;
import lombok.Getter;
+import lombok.RequiredArgsConstructor;
/**
* Job execution type statistics.
*/
+@RequiredArgsConstructor
@Getter
-@AllArgsConstructor
public final class JobExecutionTypeStatistics {
- private int transientJobCount;
+ private final int transientJobCount;
- private int daemonJobCount;
+ private final int daemonJobCount;
}
diff --git a/shardingsphere-elasticjob-lite-ui/shardingsphere-elasticjob-lite-ui-backend/src/main/java/org/apache/shardingsphere/elasticjob/lite/ui/dao/statistics/type/job/JobTypeStatistics.java b/shardingsphere-elasticjob-lite-ui/shardingsphere-elasticjob-lite-ui-backend/src/main/java/org/apache/shardingsphere/elasticjob/lite/ui/dao/statistics/type/job/JobTypeStatistics.java
index 3baaef3..be8f910 100644
--- a/shardingsphere-elasticjob-lite-ui/shardingsphere-elasticjob-lite-ui-backend/src/main/java/org/apache/shardingsphere/elasticjob/lite/ui/dao/statistics/type/job/JobTypeStatistics.java
+++ b/shardingsphere-elasticjob-lite-ui/shardingsphere-elasticjob-lite-ui-backend/src/main/java/org/apache/shardingsphere/elasticjob/lite/ui/dao/statistics/type/job/JobTypeStatistics.java
@@ -17,19 +17,19 @@
package org.apache.shardingsphere.elasticjob.lite.ui.dao.statistics.type.job;
-import lombok.AllArgsConstructor;
import lombok.Getter;
+import lombok.RequiredArgsConstructor;
/**
* Job type statistics.
*/
+@RequiredArgsConstructor
@Getter
-@AllArgsConstructor
public final class JobTypeStatistics {
- private int scriptJobCount;
+ private final int scriptJobCount;
- private int simpleJobCount;
+ private final int simpleJobCount;
- private int dataflowJobCount;
+ private final int dataflowJobCount;
}
diff --git a/shardingsphere-elasticjob-lite-ui/shardingsphere-elasticjob-lite-ui-backend/src/main/java/org/apache/shardingsphere/elasticjob/lite/ui/domain/EventTraceDataSource.java b/shardingsphere-elasticjob-lite-ui/shardingsphere-elasticjob-lite-ui-backend/src/main/java/org/apache/shardingsphere/elasticjob/lite/ui/domain/EventTraceDataSource.java
index a010da1..2de4cec 100644
--- a/shardingsphere-elasticjob-lite-ui/shardingsphere-elasticjob-lite-ui-backend/src/main/java/org/apache/shardingsphere/elasticjob/lite/ui/domain/EventTraceDataSource.java
+++ b/shardingsphere-elasticjob-lite-ui/shardingsphere-elasticjob-lite-ui-backend/src/main/java/org/apache/shardingsphere/elasticjob/lite/ui/domain/EventTraceDataSource.java
@@ -19,6 +19,7 @@ package org.apache.shardingsphere.elasticjob.lite.ui.domain;
import lombok.AccessLevel;
import lombok.Getter;
+import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import java.sql.DriverManager;
@@ -27,21 +28,18 @@ import java.sql.SQLException;
/**
* Event tracing data source.
*/
+@RequiredArgsConstructor
+@Getter(AccessLevel.PROTECTED)
@Slf4j
public final class EventTraceDataSource {
- @Getter(AccessLevel.PROTECTED)
- private EventTraceDataSourceConfiguration eventTraceDataSourceConfiguration;
-
- public EventTraceDataSource(final EventTraceDataSourceConfiguration eventTraceDataSourceConfiguration) {
- this.eventTraceDataSourceConfiguration = eventTraceDataSourceConfiguration;
- }
+ private final EventTraceDataSourceConfiguration eventTraceDataSourceConfiguration;
/**
* Initialize data source.
*/
public void init() {
- log.debug("Elastic job: data source init, connection url is: {}.", eventTraceDataSourceConfiguration.getUrl());
+ log.debug("ElasticJob: data source init, connection url is: {}.", eventTraceDataSourceConfiguration.getUrl());
try {
Class.forName(eventTraceDataSourceConfiguration.getDriver());
DriverManager.getConnection(eventTraceDataSourceConfiguration.getUrl(), eventTraceDataSourceConfiguration.getUsername(), eventTraceDataSourceConfiguration.getPassword());
diff --git a/shardingsphere-elasticjob-lite-ui/shardingsphere-elasticjob-lite-ui-backend/src/main/java/org/apache/shardingsphere/elasticjob/lite/ui/domain/JobRegisterStatistics.java b/shardingsphere-elasticjob-lite-ui/shardingsphere-elasticjob-lite-ui-backend/src/main/java/org/apache/shardingsphere/elasticjob/lite/ui/domain/JobRegisterStatistics.java
index a8e371d..678b886 100644
--- a/shardingsphere-elasticjob-lite-ui/shardingsphere-elasticjob-lite-ui-backend/src/main/java/org/apache/shardingsphere/elasticjob/lite/ui/domain/JobRegisterStatistics.java
+++ b/shardingsphere-elasticjob-lite-ui/shardingsphere-elasticjob-lite-ui-backend/src/main/java/org/apache/shardingsphere/elasticjob/lite/ui/domain/JobRegisterStatistics.java
@@ -32,9 +32,9 @@ import java.util.Date;
/**
* Job register statistics.
*/
-@Getter
@NoArgsConstructor
@AllArgsConstructor
+@Getter
@Entity
@Table(name = "JOB_REGISTER_STATISTICS")
public class JobRegisterStatistics {
diff --git a/shardingsphere-elasticjob-lite-ui/shardingsphere-elasticjob-lite-ui-backend/src/main/java/org/apache/shardingsphere/elasticjob/lite/ui/domain/JobRunningStatistics.java b/shardingsphere-elasticjob-lite-ui/shardingsphere-elasticjob-lite-ui-backend/src/main/java/org/apache/shardingsphere/elasticjob/lite/ui/domain/JobRunningStatistics.java
index 76e0245..1253fc7 100644
--- a/shardingsphere-elasticjob-lite-ui/shardingsphere-elasticjob-lite-ui-backend/src/main/java/org/apache/shardingsphere/elasticjob/lite/ui/domain/JobRunningStatistics.java
+++ b/shardingsphere-elasticjob-lite-ui/shardingsphere-elasticjob-lite-ui-backend/src/main/java/org/apache/shardingsphere/elasticjob/lite/ui/domain/JobRunningStatistics.java
@@ -32,9 +32,9 @@ import java.util.Date;
/**
* Job running statistics.
*/
-@Getter
@NoArgsConstructor
@AllArgsConstructor
+@Getter
@Entity
@Table(name = "JOB_RUNNING_STATISTICS")
public class JobRunningStatistics {
diff --git a/shardingsphere-elasticjob-lite-ui/shardingsphere-elasticjob-lite-ui-backend/src/main/java/org/apache/shardingsphere/elasticjob/lite/ui/domain/TaskResultStatistics.java b/shardingsphere-elasticjob-lite-ui/shardingsphere-elasticjob-lite-ui-backend/src/main/java/org/apache/shardingsphere/elasticjob/lite/ui/domain/TaskResultStatistics.java
index bbc05db..52629b4 100644
--- a/shardingsphere-elasticjob-lite-ui/shardingsphere-elasticjob-lite-ui-backend/src/main/java/org/apache/shardingsphere/elasticjob/lite/ui/domain/TaskResultStatistics.java
+++ b/shardingsphere-elasticjob-lite-ui/shardingsphere-elasticjob-lite-ui-backend/src/main/java/org/apache/shardingsphere/elasticjob/lite/ui/domain/TaskResultStatistics.java
@@ -32,9 +32,9 @@ import java.util.Date;
/**
* Task result statistics.
*/
-@Getter
-@AllArgsConstructor
@NoArgsConstructor
+@AllArgsConstructor
+@Getter
@Entity
@Table(name = "TASK_RESULT_STATISTICS")
public class TaskResultStatistics {
diff --git a/shardingsphere-elasticjob-lite-ui/shardingsphere-elasticjob-lite-ui-backend/src/main/java/org/apache/shardingsphere/elasticjob/lite/ui/domain/TaskRunningStatistics.java b/shardingsphere-elasticjob-lite-ui/shardingsphere-elasticjob-lite-ui-backend/src/main/java/org/apache/shardingsphere/elasticjob/lite/ui/domain/TaskRunningStatistics.java
index cd39141..a6ad83c 100644
--- a/shardingsphere-elasticjob-lite-ui/shardingsphere-elasticjob-lite-ui-backend/src/main/java/org/apache/shardingsphere/elasticjob/lite/ui/domain/TaskRunningStatistics.java
+++ b/shardingsphere-elasticjob-lite-ui/shardingsphere-elasticjob-lite-ui-backend/src/main/java/org/apache/shardingsphere/elasticjob/lite/ui/domain/TaskRunningStatistics.java
@@ -32,9 +32,9 @@ import java.util.Date;
/**
* Task running statistics.
*/
-@Getter
@NoArgsConstructor
@AllArgsConstructor
+@Getter
@Entity
@Table(name = "TASK_RUNNING_STATISTICS")
public class TaskRunningStatistics {
diff --git a/shardingsphere-elasticjob-lite-ui/shardingsphere-elasticjob-lite-ui-backend/src/main/java/org/apache/shardingsphere/elasticjob/lite/ui/repository/impl/AbstractXmlRepositoryImpl.java b/shardingsphere-elasticjob-lite-ui/shardingsphere-elasticjob-lite-ui-backend/src/main/java/org/apache/shardingsphere/elasticjob/lite/ui/repository/impl/AbstractXmlRepositoryImpl.java
index 0e8d669..b65faa8 100644
--- a/shardingsphere-elasticjob-lite-ui/shardingsphere-elasticjob-lite-ui-backend/src/main/java/org/apache/shardingsphere/elasticjob/lite/ui/repository/impl/AbstractXmlRepositoryImpl.java
+++ b/shardingsphere-elasticjob-lite-ui/shardingsphere-elasticjob-lite-ui-backend/src/main/java/org/apache/shardingsphere/elasticjob/lite/ui/repository/impl/AbstractXmlRepositoryImpl.java
@@ -37,7 +37,7 @@ public abstract class AbstractXmlRepositoryImpl<E> implements XmlRepository<E> {
private final Class<E> clazz;
- private JAXBContext jaxbContext;
+ private final JAXBContext jaxbContext;
protected AbstractXmlRepositoryImpl(final String fileName, final Class<E> clazz) {
file = new File(HomeFolderUtils.getFilePathInHomeFolder(fileName));
diff --git a/shardingsphere-elasticjob-lite-ui/shardingsphere-elasticjob-lite-ui-backend/src/main/java/org/apache/shardingsphere/elasticjob/lite/ui/security/AuthenticationResult.java b/shardingsphere-elasticjob-lite-ui/shardingsphere-elasticjob-lite-ui-backend/src/main/java/org/apache/shardingsphere/elasticjob/lite/ui/security/AuthenticationResult.java
index d082c4b..4531a75 100644
--- a/shardingsphere-elasticjob-lite-ui/shardingsphere-elasticjob-lite-ui-backend/src/main/java/org/apache/shardingsphere/elasticjob/lite/ui/security/AuthenticationResult.java
+++ b/shardingsphere-elasticjob-lite-ui/shardingsphere-elasticjob-lite-ui-backend/src/main/java/org/apache/shardingsphere/elasticjob/lite/ui/security/AuthenticationResult.java
@@ -19,7 +19,6 @@ package org.apache.shardingsphere.elasticjob.lite.ui.security;
import lombok.Getter;
import lombok.RequiredArgsConstructor;
-import lombok.Setter;
/**
* Authentication result.
diff --git a/shardingsphere-elasticjob-lite-ui/shardingsphere-elasticjob-lite-ui-backend/src/main/java/org/apache/shardingsphere/elasticjob/lite/ui/util/BeanUtils.java b/shardingsphere-elasticjob-lite-ui/shardingsphere-elasticjob-lite-ui-backend/src/main/java/org/apache/shardingsphere/elasticjob/lite/ui/util/BeanUtils.java
index ba675a1..356a955 100644
--- a/shardingsphere-elasticjob-lite-ui/shardingsphere-elasticjob-lite-ui-backend/src/main/java/org/apache/shardingsphere/elasticjob/lite/ui/util/BeanUtils.java
+++ b/shardingsphere-elasticjob-lite-ui/shardingsphere-elasticjob-lite-ui-backend/src/main/java/org/apache/shardingsphere/elasticjob/lite/ui/util/BeanUtils.java
@@ -17,11 +17,6 @@
package org.apache.shardingsphere.elasticjob.lite.ui.util;
-import org.springframework.cglib.beans.BeanMap;
-
-import java.util.Map;
-import java.util.Objects;
-
public class BeanUtils extends org.springframework.beans.BeanUtils {
/**
@@ -34,23 +29,4 @@ public class BeanUtils extends org.springframework.beans.BeanUtils {
public static <T> T newInstance(final Class<T> clazz) {
return instantiateClass(clazz);
}
-
- /**
- * map to java object.
- *
- * @param map source map
- * @param type class
- * @param <T> target java type
- * @return java object
- */
- public static <T> T toBean(final Map<String, Object> map, final Class<T> type) {
- if (Objects.isNull(map)) {
- return null;
- }
- T bean = newInstance(type);
- BeanMap beanMap = BeanMap.create(bean);
- beanMap.putAll(map);
- return bean;
- }
-
}
diff --git a/shardingsphere-elasticjob-lite-ui/shardingsphere-elasticjob-lite-ui-backend/src/main/java/org/apache/shardingsphere/elasticjob/lite/ui/web/controller/EventTraceHistoryController.java b/shardingsphere-elasticjob-lite-ui/shardingsphere-elasticjob-lite-ui-backend/src/main/java/org/apache/shardingsphere/elasticjob/lite/ui/web/controller/EventTraceHistoryController.java
index 6eed5a8..7d79f64 100644
--- a/shardingsphere-elasticjob-lite-ui/shardingsphere-elasticjob-lite-ui-backend/src/main/java/org/apache/shardingsphere/elasticjob/lite/ui/web/controller/EventTraceHistoryController.java
+++ b/shardingsphere-elasticjob-lite-ui/shardingsphere-elasticjob-lite-ui-backend/src/main/java/org/apache/shardingsphere/elasticjob/lite/ui/web/controller/EventTraceHistoryController.java
@@ -17,17 +17,16 @@
package org.apache.shardingsphere.elasticjob.lite.ui.web.controller;
-import org.apache.shardingsphere.elasticjob.tracing.event.JobExecutionEvent;
-import org.apache.shardingsphere.elasticjob.tracing.event.JobStatusTraceEvent;
import org.apache.shardingsphere.elasticjob.lite.ui.dto.request.FindJobExecutionEventsRequest;
import org.apache.shardingsphere.elasticjob.lite.ui.dto.request.FindJobStatusTraceEventsRequest;
import org.apache.shardingsphere.elasticjob.lite.ui.dto.response.BasePageResponse;
import org.apache.shardingsphere.elasticjob.lite.ui.service.EventTraceHistoryService;
import org.apache.shardingsphere.elasticjob.lite.ui.web.response.ResponseResult;
import org.apache.shardingsphere.elasticjob.lite.ui.web.response.ResponseResultUtil;
+import org.apache.shardingsphere.elasticjob.tracing.event.JobExecutionEvent;
+import org.apache.shardingsphere.elasticjob.tracing.event.JobStatusTraceEvent;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.domain.Page;
-import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
diff --git a/shardingsphere-elasticjob-lite-ui/shardingsphere-elasticjob-lite-ui-backend/src/test/java/org/apache/shardingsphere/elasticjob/lite/ui/dao/statistics/rdb/RDBStatisticRepositoryTest.java b/shardingsphere-elasticjob-lite-ui/shardingsphere-elasticjob-lite-ui-backend/src/test/java/org/apache/shardingsphere/elasticjob/lite/ui/dao/statistics/rdb/RDBStatisticRepositoryTest.java
index 24d7978..fe92109 100644
--- a/shardingsphere-elasticjob-lite-ui/shardingsphere-elasticjob-lite-ui-backend/src/test/java/org/apache/shardingsphere/elasticjob/lite/ui/dao/statistics/rdb/RDBStatisticRepositoryTest.java
+++ b/shardingsphere-elasticjob-lite-ui/shardingsphere-elasticjob-lite-ui-backend/src/test/java/org/apache/shardingsphere/elasticjob/lite/ui/dao/statistics/rdb/RDBStatisticRepositoryTest.java
@@ -37,7 +37,6 @@ 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)
@@ -59,26 +58,26 @@ public class RDBStatisticRepositoryTest {
public void assertAddTaskResultStatistics() {
for (StatisticInterval each : StatisticInterval.values()) {
TaskResultStatistics taskResultStatistics = new TaskResultStatistics(100L, 0L, each.name(), new Date());
- assertTrue(taskResultStatistics.equals(taskResultStatisticsRepository.save(taskResultStatistics)));
+ assertThat(taskResultStatisticsRepository.save(taskResultStatistics), is(taskResultStatistics));
}
}
@Test
public void assertAddTaskRunningStatistics() {
TaskRunningStatistics taskRunningStatistics = new TaskRunningStatistics(100, new Date());
- assertTrue(taskRunningStatistics.equals(taskRunningStatisticsRepository.save(taskRunningStatistics)));
+ assertThat(taskRunningStatisticsRepository.save(taskRunningStatistics), is(taskRunningStatistics));
}
@Test
public void assertAddJobRunningStatistics() {
JobRunningStatistics jobRunningStatistics = new JobRunningStatistics(100, new Date());
- assertTrue(jobRunningStatistics.equals(jobRunningStatisticsRepository.save(jobRunningStatistics)));
+ assertThat(jobRunningStatisticsRepository.save(jobRunningStatistics), is(jobRunningStatistics));
}
@Test
public void assertAddJobRegisterStatistics() {
JobRegisterStatistics jobRegisterStatistics = new JobRegisterStatistics(100, new Date());
- assertTrue(jobRegisterStatistics.equals(jobRegisterStatisticsRepository.save(jobRegisterStatistics)));
+ assertThat(jobRegisterStatisticsRepository.save(jobRegisterStatistics), is(jobRegisterStatistics));
}
@Test