support resource methods without Path annotation in rest client

Author: xvik

dropwizard-guicey/src/main/java/ru/vyarus/dropwizard/guice/url/resource/ResourceAnalyzer.java

@@ -89,6 +89,11 @@ public static String getResourcePath(final Class<?> resource) {
      * @throws java.lang.IllegalStateException if annotation not found
      */
     public static String getMethodPath(final Method method) {
+        final Path path = method.getAnnotation(Path.class);
+        if (path == null) {
+            // method might miss path annotation if the path is the same as resource path
+            return "/";
+        }
         return PathUtils.normalizeAbsolutePath(findAnnotatedMethod(method).getAnnotation(Path.class).value());
     }
 
@@ -192,18 +197,18 @@ public static Method findMethod(final Class<?> resource, final String method) {
      */
     public static Method findAnnotatedMethod(final Method method) {
         Method res = null;
-        // searching for annotated method
-        if (method.getAnnotation(Path.class) == null) {
+        // searching for annotated method (could be Path or method annotation)
+        if (!isJerseyAnnotated(method)) {
             // try to search in superclasses and interfaces (for declaring class!)
             for (Class<?> type : GenericsResolver.resolve(method.getDeclaringClass())
                     .getGenericsInfo().getComposingTypes()) {
                 for (Method cand : type.getDeclaredMethods()) {
                     // searching same method, but annotated
                     if (cand.getName().equals(method.getName())
                             && cand.getParameterTypes().length == method.getParameterTypes().length
-                            && cand.getAnnotation(Path.class) != null
                             // not count possible type differences
-                            && Arrays.equals(cand.getParameterTypes(), method.getParameterTypes())) {
+                            && Arrays.equals(cand.getParameterTypes(), method.getParameterTypes())
+                            && isJerseyAnnotated(cand)) {
                         res = cand;
                         break;
                     }
@@ -220,6 +225,21 @@ public static Method findAnnotatedMethod(final Method method) {
         return res;
     }
 
+    /**
+     * Check if provided method is annotated with jersey annotations. Http methods must have http method
+     * annotation (like {@link jakarta.ws.rs.GET}), but may lack {@link jakarta.ws.rs.Path} annotation.
+     * Sub-resource lookup method must have {@link Path annotation}. So target method must be checked to contain
+     * one of possible annotations.
+     * <p>
+     * Note that it is impossible to have Path and http method annotation on different methods (jersey requirement).
+     *
+     * @param method method to check
+     * @return true if method contains jersey annotations
+     */
+    public static boolean isJerseyAnnotated(final Method method) {
+        return method.getAnnotation(Path.class) != null || getHttpMethod(method).isPresent();
+    }
+
     /**
      * Resolve http method by searching for method annotations like {@link jakarta.ws.rs.GET} or
      * {@link jakarta.ws.rs.POST}.

dropwizard-guicey/src/test/groovy/ru/vyarus/dropwizard/guice/url/resource/ResourceAnalyzerTest.java

@@ -46,6 +46,10 @@ void testMethodPath() throws Exception {
 
         assertThat(ResourceAnalyzer.getMethodPath(DirectResource.class.getMethod("get", MappedBean.class)))
                 .isEqualTo("/{sm}/2");
+
+        // NO @Path on method
+        assertThat(ResourceAnalyzer.getMethodPath(DirectResource.class, "nopath")).isEqualTo("/");
+        assertThat(ResourceAnalyzer.getMethodPath(InterfaceResource.class, "nopath")).isEqualTo("/");
     }
 
     @Test
@@ -106,6 +110,12 @@ void testMethodCallAnalysis() throws Exception {
         assertThat(info.getHeaderParams()).isEmpty();
         assertThat(info.getCookieParams()).isEmpty();
         assertThat(info.getMatrixParams()).isEmpty();
+
+        // WHEN method without path annotation
+        info = ResourceAnalyzer
+                .analyzeMethodCall(DirectResource.class, DirectResource::nopath);
+        assertThat(info.getHttpMethod()).isEqualTo("GET");
+        assertThat(info.getPath()).isEqualTo("/");
     }
 
     @Test

dropwizard-guicey/src/test/groovy/ru/vyarus/dropwizard/guice/url/resource/support/DirectResource.java

@@ -39,6 +39,11 @@ public Response get(@PathParam("sm") String sm,
         return Response.ok().build();
     }
 
+    @GET
+    public String nopath() {
+        return "nopath";
+    }
+
     @GET
     @Path("/{sm}/2")
     public Response get(@BeanParam MappedBean bean) {

dropwizard-guicey/src/test/groovy/ru/vyarus/dropwizard/guice/url/resource/support/InterfaceResource.java

@@ -20,6 +20,11 @@ public Response get(String sm,
         return Response.ok().build();
     }
 
+    @Override
+    public String nopath() {
+        return "nopath";
+    }
+
     @Override
     public Response get(MappedBean bean) {
         return Response.ok().build();

dropwizard-guicey/src/test/groovy/ru/vyarus/dropwizard/guice/url/resource/support/ResourceDeclaration.java

@@ -32,6 +32,9 @@ Response get(@PathParam("sm") String sm,
                         @HeaderParam("HH") String hh,
                         @CookieParam("cc") String cc);
 
+    @GET
+    String nopath();
+
     @Path("/{sm}/2")
     Response get(MappedBean bean);