Skip to content

Commit cd5aa1c

Browse files
committed
fix-to(json-neat): 修复无法class范围
修复无法class范围
1 parent adcfbee commit cd5aa1c

File tree

2 files changed

+6
-6
lines changed

2 files changed

+6
-6
lines changed

json-diff-common/src/main/java/me/codeleep/jsondiff/common/model/JsonComparedOption.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ public class JsonComparedOption {
3737
* key: 与ignorePath格式一致
3838
* value: 继承 AbstractArrayJsonNeat,AbstractObjectJsonNeat,AbstractPrimitiveJsonNeat. 并且实现对应格式接口的字节码
3939
*/
40-
private Map<String, Class<JsonNeat>> customComparator = new HashMap<>();
40+
private Map<String, Class<? extends JsonNeat>> customComparator = new HashMap<>();
4141

4242

4343
public JsonComparedOption() {
@@ -64,7 +64,7 @@ public JsonComparedOption setIgnoreKey(HashSet<String> ignoreKey) {
6464
return this;
6565
}
6666

67-
public JsonComparedOption setCustomComparator(Map<String, Class<JsonNeat>> customComparator ) {
67+
public JsonComparedOption setCustomComparator(Map<String, Class<? extends JsonNeat>> customComparator ) {
6868
this.customComparator = customComparator;
6969
return this;
7070
}
@@ -95,9 +95,9 @@ public HashSet<String> getIgnoreKey() {
9595
}
9696

9797

98-
public Map<String, Class<JsonNeat>> getCustomComparator() {
98+
public Map<String, Class<? extends JsonNeat>> getCustomComparator() {
9999
if (customComparator == null) {
100-
customComparator = new HashMap<String, Class<JsonNeat>>();
100+
customComparator = new HashMap<String, Class<? extends JsonNeat>>();
101101
}
102102
return customComparator;
103103
}

json-diff-core/src/main/java/me/codeleep/jsondiff/core/utils/JsonDiffUtil.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ public static JsonNeat getJsonNeat(Object expect, Object actual, TravelPath trav
2929
if (!ClassUtil.isSameClass(expect, actual)) {
3030
return null;
3131
}
32-
Map<String, Class<JsonNeat>> customComparator = RunTimeDataFactory.getOptionInstance().getCustomComparator();
32+
Map<String, Class<? extends JsonNeat>> customComparator = RunTimeDataFactory.getOptionInstance().getCustomComparator();
3333
String abstractTravelPath = travelPath.getAbstractTravelPath();
3434
boolean custom = customComparator.containsKey(abstractTravelPath);
3535
// 返回系统默认处理器
@@ -51,7 +51,7 @@ public static JsonNeat getJsonNeat(Object expect, Object actual, TravelPath trav
5151
* @param comparator 比较器类型
5252
* @return 用户比较器实例
5353
*/
54-
private static JsonNeat selectionCustomJsonNeat(Class<JsonNeat> customComparatorClass, ComparatorEnum comparator) {
54+
private static JsonNeat selectionCustomJsonNeat(Class<? extends JsonNeat> customComparatorClass, ComparatorEnum comparator) {
5555
JsonNeat jsonNeat = null;
5656
try {
5757
jsonNeat = customComparatorClass.newInstance();

0 commit comments

Comments
 (0)