From 81f30595c13a2ece249a53c9e66c1001dd23bd72 Mon Sep 17 00:00:00 2001 From: Ben Hale Date: Mon, 11 May 2020 08:52:28 -0700 Subject: [PATCH] PostgreSQL JDBC Format [resolves #10] Signed-off-by: Ben Hale --- .../boot/PostgreSqlBindingsPropertiesProcessor.java | 7 ++++--- .../boot/PostgreSqlBindingsPropertiesProcessorTest.java | 5 ++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/main/java/org/springframework/cloud/bindings/boot/PostgreSqlBindingsPropertiesProcessor.java b/src/main/java/org/springframework/cloud/bindings/boot/PostgreSqlBindingsPropertiesProcessor.java index b1c7ce7..119dc40 100644 --- a/src/main/java/org/springframework/cloud/bindings/boot/PostgreSqlBindingsPropertiesProcessor.java +++ b/src/main/java/org/springframework/cloud/bindings/boot/PostgreSqlBindingsPropertiesProcessor.java @@ -25,6 +25,8 @@ import java.util.Map; /** * An implementation of {@link BindingsPropertiesProcessor} that detects {@link Binding}s of kind: {@value KIND}. + * + * @see JDBC URL Format */ public final class PostgreSqlBindingsPropertiesProcessor implements BindingsPropertiesProcessor { @@ -40,9 +42,8 @@ public final class PostgreSqlBindingsPropertiesProcessor implements BindingsProp properties.put("spring.datasource.driver-class-name", "org.postgresql.Driver"); properties.put("spring.datasource.password", secret.get("password")); - properties.put("spring.datasource.url", String.format("jdbc:postgres://%s:%s/%s?user=%s&password=%s", - secret.get("host"), secret.get("port"), secret.get("db"), secret.get("username"), - secret.get("password"))); + properties.put("spring.datasource.url", String.format("jdbc:postgres://%s:%s/%s", + secret.get("host"), secret.get("port"), secret.get("database"))); properties.put("spring.datasource.username", secret.get("username")); }); } diff --git a/src/test/java/org/springframework/cloud/bindings/boot/PostgreSqlBindingsPropertiesProcessorTest.java b/src/test/java/org/springframework/cloud/bindings/boot/PostgreSqlBindingsPropertiesProcessorTest.java index 2fb7914..f44efb6 100644 --- a/src/test/java/org/springframework/cloud/bindings/boot/PostgreSqlBindingsPropertiesProcessorTest.java +++ b/src/test/java/org/springframework/cloud/bindings/boot/PostgreSqlBindingsPropertiesProcessorTest.java @@ -41,7 +41,7 @@ final class PostgreSqlBindingsPropertiesProcessorTest { new Binding("test-name", Paths.get("test-path"), Collections.singletonMap("kind", KIND), new FluentMap() - .withEntry("db", "test-db") + .withEntry("database", "test-database") .withEntry("host", "test-host") .withEntry("password", "test-password") .withEntry("port", "test-port") @@ -52,8 +52,7 @@ final class PostgreSqlBindingsPropertiesProcessorTest { assertThat(properties) .containsEntry("spring.datasource.driver-class-name", "org.postgresql.Driver") .containsEntry("spring.datasource.password", "test-password") - .containsEntry("spring.datasource.url", - "jdbc:postgres://test-host:test-port/test-db?user=test-username&password=test-password") + .containsEntry("spring.datasource.url", "jdbc:postgres://test-host:test-port/test-database") .containsEntry("spring.datasource.username", "test-username"); }