Merge branch '2.7.x' into 3.0.x

Closes gh-34799
spring-projects · Mar 28, 2023 · 16b126a · 16b126a
2 parents c37ff8d + c9e69b1
commit 16b126a
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 1 deletion.
diff --git a/...ain/java/org/springframework/boot/autoconfigure/cassandra/CassandraAutoConfiguration.java b/...ain/java/org/springframework/boot/autoconfigure/cassandra/CassandraAutoConfiguration.java
@@ -135,7 +135,7 @@ private Config cassandraConfiguration(CassandraProperties properties) {
 			config = config.withFallback(loadConfig(properties.getConfig()));
 		}
 		config = config.withFallback(SPRING_BOOT_DEFAULTS);
-		config = config.withFallback(ConfigFactory.defaultReference());
+		config = config.withFallback(ConfigFactory.defaultReferenceUnresolved());
 		return config.resolve();
 	}
 

diff --git a/...ava/org/springframework/boot/autoconfigure/cassandra/CassandraAutoConfigurationTests.java b/...ava/org/springframework/boot/autoconfigure/cassandra/CassandraAutoConfigurationTests.java
@@ -298,6 +298,18 @@ void driverConfigLoaderWithConfigOverridesDefaults() {
 		});
 	}
 
+	@Test
+	void placeholdersInReferenceConfAreResolvedAgainstConfigDerivedFromSpringCassandraProperties() {
+		this.contextRunner.withPropertyValues("spring.cassandra.request.timeout=60s").run((context) -> {
+			DriverExecutionProfile actual = context.getBean(DriverConfigLoader.class)
+				.getInitialConfig()
+				.getDefaultProfile();
+			assertThat(actual.getDuration(DefaultDriverOption.REQUEST_TIMEOUT)).isEqualTo(Duration.ofSeconds(60));
+			assertThat(actual.getDuration(DefaultDriverOption.METADATA_SCHEMA_REQUEST_TIMEOUT))
+				.isEqualTo(Duration.ofSeconds(60));
+		});
+	}
+
 	@Test
 	void driverConfigLoaderWithConfigCreateProfiles() {
 		String configLocation = "org/springframework/boot/autoconfigure/cassandra/profiles.conf";