From d28514d301b58f5030a5e68110afdcefc54c8d38 Mon Sep 17 00:00:00 2001
From: David Thompson <davthomp@redhat.com>
Date: Mon, 16 Nov 2020 17:05:48 -0500
Subject: [PATCH] Try to use dev port for JAX-RS url CodeLens

Closes #311

Signed-off-by: David Thompson <davthomp@redhat.com>
---
 .../microprofile/jdt/quarkus/jaxrs/JaxRsCodeLensTest.java | 5 +++++
 .../jaxrs/java/QuarkusJaxRsCodeLensParticipant.java       | 8 +++++---
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/quarkus.jdt.ext/com.redhat.microprofile.jdt.quarkus.test/src/main/java/com/redhat/microprofile/jdt/quarkus/jaxrs/JaxRsCodeLensTest.java b/quarkus.jdt.ext/com.redhat.microprofile.jdt.quarkus.test/src/main/java/com/redhat/microprofile/jdt/quarkus/jaxrs/JaxRsCodeLensTest.java
index b93fb21a5..27553068f 100644
--- a/quarkus.jdt.ext/com.redhat.microprofile.jdt.quarkus.test/src/main/java/com/redhat/microprofile/jdt/quarkus/jaxrs/JaxRsCodeLensTest.java
+++ b/quarkus.jdt.ext/com.redhat.microprofile.jdt.quarkus.test/src/main/java/com/redhat/microprofile/jdt/quarkus/jaxrs/JaxRsCodeLensTest.java
@@ -67,6 +67,11 @@ public void urlCodeLensProperties() throws Exception {
 		// remove quarkus.http.port from application.properties
 		saveFile(JDTMicroProfileProject.APPLICATION_PROPERTIES_FILE, "", javaProject);
 		assertCodeLenses(8081, params, utils); // here port is 8081 coming from META-INF/microprofile-config.properties
+		
+		// Set a different value for the dev profile.
+		// If the dev profile for quarkus.http.port exists, this should be used instead of the default profile
+		saveFile(JDTMicroProfileProject.APPLICATION_PROPERTIES_FILE, "quarkus.http.port = 8080\n%dev.quarkus.http.port = 9090", javaProject);
+		assertCodeLenses(9090, params, utils);
 	}
 
 	@Test
diff --git a/quarkus.jdt.ext/com.redhat.microprofile.jdt.quarkus/src/main/java/com/redhat/microprofile/jdt/internal/quarkus/jaxrs/java/QuarkusJaxRsCodeLensParticipant.java b/quarkus.jdt.ext/com.redhat.microprofile.jdt.quarkus/src/main/java/com/redhat/microprofile/jdt/internal/quarkus/jaxrs/java/QuarkusJaxRsCodeLensParticipant.java
index 7a3cbf9a4..faac58481 100644
--- a/quarkus.jdt.ext/com.redhat.microprofile.jdt.quarkus/src/main/java/com/redhat/microprofile/jdt/internal/quarkus/jaxrs/java/QuarkusJaxRsCodeLensParticipant.java
+++ b/quarkus.jdt.ext/com.redhat.microprofile.jdt.quarkus/src/main/java/com/redhat/microprofile/jdt/internal/quarkus/jaxrs/java/QuarkusJaxRsCodeLensParticipant.java
@@ -27,12 +27,13 @@
  *
  * Quarkus JAX-RS CodeLens participant used to update the server port declared
  * with "quarkus.http.port" property.
- * 
+ *
  * @author Angelo ZERR
- * 
+ *
  */
 public class QuarkusJaxRsCodeLensParticipant implements IJavaCodeLensParticipant {
 
+	private static final String QUARKUS_DEV_HTTP_PORT = "%dev.quarkus.http.port";
 	private static final String QUARKUS_HTTP_PORT = "quarkus.http.port";
 
 	@Override
@@ -43,7 +44,8 @@ public void beginCodeLens(JavaCodeLensContext context, IProgressMonitor monitor)
 		JDTMicroProfileProject mpProject = JDTMicroProfileProjectManager.getInstance()
 				.getJDTMicroProfileProject(javaProject);
 		int serverPort = mpProject.getPropertyAsInteger(QUARKUS_HTTP_PORT, JaxRsContext.DEFAULT_PORT);
-		JaxRsContext.getJaxRsContext(context).setServerPort(serverPort);
+		int devServerPort = mpProject.getPropertyAsInteger(QUARKUS_DEV_HTTP_PORT, serverPort);
+		JaxRsContext.getJaxRsContext(context).setServerPort(devServerPort);
 	}
 
 	@Override