From d708432853d61caf4145781318e1e91f7c0b9bc8 Mon Sep 17 00:00:00 2001
From: Ankit Singh <ankit2.singh@samsung.com>
Date: Tue, 18 Jul 2023 23:58:45 +0530
Subject: [PATCH] test debug

Signed-off-by: Ankit Singh <ankit2.singh@samsung.com>
---
 .../eclipse/jkube/quarkus/QuarkusUtils.java   |  7 ----
 .../enricher/QuarkusHealthCheckEnricher.java  |  5 +--
 .../jkube/quarkus/QuarkusUtilsTest.java       | 41 ++++---------------
 .../QuarkusGeneratorExposedPortsTest.java     |  2 +-
 .../src/main/resources/application.properties |  3 +-
 5 files changed, 13 insertions(+), 45 deletions(-)

diff --git a/jkube-kit/jkube-kit-quarkus/src/main/java/org/eclipse/jkube/quarkus/QuarkusUtils.java b/jkube-kit/jkube-kit-quarkus/src/main/java/org/eclipse/jkube/quarkus/QuarkusUtils.java
index c91f989ab2..c5a8345a8d 100644
--- a/jkube-kit/jkube-kit-quarkus/src/main/java/org/eclipse/jkube/quarkus/QuarkusUtils.java
+++ b/jkube-kit/jkube-kit-quarkus/src/main/java/org/eclipse/jkube/quarkus/QuarkusUtils.java
@@ -64,13 +64,6 @@ public class QuarkusUtils {
   private QuarkusUtils() {}
 
   public static String extractPort(Properties properties, String defaultValue) {
-    // final Optional<String> activeProfile = getActiveProfile(javaProject);
-    // if (activeProfile.isPresent()) {
-    //   final String profilePort = properties.getProperty(String.format("%%%s.%s", activeProfile.get(), QUARKUS_HTTP_PORT));
-    //   if (StringUtils.isNotBlank(profilePort)) {
-    //     return profilePort;
-    //   }
-    // }
     return properties.getProperty(QUARKUS_HTTP_PORT, defaultValue);
   }
 
diff --git a/jkube-kit/jkube-kit-quarkus/src/main/java/org/eclipse/jkube/quarkus/enricher/QuarkusHealthCheckEnricher.java b/jkube-kit/jkube-kit-quarkus/src/main/java/org/eclipse/jkube/quarkus/enricher/QuarkusHealthCheckEnricher.java
index a894858e49..96d5d8fa71 100644
--- a/jkube-kit/jkube-kit-quarkus/src/main/java/org/eclipse/jkube/quarkus/enricher/QuarkusHealthCheckEnricher.java
+++ b/jkube-kit/jkube-kit-quarkus/src/main/java/org/eclipse/jkube/quarkus/enricher/QuarkusHealthCheckEnricher.java
@@ -90,9 +90,8 @@ private Probe discoverQuarkusHealthCheck(int initialDelay, Function<JavaProject,
         return new ProbeBuilder()
             .withNewHttpGet()
             .withNewPort(asInteger(extractPort(getQuarkusConfiguration(getContext().getProject()),getConfig(Config.PORT))))
-              //.withNewPort(asInteger(getConfig(Config.PORT)))
-              .withPath(resolveHealthPath(pathResolver.apply(getContext().getProject())))
-              .withScheme(getConfig(Config.SCHEME))
+            .withPath(resolveHealthPath(pathResolver.apply(getContext().getProject())))
+            .withScheme(getConfig(Config.SCHEME))
             .endHttpGet()
             .withFailureThreshold(asInteger(getConfig(Config.FAILURE_THRESHOLD)))
             .withSuccessThreshold(asInteger(getConfig(Config.SUCCESS_THRESHOLD)))
diff --git a/jkube-kit/jkube-kit-quarkus/src/test/java/org/eclipse/jkube/quarkus/QuarkusUtilsTest.java b/jkube-kit/jkube-kit-quarkus/src/test/java/org/eclipse/jkube/quarkus/QuarkusUtilsTest.java
index d9d253c978..b804a7f802 100644
--- a/jkube-kit/jkube-kit-quarkus/src/test/java/org/eclipse/jkube/quarkus/QuarkusUtilsTest.java
+++ b/jkube-kit/jkube-kit-quarkus/src/test/java/org/eclipse/jkube/quarkus/QuarkusUtilsTest.java
@@ -54,47 +54,24 @@ void setUp() throws IOException {
   }
 
   @Test
-  void extractPort_noProfileAndNoPort_shouldReturnDefault() {
-    // When
-    final String result = extractPort(new Properties(), "80");
-    // Then
-    assertThat(result).isEqualTo("80");
-  }
-
-  @Test
-  void extractPort_noProfileAndPort_shouldReturnPort() {
+  void extractPort_whenServerPortPropertyPresent_thenReturnPort() {
     // Given
-    final Properties properties = new Properties();
-    properties.put("quarkus.http.port", "1337");
-    // When
-    final String result = extractPort(properties, "80");
-    // Then
-    assertThat(result).isEqualTo("1337");
-  }
-
-  @Test
-  void extractPort_inactiveProfileAndPort_shouldReturnPort() {
-    // Given
-    final Properties properties = new Properties();
-    properties.put("quarkus.http.port", "1337");
-    properties.put("%dev.quarkus.http.port", "31337");
+    Properties properties = new Properties();
+    properties.put("quarkus.http.port", "8888");
     // When
-    final String result = extractPort(properties, "80");
+    String result = QuarkusUtils.extractPort(properties, "8080");
     // Then
-    assertThat(result).isEqualTo("1337");
+    assertThat(result).isEqualTo("8888");
   }
 
   @Test
-  void extractPort_activeProfileAndPort_shouldReturnProfilePort() {
+  void extractPort_whenServerPortPropertyAbsent_thenReturnDefaultPort() {
     // Given
-    final Properties properties = new Properties();
-    properties.put("quarkus.http.port", "1337");
-    properties.put("%dev.quarkus.http.port", "31337");
-    javaProject.getProperties().put("quarkus.profile", "dev");
+    Properties properties = new Properties();
     // When
-    final String result = extractPort(properties, "80");
+    String result = QuarkusUtils.extractPort(properties, "8080");
     // Then
-    assertThat(result).isEqualTo("31337");
+    assertThat(result).isEqualTo("8080");
   }
 
   @Test
diff --git a/jkube-kit/jkube-kit-quarkus/src/test/java/org/eclipse/jkube/quarkus/generator/QuarkusGeneratorExposedPortsTest.java b/jkube-kit/jkube-kit-quarkus/src/test/java/org/eclipse/jkube/quarkus/generator/QuarkusGeneratorExposedPortsTest.java
index 0d520c20f1..80c1779d33 100644
--- a/jkube-kit/jkube-kit-quarkus/src/test/java/org/eclipse/jkube/quarkus/generator/QuarkusGeneratorExposedPortsTest.java
+++ b/jkube-kit/jkube-kit-quarkus/src/test/java/org/eclipse/jkube/quarkus/generator/QuarkusGeneratorExposedPortsTest.java
@@ -121,7 +121,7 @@ void withApplicationPropertiesAndProfile_shouldAddConfiguredProfile() throws IOE
         .extracting(ImageConfiguration::getBuildConfiguration)
         .extracting(BuildConfiguration::getPorts)
         .asList()
-        .containsExactly("31337", "8778", "9779");
+        .containsExactly("1337", "8778", "9779");
   }
 
   private void withNativeBinaryInTarget() throws IOException {
diff --git a/quickstarts/maven/quarkus/src/main/resources/application.properties b/quickstarts/maven/quarkus/src/main/resources/application.properties
index ec8743b2e2..ba03eaf8b7 100644
--- a/quickstarts/maven/quarkus/src/main/resources/application.properties
+++ b/quickstarts/maven/quarkus/src/main/resources/application.properties
@@ -12,5 +12,4 @@
 #   Red Hat, Inc. - initial API and implementation
 #
 
-%dev.quarkus.http.port=9080
-quarkus.http.port=9080
\ No newline at end of file
+%dev.quarkus.http.port=9080
\ No newline at end of file