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/04 04:42:30 UTC
[shardingsphere-elasticjob-lite] branch master updated: For code
style (#931)
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 4d62c40 For code style (#931)
4d62c40 is described below
commit 4d62c40ed59447f0e8cde55a15a9f9d702c6c657
Author: Liang Zhang <te...@163.com>
AuthorDate: Sat Jul 4 12:42:20 2020 +0800
For code style (#931)
---
.../controller/EventTraceHistoryController.java | 7 ++--
.../controller/RegistryCenterController.java | 2 +-
.../lite/console/dto/request/BasePageRequest.java | 10 +++---
.../dto/request/FindJobExecutionEventsRequest.java | 15 +++++----
.../request/FindJobStatusTraceEventsRequest.java | 36 ++++++--------------
.../console/dto/response/BasePageResponse.java | 13 ++++----
.../console/service/EventTraceHistoryService.java | 4 +--
.../service/impl/EventTraceHistoryServiceImpl.java | 31 ++++++++---------
.../console/dao/search/RDBJobEventSearchTest.java | 39 +++++++++++-----------
.../search/RDBJobEventSearchTestConfiguration.java | 13 ++++----
10 files changed, 81 insertions(+), 89 deletions(-)
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 c328b54..3a6521c 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
@@ -17,7 +17,6 @@
package org.apache.shardingsphere.elasticjob.lite.console.controller;
-import javax.ws.rs.core.MediaType;
import org.apache.shardingsphere.elasticjob.lite.console.dto.request.FindJobExecutionEventsRequest;
import org.apache.shardingsphere.elasticjob.lite.console.dto.request.FindJobStatusTraceEventsRequest;
import org.apache.shardingsphere.elasticjob.lite.console.dto.response.BasePageResponse;
@@ -30,16 +29,18 @@ import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
+import javax.ws.rs.core.MediaType;
+
/**
* Event trace history RESTful API.
*/
@RestController
@RequestMapping("/event-trace")
public final class EventTraceHistoryController {
-
+
@Autowired
private EventTraceHistoryService eventTraceHistoryService;
-
+
/**
* Find job execution events.
*
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 1c81b71..0057310 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
@@ -51,7 +51,7 @@ public final class RegistryCenterController {
public RegistryCenterController(final RegistryCenterConfigurationService regCenterService) {
this.regCenterService = regCenterService;
}
-
+
/**
* Judge whether registry center is activated.
*
diff --git a/elastic-job-lite-console/src/main/java/org/apache/shardingsphere/elasticjob/lite/console/dto/request/BasePageRequest.java b/elastic-job-lite-console/src/main/java/org/apache/shardingsphere/elasticjob/lite/console/dto/request/BasePageRequest.java
index fd78e95..a1c6860 100644
--- a/elastic-job-lite-console/src/main/java/org/apache/shardingsphere/elasticjob/lite/console/dto/request/BasePageRequest.java
+++ b/elastic-job-lite-console/src/main/java/org/apache/shardingsphere/elasticjob/lite/console/dto/request/BasePageRequest.java
@@ -31,28 +31,28 @@ import lombok.Setter;
@NoArgsConstructor
@AllArgsConstructor
public class BasePageRequest {
-
+
public static final int DEFAULT_PAGE_SIZE = 10;
-
+
// CHECKSTYLE:OFF
/**
* Page size of request.
*/
@JsonProperty("per_page")
protected Integer pageSize = DEFAULT_PAGE_SIZE;
-
+
/**
* Page number of request.
*/
@JsonProperty("page")
protected Integer pageNumber = 1;
-
+
/**
* The field name for sort by.
*/
@JsonProperty("sort")
protected String sortBy;
-
+
/**
* Order type, asc or desc.
*/
diff --git a/elastic-job-lite-console/src/main/java/org/apache/shardingsphere/elasticjob/lite/console/dto/request/FindJobExecutionEventsRequest.java b/elastic-job-lite-console/src/main/java/org/apache/shardingsphere/elasticjob/lite/console/dto/request/FindJobExecutionEventsRequest.java
index 02abc05..466c62d 100644
--- a/elastic-job-lite-console/src/main/java/org/apache/shardingsphere/elasticjob/lite/console/dto/request/FindJobExecutionEventsRequest.java
+++ b/elastic-job-lite-console/src/main/java/org/apache/shardingsphere/elasticjob/lite/console/dto/request/FindJobExecutionEventsRequest.java
@@ -19,12 +19,13 @@ package org.apache.shardingsphere.elasticjob.lite.console.dto.request;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.fasterxml.jackson.annotation.JsonProperty;
-import java.util.Date;
import lombok.AllArgsConstructor;
import lombok.Getter;
import lombok.NoArgsConstructor;
import lombok.Setter;
+import java.util.Date;
+
/**
* Request object of uri '/event-trace/execution'.
*/
@@ -33,13 +34,13 @@ import lombok.Setter;
@NoArgsConstructor
@AllArgsConstructor
public class FindJobExecutionEventsRequest extends BasePageRequest {
-
+
private String jobName;
-
+
private String ip;
-
+
private Boolean isSuccess;
-
+
@JsonProperty("startTime")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date start;
@@ -47,7 +48,7 @@ public class FindJobExecutionEventsRequest extends BasePageRequest {
@JsonProperty("endTime")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date end;
-
+
/**
* Create new FindJobExecutionEventsRequest with pageSize and pageNumber.
* @param pageNumber page number
@@ -57,7 +58,7 @@ public class FindJobExecutionEventsRequest extends BasePageRequest {
this.pageSize = pageSize;
this.pageNumber = pageNumber;
}
-
+
/**
* Create new FindJobExecutionEventsRequest with properties.
* @param pageNumber page number
diff --git a/elastic-job-lite-console/src/main/java/org/apache/shardingsphere/elasticjob/lite/console/dto/request/FindJobStatusTraceEventsRequest.java b/elastic-job-lite-console/src/main/java/org/apache/shardingsphere/elasticjob/lite/console/dto/request/FindJobStatusTraceEventsRequest.java
index 252c87c..51e5bd9 100644
--- a/elastic-job-lite-console/src/main/java/org/apache/shardingsphere/elasticjob/lite/console/dto/request/FindJobStatusTraceEventsRequest.java
+++ b/elastic-job-lite-console/src/main/java/org/apache/shardingsphere/elasticjob/lite/console/dto/request/FindJobStatusTraceEventsRequest.java
@@ -19,12 +19,13 @@ package org.apache.shardingsphere.elasticjob.lite.console.dto.request;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.fasterxml.jackson.annotation.JsonProperty;
-import java.util.Date;
import lombok.AllArgsConstructor;
import lombok.Getter;
import lombok.NoArgsConstructor;
import lombok.Setter;
+import java.util.Date;
+
/**
* Request object of uri '/event-trace/status'.
*/
@@ -33,44 +34,29 @@ import lombok.Setter;
@NoArgsConstructor
@AllArgsConstructor
public class FindJobStatusTraceEventsRequest extends BasePageRequest {
-
+
private String jobName;
-
+
private String source;
-
+
private String executionType;
-
+
private String state;
-
+
@JsonProperty("startTime")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date start;
-
+
@JsonProperty("endTime")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date end;
-
- /**
- * Create new FindJobStatusTraceEventsRequest with pageSize and pageNumber.
- * @param pageNumber page number.
- * @param pageSize page size.
- */
+
public FindJobStatusTraceEventsRequest(final Integer pageSize, final Integer pageNumber) {
this.pageSize = pageSize;
this.pageNumber = pageNumber;
}
-
- /**
- * Create new FindJobStatusTraceEventsRequest with properties.
- * @param pageNumber page number
- * @param pageSize page size
- * @param sortBy the field name sort by
- * @param orderType order type, asc or desc
- * @param startTime start time
- * @param endTime end time
- */
- public FindJobStatusTraceEventsRequest(final Integer pageSize, final Integer pageNumber, final String sortBy,
- final String orderType, final Date startTime, final Date endTime) {
+
+ public FindJobStatusTraceEventsRequest(final Integer pageSize, final Integer pageNumber, final String sortBy, final String orderType, final Date startTime, final Date endTime) {
this.pageSize = pageSize;
this.pageNumber = pageNumber;
this.sortBy = sortBy;
diff --git a/elastic-job-lite-console/src/main/java/org/apache/shardingsphere/elasticjob/lite/console/dto/response/BasePageResponse.java b/elastic-job-lite-console/src/main/java/org/apache/shardingsphere/elasticjob/lite/console/dto/response/BasePageResponse.java
index bda2983..b3d5e8c 100644
--- a/elastic-job-lite-console/src/main/java/org/apache/shardingsphere/elasticjob/lite/console/dto/response/BasePageResponse.java
+++ b/elastic-job-lite-console/src/main/java/org/apache/shardingsphere/elasticjob/lite/console/dto/response/BasePageResponse.java
@@ -18,29 +18,30 @@
package org.apache.shardingsphere.elasticjob.lite.console.dto.response;
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
-import java.io.Serializable;
-import java.util.List;
import lombok.AllArgsConstructor;
import lombok.Getter;
import lombok.NoArgsConstructor;
import org.springframework.data.domain.Page;
+import java.io.Serializable;
+import java.util.List;
+
@Getter
@AllArgsConstructor
@NoArgsConstructor
@JsonIgnoreProperties(ignoreUnknown = true)
public class BasePageResponse<T> implements Serializable {
-
+
/**
* Total count of rows.
*/
private Long total;
-
+
/**
* Rows data.
*/
private List<T> rows;
-
+
/**
* Create new BasePageResponse with total and data.
* @param total Total count of match data
@@ -51,7 +52,7 @@ public class BasePageResponse<T> implements Serializable {
public static <T> BasePageResponse of(final Long total, final List<T> data) {
return new BasePageResponse(total, data);
}
-
+
/**
* Create new BasePageResponse with Page.
* @param page match data info.
diff --git a/elastic-job-lite-console/src/main/java/org/apache/shardingsphere/elasticjob/lite/console/service/EventTraceHistoryService.java b/elastic-job-lite-console/src/main/java/org/apache/shardingsphere/elasticjob/lite/console/service/EventTraceHistoryService.java
index cf3ab16..a0ed520 100644
--- a/elastic-job-lite-console/src/main/java/org/apache/shardingsphere/elasticjob/lite/console/service/EventTraceHistoryService.java
+++ b/elastic-job-lite-console/src/main/java/org/apache/shardingsphere/elasticjob/lite/console/service/EventTraceHistoryService.java
@@ -27,7 +27,7 @@ import org.springframework.data.domain.Page;
* Event trace history service.
*/
public interface EventTraceHistoryService {
-
+
/**
* Find job execution events.
*
@@ -35,7 +35,7 @@ public interface EventTraceHistoryService {
* @return job execution events
*/
Page<JobExecutionEvent> findJobExecutionEvents(FindJobExecutionEventsRequest findJobExecutionEventsRequest);
-
+
/**
* Find job status trace events.
*
diff --git a/elastic-job-lite-console/src/main/java/org/apache/shardingsphere/elasticjob/lite/console/service/impl/EventTraceHistoryServiceImpl.java b/elastic-job-lite-console/src/main/java/org/apache/shardingsphere/elasticjob/lite/console/service/impl/EventTraceHistoryServiceImpl.java
index 93f8c07..84315ba 100644
--- a/elastic-job-lite-console/src/main/java/org/apache/shardingsphere/elasticjob/lite/console/service/impl/EventTraceHistoryServiceImpl.java
+++ b/elastic-job-lite-console/src/main/java/org/apache/shardingsphere/elasticjob/lite/console/service/impl/EventTraceHistoryServiceImpl.java
@@ -18,13 +18,6 @@
package org.apache.shardingsphere.elasticjob.lite.console.service.impl;
import com.google.common.base.Strings;
-import java.lang.reflect.Field;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Date;
-import java.util.List;
-import java.util.stream.Collectors;
-import javax.persistence.criteria.Predicate;
import lombok.extern.slf4j.Slf4j;
import org.apache.shardingsphere.elasticjob.lite.console.dao.search.JobExecutionLogRepository;
import org.apache.shardingsphere.elasticjob.lite.console.dao.search.JobStatusTraceLogRepository;
@@ -48,19 +41,27 @@ import org.springframework.data.jpa.convert.QueryByExamplePredicateBuilder;
import org.springframework.data.jpa.domain.Specification;
import org.springframework.stereotype.Component;
+import javax.persistence.criteria.Predicate;
+import java.lang.reflect.Field;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Date;
+import java.util.List;
+import java.util.stream.Collectors;
+
/**
* Event trace history service implementation.
*/
@Slf4j
@Component
public final class EventTraceHistoryServiceImpl implements EventTraceHistoryService {
-
+
@Autowired
private JobExecutionLogRepository jobExecutionLogRepository;
-
+
@Autowired
private JobStatusTraceLogRepository jobStatusTraceLogRepository;
-
+
@Override
public Page<JobExecutionEvent> findJobExecutionEvents(final FindJobExecutionEventsRequest findJobExecutionEventsRequest) {
Example<JobExecutionLog> jobExecutionLogExample = getExample(findJobExecutionEventsRequest, JobExecutionLog.class);
@@ -70,7 +71,7 @@ public final class EventTraceHistoryServiceImpl implements EventTraceHistoryServ
Page<JobExecutionLog> page = jobExecutionLogRepository.findAll(specification, getPageable(findJobExecutionEventsRequest, JobExecutionLog.class));
return new PageImpl<>(page.get().map(JobExecutionLog::toJobExecutionEvent).collect(Collectors.toList()), page.getPageable(), page.getTotalElements());
}
-
+
@Override
public Page<JobStatusTraceEvent> findJobStatusTraceEvents(final FindJobStatusTraceEventsRequest findJobStatusTraceEventsRequest) {
Example<JobStatusTraceLog> jobStatusTraceLogExample = getExample(findJobStatusTraceEventsRequest, JobStatusTraceLog.class);
@@ -79,7 +80,7 @@ public final class EventTraceHistoryServiceImpl implements EventTraceHistoryServ
Page<JobStatusTraceLog> page = jobStatusTraceLogRepository.findAll(specification, getPageable(findJobStatusTraceEventsRequest, JobStatusTraceLog.class));
return new PageImpl<>(page.get().map(JobStatusTraceLog::toJobStatusTraceEvent).collect(Collectors.toList()), page.getPageable(), page.getTotalElements());
}
-
+
private <T> Pageable getPageable(final BasePageRequest pageRequest, final Class<T> clazz) {
int page = 0;
int perPage = BasePageRequest.DEFAULT_PAGE_SIZE;
@@ -89,7 +90,7 @@ public final class EventTraceHistoryServiceImpl implements EventTraceHistoryServ
}
return PageRequest.of(page, perPage, getSort(pageRequest, clazz));
}
-
+
private <T> Sort getSort(final BasePageRequest pageRequest, final Class<T> clazz) {
Sort sort = Sort.unsorted();
boolean sortFieldIsPresent = Arrays.stream(clazz.getDeclaredFields())
@@ -108,7 +109,7 @@ public final class EventTraceHistoryServiceImpl implements EventTraceHistoryServ
}
return sort;
}
-
+
private <T> Specification<T> getSpecWithExampleAndDate(final Example<T> example, final Date from, final Date to, final String field) {
return (Specification<T>) (root, query, builder) -> {
final List<Predicate> predicates = new ArrayList<>();
@@ -122,7 +123,7 @@ public final class EventTraceHistoryServiceImpl implements EventTraceHistoryServ
return builder.and(predicates.toArray(new Predicate[0]));
};
}
-
+
private <T> Example<T> getExample(final Object source, final Class<T> clazz) {
T instance = BeanUtils.newInstance(clazz);
BeanUtils.copyProperties(source, instance);
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 e79eb37..3e0f13a 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
@@ -17,10 +17,6 @@
package org.apache.shardingsphere.elasticjob.lite.console.dao.search;
-import static org.hamcrest.CoreMatchers.is;
-import static org.junit.Assert.assertThat;
-
-import java.util.Date;
import org.apache.shardingsphere.elasticjob.lite.console.dto.request.FindJobExecutionEventsRequest;
import org.apache.shardingsphere.elasticjob.lite.console.dto.request.FindJobStatusTraceEventsRequest;
import org.apache.shardingsphere.elasticjob.lite.console.service.EventTraceHistoryService;
@@ -34,14 +30,19 @@ import org.springframework.context.annotation.Import;
import org.springframework.data.domain.Page;
import org.springframework.test.context.junit4.SpringRunner;
+import java.util.Date;
+
+import static org.hamcrest.CoreMatchers.is;
+import static org.junit.Assert.assertThat;
+
@RunWith(SpringRunner.class)
@SpringBootTest
@Import(RDBJobEventSearchTestConfiguration.class)
public final class RDBJobEventSearchTest {
-
+
@Autowired
private EventTraceHistoryService eventTraceHistoryService;
-
+
@Test
public void assertFindJobExecutionEventsWithPageSizeAndNumber() {
Page<JobExecutionEvent> result = eventTraceHistoryService.findJobExecutionEvents(new FindJobExecutionEventsRequest());
@@ -57,14 +58,14 @@ public final class RDBJobEventSearchTest {
assertThat(result.getTotalElements(), is(500L));
assertThat(result.getContent().size(), is(0));
}
-
+
@Test
public void assertFindJobExecutionEventsWithErrorPageSizeAndNumber() {
Page<JobExecutionEvent> result = eventTraceHistoryService.findJobExecutionEvents(new FindJobExecutionEventsRequest(-1, -1, null, null, null, null));
assertThat(result.getTotalElements(), is(500L));
assertThat(result.getContent().size(), is(10));
}
-
+
@Test
public void assertFindJobExecutionEventsWithSort() {
Page<JobExecutionEvent> result = eventTraceHistoryService.findJobExecutionEvents(new FindJobExecutionEventsRequest(10, 1, "jobName", "ASC", null, null));
@@ -76,7 +77,7 @@ public final class RDBJobEventSearchTest {
assertThat(result.getContent().size(), is(10));
assertThat(result.getContent().get(0).getJobName(), is("test_job_99"));
}
-
+
@Test
public void assertFindJobExecutionEventsWithErrorSort() {
Page<JobExecutionEvent> result = eventTraceHistoryService.findJobExecutionEvents(new FindJobExecutionEventsRequest(10, 1, "jobName", "ERROR_SORT", null, null));
@@ -87,7 +88,7 @@ public final class RDBJobEventSearchTest {
assertThat(result.getTotalElements(), is(500L));
assertThat(result.getContent().size(), is(10));
}
-
+
@Test
public void assertFindJobExecutionEventsWithTime() {
Date now = new Date();
@@ -108,7 +109,7 @@ public final class RDBJobEventSearchTest {
assertThat(result.getTotalElements(), is(500L));
assertThat(result.getContent().size(), is(10));
}
-
+
@Test
public void assertFindJobExecutionEventsWithFields() {
FindJobExecutionEventsRequest findJobExecutionEventsRequest = new FindJobExecutionEventsRequest(10, 1, null, null, null, null);
@@ -122,14 +123,14 @@ public final class RDBJobEventSearchTest {
assertThat(result.getTotalElements(), is(1L));
assertThat(result.getContent().size(), is(1));
}
-
+
@Test
public void assertFindJobExecutionEventsWithErrorFields() {
Page<JobExecutionEvent> result = eventTraceHistoryService.findJobExecutionEvents(new FindJobExecutionEventsRequest(10, 1));
assertThat(result.getTotalElements(), is(500L));
assertThat(result.getContent().size(), is(10));
}
-
+
@Test
public void assertFindJobStatusTraceEventsWithPageSizeAndNumber() {
Page<JobStatusTraceEvent> result = eventTraceHistoryService.findJobStatusTraceEvents(new FindJobStatusTraceEventsRequest(10, 1, null, null, null, null));
@@ -145,14 +146,14 @@ public final class RDBJobEventSearchTest {
assertThat(result.getTotalElements(), is(500L));
assertThat(result.getContent().size(), is(0));
}
-
+
@Test
public void assertFindJobStatusTraceEventsWithErrorPageSizeAndNumber() {
Page<JobStatusTraceEvent> result = eventTraceHistoryService.findJobStatusTraceEvents(new FindJobStatusTraceEventsRequest(-1, -1));
assertThat(result.getTotalElements(), is(500L));
assertThat(result.getContent().size(), is(10));
}
-
+
@Test
public void assertFindJobStatusTraceEventsWithSort() {
Page<JobStatusTraceEvent> result = eventTraceHistoryService.findJobStatusTraceEvents(new FindJobStatusTraceEventsRequest(10, 1, "jobName", "ASC", null, null));
@@ -164,7 +165,7 @@ public final class RDBJobEventSearchTest {
assertThat(result.getContent().size(), is(10));
assertThat(result.getContent().get(0).getJobName(), is("test_job_99"));
}
-
+
@Test
public void assertFindJobStatusTraceEventsWithErrorSort() {
Page<JobStatusTraceEvent> result = eventTraceHistoryService.findJobStatusTraceEvents(new FindJobStatusTraceEventsRequest(10, 1, "jobName", "ERROR_SORT", null, null));
@@ -175,7 +176,7 @@ public final class RDBJobEventSearchTest {
assertThat(result.getTotalElements(), is(500L));
assertThat(result.getContent().size(), is(10));
}
-
+
@Test
public void assertFindJobStatusTraceEventsWithTime() {
Date now = new Date();
@@ -196,7 +197,7 @@ public final class RDBJobEventSearchTest {
assertThat(result.getTotalElements(), is(500L));
assertThat(result.getContent().size(), is(10));
}
-
+
@Test
public void assertFindJobStatusTraceEventsWithFields() {
FindJobStatusTraceEventsRequest findJobStatusTraceEventsRequest = new FindJobStatusTraceEventsRequest(10, 1);
@@ -205,7 +206,7 @@ public final class RDBJobEventSearchTest {
assertThat(result.getTotalElements(), is(1L));
assertThat(result.getContent().size(), is(1));
}
-
+
@Test
public void assertFindJobStatusTraceEventsWithErrorFields() {
FindJobStatusTraceEventsRequest findJobStatusTraceEventsRequest = new FindJobStatusTraceEventsRequest(10, 1);
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 2d23be1..871712a 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
@@ -17,8 +17,6 @@
package org.apache.shardingsphere.elasticjob.lite.console.dao.search;
-import java.sql.SQLException;
-import javax.sql.DataSource;
import org.apache.shardingsphere.elasticjob.lite.console.dto.request.FindJobExecutionEventsRequest;
import org.apache.shardingsphere.elasticjob.lite.console.dto.request.FindJobStatusTraceEventsRequest;
import org.apache.shardingsphere.elasticjob.lite.console.service.EventTraceHistoryService;
@@ -29,20 +27,23 @@ import org.springframework.beans.factory.InitializingBean;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.test.context.TestConfiguration;
+import javax.sql.DataSource;
+import java.sql.SQLException;
+
@TestConfiguration
public class RDBJobEventSearchTestConfiguration implements InitializingBean {
-
+
@Autowired
private EventTraceHistoryService eventTraceHistoryService;
-
+
@Autowired
private DataSource dataSource;
-
+
@Override
public void afterPropertiesSet() throws Exception {
initStorage();
}
-
+
private void initStorage() throws SQLException {
eventTraceHistoryService.findJobExecutionEvents(new FindJobExecutionEventsRequest(10, 1));
eventTraceHistoryService.findJobStatusTraceEvents(new FindJobStatusTraceEventsRequest(10, 1));