From d90e622d1c80dd1c631df9885bd9af03d9a9fa2e Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Wed, 15 Jan 2025 18:50:10 +0000 Subject: [PATCH] Polish "Add support for AWS Advanced JDBC Wrapper" See gh-43812 --- spring-boot-project/spring-boot-parent/build.gradle | 2 +- .../java/org/springframework/boot/jdbc/DatabaseDriver.java | 5 ++--- .../org/springframework/boot/jdbc/DatabaseDriverTests.java | 2 +- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/spring-boot-project/spring-boot-parent/build.gradle b/spring-boot-project/spring-boot-parent/build.gradle index c413833df81..a216a482975 100644 --- a/spring-boot-project/spring-boot-parent/build.gradle +++ b/spring-boot-project/spring-boot-parent/build.gradle @@ -28,7 +28,7 @@ bom { library("AWS Advanced JDBC Wrapper", "2.5.4") { group("software.amazon.jdbc") { modules = [ - "aws-advanced-jdbc-wrapper" + "aws-advanced-jdbc-wrapper" ] } } diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/jdbc/DatabaseDriver.java b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/jdbc/DatabaseDriver.java index 1f40cb74d3b..19d5307eb9a 100644 --- a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/jdbc/DatabaseDriver.java +++ b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/jdbc/DatabaseDriver.java @@ -19,7 +19,6 @@ package org.springframework.boot.jdbc; import java.util.Arrays; import java.util.Collection; import java.util.Collections; -import java.util.List; import java.util.Locale; import org.springframework.util.Assert; @@ -225,11 +224,11 @@ public enum DatabaseDriver { * AWS Advanced JDBC Wrapper. * @since 3.5.0 */ - AWS_JDBC_WRAPPER(null, "software.amazon.jdbc.Driver") { + AWS_WRAPPER(null, "software.amazon.jdbc.Driver") { @Override protected Collection getUrlPrefixes() { - return List.of("aws-wrapper"); + return Collections.singleton("aws-wrapper"); } }; diff --git a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/jdbc/DatabaseDriverTests.java b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/jdbc/DatabaseDriverTests.java index 016dd6a23ab..551bb5c1bd2 100644 --- a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/jdbc/DatabaseDriverTests.java +++ b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/jdbc/DatabaseDriverTests.java @@ -122,7 +122,7 @@ class DatabaseDriverTests { .isEqualTo(DatabaseDriver.CLICKHOUSE); assertThat(DatabaseDriver.fromJdbcUrl("jdbc:ch://localhost:3306/sample")).isEqualTo(DatabaseDriver.CLICKHOUSE); assertThat(DatabaseDriver.fromJdbcUrl("jdbc:aws-wrapper:postgresql://127.0.0.1:5432/sample")) - .isEqualTo(DatabaseDriver.AWS_JDBC_WRAPPER); + .isEqualTo(DatabaseDriver.AWS_WRAPPER); } }