fix Renarde url computation

Signed-off-by: Fred Bricon <fbricon@gmail.com>

Author: fbricon

.gitignore

@@ -115,3 +115,5 @@ buildNumber.properties
 # Ignore config for Eclipse PDE in VS Code until we get remote repositories working
 javaConfig.json
 **/*.target
+
+.DS_Store

quarkus.jdt.ext/com.redhat.microprofile.jdt.quarkus.test/projects/maven/quarkus-renarde-todo/src/main/java/rest/Game.java

@@ -0,0 +1,17 @@
+package rest;
+
+import javax.ws.rs.Path;
+import io.quarkiverse.renarde.Controller;
+
+@Path("/play")
+public class Game extends Controller {
+
+    @Path("/id")
+    public String endpoint() {
+        return "id";
+    }
+    
+    public String start() {
+        return "start";
+    }
+}

quarkus.jdt.ext/com.redhat.microprofile.jdt.quarkus.test/src/main/java/com/redhat/microprofile/jdt/quarkus/renarde/RenardeJaxRsTest.java

@@ -52,6 +52,23 @@ public void codeLens() throws Exception {
 				cl("http://localhost:8080/Application/endpoint", "", r(34, 18, 26)));
 	}
 
+	@Test
+	public void absolutePathCodeLens() throws Exception {
+		IJavaProject javaProject = loadMavenProject(quarkus_renarde_todo);
+
+		assertNotNull(javaProject);
+
+		MicroProfileJavaCodeLensParams params = new MicroProfileJavaCodeLensParams();
+		params.setCheckServerAvailable(false);
+		IFile javaFile = javaProject.getProject().getFile(new Path("src/main/java/rest/Game.java"));
+		params.setUri(javaFile.getLocation().toFile().toURI().toString());
+		params.setUrlCodeLensEnabled(true);
+
+		assertCodeLens(params, JDT_UTILS, //
+				cl("http://localhost:8080/play/id", "", r(9, 16, 16)),
+				cl("http://localhost:8080/play/start", "", r(13, 18, 23)));
+	}
+	
 	@Test
 	public void workspaceSymbols() throws Exception {
 		IJavaProject javaProject = loadMavenProject(quarkus_renarde_todo);
@@ -73,7 +90,9 @@ public void workspaceSymbols() throws Exception {
 				si("@/Todos/delete: POST", r(35, 16, 22)), //
 				si("@/Todos/done: POST", r(46, 16, 20)), //
 				si("@/Todos/index: GET", r(29, 28, 33)), //
-				si("@/about: GET", r(25, 28, 33)));
+				si("@/about: GET", r(25, 28, 33)),
+				si("@/play/id: GET", r(9, 18, 26)),
+				si("@/play/start: GET", r(13, 18, 23)));
 	}
 
 }

quarkus.jdt.ext/com.redhat.microprofile.jdt.quarkus/src/main/java/com/redhat/microprofile/jdt/internal/quarkus/renarde/java/RenardeJaxRsInfoProvider.java

@@ -61,10 +61,8 @@ public List<JaxRsMethodInfo> getJaxRsMethodInfo(ITypeRoot typeRoot, JaxRsContext
 			IProgressMonitor monitor) {
 		try {
 			IType type = typeRoot.findPrimaryType();
-			String typeSegment = JaxRsUtils.getJaxRsPathValue(type);
-			if (typeSegment == null) {
-				typeSegment = type.getElementName();
-			}
+			String pathSegment = JaxRsUtils.getJaxRsPathValue(type);
+			String typeSegment = type.getElementName();
 
 			List<JaxRsMethodInfo> methodInfos = new ArrayList<>();
 			for (IMethod method : type.getMethods()) {
@@ -85,9 +83,14 @@ public List<JaxRsMethodInfo> getJaxRsMethodInfo(ITypeRoot typeRoot, JaxRsContext
 					if (methodSegment == null) {
 						methodSegment = method.getElementName();
 					}
-					String url = methodSegment.startsWith("/") ? methodSegment
-							: JaxRsUtils.buildURL(typeSegment, methodSegment);
-					url = JaxRsUtils.buildURL(jaxrsContext.getLocalBaseURL(), url);
+					String path;
+					if (pathSegment == null) {
+						path = methodSegment.startsWith("/") ? methodSegment : JaxRsUtils.buildURL(typeSegment, methodSegment);
+					} else {
+						path = JaxRsUtils.buildURL(pathSegment, methodSegment);
+					}
+					
+					String url = JaxRsUtils.buildURL(jaxrsContext.getLocalBaseURL(), path);
 
 					JaxRsMethodInfo methodInfo = createMethodInfo(method, url);
 					if (methodInfo != null) {