Fixes #240

fabiomaffioletti · Nov 20, 2017 · 8dff425 · 8dff425
1 parent d6a5262
commit 8dff425
Show file tree

Hide file tree

Showing 2 changed files with 37 additions and 3 deletions.
diff --git a/jsondoc-springmvc/src/main/java/org/jsondoc/springmvc/scanner/builder/SpringPathBuilder.java b/jsondoc-springmvc/src/main/java/org/jsondoc/springmvc/scanner/builder/SpringPathBuilder.java
@@ -16,9 +16,7 @@ public class SpringPathBuilder {
 	 * the method level! When used at the type level, all method-level mappings
 	 * inherit this primary mapping, narrowing it for a specific handler method.
 	 * 
-	 * @param apiMethodDoc
 	 * @param method
-	 * @param controller
 	 * @return
 	 */
 	public static Set<String> buildPath(Method method) {
@@ -52,7 +50,13 @@ public static Set<String> buildPath(Method method) {
 
 		for (String controllerPath : controllerMapping) {
 			for (String methodPath : methodMapping) {
-				paths.add(controllerPath + methodPath);
+				String resolvedPath;
+				if(needsToJoinWithSlash(controllerPath, methodPath)) {
+					resolvedPath = controllerPath + "/" + methodPath;
+				} else {
+					resolvedPath = controllerPath + methodPath;
+				}
+				paths.add(resolvedPath);
 			}
 		}
 
@@ -66,6 +70,10 @@ public static Set<String> buildPath(Method method) {
 		return paths;
 	}
 
+	private static boolean needsToJoinWithSlash(String controllerPath, String methodPath) {
+		return (!controllerPath.isEmpty() && !controllerPath.endsWith("/")) && (!methodPath.isEmpty() && !methodPath.startsWith("/"));
+	}
+
 	//Handle the fact that this method is only in Spring 4, not available in Spring 3
 	private static String[] pathMapping(RequestMapping requestMapping) {
 		try {

diff --git a/jsondoc-springmvc/src/test/java/org/jsondoc/springmvc/scanner/SpringPathBuilderTest.java b/jsondoc-springmvc/src/test/java/org/jsondoc/springmvc/scanner/SpringPathBuilderTest.java
@@ -12,6 +12,7 @@
 import com.google.common.base.Predicate;
 import com.google.common.collect.FluentIterable;
 import com.google.common.collect.Sets;
+import org.springframework.web.bind.annotation.RequestMethod;
 
 public class SpringPathBuilderTest {
 
@@ -85,6 +86,17 @@ public void none() {
 
 	}
 
+	@Controller
+	@RequestMapping(path = {"/api/widget"})
+	public class SpringController6 {
+
+		@RequestMapping(method = RequestMethod.GET, path = "frame")
+		public void getItem() {
+
+		}
+
+	}
+
 	@Test
 	public void testPath() {
 		ApiDoc apiDoc = jsondocScanner.getApiDocs(Sets.<Class<?>> newHashSet(SpringController.class), MethodDisplay.URI).iterator().next();
@@ -182,6 +194,20 @@ public boolean apply(ApiMethodDoc input) {
 		});
 		Assert.assertTrue(allRight);
 	}
+
+	@Test
+	public void testPath6() {
+		ApiDoc apiDoc = jsondocScanner.getApiDocs(Sets.<Class<?>> newHashSet(SpringController6.class), MethodDisplay.URI).iterator().next();
+		Assert.assertEquals("SpringController6", apiDoc.getName());
+
+		boolean allRight = FluentIterable.from(apiDoc.getMethods()).anyMatch(new Predicate<ApiMethodDoc>() {
+			@Override
+			public boolean apply(ApiMethodDoc input) {
+				return input.getPath().contains("/api/widget/frame");
+			}
+		});
+		Assert.assertTrue(allRight);
+	}
 
 	@Test
 	public void testPathWithMethodDisplayMethod() {