Adapt to new Placeholder resolution API

snicoll · Feb 28, 2024 · d2dc340 · d2dc340
1 parent cc6030c
commit d2dc340
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 10 deletions.
diff --git a/...rc/main/java/org/springframework/boot/autoconfigure/jdbc/DataSourceAutoConfiguration.java b/...rc/main/java/org/springframework/boot/autoconfigure/jdbc/DataSourceAutoConfiguration.java
@@ -42,6 +42,7 @@
 import org.springframework.core.env.Environment;
 import org.springframework.core.type.AnnotatedTypeMetadata;
 import org.springframework.jdbc.datasource.embedded.EmbeddedDatabaseType;
+import org.springframework.util.PlaceholderResolutionException;
 import org.springframework.util.StringUtils;
 
 /**
@@ -156,7 +157,7 @@ private boolean hasDataSourceUrlProperty(ConditionContext context) {
 				try {
 					return StringUtils.hasText(environment.getProperty(DATASOURCE_URL_PROPERTY));
 				}
-				catch (IllegalArgumentException ex) {
+				catch (PlaceholderResolutionException ex) {
 					// Ignore unresolvable placeholder errors
 				}
 			}

diff --git a/.../springframework/boot/test/web/SpringBootTestRandomPortEnvironmentPostProcessorTests.java b/.../springframework/boot/test/web/SpringBootTestRandomPortEnvironmentPostProcessorTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2023 the original author or authors.
+ * Copyright 2012-2024 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.
@@ -27,9 +27,10 @@
 import org.springframework.core.env.MutablePropertySources;
 import org.springframework.mock.env.MockEnvironment;
 import org.springframework.test.context.support.TestPropertySourceUtils;
+import org.springframework.util.PlaceholderResolutionException;
 
 import static org.assertj.core.api.Assertions.assertThat;
-import static org.assertj.core.api.Assertions.assertThatIllegalArgumentException;
+import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
 
 /**
  * Tests for {@link SpringBootTestRandomPortEnvironmentPostProcessor}.
@@ -169,7 +170,7 @@ void postProcessWhenManagementServerPortPlaceholderAbsentShouldFail() {
 		addTestPropertySource("0", null);
 		this.propertySources
 			.addLast(new MapPropertySource("other", Collections.singletonMap("management.server.port", "${port}")));
-		assertThatIllegalArgumentException()
+		assertThatExceptionOfType(PlaceholderResolutionException.class)
 			.isThrownBy(() -> this.postProcessor.postProcessEnvironment(this.environment, null))
 			.withMessage("Could not resolve placeholder 'port' in value \"${port}\"");
 	}
@@ -196,7 +197,7 @@ void postProcessWhenServerPortPlaceholderAbsentShouldFail() {
 		source.put("server.port", "${port}");
 		source.put("management.server.port", "9090");
 		this.propertySources.addLast(new MapPropertySource("other", source));
-		assertThatIllegalArgumentException()
+		assertThatExceptionOfType(PlaceholderResolutionException.class)
 			.isThrownBy(() -> this.postProcessor.postProcessEnvironment(this.environment, null))
 			.withMessage("Could not resolve placeholder 'port' in value \"${port}\"");
 	}

diff --git a/...ngframework/boot/context/config/ConfigDataEnvironmentContributorPlaceholdersResolver.java b/...ngframework/boot/context/config/ConfigDataEnvironmentContributorPlaceholdersResolver.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2023 the original author or authors.
+ * Copyright 2012-2024 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.
@@ -51,7 +51,8 @@ class ConfigDataEnvironmentContributorPlaceholdersResolver implements Placeholde
 		this.activeContributor = activeContributor;
 		this.failOnResolveFromInactiveContributor = failOnResolveFromInactiveContributor;
 		this.helper = new PropertyPlaceholderHelper(SystemPropertyUtils.PLACEHOLDER_PREFIX,
-				SystemPropertyUtils.PLACEHOLDER_SUFFIX, SystemPropertyUtils.VALUE_SEPARATOR, true);
+				SystemPropertyUtils.PLACEHOLDER_SUFFIX, SystemPropertyUtils.VALUE_SEPARATOR,
+				SystemPropertyUtils.ESCAPE_CHARACTER, true);
 	}
 
 	@Override

diff --git a/...org/springframework/boot/context/properties/bind/PropertySourcesPlaceholdersResolver.java b/...org/springframework/boot/context/properties/bind/PropertySourcesPlaceholdersResolver.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2022 the original author or authors.
+ * Copyright 2012-2024 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.
@@ -47,8 +47,10 @@ public PropertySourcesPlaceholdersResolver(Iterable<PropertySource<?>> sources)
 
 	public PropertySourcesPlaceholdersResolver(Iterable<PropertySource<?>> sources, PropertyPlaceholderHelper helper) {
 		this.sources = sources;
-		this.helper = (helper != null) ? helper : new PropertyPlaceholderHelper(SystemPropertyUtils.PLACEHOLDER_PREFIX,
-				SystemPropertyUtils.PLACEHOLDER_SUFFIX, SystemPropertyUtils.VALUE_SEPARATOR, true);
+		this.helper = (helper != null) ? helper
+				: new PropertyPlaceholderHelper(SystemPropertyUtils.PLACEHOLDER_PREFIX,
+						SystemPropertyUtils.PLACEHOLDER_SUFFIX, SystemPropertyUtils.VALUE_SEPARATOR,
+						SystemPropertyUtils.ESCAPE_CHARACTER, true);
 	}
 
 	@Override