From 0a035c7fa69eed56d21bbdf6f3cca7bd9a78dc83 Mon Sep 17 00:00:00 2001 From: hak7a3 Date: Sun, 6 Mar 2022 09:42:02 +0900 Subject: [PATCH] Fix references to spring.data.cassandra.connection.connect-timeout See gh-30074 --- .../META-INF/additional-spring-configuration-metadata.json | 2 +- .../boot/autoconfigure/cassandra/CassandraPropertiesTests.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/resources/META-INF/additional-spring-configuration-metadata.json b/spring-boot-project/spring-boot-autoconfigure/src/main/resources/META-INF/additional-spring-configuration-metadata.json index b6ae115aedf..c03d5d5dcb1 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/resources/META-INF/additional-spring-configuration-metadata.json +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/resources/META-INF/additional-spring-configuration-metadata.json @@ -512,7 +512,7 @@ "defaultValue": "none" }, { - "name": "spring.data.cassandra.connection.connection-timeout", + "name": "spring.data.cassandra.connection.connect-timeout", "defaultValue": "5s" }, { diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/cassandra/CassandraPropertiesTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/cassandra/CassandraPropertiesTests.java index e4eef02c119..ca3d2cd2d75 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/cassandra/CassandraPropertiesTests.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/cassandra/CassandraPropertiesTests.java @@ -40,7 +40,7 @@ class CassandraPropertiesTests { @Test void defaultValuesInManualMetadataAreConsistent() { OptionsMap driverDefaults = OptionsMap.driverDefaults(); - // spring.data.cassandra.connection.connection-timeout + // spring.data.cassandra.connection.connect-timeout assertThat(driverDefaults.get(TypedDriverOption.CONNECTION_CONNECT_TIMEOUT)).isEqualTo(Duration.ofSeconds(5)); // spring.data.cassandra.connection.init-query-timeout assertThat(driverDefaults.get(TypedDriverOption.CONNECTION_INIT_QUERY_TIMEOUT))