feat: Compatible with replayResult interface logic

arex-schedule-web-api/pom.xml

@@ -136,7 +136,7 @@
   <parent>
     <artifactId>arex-schedule-parent</artifactId>
     <groupId>com.arextest</groupId>
-    <version>1.2.17</version>
+    <version>1.2.18</version>
   </parent>
 
   <profiles>
@@ -338,5 +338,5 @@
       </properties>
     </profile>
   </profiles>
-  <version>1.2.17</version>
+  <version>1.2.18</version>
 </project>

arex-schedule-web-api/src/main/java/com/arextest/schedule/client/HttpWepServiceApiClient.java

@@ -1,6 +1,7 @@
 package com.arextest.schedule.client;
 
 import static com.arextest.schedule.common.CommonConstant.URL;
+import static org.springframework.http.HttpHeaders.CONTENT_TYPE;
 
 import com.arextest.schedule.utils.SSLUtils;
 import com.fasterxml.jackson.databind.ObjectMapper;
@@ -74,6 +75,7 @@ public final class HttpWepServiceApiClient {
 
   @Autowired(required = false)
   private List<ClientHttpRequestInterceptor> clientHttpRequestInterceptors;
+  private static final String ZSTD_JSON_CONTENT_TYPE = "application/zstd-json;charset=UTF-8";
 
   @PostConstruct
   private void initTemplate() {
@@ -250,6 +252,21 @@ public <TRequest, TResponse> ResponseEntity<TResponse> retryJsonPost(String url,
     }
   }
 
+  public <TRequest, TResponse> TResponse retryZstdJsonPost(String url, TRequest request,
+      Class<TResponse> responseType) {
+    Map<String, String> headers = Maps.newHashMapWithExpectedSize(1);
+    headers.put(HttpHeaders.CONTENT_TYPE, ZSTD_JSON_CONTENT_TYPE);
+
+    try {
+      return retryTemplate.execute(retryCallback -> {
+        retryCallback.setAttribute(URL, url);
+        return restTemplate.postForObject(url, wrapJsonContentType(request, headers), responseType);
+      });
+    } catch (Exception e) {
+      return null;
+    }
+  }
+
   @SuppressWarnings("unchecked")
   private <TRequest> HttpEntity<TRequest> wrapJsonContentType(TRequest request) {
     HttpEntity<TRequest> httpJsonEntity;
@@ -271,7 +288,9 @@ private <TRequest> HttpEntity<TRequest> wrapJsonContentType(TRequest request,
       httpJsonEntity = (HttpEntity<TRequest>) request;
     } else {
       HttpHeaders headers = new HttpHeaders();
-      headers.setContentType(MediaType.APPLICATION_JSON);
+      if (!extraHeaders.containsKey(CONTENT_TYPE)) {
+        headers.setContentType(MediaType.APPLICATION_JSON);
+      }
       headers.setAll(extraHeaders);
       httpJsonEntity = new HttpEntity<>(request, headers);
     }

arex-schedule-web-api/src/main/java/com/arextest/schedule/client/ZstdJacksonMessageConverter.java

@@ -29,7 +29,7 @@ public ZstdJacksonMessageConverter() {
 
   @Override
   protected boolean supports(Class<?> clazz) {
-    return true;
+    return !(clazz == byte[].class || clazz.isPrimitive());
   }
 
   @Override
@@ -41,6 +41,6 @@ protected Object readInternal(Class<?> clazz, HttpInputMessage inputMessage) thr
   @Override
   protected void writeInternal(Object o, HttpOutputMessage outputMessage) throws IOException,
       HttpMessageNotWritableException {
-    zstdJacksonSerializer.serializeTo(o, outputMessage.getBody());
+    outputMessage.getBody().write(zstdJacksonSerializer.serialize(o));
   }
 }

arex-schedule-web-api/src/main/java/com/arextest/schedule/common/JsonUtils.java

@@ -22,11 +22,20 @@ public static  <T> T byteToObject(byte[] bytes, Class<T> tClass) {
     return null;
   }
 
+  public static  <T> T jsonStringToObject(String string, Class<T> tClass) {
+    try {
+      return objectMapper.readValue(string, tClass);
+    } catch (IOException e) {
+      LOGGER.error("jsonStringToObject error:{}", e.getMessage(), e);
+    }
+    return null;
+  }
+
   public static String objectToJsonString(Object value) {
     try {
       return objectMapper.writeValueAsString(value);
     } catch (IOException e) {
-      LOGGER.error("byteToObject error:{}", e.getMessage(), e);
+      LOGGER.error("objectToJsonString error:{}", e.getMessage(), e);
     }
     return StringUtils.EMPTY;
   }

arex-schedule-web-api/src/main/java/com/arextest/schedule/comparer/CategoryComparisonHolder.java

@@ -1,6 +1,7 @@
 package com.arextest.schedule.comparer;
 
 import java.util.List;
+import lombok.AllArgsConstructor;
 import lombok.Data;
 
 /**
@@ -11,6 +12,18 @@
 public class CategoryComparisonHolder {
 
   private String categoryName;
+  // Need to match the comparison relationship
   private List<CompareItem> record;
   private List<CompareItem> replayResult;
+
+  private boolean needMatch;
+  // not need to match the comparison relationship
+  private CompareResultItem compareResultItem;
+
+  @Data
+  @AllArgsConstructor
+  public static class CompareResultItem {
+    CompareItem recordItem;
+    CompareItem replayItem;
+  }
 }

arex-schedule-web-api/src/main/java/com/arextest/schedule/comparer/CompareItemConvertFactory.java

@@ -0,0 +1,22 @@
+package com.arextest.schedule.comparer;
+
+import com.arextest.model.mock.MockCategoryType;
+import java.util.function.Function;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+@Component
+public class CompareItemConvertFactory {
+  private final Map<MockCategoryType, CompareItemConverter> categoryConverters;
+  public CompareItemConvertFactory(@Autowired List<CompareItemConverter> converters) {
+    this.categoryConverters = converters.stream().filter(c -> c.getCategoryType() != null)
+        .collect(Collectors.toMap(CompareItemConverter::getCategoryType, Function.identity()));
+  }
+
+  public CompareItemConverter getConverts(MockCategoryType categoryType) {
+    return categoryConverters.getOrDefault(categoryType, null);
+  }
+}

arex-schedule-web-api/src/main/java/com/arextest/schedule/comparer/CompareItemConverter.java

@@ -0,0 +1,14 @@
+package com.arextest.schedule.comparer;
+
+import com.arextest.model.mock.AREXMocker;
+import com.arextest.model.mock.MockCategoryType;
+import com.arextest.model.replay.CompareRelationResult;
+
+public interface CompareItemConverter {
+  MockCategoryType getCategoryType();
+
+  CompareItem convert(AREXMocker mocker);
+
+  CompareItem convert(CompareRelationResult relationResult, boolean recordCompareItem);
+
+}

arex-schedule-web-api/src/main/java/com/arextest/schedule/comparer/converter/DatabaseCompareItemConverterImpl.java

@@ -0,0 +1,91 @@
+package com.arextest.schedule.comparer.converter;
+
+import com.arextest.model.constants.MockAttributeNames;
+import com.arextest.model.mock.AREXMocker;
+import com.arextest.model.mock.MockCategoryType;
+import com.arextest.model.mock.Mocker.Target;
+import com.arextest.model.replay.CompareRelationResult;
+import com.arextest.schedule.common.JsonUtils;
+import com.arextest.schedule.comparer.CompareItem;
+import com.arextest.schedule.comparer.CompareItemConverter;
+import com.arextest.schedule.comparer.impl.PrepareCompareItemBuilder.CompareItemImpl;
+import com.fasterxml.jackson.databind.node.JsonNodeFactory;
+import com.fasterxml.jackson.databind.node.ObjectNode;
+import java.util.Map;
+import java.util.Map.Entry;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.stereotype.Component;
+
+/**
+ * @author xinyuan_wang.
+ * @create 2024/9/2 16:46
+ */
+@Slf4j
+@Component
+public class DatabaseCompareItemConverterImpl implements CompareItemConverter {
+
+  @Override
+  public MockCategoryType getCategoryType() {
+    return MockCategoryType.DATABASE;
+  }
+
+  @Override
+  public CompareItem convert(AREXMocker mocker) {
+    MockCategoryType categoryType = mocker.getCategoryType();
+    String operationKey = getOperationName(mocker.getTargetRequest(), mocker.getOperationName());
+    return new CompareItemImpl(operationKey, buildAttributes(mocker.getTargetRequest()).toString(),
+        mocker.getId(), mocker.getCreationTime(), categoryType.isEntryPoint());
+  }
+  @Override
+  public CompareItem convert(CompareRelationResult relationResult, boolean recordCompareItem) {
+    String message = recordCompareItem ? relationResult.getRecordMessage() : relationResult.getReplayMessage();
+    long createTime = recordCompareItem ? relationResult.getRecordTime() : relationResult.getReplayTime();
+    return new CompareItemImpl(relationResult.getOperationName(), processMessage(message), null,
+            createTime, relationResult.getCategoryType().isEntryPoint());
+  }
+
+  private String processMessage(String message) {
+    if (StringUtils.isBlank(message)) {
+      return message;
+    }
+
+    Target target = JsonUtils.jsonStringToObject(message, Target.class);
+    if (target != null) {
+      message = buildAttributes(target).toString();
+    }
+    return message;
+  }
+
+  private ObjectNode buildAttributes(Target target) {
+    ObjectNode obj = JsonNodeFactory.instance.objectNode();
+    if (target == null) {
+        return obj;
+    }
+    Map<String, Object> attributes = target.getAttributes();
+    if (attributes != null) {
+        for (Entry<String, Object> entry : attributes.entrySet()) {
+            Object value = entry.getValue();
+            if (value instanceof String) {
+                obj.put(entry.getKey(), (String) value);
+            } else {
+                obj.putPOJO(entry.getKey(), value);
+            }
+        }
+    }
+    if (StringUtils.isNotEmpty(target.getBody())) {
+        obj.put("body", target.getBody());
+    }
+    return obj;
+  }
+
+  private String getOperationName(Target target, String operationName) {
+    // The "@" in the operationName of DATABASE indicates that the SQL statement has been parsed and returned directly.
+    String compareOperationName = StringUtils.contains(operationName, "@") ? operationName
+      : target.attributeAsString(MockAttributeNames.DB_NAME);
+    if (StringUtils.isNotBlank(compareOperationName)) {
+      return compareOperationName;
+    }
+    return operationName;
+  }
+}

arex-schedule-web-api/src/main/java/com/arextest/schedule/comparer/converter/RedisCompareItemConverterImpl.java

@@ -0,0 +1,54 @@
+package com.arextest.schedule.comparer.converter;
+
+import com.arextest.model.constants.MockAttributeNames;
+import com.arextest.model.mock.AREXMocker;
+import com.arextest.model.mock.MockCategoryType;
+import com.arextest.model.mock.Mocker.Target;
+import com.arextest.model.replay.CompareRelationResult;
+import com.arextest.schedule.comparer.CompareItem;
+import com.arextest.schedule.comparer.CompareItemConverter;
+import com.arextest.schedule.comparer.impl.PrepareCompareItemBuilder.CompareItemImpl;
+import java.util.Objects;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.stereotype.Component;
+
+/**
+ * @author xinyuan_wang.
+ * @create 2024/9/2 16:46
+ */
+@Slf4j
+@Component
+public class RedisCompareItemConverterImpl implements CompareItemConverter {
+
+  @Override
+  public MockCategoryType getCategoryType() {
+    return MockCategoryType.REDIS;
+  }
+
+  @Override
+  public CompareItem convert(AREXMocker mocker) {
+    MockCategoryType categoryType = mocker.getCategoryType();
+    String operationKey = getOperationName(mocker.getTargetRequest(), mocker.getOperationName());
+    String compareMessage = Objects.isNull(mocker.getTargetRequest()) ? null
+        : mocker.getTargetRequest().getBody();
+
+    return new CompareItemImpl(operationKey, compareMessage, mocker.getId(),
+        mocker.getCreationTime(), categoryType.isEntryPoint());
+  }
+  @Override
+  public CompareItem convert(CompareRelationResult relationResult, boolean recordCompareItem) {
+    String message = recordCompareItem ? relationResult.getRecordMessage() : relationResult.getReplayMessage();
+    long createTime = recordCompareItem ? relationResult.getRecordTime() : relationResult.getReplayTime();
+    return new CompareItemImpl(relationResult.getOperationName(), message, null,
+            createTime, relationResult.getCategoryType().isEntryPoint());
+  }
+
+  private String getOperationName(Target target, String operationName) {
+    String compareOperationName = target.attributeAsString(MockAttributeNames.CLUSTER_NAME);
+    if (StringUtils.isNotBlank(compareOperationName)) {
+      return compareOperationName;
+    }
+    return operationName;
+  }
+}

arex-schedule-web-api/src/main/java/com/arextest/schedule/comparer/impl/DefaultReplayResultComparer.java

@@ -6,6 +6,7 @@
 import com.arextest.diff.sdk.CompareSDK;
 import com.arextest.model.mock.MockCategoryType;
 import com.arextest.schedule.comparer.CategoryComparisonHolder;
+import com.arextest.schedule.comparer.CategoryComparisonHolder.CompareResultItem;
 import com.arextest.schedule.comparer.CompareConfigService;
 import com.arextest.schedule.comparer.CompareItem;
 import com.arextest.schedule.comparer.CompareService;
@@ -162,10 +163,39 @@ public List<ReplayCompareResult> doContentCompare(ReplayActionCaseItem caseItem,
   }
 
   /**
-   * compare recording and replay data. 1. record and replay data through compareKey.
+   * compare recording and replay data.
    */
   private List<ReplayCompareResult> compareReplayResult(CategoryComparisonHolder bindHolder,
       ReplayActionCaseItem caseItem, ComparisonInterfaceConfig operationConfig) {
+    if (bindHolder.isNeedMatch()) {
+      return matchCompareReplayResults(bindHolder, caseItem, operationConfig);
+    }
+
+    return getReplayCompareResults(bindHolder, caseItem, operationConfig);
+  }
+
+  private List<ReplayCompareResult> getReplayCompareResults(CategoryComparisonHolder bindHolder,
+      ReplayActionCaseItem caseItem, ComparisonInterfaceConfig operationConfig) {
+    CompareResultItem item = bindHolder.getCompareResultItem();
+    if (item == null) {
+      return Collections.emptyList();
+    }
+
+    List<ReplayCompareResult> compareResults = new ArrayList<>();
+    compareResults.add(compareRecordAndResult(operationConfig, caseItem, bindHolder.getCategoryName(),
+        item.getReplayItem(), item.getRecordItem()));
+    return compareResults;
+  }
+
+  /**
+   * record and replay data through compareKey.
+   * @param bindHolder
+   * @param caseItem
+   * @param operationConfig
+   * @return
+   */
+  private List<ReplayCompareResult> matchCompareReplayResults(CategoryComparisonHolder bindHolder,
+      ReplayActionCaseItem caseItem, ComparisonInterfaceConfig operationConfig) {
     List<ReplayCompareResult> compareResults = new ArrayList<>();
     List<CompareItem> recordResults = bindHolder.getRecord();
     List<CompareItem> replayResults = bindHolder.getReplayResult();