支持不同类型对象的比对;比包含父类字段;

dadiyang · Jun 6, 2020 · 727e167 · 727e167
1 parent edc1547
commit 727e167
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 3 deletions.
diff --git a/src/main/java/com/github/dadiyang/equator/AbstractEquator.java b/src/main/java/com/github/dadiyang/equator/AbstractEquator.java
@@ -146,7 +146,10 @@ boolean isSimpleField(Object first, Object second) {
         return clazz.isPrimitive() || WRAPPER.contains(clazz);
     }
 
-    Set<String> getAllFields(Set<String> firstFields, Set<String> secondFields) {
+    /**
+     * 根据配置的规则决定取两个对象字段的交集或并集
+     */
+    Set<String> getAllFieldNames(Set<String> firstFields, Set<String> secondFields) {
         Set<String> allFields;
         // 只取交集
         if (isBothExistFieldOnly()) {

diff --git a/src/main/java/com/github/dadiyang/equator/FieldBaseEquator.java b/src/main/java/com/github/dadiyang/equator/FieldBaseEquator.java
@@ -55,7 +55,7 @@ public List<FieldInfo> getDiffFields(Object first, Object second) {
         } else if (second == null) {
             allFieldNames = firstFields.keySet();
         } else {
-            allFieldNames = getAllFields(firstFields.keySet(), secondFields.keySet());
+            allFieldNames = getAllFieldNames(firstFields.keySet(), secondFields.keySet());
         }
         List<FieldInfo> diffFields = new LinkedList<>();
         for (String fieldName : allFieldNames) {

diff --git a/src/main/java/com/github/dadiyang/equator/GetterBaseEquator.java b/src/main/java/com/github/dadiyang/equator/GetterBaseEquator.java
@@ -75,7 +75,7 @@ public List<FieldInfo> getDiffFields(Object first, Object second) {
         } else if (second == null) {
             allFieldNames = firstGetters.keySet();
         } else {
-            allFieldNames = getAllFields(firstGetters.keySet(), secondGetters.keySet());
+            allFieldNames = getAllFieldNames(firstGetters.keySet(), secondGetters.keySet());
         }
         List<FieldInfo> diffFields = new LinkedList<>();
         for (String fieldName : allFieldNames) {