Skip to content

Commit c9e69b1

Browse files
committed
Resolve placeholders in reference config against all other config
Fixes gh-34643
1 parent 0ed73a8 commit c9e69b1

File tree

2 files changed

+13
-1
lines changed

2 files changed

+13
-1
lines changed

spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/cassandra/CassandraAutoConfiguration.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,7 @@ private Config cassandraConfiguration(CassandraProperties properties) {
136136
config = config.withFallback(loadConfig(properties.getConfig()));
137137
}
138138
config = config.withFallback(SPRING_BOOT_DEFAULTS);
139-
config = config.withFallback(ConfigFactory.defaultReference());
139+
config = config.withFallback(ConfigFactory.defaultReferenceUnresolved());
140140
return config.resolve();
141141
}
142142

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

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -300,6 +300,18 @@ void driverConfigLoaderWithConfigOverridesDefaults() {
300300
});
301301
}
302302

303+
@Test
304+
void placeholdersInReferenceConfAreResolvedAgainstConfigDerivedFromSpringCassandraProperties() {
305+
this.contextRunner.withPropertyValues("spring.data.cassandra.request.timeout=60s").run((context) -> {
306+
DriverExecutionProfile actual = context.getBean(DriverConfigLoader.class)
307+
.getInitialConfig()
308+
.getDefaultProfile();
309+
assertThat(actual.getDuration(DefaultDriverOption.REQUEST_TIMEOUT)).isEqualTo(Duration.ofSeconds(60));
310+
assertThat(actual.getDuration(DefaultDriverOption.METADATA_SCHEMA_REQUEST_TIMEOUT))
311+
.isEqualTo(Duration.ofSeconds(60));
312+
});
313+
}
314+
303315
@Test
304316
void driverConfigLoaderWithConfigCreateProfiles() {
305317
String configLocation = "org/springframework/boot/autoconfigure/cassandra/profiles.conf";

0 commit comments

Comments
 (0)