diff --git a/arex-storage-config/pom.xml b/arex-storage-config/pom.xml index baf658e0..6c6ec48d 100644 --- a/arex-storage-config/pom.xml +++ b/arex-storage-config/pom.xml @@ -45,7 +45,7 @@ arex-storage-service com.arextest - 1.0.45 + 1.0.46 diff --git a/arex-storage-model/pom.xml b/arex-storage-model/pom.xml index 2fee61af..720aa7bd 100644 --- a/arex-storage-model/pom.xml +++ b/arex-storage-model/pom.xml @@ -7,7 +7,7 @@ arex-storage-service com.arextest - 1.0.45 + 1.0.46 diff --git a/arex-storage-model/src/main/java/com/arextest/model/replay/ViewRecordResponseType.java b/arex-storage-model/src/main/java/com/arextest/model/replay/ViewRecordResponseType.java index 355f5df4..fa768415 100644 --- a/arex-storage-model/src/main/java/com/arextest/model/replay/ViewRecordResponseType.java +++ b/arex-storage-model/src/main/java/com/arextest/model/replay/ViewRecordResponseType.java @@ -1,6 +1,6 @@ package com.arextest.model.replay; -import com.arextest.model.mock.Mocker; +import com.arextest.model.mock.AREXMocker; import com.arextest.model.response.DesensitizationResponseType; import com.arextest.model.response.Response; import com.arextest.model.response.ResponseStatusType; @@ -15,5 +15,5 @@ public class ViewRecordResponseType extends DesensitizationResponseType implements Response { private ResponseStatusType responseStatusType; - private List recordResult; + private List recordResult; } \ No newline at end of file diff --git a/arex-storage-web-api/pom.xml b/arex-storage-web-api/pom.xml index 4a62a9f2..5b54dd7a 100644 --- a/arex-storage-web-api/pom.xml +++ b/arex-storage-web-api/pom.xml @@ -123,7 +123,7 @@ arex-storage-service com.arextest - 1.0.45 + 1.0.46 diff --git a/arex-storage-web-api/src/main/java/com/arextest/storage/mock/MockerPostProcessor.java b/arex-storage-web-api/src/main/java/com/arextest/storage/mock/MockerPostProcessor.java index 1e342253..0a9df8f6 100644 --- a/arex-storage-web-api/src/main/java/com/arextest/storage/mock/MockerPostProcessor.java +++ b/arex-storage-web-api/src/main/java/com/arextest/storage/mock/MockerPostProcessor.java @@ -1,6 +1,7 @@ package com.arextest.storage.mock; import com.arextest.common.utils.JsonTraverseUtils; +import com.arextest.model.mock.AREXMocker; import com.arextest.model.mock.Mocker; import com.arextest.storage.utils.JsonUtil; import com.fasterxml.jackson.core.JsonProcessingException; @@ -9,9 +10,9 @@ public class MockerPostProcessor { - public static void desensitize(List allReadableResult) + public static void desensitize(List allReadableResult) throws JsonProcessingException { - for (Mocker arexMocker : allReadableResult) { + for (AREXMocker arexMocker : allReadableResult) { Mocker.Target request = arexMocker.getTargetRequest(); Mocker.Target response = arexMocker.getTargetResponse(); diff --git a/arex-storage-web-api/src/main/java/com/arextest/storage/service/MockSourceEditionService.java b/arex-storage-web-api/src/main/java/com/arextest/storage/service/MockSourceEditionService.java index 662f568e..8bea71af 100644 --- a/arex-storage-web-api/src/main/java/com/arextest/storage/service/MockSourceEditionService.java +++ b/arex-storage-web-api/src/main/java/com/arextest/storage/service/MockSourceEditionService.java @@ -133,7 +133,7 @@ public int copyTo(String srcProviderName, String srcRecordId, String targetProvi LOGGER.warn("could not found provider for {} or {}", srcProvider, targetProvider); return count; } - List srcMockers; + List srcMockers; Set categoryTypes = providerFactory.getCategoryTypes(); for (MockCategoryType categoryType : categoryTypes) { srcMockers = scheduleReplayingService.queryRecordList(srcProvider, categoryType, srcRecordId); @@ -172,7 +172,7 @@ public void invalidCase(String srcProviderName, String recordId) { removeAll(srcProviderName, recordId); } - private List createTargetList(List srcMockers, String targetRecordId) { + private List createTargetList(List srcMockers, String targetRecordId) { List targetList = null; long now = System.currentTimeMillis(); for (Mocker mocker: srcMockers) { diff --git a/arex-storage-web-api/src/main/java/com/arextest/storage/service/ScheduleReplayingService.java b/arex-storage-web-api/src/main/java/com/arextest/storage/service/ScheduleReplayingService.java index dbbba94f..bd4dfc34 100644 --- a/arex-storage-web-api/src/main/java/com/arextest/storage/service/ScheduleReplayingService.java +++ b/arex-storage-web-api/src/main/java/com/arextest/storage/service/ScheduleReplayingService.java @@ -98,7 +98,7 @@ public List queryEntryPointByRange(PagedRequestType requestType) { return Collections.emptyList(); } - public List queryRecordList(ViewRecordRequestType viewRecordRequestType) { + public List queryRecordList(ViewRecordRequestType viewRecordRequestType) { String sourceProvider = viewRecordRequestType.getSourceProvider(); String recordId = viewRecordRequestType.getRecordId(); RepositoryProvider repositoryReader = repositoryProviderFactory.findProvider( @@ -111,10 +111,10 @@ public List queryRecordList(ViewRecordRequestType viewRecordRequestType) if (categoryType != null) { return queryRecordList(repositoryReader, categoryType, recordId); } - List readableResult = new LinkedList<>(); + List readableResult = new LinkedList<>(); for (MockCategoryType category : repositoryProviderFactory.getCategoryTypes()) { MDCTracer.addCategory(category); - List mockers = queryRecordList(repositoryReader, category, recordId); + List mockers = queryRecordList(repositoryReader, category, recordId); if (CollectionUtils.isNotEmpty(mockers)) { readableResult.addAll(mockers); } @@ -122,15 +122,15 @@ public List queryRecordList(ViewRecordRequestType viewRecordRequestType) return readableResult; } - public List queryRecordList(RepositoryProvider repositoryReader, + public List queryRecordList(RepositoryProvider repositoryReader, MockCategoryType categoryType, String recordId) { Iterable iterable = repositoryReader.queryRecordList(categoryType, recordId); if (iterable == null) { return null; } - List resultList = new LinkedList<>(); + List resultList = new LinkedList<>(); for (Mocker mocker : iterable) { - resultList.add(mocker); + resultList.add((AREXMocker) mocker); } resultList.sort(Comparator.comparing(Mocker::getCreationTime)); return resultList; diff --git a/arex-storage-web-api/src/main/java/com/arextest/storage/web/controller/ScheduleReplayQueryController.java b/arex-storage-web-api/src/main/java/com/arextest/storage/web/controller/ScheduleReplayQueryController.java index 108d1fb7..72ec1c6e 100644 --- a/arex-storage-web-api/src/main/java/com/arextest/storage/web/controller/ScheduleReplayQueryController.java +++ b/arex-storage-web-api/src/main/java/com/arextest/storage/web/controller/ScheduleReplayQueryController.java @@ -1,6 +1,6 @@ package com.arextest.storage.web.controller; -import com.arextest.model.mock.Mocker; +import com.arextest.model.mock.AREXMocker; import com.arextest.model.replay.CountOperationCaseRequestType; import com.arextest.model.replay.CountOperationCaseResponseType; import com.arextest.model.replay.PagedRequestType; @@ -239,7 +239,7 @@ public Response viewRecord(@RequestBody ViewRecordRequestType requestType) { MDCTracer.addRecordId(recordId); ViewRecordResponseType responseType = new ViewRecordResponseType(); try { - List allReadableResult = scheduleReplayingService.queryRecordList(requestType); + List allReadableResult = scheduleReplayingService.queryRecordList(requestType); if (CollectionUtils.isEmpty(allReadableResult)) { LOGGER.info("could not found any resources for request: {}", requestType); } diff --git a/pom.xml b/pom.xml index 11929562..f4270eab 100644 --- a/pom.xml +++ b/pom.xml @@ -408,5 +408,5 @@ https://github.com/arextest/arex-storage - 1.0.45 + 1.0.46 \ No newline at end of file