black and whitelist no longer works because of Spring Data Commons change since SpringBoot 2.3.2. Fixes #814

Author: bnasslahsen

springdoc-openapi-data-rest/src/main/java/org/springdoc/data/rest/customisers/QuerydslPredicateOperationCustomizer.java

@@ -107,10 +107,10 @@ public Operation customize(Operation operation, HandlerMethod handlerMethod) {
 
 			Map<String, Object> pathSpecMap = getPathSpec(bindings, "pathSpecs");
 			//remove blacklisted fields
-			Set<String> blacklist = getFieldValues(bindings, "blackList");
+			Set<String> blacklist = getFieldValues(bindings, "denyList");
 			fieldsToAdd.removeIf(blacklist::contains);
 
-			Set<String> whiteList = getFieldValues(bindings, "whiteList");
+			Set<String> whiteList = getFieldValues(bindings, "allowList");
 			Set<String> aliases = getFieldValues(bindings, "aliases");
 
 			fieldsToAdd.addAll(aliases);
@@ -154,9 +154,8 @@ private QuerydslBindings extractQdslBindings(QuerydslPredicate predicate) {
 	 */
 	private Set<String> getFieldValues(QuerydslBindings instance, String fieldName) {
 		try {
-			Field field = FieldUtils.getDeclaredField(instance.getClass(), fieldName, true);
-			if (field != null)
-				return (Set<String>) field.get(instance);
+			Field field = FieldUtils.getDeclaredField(instance.getClass(),fieldName,true);
+			return (Set<String>) field.get(instance);
 		}
 		catch (IllegalAccessException e) {
 			LOGGER.warn(e.getMessage());
@@ -173,7 +172,7 @@ private Set<String> getFieldValues(QuerydslBindings instance, String fieldName)
 	 */
 	private Map<String, Object> getPathSpec(QuerydslBindings instance, String fieldName) {
 		try {
-			Field field = FieldUtils.getDeclaredField(instance.getClass(), fieldName, true);
+			Field field = FieldUtils.getDeclaredField(instance.getClass(),fieldName,true);
 			return (Map<String, Object>) field.get(instance);
 		}
 		catch (IllegalAccessException e) {
@@ -193,7 +192,7 @@ private Optional<Path<?>> getPathFromPathSpec(Object instance) {
 			if (instance == null) {
 				return Optional.empty();
 			}
-			Field field = FieldUtils.getDeclaredField(instance.getClass(), "path", true);
+			Field field = FieldUtils.getDeclaredField(instance.getClass(),"path",true);
 			return (Optional<Path<?>>) field.get(instance);
 		}
 		catch (IllegalAccessException e) {

springdoc-openapi-data-rest/src/test/resources/results/app5.json

@@ -33,13 +33,6 @@
               }
             }
           },
-          {
-            "name": "codeISO3166",
-            "in": "query",
-            "schema": {
-              "type": "string"
-            }
-          },
           {
             "name": "code",
             "in": "query",
@@ -76,13 +69,6 @@
               "type": "string"
             }
           },
-          {
-            "name": "dialingCode",
-            "in": "query",
-            "schema": {
-              "type": "string"
-            }
-          },
           {
             "name": "status",
             "in": "query",