Fix an issue with trailing slashes in @path annotations on classes

Jacob Meacham · Jacob Meacham · commit b85d5c1efc59 · 2015-06-11T21:03:40.000-07:00
diff --git a/jaxrs/src/main/java/feign/jaxrs/JAXRSContract.java b/jaxrs/src/main/java/feign/jaxrs/JAXRSContract.java
@@ -54,6 +54,10 @@ public MethodMetadata parseAndValidatateMetadata(Method method) {
       if (!pathValue.startsWith("/")) {
         pathValue = "/" + pathValue;
       }
+      if (pathValue.endsWith("/")) {
+          // Strip off any trailing slashes, since the template has already had slashes appropriately added
+          pathValue = pathValue.substring(0, pathValue.length()-1);
+      }
       md.template().insert(0, pathValue);
     }
     return md;
diff --git a/jaxrs/src/test/java/feign/jaxrs/JAXRSContractTest.java b/jaxrs/src/test/java/feign/jaxrs/JAXRSContractTest.java
@@ -374,6 +374,22 @@ public void pathsWithSomeOtherSlashesParseCorrectly() throws Exception {
 
   }
 
+  @Test
+  public void classWithRootPathParsesCorrectly() throws Exception {
+      assertThat(
+              contract.parseAndValidatateMetadata(ClassRootPath.class.getDeclaredMethod("get"))
+                  .template())
+              .hasUrl("/specific");
+  }
+
+  @Test
+  public void classPathWithTrailingSlashParsesCorrectly() throws Exception {
+      assertThat(
+              contract.parseAndValidatateMetadata(ClassPathWithTrailingSlash.class.getDeclaredMethod("get"))
+                  .template())
+              .hasUrl("/base/specific");
+  }
+
   interface Methods {
 
     @POST
@@ -549,4 +565,18 @@ interface PathsWithSomeOtherSlashes {
     @Path("/specific")
     Response get();
   }
+
+  @Path("/")
+  interface ClassRootPath {
+      @GET
+      @Path("/specific")
+      Response get();
+  }
+
+  @Path("/base/")
+  interface ClassPathWithTrailingSlash {
+      @GET
+      @Path("/specific")
+      Response get();
+  }
 }

Original file line number	Diff line number	Diff line change
`@@ -54,6 +54,10 @@ public MethodMetadata parseAndValidatateMetadata(Method method) {`
`54`	`54`	`if (!pathValue.startsWith("/")) {`
`55`	`55`	`pathValue = "/" + pathValue;`
`56`	`56`	`}`
	`57`	`+ if (pathValue.endsWith("/")) {`
	`58`	`+ // Strip off any trailing slashes, since the template has already had slashes appropriately added`
	`59`	`+ pathValue = pathValue.substring(0, pathValue.length()-1);`
	`60`	`+ }`
`57`	`61`	`md.template().insert(0, pathValue);`
`58`	`62`	`}`
`59`	`63`	`return md;`