From 268be9f7c7933103ac2e01003ccddd333103f461 Mon Sep 17 00:00:00 2001 From: Ben Hale Date: Mon, 11 May 2020 08:47:35 -0700 Subject: [PATCH] MySQL JDBC Format [resolves #8] Signed-off-by: Ben Hale --- .../bindings/boot/MySqlBindingsPropertiesProcessor.java | 7 ++++--- .../boot/MySqlBindingsPropertiesProcessorTest.java | 4 ++-- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/src/main/java/org/springframework/cloud/bindings/boot/MySqlBindingsPropertiesProcessor.java b/src/main/java/org/springframework/cloud/bindings/boot/MySqlBindingsPropertiesProcessor.java index 4e35d71..2c66aab 100644 --- a/src/main/java/org/springframework/cloud/bindings/boot/MySqlBindingsPropertiesProcessor.java +++ b/src/main/java/org/springframework/cloud/bindings/boot/MySqlBindingsPropertiesProcessor.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 MySqlBindingsPropertiesProcessor implements BindingsPropertiesProcessor { @@ -50,9 +52,8 @@ public final class MySqlBindingsPropertiesProcessor implements BindingsPropertie } properties.put("spring.datasource.password", secret.get("password")); - properties.put("spring.datasource.url", String.format("jdbc:mysql://%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:mysql://%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/MySqlBindingsPropertiesProcessorTest.java b/src/test/java/org/springframework/cloud/bindings/boot/MySqlBindingsPropertiesProcessorTest.java index c8e484a..71fcb0c 100644 --- a/src/test/java/org/springframework/cloud/bindings/boot/MySqlBindingsPropertiesProcessorTest.java +++ b/src/test/java/org/springframework/cloud/bindings/boot/MySqlBindingsPropertiesProcessorTest.java @@ -41,7 +41,7 @@ final class MySqlBindingsPropertiesProcessorTest { 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,7 +52,7 @@ final class MySqlBindingsPropertiesProcessorTest { assertThat(properties) .containsEntry("spring.datasource.driver-class-name", "org.mariadb.jdbc.Driver") .containsEntry("spring.datasource.password", "test-password") - .containsEntry("spring.datasource.url", "jdbc:mysql://test-host:test-port/test-db?user=test-username&password=test-password") + .containsEntry("spring.datasource.url", "jdbc:mysql://test-host:test-port/test-database") .containsEntry("spring.datasource.username", "test-username"); }