Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Use JdbcDatabaseContainer#withUrlParam() and delegate URL creation #15768

Merged
merged 1 commit into from
Mar 16, 2021
Merged

Use JdbcDatabaseContainer#withUrlParam() and delegate URL creation #15768

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
20 changes: 2 additions & 18 deletions ...ices/db2/src/main/java/io/quarkus/devservices/db2/deployment/DB2DevServicesProcessor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,25 +25,9 @@ public RunningDevServicesDatasource startDatabase(Optional<String> username, Opt
.withPassword(password.orElse("quarkus"))
.withUsername(username.orElse("quarkus"))
.withDatabaseName(datasourceName.orElse("default"));
additionalProperties.forEach(container::withUrlParam);
container.start();
StringBuilder additionalArgs = new StringBuilder();
for (Map.Entry<String, String> i : additionalProperties.entrySet()) {
if (additionalArgs.length() > 0) {
additionalArgs.append("&");
}
additionalArgs.append(i.getKey());
additionalArgs.append("=");
additionalArgs.append(i.getValue());
}
String jdbcUrl = container.getJdbcUrl();
if (additionalArgs.length() > 0) {
if (jdbcUrl.contains("?")) {
jdbcUrl = jdbcUrl + "&" + additionalArgs.toString();
} else {
jdbcUrl = jdbcUrl + "?" + additionalArgs.toString();
}
}
return new RunningDevServicesDatasource(jdbcUrl, container.getUsername(),
return new RunningDevServicesDatasource(container.getJdbcUrl(), container.getUsername(),
container.getPassword(),
new Closeable() {
@Override
Expand Down
21 changes: 2 additions & 19 deletions ...c/main/java/io/quarkus/devservices/postgresql/deployment/MariaDBDevServicesProcessor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,26 +25,9 @@ public RunningDevServicesDatasource startDatabase(Optional<String> username, Opt
.withPassword(password.orElse("quarkus"))
.withUsername(username.orElse("quarkus"))
.withDatabaseName(datasourceName.orElse("default"));
additionalProperties.forEach(container::withUrlParam);
container.start();

StringBuilder additionalArgs = new StringBuilder();
for (Map.Entry<String, String> i : additionalProperties.entrySet()) {
if (additionalArgs.length() > 0) {
additionalArgs.append("&");
}
additionalArgs.append(i.getKey());
additionalArgs.append("=");
additionalArgs.append(i.getValue());
}
String jdbcUrl = container.getJdbcUrl();
if (additionalArgs.length() > 0) {
if (jdbcUrl.contains("?")) {
jdbcUrl = jdbcUrl + "&" + additionalArgs.toString();
} else {
jdbcUrl = jdbcUrl + "?" + additionalArgs.toString();
}
}
return new RunningDevServicesDatasource(jdbcUrl, container.getUsername(),
return new RunningDevServicesDatasource(container.getJdbcUrl(), container.getUsername(),
container.getPassword(),
new Closeable() {
@Override
Expand Down
20 changes: 2 additions & 18 deletions ...ssql/src/main/java/io/quarkus/devservices/mssql/deployment/MSSQLDevServicesProcessor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,25 +24,9 @@ public RunningDevServicesDatasource startDatabase(Optional<String> username, Opt
JdbcDatabaseContainer container = new MSSQLServerContainer(
imageName.orElse(MSSQLServerContainer.IMAGE + ":" + MSSQLServerContainer.DEFAULT_TAG))
.withPassword(password.orElse("Quarkuspassword1"));
additionalProperties.forEach(container::withUrlParam);
container.start();
StringBuilder additionalArgs = new StringBuilder();
for (Map.Entry<String, String> i : additionalProperties.entrySet()) {
if (additionalArgs.length() > 0) {
additionalArgs.append("&");
}
additionalArgs.append(i.getKey());
additionalArgs.append("=");
additionalArgs.append(i.getValue());
}
String jdbcUrl = container.getJdbcUrl();
if (additionalArgs.length() > 0) {
if (jdbcUrl.contains("?")) {
jdbcUrl = jdbcUrl + "&" + additionalArgs.toString();
} else {
jdbcUrl = jdbcUrl + "?" + additionalArgs.toString();
}
}
return new RunningDevServicesDatasource(jdbcUrl, container.getUsername(),
return new RunningDevServicesDatasource(container.getJdbcUrl(), container.getUsername(),
container.getPassword(),
new Closeable() {
@Override
Expand Down
21 changes: 2 additions & 19 deletions ...src/main/java/io/quarkus/devservices/postgresql/deployment/MySQLDevServicesProcessor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,26 +25,9 @@ public RunningDevServicesDatasource startDatabase(Optional<String> username, Opt
.withPassword(password.orElse("quarkus"))
.withUsername(username.orElse("quarkus"))
.withDatabaseName(datasourceName.orElse("default"));
additionalProperties.forEach(container::withUrlParam);
container.start();

StringBuilder additionalArgs = new StringBuilder();
for (Map.Entry<String, String> i : additionalProperties.entrySet()) {
if (additionalArgs.length() > 0) {
additionalArgs.append("&");
}
additionalArgs.append(i.getKey());
additionalArgs.append("=");
additionalArgs.append(i.getValue());
}
String jdbcUrl = container.getJdbcUrl();
if (additionalArgs.length() > 0) {
if (jdbcUrl.contains("?")) {
jdbcUrl = jdbcUrl + "&" + additionalArgs.toString();
} else {
jdbcUrl = jdbcUrl + "?" + additionalArgs.toString();
}
}
return new RunningDevServicesDatasource(jdbcUrl, container.getUsername(),
return new RunningDevServicesDatasource(container.getJdbcUrl(), container.getUsername(),
container.getPassword(),
new Closeable() {
@Override
Expand Down
20 changes: 2 additions & 18 deletions ...ain/java/io/quarkus/devservices/postgresql/deployment/PostgresqlDevServicesProcessor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,25 +25,9 @@ public RunningDevServicesDatasource startDatabase(Optional<String> username, Opt
.withPassword(password.orElse("quarkus"))
.withUsername(username.orElse("quarkus"))
.withDatabaseName(datasourceName.orElse("default"));
additionalProperties.forEach(container::withUrlParam);
container.start();
StringBuilder additionalArgs = new StringBuilder();
for (Map.Entry<String, String> i : additionalProperties.entrySet()) {
if (additionalArgs.length() > 0) {
additionalArgs.append("&");
}
additionalArgs.append(i.getKey());
additionalArgs.append("=");
additionalArgs.append(i.getValue());
}
String jdbcUrl = container.getJdbcUrl();
if (additionalArgs.length() > 0) {
if (jdbcUrl.contains("?")) {
jdbcUrl = jdbcUrl + "&" + additionalArgs.toString();
} else {
jdbcUrl = jdbcUrl + "?" + additionalArgs.toString();
}
}
return new RunningDevServicesDatasource(jdbcUrl, container.getUsername(),
return new RunningDevServicesDatasource(container.getJdbcUrl(), container.getUsername(),
container.getPassword(),
new Closeable() {
@Override
Expand Down