root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions 12 Packages Projects Releases Wiki Activity

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
This commit is contained in:
Stephane Nicoll 2022-03-07 09:48:49 +01:00
parent 1872af056e cf9cc82025
commit 089ea17423
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -512,7 +512,7 @@
"defaultValue": "none" "defaultValue": "none"
}, },
{ {
"name": "spring.data.cassandra.connection.connection-timeout", "name": "spring.data.cassandra.connection.connect-timeout",
"defaultValue": "5s" "defaultValue": "5s"
}, },
{ {

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

@ -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"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@ -40,7 +40,7 @@ class CassandraPropertiesTests {
@Test @Test
void defaultValuesInManualMetadataAreConsistent() { void defaultValuesInManualMetadataAreConsistent() {
OptionsMap driverDefaults = OptionsMap.driverDefaults(); 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)); assertThat(driverDefaults.get(TypedDriverOption.CONNECTION_CONNECT_TIMEOUT)).isEqualTo(Duration.ofSeconds(5));
// spring.data.cassandra.connection.init-query-timeout // spring.data.cassandra.connection.init-query-timeout
assertThat(driverDefaults.get(TypedDriverOption.CONNECTION_INIT_QUERY_TIMEOUT)) assertThat(driverDefaults.get(TypedDriverOption.CONNECTION_INIT_QUERY_TIMEOUT))