fix issue OpenFeign#31: support @path on type

adriancole · adriancole · commit 15b48c1b7143 · 2013-08-04T13:36:59.000-07:00
diff --git a/CHANGES.md b/CHANGES.md
@@ -6,6 +6,7 @@
 
 ### Version 3.2
 * Add wikipedia search example
+* Allow `@Path` on types in feign-jaxrs
 
 ### Version 3.1
 * Log when an http request is retried or a response fails due to an IOException.
diff --git a/feign-jaxrs/src/main/java/feign/jaxrs/JAXRSModule.java b/feign-jaxrs/src/main/java/feign/jaxrs/JAXRSModule.java
@@ -45,6 +45,16 @@ public final class JAXRSModule {
 
   public static final class JAXRSContract extends Contract.BaseContract {
 
+    @Override
+    public MethodMetadata parseAndValidatateMetadata(Method method) {
+      MethodMetadata md = super.parseAndValidatateMetadata(method);
+      Path path = method.getDeclaringClass().getAnnotation(Path.class);
+      if (path != null) {
+        md.template().insert(0, path.value());
+      }
+      return md;
+    }
+
     @Override
     protected void processAnnotationOnMethod(MethodMetadata data, Annotation methodAnnotation, Method method) {
       Class<? extends Annotation> annotationType = methodAnnotation.annotationType();
diff --git a/feign-jaxrs/src/test/java/feign/jaxrs/JAXRSContractTest.java b/feign-jaxrs/src/test/java/feign/jaxrs/JAXRSContractTest.java
@@ -193,6 +193,20 @@ public void tooManyBodies() throws Exception {
     contract.parseAndValidatateMetadata(BodyParams.class.getDeclaredMethod("tooMany", List.class, List.class));
   }
 
+  @Path("/base")
+  interface PathOnType {
+    @GET Response base();
+
+    @GET @Path("/specific") Response get();
+  }
+
+  @Test public void pathOnType() throws Exception {
+    MethodMetadata md = contract.parseAndValidatateMetadata(PathOnType.class.getDeclaredMethod("base"));
+    assertEquals(md.template().url(), "/base");
+    md = contract.parseAndValidatateMetadata(PathOnType.class.getDeclaredMethod("get"));
+    assertEquals(md.template().url(), "/base/specific");
+  }
+
   interface WithURIParam {
     @GET @Path("/{1}/{2}") Response uriParam(@PathParam("1") String one, URI endpoint, @PathParam("2") String two);
   }
