feat: compatible fixed case

Author: lucas-myx

arex-instrumentation-api/src/main/java/io/arex/inst/runtime/match/ReplayMatcher.java

@@ -1,5 +1,6 @@
 package io.arex.inst.runtime.match;
 
+import io.arex.agent.bootstrap.model.MockCategoryType;
 import io.arex.agent.bootstrap.model.MockStrategyEnum;
 import io.arex.agent.bootstrap.model.Mocker;
 import io.arex.agent.bootstrap.util.CollectionUtil;
@@ -47,23 +48,46 @@ public static Mocker match(Mocker requestMocker, MockStrategyEnum mockStrategy)
     private static void doMatch(MatchStrategyContext context) {
         Mocker requestMocker = context.getRequestMocker();
         Map<Integer, List<Mocker>> cachedReplayResultMap = ContextManager.currentContext().getCachedReplayResultMap();
-        // first fuzzy match, such as: category + operationName + requestType, ensure the same method
-        requestMocker.setFuzzyMatchKey(MatchKeyFactory.INSTANCE.getFuzzyMatchKey(requestMocker));
-        List<Mocker> recordList = cachedReplayResultMap.get(requestMocker.getFuzzyMatchKey());
+        // pre match for all mocker category type
+        List<Mocker> recordList = preMatch(context, requestMocker, cachedReplayResultMap);
         if (CollectionUtil.isEmpty(recordList)) {
-            context.setReason("match no result, not exist this method signature, check if it has been recorded");
             return;
         }
         context.setRecordList(recordList);
         int fuzzyMatchResultCount = recordList.size();
         List<AbstractMatchStrategy> matchStrategyList = MatchStrategyRegister.getMatchStrategies(requestMocker, fuzzyMatchResultCount);
+        // multi thread match safe
         synchronized (cachedReplayResultMap) {
             for (AbstractMatchStrategy matchStrategy : matchStrategyList) {
                 matchStrategy.match(context);
             }
         }
     }
 
+    private static List<Mocker> preMatch(MatchStrategyContext context, Mocker requestMocker, Map<Integer, List<Mocker>> cachedReplayResultMap) {
+        // first match, such as: category + operationName + requestType, ensure the same method
+        requestMocker.setFuzzyMatchKey(MatchKeyFactory.INSTANCE.getFuzzyMatchKey(requestMocker));
+        List<Mocker> recordList = cachedReplayResultMap.get(requestMocker.getFuzzyMatchKey());
+        recordList = compatibleNoRequestType(recordList, cachedReplayResultMap, requestMocker);
+        if (CollectionUtil.isEmpty(recordList)) {
+            context.setReason("match no result, not exist this method signature, check if it has been recorded or request type is empty");
+        }
+        return recordList;
+    }
+
+    private static List<Mocker> compatibleNoRequestType(List<Mocker> recordList, Map<Integer, List<Mocker>> cachedReplayResultMap, Mocker requestMocker) {
+        if (CollectionUtil.isEmpty(recordList)) {
+            String categoryType = requestMocker.getCategoryType().getName();
+            if (MockCategoryType.DYNAMIC_CLASS.getName().equals(categoryType) || MockCategoryType.REDIS.getName().equals(categoryType)) {
+                // dynamic class or redis may not record requestType on old version
+                requestMocker.getTargetRequest().setType(null);
+                requestMocker.setFuzzyMatchKey(MatchKeyFactory.INSTANCE.getFuzzyMatchKey(requestMocker));
+                return cachedReplayResultMap.get(requestMocker.getFuzzyMatchKey());
+            }
+        }
+        return recordList;
+    }
+
     private static void logMatchResult(MatchStrategyContext context) {
         Mocker matchedMocker = context.getMatchMocker();
         Mocker requestMocker = context.getRequestMocker();

arex-instrumentation-api/src/main/java/io/arex/inst/runtime/util/ReplayUtil.java

@@ -160,19 +160,35 @@ private static void buildReplayResultMap(List<Mocker> recordMockerList, Map<Inte
             if (recordMocker == null) {
                 continue;
             }
+            // compatible with fixed case, set operationName for database mocker
+            compatibleFixedCase(recordMocker);
+
             // replay match need methodRequestTypeHash and methodSignatureHash
             if (recordMocker.getFuzzyMatchKey() == 0) {
                 recordMocker.setFuzzyMatchKey(MatchKeyFactory.INSTANCE.getFuzzyMatchKey(recordMocker));
             }
+            // fuzzyMatchKey and accurateMatchKey maybe not 0 on old merge record(methodRequestTypeHash、methodSignatureHash)
             if (recordMocker.getAccurateMatchKey() == 0) {
                 recordMocker.setAccurateMatchKey(MatchKeyFactory.INSTANCE.getAccurateMatchKey(recordMocker));
             }
+
             // eigen will be calculated in agent
             recordMocker.setEigenMap(null);
             cachedReplayResultMap.computeIfAbsent(recordMocker.getFuzzyMatchKey(), k -> new ArrayList<>()).add(recordMocker);
         }
     }
 
+    private static void compatibleFixedCase(Mocker mocker) {
+        String categoryType = mocker.getCategoryType().getName();
+        if (MockCategoryType.DATABASE.getName().equals(categoryType)) {
+            String dbName = mocker.getTargetRequest().attributeAsString(ArexConstants.DB_NAME);
+            String sql = mocker.getTargetRequest().getBody();
+            // if operationName contains '@' then not need to regenerate
+            String operationName = DatabaseUtils.regenerateOperationName(StringUtil.defaultString(dbName), mocker.getOperationName(), sql);
+            mocker.setOperationName(operationName);
+        }
+    }
+
     private static void ascendingSortByCreationTime(Map<Integer, List<Mocker>> cachedReplayResultMap) {
         for (List<Mocker> mergeReplayList : cachedReplayResultMap.values()) {
             if (mergeReplayList.size() == 1) {