Fixed the Action resolver test to test the right thing

Author: dilipkrish

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

@@ -1,6 +1,5 @@
 package springfox.documentation.grails;
 
-import grails.core.GrailsClass;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
@@ -18,17 +17,18 @@ public ActionSpecificationResolver(
   }
 
   ActionSpecification resolve(GrailsActionContext context) {
-    if (isRestfulController(context.getController())) {
+    if (isRestfulController(context)) {
       return restfulActions.create(context);
     }
     return methodBackedActions.create(context);
   }
 
   @SuppressWarnings({"unchecked", "squid:S1166"})
-  private boolean isRestfulController(GrailsClass controllerClazz) {
+  private boolean isRestfulController(GrailsActionContext context) {
     try {
       Class<?> restfulController = Class.forName("grails.rest.RestfulController");
-      return restfulController.isAssignableFrom(controllerClazz.getClazz());
+      return restfulController.isAssignableFrom(context.getController().getClazz())
+          && restfulActions.canHandle(context.getAction());
     } catch (ClassNotFoundException e) {
       return false;
     }

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

@@ -20,12 +20,16 @@ public RestfulActionSpecificationFactory(TypeResolver resolver) {
   @Override
   public ActionSpecification create(GrailsActionContext context) {
     Preconditions.checkArgument(
-        factoryLookup.containsKey(context.getAction()),
+        canHandle(context.getAction()),
         String.format("Action %s is not a restful action", context.getAction()));
 
     return factoryLookup.get(context.getAction()).create(context);
   }
 
+  public boolean canHandle(String action) {
+    return factoryLookup.containsKey(action);
+  }
+
   private static Map<String, ActionSpecificationFactory> restfulActions(TypeResolver resolver) {
     LinkedHashMap<String, ActionSpecificationFactory> map = new LinkedHashMap<>(8);
     map.put("index", new IndexActionSpecificationFactory(resolver));

springfox-grails/src/test/groovy/springfox/documentation/grails/ActionSpecificationResolverSpec.groovy

@@ -8,6 +8,7 @@ import grails.web.mapping.LinkGenerator
 import grails.web.mapping.UrlMapping
 import grails.web.mapping.UrlMappings
 import spock.lang.Specification
+import spock.lang.Unroll
 
 class ActionSpecificationResolverSpec extends Specification {
   def resolver = new TypeResolver()
@@ -27,13 +28,16 @@ class ActionSpecificationResolverSpec extends Specification {
     actionAttributes = new GrailsActionAttributes(links, urlMappings)
   }
 
-  def "Resolves restful and method backed actions"() {
+  @Unroll
+  def "Resolves action #action"() {
     given:
-      def sut = new MethodBackedActionSpecificationFactory(resolver, actionAttributes)
+      def sut = new ActionSpecificationResolver(
+          new RestfulActionSpecificationFactory(resolver),
+          new MethodBackedActionSpecificationFactory(resolver, actionAttributes))
     and:
       urlMappings.urlMappings >> [otherMapping(Mock(UrlMapping))]
     when:
-      def spec = sut.create(new GrailsActionContext(controller, domain, action))
+      def spec = sut.resolve(new GrailsActionContext(controller, domain, action))
     then:
       spec != null
       spec.handlerMethod.method.name == action