diff --git a/arex-storage-config/pom.xml b/arex-storage-config/pom.xml index bac8eb22..0fada02d 100644 --- a/arex-storage-config/pom.xml +++ b/arex-storage-config/pom.xml @@ -45,7 +45,7 @@ arex-storage-service com.arextest - 1.1.3 + 1.1.4 diff --git a/arex-storage-model/pom.xml b/arex-storage-model/pom.xml index 8ef8758a..ffa35fca 100644 --- a/arex-storage-model/pom.xml +++ b/arex-storage-model/pom.xml @@ -7,7 +7,7 @@ arex-storage-service com.arextest - 1.1.3 + 1.1.4 diff --git a/arex-storage-model/src/main/java/com/arextest/model/mock/MergeRecordDTO.java b/arex-storage-model/src/main/java/com/arextest/model/mock/MergeRecordDTO.java index da183816..0b3e968c 100644 --- a/arex-storage-model/src/main/java/com/arextest/model/mock/MergeRecordDTO.java +++ b/arex-storage-model/src/main/java/com/arextest/model/mock/MergeRecordDTO.java @@ -13,7 +13,7 @@ @NoArgsConstructor @AllArgsConstructor public class MergeRecordDTO { - private Object arexOriginalResult; + private Object response; private String arexResultClazz; private String category; private int methodSignatureHash; diff --git a/arex-storage-web-api/pom.xml b/arex-storage-web-api/pom.xml index 90219d89..e2bfd911 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.1.3 + 1.1.4 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 2abdcb78..64a0b6ac 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 @@ -7,15 +7,12 @@ import com.arextest.model.mock.Mocker; import com.arextest.storage.repository.RepositoryProvider; import com.arextest.storage.repository.RepositoryProviderFactory; +import com.fasterxml.jackson.core.type.TypeReference; import java.sql.Date; import java.time.LocalDateTime; import java.time.ZoneId; -import java.util.Collections; -import java.util.Comparator; -import com.fasterxml.jackson.core.type.TypeReference; import java.util.ArrayList; import java.util.HashMap; -import java.util.Iterator; import java.util.LinkedList; import java.util.List; import java.util.Map; @@ -63,7 +60,7 @@ public T editMergedMocker(String providerName, AREXMocker ite })); MergeRecordDTO mergeRecordDTO = mergeRecordDTOS.get(item.getIndex()); mergeRecordDTO.setRequest(item.getTargetRequest().getBody()); - mergeRecordDTO.setArexOriginalResult( + mergeRecordDTO.setResponse( objectMapper.readValue(item.getTargetResponse().getBody(), new TypeReference>() { })); 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 7e7c29e2..4e6bcb2d 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 @@ -177,7 +177,7 @@ private List splitMergedMocker(AREXMocker mocker) { splitMocker.setTargetRequest(request); Target response = new Target(); - response.setBody(objectMapper.writeValueAsString(mergeRecord.getArexOriginalResult())); + response.setBody(objectMapper.writeValueAsString(mergeRecord.getResponse())); response.setAttributes(mergeRecord.getResponseAttributes()); response.setType(mergeRecord.getArexResultClazz()); splitMocker.setTargetResponse(response); diff --git a/pom.xml b/pom.xml index 9ff25676..9f7da46f 100644 --- a/pom.xml +++ b/pom.xml @@ -408,5 +408,5 @@ https://github.com/arextest/arex-storage - 1.1.3 + 1.1.4