Fix support to set a custom database name in Host-less JDBC urls by maxhov · Pull Request #10603 · testcontainers/testcontainers-java
Expand Up
@@ -107,7 +107,7 @@ private void parseUrl() {
//In case it matches to the default pattern
Matcher dbInstanceMatcher = Patterns.DB_INSTANCE_MATCHING_PATTERN.matcher(dbHostString);
if (dbInstanceMatcher.matches()) {
databaseHost = Optional.of(dbInstanceMatcher.group("databaseHost"));
databaseHost = Optional.ofNullable(dbInstanceMatcher.group("databaseHost"));
databasePort = Optional.ofNullable(dbInstanceMatcher.group("databasePort")).map(Integer::valueOf);
databaseName = Optional.of(dbInstanceMatcher.group("databaseName"));
}
Expand Down
Expand Up
@@ -227,7 +227,7 @@ public interface Patterns {
//Matches to part of string - hostname:port/databasename Pattern DB_INSTANCE_MATCHING_PATTERN = Pattern.compile( "(?<databaseHost>[^:]+)" + "(?<databaseHost>[^:]+)?" + "(:(?<databasePort>[0-9]+))?" + "(" + "(?<sidOrServiceName>[:/])" + Expand Down
//Matches to part of string - hostname:port/databasename Pattern DB_INSTANCE_MATCHING_PATTERN = Pattern.compile( "(?<databaseHost>[^:]+)" + "(?<databaseHost>[^:]+)?" + "(:(?<databasePort>[0-9]+))?" + "(" + "(?<sidOrServiceName>[:/])" + Expand Down