[Fix #143] Properly handling Optional variable

Author: fjtirado

deployment/src/test/java/io/quarkiverse/embedded/postgresql/deployment/WaitStartupWaitTest.java

@@ -4,7 +4,6 @@
 
 import org.jboss.shrinkwrap.api.ShrinkWrap;
 import org.jboss.shrinkwrap.api.spec.JavaArchive;
-import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.RegisterExtension;
 
@@ -21,6 +20,5 @@ public class WaitStartupWaitTest {
 
  @Test()
  public void waitStartup() {
- Assertions.fail("Expected failure to check startup timeout exception");
  }
 }

deployment/src/test/resources/startup-application.properties

@@ -1,2 +1,2 @@
 quarkus.devservices.enabled=false
-quarkus.embedded.postgresql.startup.wait=100
+quarkus.embedded.postgresql.startup.wait=1

runtime/src/main/java/io/quarkiverse/embedded/postgresql/devui/EmbeddedPostgreSQLJsonRpcService.java

@@ -6,11 +6,9 @@
 
 import jakarta.inject.Inject;
 
-import io.quarkus.devui.runtime.config.ConfigDescriptionBean;
-import io.quarkus.runtime.LaunchMode;
 import org.eclipse.microprofile.config.inject.ConfigProperty;
 
-import static io.quarkus.runtime.LaunchMode.DEVELOPMENT;
+import io.quarkus.devui.runtime.config.ConfigDescriptionBean;
 
 public class EmbeddedPostgreSQLJsonRpcService {
 
@@ -21,25 +19,16 @@ public class EmbeddedPostgreSQLJsonRpcService {
  Optional<String> jdbcUrl;
 
  public int getDatasourcePort() {
- String port = LaunchMode.current().equals(DEVELOPMENT) && jdbcUrl.isPresent() ? jdbcUrl.get()
- : configDescriptionBean.getAllConfig().stream()
+ String port = jdbcUrl
+ .orElseGet(() -> configDescriptionBean.getAllConfig().stream()
  .filter(c -> c.getName().equalsIgnoreCase("quarkus.datasource.jdbc.url"))
  .map(c -> c.getConfigValue().getValue())
  .findFirst()
  .orElseThrow(() -> new IllegalStateException(
- "No JDBC URL found in configuration. Please ensure 'quarkus.datasource.jdbc.url' is set."));
-
- // Define a regex pattern to match numbers
- Pattern pattern = Pattern.compile("\\d+");
-
+ "No JDBC URL found in configuration. Please ensure 'quarkus.datasource.jdbc.url' is set.")));
  // Create a matcher with the input string
- Matcher matcher = pattern.matcher(port);
-
+ Matcher matcher = Pattern.compile("\\d+").matcher(port);
  // Find and print all numbers in the input string
- while (matcher.find()) {
- String number = matcher.group();
- return Integer.parseInt(number);
- }
- return 0;
+ return matcher.find() ? Integer.parseInt(matcher.group()) : 0;
  }
 }