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

Merge branch '6.2.x'

This commit is contained in:
Sam Brannen 2025-05-11 14:11:53 +02:00
parent 958dab7c84 65e30132f3
commit c28b22b465
1 changed files with 3 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
spring-core/src/main/java/org/springframework/core/env/CompositePropertySource.java vendored
View File

@ -1,5 +1,5 @@
/* /*
* Copyright 2002-2025 the original author or authors. * Copyright 2002-2024 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,6 @@ import org.springframework.util.StringUtils;
* @author Chris Beams * @author Chris Beams
* @author Juergen Hoeller * @author Juergen Hoeller
* @author Phillip Webb * @author Phillip Webb
* @author Sam Brannen
* @since 3.1.1 * @since 3.1.1
*/ */
public class CompositePropertySource extends EnumerablePropertySource<Object> { public class CompositePropertySource extends EnumerablePropertySource<Object> {
@ -49,35 +48,13 @@ public class CompositePropertySource extends EnumerablePropertySource<Object> {
/** /**
* Create a new empty {@code CompositePropertySource} with the given name. * Create a new {@code CompositePropertySource}.
* @param name the name of the composite property source * @param name the name of the property source
* @see #CompositePropertySource(String, Iterable)
* @see #addPropertySource(PropertySource)
* @see #addFirstPropertySource(PropertySource)
*/ */
public CompositePropertySource(String name) { public CompositePropertySource(String name) {
super(name); super(name);
} }
/**
* Create a new {@code CompositePropertySource} with the given name and
* property sources supplied as an {@link Iterable} or {@link PropertySources}
* implementation, preserving the original order of the property sources.
* @param name the name of the composite property source
* @param propertySources the initial set of {@link PropertySource} instances
* @since 6.2.7
* @see PropertySources
* @see MutablePropertySources
* @see #addPropertySource(PropertySource)
* @see #addFirstPropertySource(PropertySource)
*/
public CompositePropertySource(String name, Iterable<PropertySource<?>> propertySources) {
this(name);
for (PropertySource<?> propertySource : propertySources) {
this.propertySources.add(propertySource);
}
}
@Override @Override
public @Nullable Object getProperty(String name) { public @Nullable Object getProperty(String name) {