From 0a035c7fa69eed56d21bbdf6f3cca7bd9a78dc83 Mon Sep 17 00:00:00 2001 From: hak7a3 Date: Sun, 6 Mar 2022 09:42:02 +0900 Subject: [PATCH 1/2] 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 b6ae115aedf2..c03d5d5dcb16 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 e4eef02c1194..ca3d2cd2d75f 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)) From cf9cc820250f399826b75eb29013a188d4f93b98 Mon Sep 17 00:00:00 2001 From: Stephane Nicoll Date: Mon, 7 Mar 2022 09:47:12 +0100 Subject: [PATCH 2/2] Update copyright year of change file See gh-30074 --- .../boot/autoconfigure/cassandra/CassandraPropertiesTests.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 ca3d2cd2d75f..abb2e6fb9e39 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 @@ -1,5 +1,5 @@ /* - * Copyright 2012-2021 the original author or authors. + * Copyright 2012-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License.