Refactored the selector predicate

(10)

Author: dilipkrish

springfox-grails/src/main/java/springfox/documentation/grails/GrailsActionAttributes.java

@@ -6,7 +6,6 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.servlet.mvc.condition.RequestCondition;
 
 import java.util.Arrays;
 import java.util.Collection;
@@ -18,12 +17,12 @@
 import java.util.Optional;
 import java.util.Set;
 import java.util.function.Predicate;
-import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
 import static com.google.common.collect.Lists.*;
 import static springfox.documentation.builders.BuilderDefaults.*;
 import static springfox.documentation.grails.Actions.*;
+import static springfox.documentation.grails.UrlMappings.*;
 
 @Component
 class GrailsActionAttributes {
@@ -63,7 +62,10 @@ public Collection<RequestMethod> httpMethods(GrailsActionContext context) {
     Set<RequestMethod> requestMethods = methodOverrides(context);
     if (requestMethods.isEmpty()) {
       Stream<UrlMapping> sorted = Arrays.stream(urlMappings.getUrlMappings())
-          .filter(UrlMappings.selector(context, null))
+          .filter(selector(
+              context.getController().getLogicalPropertyName(),
+              context.getAction(),
+              null))
           .sorted(Comparator.comparing(this::score));
       return sorted.findFirst()
           .map(m -> httpMethods(defaultIfAbsent(m.getHttpMethod(), "*")))

springfox-grails/src/main/java/springfox/documentation/grails/GrailsActionContext.java

@@ -45,13 +45,17 @@ public GrailsActionContext(
     this.resolver = resolver;
     this.isRestfulController = isRestfulController(controller, action);
     this.requestMethods = urlProvider.httpMethods(this);
-    String method = requestMethods
+    String httpMethod = requestMethods
         .stream()
         .findFirst()
         .map(Enum::toString)
         .orElse(null);
     this.missingMapping = requestMethods.isEmpty();
-    this.urlMapping = urlProvider.urlMapping(selector(this, method));
+    this.urlMapping = urlProvider.urlMapping(
+        selector(
+            controller.getLogicalPropertyName(),
+            action,
+            httpMethod));
     this.mediaTypes = mediaTypeOverrides(this);
     maybeAddDefaultMediaType(mediaTypes);
   }

springfox-grails/src/main/java/springfox/documentation/grails/UrlMappings.java

@@ -26,10 +26,13 @@ private UrlMappings() {
     throw new UnsupportedOperationException();
   }
 
-  public static Predicate<UrlMapping> selector(GrailsActionContext context, String methodName) {
-    return u -> httpMethodMatches(methodName, u)
-        && controllerMatches(context, u)
-        && actionMatches(context, u);
+  public static Predicate<UrlMapping> selector(
+      String logicalControllerName,
+      String action,
+      String httpMethod) {
+    return u -> httpMethodMatches(httpMethod, u)
+        && controllerMatches(u, logicalControllerName)
+        && actionMatches(action, u);
   }
 
   public static Map<String, String> pathParameters(UrlMapping mapping) {
@@ -81,28 +84,28 @@ private static ResolvedType resolvedPropertyType(
     return resolver.resolve(String.class);
   }
 
-  private static boolean httpMethodMatches(String methodName, UrlMapping urlMapping) {
-    return anyMethod(methodName) || Objects.equals(urlMapping.getHttpMethod(), methodName);
+  private static boolean httpMethodMatches(String httpMethod, UrlMapping urlMapping) {
+    return anyMethod(httpMethod) || Objects.equals(urlMapping.getHttpMethod(), httpMethod);
   }
 
   private static boolean anyMethod(String methodName) {
     return Strings.isNullOrEmpty(methodName);
   }
 
-  private static boolean actionMatches(GrailsActionContext context, UrlMapping urlMapping) {
+  private static boolean actionMatches(String context, UrlMapping urlMapping) {
     return isWildcardAction(urlMapping) || explicitAction(context, urlMapping);
   }
 
-  private static boolean explicitAction(GrailsActionContext context, UrlMapping urlMapping) {
-    return Objects.equals(urlMapping.getActionName(), context.getAction());
+  private static boolean explicitAction(String action, UrlMapping urlMapping) {
+    return Objects.equals(urlMapping.getActionName(), action);
   }
 
-  private static boolean controllerMatches(GrailsActionContext context, UrlMapping urlMapping) {
-    return isWildcardController(urlMapping) || explicitController(urlMapping, context);
+  private static boolean controllerMatches(UrlMapping urlMapping, String logicalControllerName) {
+    return isWildcardController(urlMapping) || explicitController(urlMapping, logicalControllerName);
   }
 
-  private static boolean explicitController(UrlMapping urlMapping, GrailsActionContext context) {
-    return Objects.equals(urlMapping.getControllerName(), context.getController().getLogicalPropertyName());
+  private static boolean explicitController(UrlMapping urlMapping, String logicalControllerName) {
+    return Objects.equals(urlMapping.getControllerName(), logicalControllerName);
   }
 
   private static boolean isWildcardController(UrlMapping urlMapping) {