From 19d30078068868bcd4151f79770d9d1b1979cf80 Mon Sep 17 00:00:00 2001 From: Phillip Webb Date: Mon, 18 Oct 2021 21:44:41 -0700 Subject: [PATCH] Polish --- .../boot/r2dbc/EmbeddedDatabaseConnection.java | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/r2dbc/EmbeddedDatabaseConnection.java b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/r2dbc/EmbeddedDatabaseConnection.java index 67dd7b02b0..f7f224415e 100644 --- a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/r2dbc/EmbeddedDatabaseConnection.java +++ b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/r2dbc/EmbeddedDatabaseConnection.java @@ -99,12 +99,10 @@ public enum EmbeddedDatabaseConnection { */ public static boolean isEmbedded(ConnectionFactory connectionFactory) { OptionsCapableConnectionFactory optionsCapable = OptionsCapableConnectionFactory.unwrapFrom(connectionFactory); - if (optionsCapable == null) { - throw new IllegalArgumentException( - "Cannot determine database's type as ConnectionFactory is not options-capable. To be " - + "options-capable, a ConnectionFactory should be created with " - + ConnectionFactoryBuilder.class.getName()); - } + Assert.notNull(optionsCapable, + () -> "Cannot determine database's type as ConnectionFactory is not options-capable. To be " + + "options-capable, a ConnectionFactory should be created with " + + ConnectionFactoryBuilder.class.getName()); ConnectionFactoryOptions options = optionsCapable.getOptions(); for (EmbeddedDatabaseConnection candidate : values()) { if (candidate.embedded.test(options)) {