Rename ReflectiveTypeAdapterFactory field inclusion check method (#2121)

Marcono1234 · web-flow · commit 503c20bb392e · 2022-07-21T11:53:52.000-07:00
diff --git a/gson/src/main/java/com/google/gson/internal/bind/ReflectiveTypeAdapterFactory.java b/gson/src/main/java/com/google/gson/internal/bind/ReflectiveTypeAdapterFactory.java
@@ -68,11 +68,7 @@ public ReflectiveTypeAdapterFactory(ConstructorConstructor constructorConstructo
     this.reflectionFilters = reflectionFilters;
   }
 
-  public boolean excludeField(Field f, boolean serialize) {
-    return excludeField(f, serialize, excluder);
-  }
-
-  static boolean excludeField(Field f, boolean serialize, Excluder excluder) {
+  private boolean includeField(Field f, boolean serialize) {
     return !excluder.excludeClass(f.getType(), serialize) && !excluder.excludeField(f, serialize);
   }
 
@@ -196,8 +192,8 @@ private Map<String, BoundField> getBoundFields(Gson context, TypeToken<?> type,
       }
 
       for (Field field : fields) {
-        boolean serialize = excludeField(field, true);
-        boolean deserialize = excludeField(field, false);
+        boolean serialize = includeField(field, true);
+        boolean deserialize = includeField(field, false);
         if (!serialize && !deserialize) {
           continue;
         }

Original file line number	Diff line number	Diff line change
`@@ -68,11 +68,7 @@ public ReflectiveTypeAdapterFactory(ConstructorConstructor constructorConstructo`
`68`	`68`	`this.reflectionFilters = reflectionFilters;`
`69`	`69`	`}`
`70`	`70`
`71`		`- public boolean excludeField(Field f, boolean serialize) {`
`72`		`- return excludeField(f, serialize, excluder);`
`73`		`- }`
`74`		`-`
`75`		`- static boolean excludeField(Field f, boolean serialize, Excluder excluder) {`
	`71`	`+ private boolean includeField(Field f, boolean serialize) {`
`76`	`72`	`return !excluder.excludeClass(f.getType(), serialize) && !excluder.excludeField(f, serialize);`
`77`	`73`	`}`
`78`	`74`
`@@ -196,8 +192,8 @@ private Map<String, BoundField> getBoundFields(Gson context, TypeToken<?> type,`
`196`	`192`	`}`
`197`	`193`
`198`	`194`	`for (Field field : fields) {`
`199`		`- boolean serialize = excludeField(field, true);`
`200`		`- boolean deserialize = excludeField(field, false);`
	`195`	`+ boolean serialize = includeField(field, true);`
	`196`	`+ boolean deserialize = includeField(field, false);`
`201`	`197`	`if (!serialize && !deserialize) {`
`202`	`198`	`continue;`
`203`	`199`	`}`