Test case and fix for RESTEASY-1212

jaxrs/resteasy-spring/src/main/java/org/jboss/resteasy/plugins/spring/SpringBeanProcessor.java

@@ -19,7 +19,6 @@
 import org.springframework.context.event.ContextRefreshedEvent;
 import org.springframework.context.event.SmartApplicationListener;
 import org.springframework.util.ClassUtils;
-import org.springframework.util.ReflectionUtils;
 
 import javax.ws.rs.ext.MessageBodyReader;
 import javax.ws.rs.ext.MessageBodyWriter;
@@ -413,14 +412,20 @@ private static Class<?> getBeanClass(String name, BeanDefinition beanDef,
             }
          }
 
-          final Class<?> beanClass = getBeanClass(factoryClassName);
-          final Method[] methods = ReflectionUtils.getAllDeclaredMethods(beanClass);
-          for (Method method : methods) {
-              if (method.getName().equals(factoryMethodName)) {
+         Class<?> factoryClass = getBeanClass(factoryClassName);
+         while (factoryClass != Object.class) 
+         {
+            for (Method method : factoryClass.getDeclaredMethods()) 
+            {
+               if (method.getName().equals(factoryMethodName)) {
                   return method.getReturnType();
-              }
-          }
-
+               }
+            }
+            factoryClass = factoryClass.getSuperclass();
+         }
+         final Class<?> beanClass = getBeanClass(factoryClassName);
+         final Method[] methods = beanClass.getDeclaredMethods();
+
          /*
             https://github.com/resteasy/Resteasy/issues/585
 

jaxrs/resteasy-spring/src/test/java/org/jboss/resteasy/spring/TestSpringBeanProcessor.java

@@ -53,6 +53,19 @@ public void testRegistration() throws Exception
       ClientResponse<String> resp = createClientRequest("/registered/singleton/count").post(
             String.class);
       check(resp, 200, "0");
+   }
+
+	@Test
+   // test for https://issues.jboss.org/browse/RESTEASY-1212
+	public void testRegistrationViaSuper() throws Exception
+   {
+		ClientResponse<String> resp = createClientRequest("/registered/super/count").post(
+				String.class);
+		check(resp, 200, "0");
+	}
+
+   @Test
+   public void testNotRegisteredAtRoot() throws Exception {
       Assert.assertEquals(404, createClientRequest("/count").post().getStatus());
    }
 

jaxrs/resteasy-spring/src/test/java/org/jboss/resteasy/spring/beanprocessor/AbstractResourceConfiguration.java

@@ -0,0 +1,16 @@
+package org.jboss.resteasy.spring.beanprocessor;
+
+import org.springframework.context.annotation.Bean;
+
+/**
+ * @author Michiel Meeuwissen
+ */
+public abstract class AbstractResourceConfiguration
+{
+   @Bean
+   Counter superCounter()
+   {
+      return new Counter();
+   }
+
+}

jaxrs/resteasy-spring/src/test/java/org/jboss/resteasy/spring/beanprocessor/ResourceConfiguration.java

@@ -6,7 +6,7 @@
 import org.springframework.context.annotation.Scope;
 
 @Configuration
-public class ResourceConfiguration
+public class ResourceConfiguration extends AbstractResourceConfiguration
 {
    @Bean
    public ResteasyRegistration singletonRegistration()
@@ -20,6 +20,12 @@ public ResteasyRegistration prototypeRegistration()
       return new ResteasyRegistration("/registered/prototype", "prototypeCounter");
    }
 
+   @Bean
+   public ResteasyRegistration superRegistration()
+   {
+      return new ResteasyRegistration("/registered/super", "superCounter");
+   }
+
    @Bean
    Counter singletonCounter()
    {