Commit 062163b

committed

Fix package tangle with configuration properties

Fix a package tangle that was introduced when we added cache bypass to `SpringIterableConfigurationPropertySource`. Ideally we should have been able to depend on `env` from `context` but unfortunately the `EnvironmentPostProcessor` interface references `SpringApplication` which needs to use the Binder. The `isImmutable` method has now been moved to `OriginLookup` which removes the immediate tangle. Closes gh-18393

1 parent 615c6d4 commit 062163bCopy full SHA for 062163b

File tree

3 files changed

+15

-9

lines changed

spring-boot-project/spring-boot/src/main/java/org/springframework/boot
- context/properties/source
  - SpringIterableConfigurationPropertySource.java
- env
  - OriginTrackedMapPropertySource.java
- origin
  - OriginLookup.java

3 files changed

+15

-9

lines changed

`‎spring-boot-project/spring-boot/src/main/java/org/springframework/boot/context/properties/source/SpringIterableConfigurationPropertySource.java‎`

Lines changed: 3 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,7 @@`
`25`	`25`	`import java.util.Set;`
`26`	`26`	`import java.util.stream.Stream;`
`27`	`27`
`28`		`-import org.springframework.boot.env.OriginTrackedMapPropertySource;`
	`28`	`+import org.springframework.boot.origin.OriginLookup;`
`29`	`29`	`import org.springframework.core.env.EnumerablePropertySource;`
`30`	`30`	`import org.springframework.core.env.MapPropertySource;`
`31`	`31`	`import org.springframework.core.env.PropertySource;`
`@@ -236,8 +236,8 @@ static CacheKey get(EnumerablePropertySource<?> source) {`
`236`	`236`	`}`
`237`	`237`
`238`	`238`	`private static boolean isImmutable(EnumerablePropertySource<?> source) {`
`239`		`- if (source instanceof OriginTrackedMapPropertySource) {`
`240`		`- return ((OriginTrackedMapPropertySource) source).isImmutable();`
	`239`	`+ if (source instanceof OriginLookup) {`
	`240`	`+ return ((OriginLookup<?>) source).isImmutable();`
`241`	`241`	`}`
`242`	`242`	`if (StandardEnvironment.SYSTEM_ENVIRONMENT_PROPERTY_SOURCE_NAME.equals(source.getName())) {`
`243`	`243`	`return source.getSource() == System.getenv();`

`‎spring-boot-project/spring-boot/src/main/java/org/springframework/boot/env/OriginTrackedMapPropertySource.java‎`

Lines changed: 2 additions & 6 deletions

Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,6 @@`
`22`	`22`	`import org.springframework.boot.origin.OriginLookup;`
`23`	`23`	`import org.springframework.boot.origin.OriginTrackedValue;`
`24`	`24`	`import org.springframework.core.env.MapPropertySource;`
`25`		`-import org.springframework.core.env.PropertySource;`
`26`	`25`
`27`	`26`	`/**`
`28`	`27`	`* {@link OriginLookup} backed by a {@link Map} containing {@link OriginTrackedValue`
`@@ -52,6 +51,7 @@ public OriginTrackedMapPropertySource(String name, Map source) {`
`52`	`51`	`* @param name the property source name`
`53`	`52`	`* @param source the underlying map source`
`54`	`53`	`* @param immutable if the underlying source is immutable and guaranteed not to change`
	`54`	`+ * @since 2.2.0`
`55`	`55`	`*/`
`56`	`56`	`@SuppressWarnings({ "unchecked", "rawtypes" })`
`57`	`57`	`public OriginTrackedMapPropertySource(String name, Map source, boolean immutable) {`
`@@ -77,11 +77,7 @@ public Origin getOrigin(String name) {`
`77`	`77`	`return null;`
`78`	`78`	`}`
`79`	`79`
`80`		`- /**`
`81`		`- * Return {@code true} if this {@link PropertySource} is immutable and has contents`
`82`		`- * that will never change.`
`83`		`- * @return if the property source is read only`
`84`		`- */`
	`80`	`+ @Override`
`85`	`81`	`public boolean isImmutable() {`
`86`	`82`	`return this.immutable;`
`87`	`83`	`}`

`‎spring-boot-project/spring-boot/src/main/java/org/springframework/boot/origin/OriginLookup.java‎`

Lines changed: 10 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -35,6 +35,16 @@ public interface OriginLookup<K> {`
`35`	`35`	`*/`
`36`	`36`	`Origin getOrigin(K key);`
`37`	`37`
	`38`	`+ /**`
	`39`	`+ * Return {@code true} if this lookup is immutable and has contents that will never`
	`40`	`+ * change.`
	`41`	`+ * @return if the lookup is immutable`
	`42`	`+ * @since 2.2.0`
	`43`	`+ */`
	`44`	`+ default boolean isImmutable() {`
	`45`	`+ return false;`
	`46`	`+ }`
	`47`	`+`
`38`	`48`	`/**`
`39`	`49`	`* Attempt to lookup the origin from the given source. If the source is not a`
`40`	`50`	`* {@link OriginLookup} or if an exception occurs during lookup then {@code null} is`

0 commit comments

Comments

(0)

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit 062163b

File tree

3 files changed

3 files changed

`‎spring-boot-project/spring-boot/src/main/java/org/springframework/boot/context/properties/source/SpringIterableConfigurationPropertySource.java‎`

`‎spring-boot-project/spring-boot/src/main/java/org/springframework/boot/env/OriginTrackedMapPropertySource.java‎`

`‎spring-boot-project/spring-boot/src/main/java/org/springframework/boot/origin/OriginLookup.java‎`

0 commit comments