docs(pom): 版本更新 -> 3.0.2-RC1-RELEASE

mini1798 · mini1798 · commit 5aba462f68f8 · 2023-04-19T19:14:46.000+08:00
1. 支持全局自定义比较器
2. 支持返回结果添加自定义数据
3. 自定义比较器设置移至JsonDiffConfig.getJsonNeatFactory()
diff --git a/Readme.md b/Readme.md
@@ -40,8 +40,8 @@
     <version>${version}</version>
 </dependency>
 ```
-[版本查看](https://central.sonatype.com/artifact/cn.xiaoandcai/json-diff/3.0.3-RC1-RELEASE)
-2022-03-04 最新版本：3.0.3-RC1-RELEASE
+[版本查看](https://central.sonatype.com/artifact/cn.xiaoandcai/json-diff/3.1.0-RC1-RELEASE)
+2022-03-04 最新版本：3.1.0-RC1-RELEASE
 
 ```java
 /**
@@ -183,9 +183,12 @@ ignoreKey.add("high");
 
 它配置的key是一个 travelPath 。具体格式参照 ignorePath 。value 则是一个自定义比较器。对于自定义比较器需要继承对应的抽象类。并且实现具体的抽象接口。具体如下：
 
+> 从 3.1.0-RC1-RELEASE 版本开始，自定义比较器的设置移至 JsonDiffOption.getJsonNeatFactory()
+> 不再在原先的Option中设置
+
 对象比较：
 
-需要继承 `me.codeleep.jsondiff.core.handle.array.AbstractArrayJsonNeat` 并且重写以下方法。
+需要继承 `me.codeleep.jsondiff.core.handle.array.AbstractObjectJsonNeat` 并且重写以下方法。
 
 ```java
 /**
@@ -201,7 +204,7 @@ JsonCompareResult detectDiff(JSONObject expect, JSONObject actual);
 
 数组比较：
 
-需要继承 `me.codeleep.jsondiff.core.handle.object.AbstractObjectJsonNeat` 并且重写以下方法。
+需要继承 `me.codeleep.jsondiff.core.handle.object.AbstractArrayJsonNeat` 并且重写以下方法。
 
 ```java
   /**
diff --git a/json-diff-common/pom.xml b/json-diff-common/pom.xml
@@ -5,12 +5,12 @@
     <parent>
         <artifactId>json-diff-parent</artifactId>
         <groupId>cn.xiaoandcai</groupId>
-        <version>3.0.3-RC1-RELEASE</version>
+        <version>3.1.0-RC1-RELEASE</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>json-diff-common</artifactId>
-    <version>3.0.3-RC1-RELEASE</version>
+    <version>3.1.0-RC1-RELEASE</version>
 
     <properties>
         <maven.compiler.source>8</maven.compiler.source>
diff --git a/json-diff-core/pom.xml b/json-diff-core/pom.xml
@@ -5,12 +5,12 @@
     <parent>
         <artifactId>json-diff-parent</artifactId>
         <groupId>cn.xiaoandcai</groupId>
-        <version>3.0.3-RC1-RELEASE</version>
+        <version>3.1.0-RC1-RELEASE</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>json-diff-core</artifactId>
-    <version>3.0.3-RC1-RELEASE</version>
+    <version>3.1.0-RC1-RELEASE</version>
 
     <dependencies>
         <dependency>
diff --git a/json-diff-core/src/main/java/me/codeleep/jsondiff/core/DefaultJsonDifference.java b/json-diff-core/src/main/java/me/codeleep/jsondiff/core/DefaultJsonDifference.java
@@ -5,7 +5,7 @@
 import me.codeleep.jsondiff.common.model.JsonCompareResult;
 import me.codeleep.jsondiff.common.model.JsonComparedOption;
 import me.codeleep.jsondiff.common.model.TravelPath;
-import me.codeleep.jsondiff.common.utils.RunTimeDataFactory;
+import me.codeleep.jsondiff.core.utils.RunTimeDataFactory;
 import me.codeleep.jsondiff.core.handle.array.ComplexArrayJsonNeat;
 import me.codeleep.jsondiff.core.handle.object.ComplexObjectJsonNeat;
 
diff --git a/json-diff-core/src/main/java/me/codeleep/jsondiff/core/config/JsonDiffConfig.java b/json-diff-core/src/main/java/me/codeleep/jsondiff/core/config/JsonDiffConfig.java
diff --git a/json-diff-core/src/main/java/me/codeleep/jsondiff/core/config/JsonDiffOption.java b/json-diff-core/src/main/java/me/codeleep/jsondiff/core/config/JsonDiffOption.java
@@ -1,6 +1,7 @@
-package me.codeleep.jsondiff.common;
+package me.codeleep.jsondiff.core.config;
 
 import me.codeleep.jsondiff.common.model.JsonComparedOption;
+import me.codeleep.jsondiff.core.utils.JsonNeatFactory;
 
 /**
  * @author: codeleep
@@ -19,6 +20,15 @@ public class JsonDiffOption {
      */
     private static boolean uniqueOption = false;
 
