fix: resolve ViewRecordResponseType class cannot be serialized

arextest · Dec 6, 2023 · 2849460 · 2849460
1 parent 93ba6bf
commit 2849460
Show file tree

Hide file tree

Showing 9 changed files with 19 additions and 18 deletions.
diff --git a/arex-storage-config/pom.xml b/arex-storage-config/pom.xml
@@ -45,7 +45,7 @@
   <parent>
     <artifactId>arex-storage-service</artifactId>
     <groupId>com.arextest</groupId>
-    <version>1.0.45</version>
+    <version>1.0.46</version>
   </parent>
 
   <properties>

diff --git a/arex-storage-model/pom.xml b/arex-storage-model/pom.xml
@@ -7,7 +7,7 @@
   <parent>
     <artifactId>arex-storage-service</artifactId>
     <groupId>com.arextest</groupId>
-    <version>1.0.45</version>
+    <version>1.0.46</version>
   </parent>
 
   <profiles>

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
@@ -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<Mocker> recordResult;
+  private List<AREXMocker> recordResult;
 }
diff --git a/arex-storage-web-api/pom.xml b/arex-storage-web-api/pom.xml
@@ -123,7 +123,7 @@
   <parent>
     <artifactId>arex-storage-service</artifactId>
     <groupId>com.arextest</groupId>
-    <version>1.0.45</version>
+    <version>1.0.46</version>
   </parent>
 
   <profiles>

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
@@ -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<Mocker> allReadableResult)
+  public static void desensitize(List<AREXMocker> allReadableResult)
       throws JsonProcessingException {
-    for (Mocker arexMocker : allReadableResult) {
+    for (AREXMocker arexMocker : allReadableResult) {
       Mocker.Target request = arexMocker.getTargetRequest();
       Mocker.Target response = arexMocker.getTargetResponse();
 

diff --git a/...-storage-web-api/src/main/java/com/arextest/storage/service/MockSourceEditionService.java b/...-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<Mocker> srcMockers;
+    List<AREXMocker> srcMockers;
     Set<MockCategoryType> 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<Mocker> createTargetList(List<Mocker> srcMockers, String targetRecordId) {
+  private List<Mocker> createTargetList(List<AREXMocker> srcMockers, String targetRecordId) {
     List<Mocker> targetList = null;
     long now = System.currentTimeMillis();
     for (Mocker mocker: srcMockers) {

diff --git a/...-storage-web-api/src/main/java/com/arextest/storage/service/ScheduleReplayingService.java b/...-storage-web-api/src/main/java/com/arextest/storage/service/ScheduleReplayingService.java
@@ -98,7 +98,7 @@ public List<AREXMocker> queryEntryPointByRange(PagedRequestType requestType) {
     return Collections.emptyList();
   }
 
-  public List<Mocker> queryRecordList(ViewRecordRequestType viewRecordRequestType) {
+  public List<AREXMocker> queryRecordList(ViewRecordRequestType viewRecordRequestType) {
     String sourceProvider = viewRecordRequestType.getSourceProvider();
     String recordId = viewRecordRequestType.getRecordId();
     RepositoryProvider<Mocker> repositoryReader = repositoryProviderFactory.findProvider(
@@ -111,26 +111,26 @@ public List<Mocker> queryRecordList(ViewRecordRequestType viewRecordRequestType)
     if (categoryType != null) {
       return queryRecordList(repositoryReader, categoryType, recordId);
     }
-    List<Mocker> readableResult = new LinkedList<>();
+    List<AREXMocker> readableResult = new LinkedList<>();
     for (MockCategoryType category : repositoryProviderFactory.getCategoryTypes()) {
       MDCTracer.addCategory(category);
-      List<Mocker> mockers = queryRecordList(repositoryReader, category, recordId);
+      List<AREXMocker> mockers = queryRecordList(repositoryReader, category, recordId);
       if (CollectionUtils.isNotEmpty(mockers)) {
         readableResult.addAll(mockers);
       }
     }
     return readableResult;
   }
 
-  public List<Mocker> queryRecordList(RepositoryProvider<Mocker> repositoryReader,
+  public List<AREXMocker> queryRecordList(RepositoryProvider<Mocker> repositoryReader,
       MockCategoryType categoryType, String recordId) {
     Iterable<? extends Mocker> iterable = repositoryReader.queryRecordList(categoryType, recordId);
     if (iterable == null) {
       return null;
     }
-    List<Mocker> resultList = new LinkedList<>();
+    List<AREXMocker> 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/...-api/src/main/java/com/arextest/storage/web/controller/ScheduleReplayQueryController.java b/...-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<Mocker> allReadableResult = scheduleReplayingService.queryRecordList(requestType);
+      List<AREXMocker> 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
@@ -408,5 +408,5 @@
   <url>https://github.com/arextest/arex-storage</url>
 
 
-  <version>1.0.45</version>
+  <version>1.0.46</version>
 </project>