Skip to content

Commit 089ea17

Browse files
committed
Merge pull request #30074 from hak7a3
* pr/30074: Update copyright year of change file Fix references to spring.data.cassandra.connection.connect-timeout Closes gh-30074
2 parents 1872af0 + cf9cc82 commit 089ea17

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

spring-boot-project/spring-boot-autoconfigure/src/main/resources/META-INF/additional-spring-configuration-metadata.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -512,7 +512,7 @@
512512
"defaultValue": "none"
513513
},
514514
{
515-
"name": "spring.data.cassandra.connection.connection-timeout",
515+
"name": "spring.data.cassandra.connection.connect-timeout",
516516
"defaultValue": "5s"
517517
},
518518
{

spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/cassandra/CassandraPropertiesTests.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2012-2021 the original author or authors.
2+
* Copyright 2012-2022 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -40,7 +40,7 @@ class CassandraPropertiesTests {
4040
@Test
4141
void defaultValuesInManualMetadataAreConsistent() {
4242
OptionsMap driverDefaults = OptionsMap.driverDefaults();
43-
// spring.data.cassandra.connection.connection-timeout
43+
// spring.data.cassandra.connection.connect-timeout
4444
assertThat(driverDefaults.get(TypedDriverOption.CONNECTION_CONNECT_TIMEOUT)).isEqualTo(Duration.ofSeconds(5));
4545
// spring.data.cassandra.connection.init-query-timeout
4646
assertThat(driverDefaults.get(TypedDriverOption.CONNECTION_INIT_QUERY_TIMEOUT))

0 commit comments

Comments
 (0)