+    /**
+     * 默认的比较器工厂
+     */
+    private final static JsonNeatFactory jsonNeatFactory = new JsonNeatFactory();
+
+    public static JsonNeatFactory getJsonNeatFactory() {
+        return jsonNeatFactory;
+    }
+
 
     public static JsonComparedOption getGloballyUniqueOption() {
         if (globallyUniqueOption == null) {
diff --git a/json-diff-core/src/main/java/me/codeleep/jsondiff/core/handle/array/AbstractArrayJsonNeat.java b/json-diff-core/src/main/java/me/codeleep/jsondiff/core/handle/array/AbstractArrayJsonNeat.java
@@ -7,7 +7,7 @@
 import me.codeleep.jsondiff.common.model.Defects;
 import me.codeleep.jsondiff.common.model.JsonCompareResult;
 import me.codeleep.jsondiff.common.model.TravelPath;
-import me.codeleep.jsondiff.common.utils.RunTimeDataFactory;
+import me.codeleep.jsondiff.core.utils.RunTimeDataFactory;
 import me.codeleep.jsondiff.core.handle.AbstractTypeCheck;
 import me.codeleep.jsondiff.common.model.neat.ArrayJsonNeat;
 
diff --git a/json-diff-core/src/main/java/me/codeleep/jsondiff/core/handle/array/ComplexArrayJsonNeat.java b/json-diff-core/src/main/java/me/codeleep/jsondiff/core/handle/array/ComplexArrayJsonNeat.java
@@ -4,7 +4,7 @@
 import me.codeleep.jsondiff.common.model.Defects;
 import me.codeleep.jsondiff.common.model.JsonCompareResult;
 import me.codeleep.jsondiff.common.model.TravelPath;
-import me.codeleep.jsondiff.common.utils.RunTimeDataFactory;
+import me.codeleep.jsondiff.core.utils.RunTimeDataFactory;
 import me.codeleep.jsondiff.common.model.neat.JsonNeat;
 import me.codeleep.jsondiff.core.utils.ClassUtil;
 import me.codeleep.jsondiff.core.utils.JsonDiffUtil;
diff --git a/json-diff-core/src/main/java/me/codeleep/jsondiff/core/handle/object/AbstractObjectJsonNeat.java b/json-diff-core/src/main/java/me/codeleep/jsondiff/core/handle/object/AbstractObjectJsonNeat.java
@@ -6,7 +6,7 @@
 import me.codeleep.jsondiff.common.exception.JsonDiffException;
 import me.codeleep.jsondiff.common.model.JsonCompareResult;
 import me.codeleep.jsondiff.common.model.TravelPath;
-import me.codeleep.jsondiff.common.utils.RunTimeDataFactory;
+import me.codeleep.jsondiff.core.utils.RunTimeDataFactory;
 import me.codeleep.jsondiff.core.handle.AbstractTypeCheck;
 import me.codeleep.jsondiff.common.model.neat.ObjectJsonNeat;
 
diff --git a/json-diff-core/src/main/java/me/codeleep/jsondiff/core/handle/object/ComplexObjectJsonNeat.java b/json-diff-core/src/main/java/me/codeleep/jsondiff/core/handle/object/ComplexObjectJsonNeat.java
@@ -6,7 +6,7 @@
 import me.codeleep.jsondiff.common.model.MappingKey;
 import me.codeleep.jsondiff.common.model.TravelPath;
 import me.codeleep.jsondiff.common.utils.PathUtil;
-import me.codeleep.jsondiff.common.utils.RunTimeDataFactory;
+import me.codeleep.jsondiff.core.utils.RunTimeDataFactory;
 import me.codeleep.jsondiff.common.model.neat.JsonNeat;
 import me.codeleep.jsondiff.core.utils.ClassUtil;
 import me.codeleep.jsondiff.core.utils.JsonDiffUtil;
diff --git a/json-diff-core/src/main/java/me/codeleep/jsondiff/core/handle/primitive/AbstractPrimitiveJsonNeat.java b/json-diff-core/src/main/java/me/codeleep/jsondiff/core/handle/primitive/AbstractPrimitiveJsonNeat.java
@@ -6,7 +6,7 @@
 import me.codeleep.jsondiff.common.exception.JsonDiffException;
 import me.codeleep.jsondiff.common.model.JsonCompareResult;
 import me.codeleep.jsondiff.common.model.TravelPath;
-import me.codeleep.jsondiff.common.utils.RunTimeDataFactory;
+import me.codeleep.jsondiff.core.utils.RunTimeDataFactory;
 import me.codeleep.jsondiff.core.handle.AbstractTypeCheck;
 import me.codeleep.jsondiff.common.model.neat.PrimitiveJsonNeat;
 
diff --git a/json-diff-core/src/main/java/me/codeleep/jsondiff/core/utils/JsonDiffUtil.java b/json-diff-core/src/main/java/me/codeleep/jsondiff/core/utils/JsonDiffUtil.java
@@ -6,8 +6,7 @@
 import me.codeleep.jsondiff.common.model.ComparatorEnum;
 import me.codeleep.jsondiff.common.model.TravelPath;
 import me.codeleep.jsondiff.common.model.neat.JsonNeat;
-import me.codeleep.jsondiff.common.utils.RunTimeDataFactory;
-import me.codeleep.jsondiff.core.config.JsonDiffConfig;
+import me.codeleep.jsondiff.core.config.JsonDiffOption;
 import me.codeleep.jsondiff.core.handle.array.AbstractArrayJsonNeat;
 import me.codeleep.jsondiff.core.handle.object.AbstractObjectJsonNeat;
 import me.codeleep.jsondiff.core.handle.primitive.AbstractPrimitiveJsonNeat;
@@ -26,17 +25,17 @@ public static JsonNeat getJsonNeat(Object expect, Object actual, TravelPath trav
             return null;
         }
         boolean defaultNeat = RunTimeDataFactory.getOptionInstance().isMandatoryDefaultNeat();
-        Class<? extends JsonNeat> customComparator = JsonDiffConfig.getJsonNeatFactory().getCustomComparator(travelPath.getAbstractTravelPath());
+        Class<? extends JsonNeat> customComparator = JsonDiffOption.getJsonNeatFactory().getCustomComparator(travelPath.getAbstractTravelPath());
         boolean custom = customComparator != null;
         // 返回系统默认处理器
         if (expect instanceof JSONObject && actual instanceof JSONObject) {
-            return custom ? selectionCustomJsonNeat(customComparator, ComparatorEnum.OBJECT) : JsonDiffConfig.getJsonNeatFactory().getObjectJsonNeatInstance(defaultNeat);
+            return custom ? selectionCustomJsonNeat(customComparator, ComparatorEnum.OBJECT) : JsonDiffOption.getJsonNeatFactory().getObjectJsonNeatInstance(defaultNeat);
         }
         if (expect instanceof JSONArray && actual instanceof JSONArray) {
-            return custom ? selectionCustomJsonNeat(customComparator, ComparatorEnum.ARRAY) : JsonDiffConfig.getJsonNeatFactory().getArrayJsonNeatInstance(defaultNeat);
+            return custom ? selectionCustomJsonNeat(customComparator, ComparatorEnum.ARRAY) : JsonDiffOption.getJsonNeatFactory().getArrayJsonNeatInstance(defaultNeat);
         }
         if (ClassUtil.isPrimitiveType(expect) && ClassUtil.isPrimitiveType(actual)) {
-            return custom ? selectionCustomJsonNeat(customComparator, ComparatorEnum.PRIMITIVE) : JsonDiffConfig.getJsonNeatFactory().getPrimitiveJsonNeatInstance(defaultNeat);
+            return custom ? selectionCustomJsonNeat(customComparator, ComparatorEnum.PRIMITIVE) : JsonDiffOption.getJsonNeatFactory().getPrimitiveJsonNeatInstance(defaultNeat);
         }
         return null;
     }
diff --git a/json-diff-core/src/main/java/me/codeleep/jsondiff/core/utils/RunTimeDataFactory.java b/json-diff-core/src/main/java/me/codeleep/jsondiff/core/utils/RunTimeDataFactory.java
@@ -1,8 +1,8 @@
-package me.codeleep.jsondiff.common.utils;
+package me.codeleep.jsondiff.core.utils;
 
 
-import me.codeleep.jsondiff.common.JsonDiffOption;
 import me.codeleep.jsondiff.common.model.JsonComparedOption;
+import me.codeleep.jsondiff.core.config.JsonDiffOption;
 
 /**
  * @author: codeleep
diff --git a/json-diff-test/pom.xml b/json-diff-test/pom.xml
@@ -5,12 +5,12 @@
     <parent>
         <artifactId>json-diff-parent</artifactId>
         <groupId>cn.xiaoandcai</groupId>
-        <version>3.0.3-RC1-RELEASE</version>
+        <version>3.1.0-RC1-RELEASE</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>json-diff-test</artifactId>
-    <version>3.0.3-RC1-RELEASE</version>
+    <version>3.1.0-RC1-RELEASE</version>
 
     <properties>
         <maven.compiler.source>8</maven.compiler.source>
diff --git a/json-diff/pom.xml b/json-diff/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>json-diff-parent</artifactId>
         <groupId>cn.xiaoandcai</groupId>
-        <version>3.0.3-RC1-RELEASE</version>
+        <version>3.1.0-RC1-RELEASE</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/pom.xml b/pom.xml
@@ -7,7 +7,7 @@
     <groupId>cn.xiaoandcai</groupId>
     <artifactId>json-diff-parent</artifactId>
     <!-- mvn clean deploy - -settings /Users/weidian/.m2/settings-out.xml   -->
-    <version>3.0.3-RC1-RELEASE</version>
+    <version>3.1.0-RC1-RELEASE</version>
     <name>JsonDiff</name>
     <url>https://gitee.com/local-li/json-diff</url>
     <description>一款高性能的Json差异发现工具</description>
