Browse Source

Polish "Add support for AWS Advanced JDBC Wrapper"

See gh-43812
pull/43852/head
Andy Wilkinson 11 months ago
parent
commit
d90e622d1c
  1. 2
      spring-boot-project/spring-boot-parent/build.gradle
  2. 5
      spring-boot-project/spring-boot/src/main/java/org/springframework/boot/jdbc/DatabaseDriver.java
  3. 2
      spring-boot-project/spring-boot/src/test/java/org/springframework/boot/jdbc/DatabaseDriverTests.java

2
spring-boot-project/spring-boot-parent/build.gradle

@ -28,7 +28,7 @@ bom {
library("AWS Advanced JDBC Wrapper", "2.5.4") { library("AWS Advanced JDBC Wrapper", "2.5.4") {
group("software.amazon.jdbc") { group("software.amazon.jdbc") {
modules = [ modules = [
"aws-advanced-jdbc-wrapper" "aws-advanced-jdbc-wrapper"
] ]
} }
} }

5
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.Arrays;
import java.util.Collection; import java.util.Collection;
import java.util.Collections; import java.util.Collections;
import java.util.List;
import java.util.Locale; import java.util.Locale;
import org.springframework.util.Assert; import org.springframework.util.Assert;
@ -225,11 +224,11 @@ public enum DatabaseDriver {
* AWS Advanced JDBC Wrapper. * AWS Advanced JDBC Wrapper.
* @since 3.5.0 * @since 3.5.0
*/ */
AWS_JDBC_WRAPPER(null, "software.amazon.jdbc.Driver") { AWS_WRAPPER(null, "software.amazon.jdbc.Driver") {
@Override @Override
protected Collection<String> getUrlPrefixes() { protected Collection<String> getUrlPrefixes() {
return List.of("aws-wrapper"); return Collections.singleton("aws-wrapper");
} }
}; };

2
spring-boot-project/spring-boot/src/test/java/org/springframework/boot/jdbc/DatabaseDriverTests.java

@ -122,7 +122,7 @@ class DatabaseDriverTests {
.isEqualTo(DatabaseDriver.CLICKHOUSE); .isEqualTo(DatabaseDriver.CLICKHOUSE);
assertThat(DatabaseDriver.fromJdbcUrl("jdbc:ch://localhost:3306/sample")).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")) assertThat(DatabaseDriver.fromJdbcUrl("jdbc:aws-wrapper:postgresql://127.0.0.1:5432/sample"))
.isEqualTo(DatabaseDriver.AWS_JDBC_WRAPPER); .isEqualTo(DatabaseDriver.AWS_WRAPPER);
} }
} }

Loading…
Cancel
Save