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

Polish internal SequencedProperties implementation

This commit is contained in:
Sam Brannen 2023-08-16 14:11:02 +02:00
parent b43972bb54
commit 24dd484471
1 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
spring-test/src/main/java/org/springframework/test/context/support/TestPropertySourceUtils.java
View File

@ -389,7 +389,9 @@ public abstract class TestPropertySourceUtils {
*/ */
public static Map<String, Object> convertInlinedPropertiesToMap(String... inlinedProperties) { public static Map<String, Object> convertInlinedPropertiesToMap(String... inlinedProperties) {
Assert.notNull(inlinedProperties, "'inlinedProperties' must not be null"); Assert.notNull(inlinedProperties, "'inlinedProperties' must not be null");
SequencedProperties sequencedProperties = new SequencedProperties();
LinkedHashMap<String, Object> map = new LinkedHashMap<>();
SequencedProperties sequencedProperties = new SequencedProperties(map);
for (String input : inlinedProperties) { for (String input : inlinedProperties) {
if (!StringUtils.hasText(input)) { if (!StringUtils.hasText(input)) {
@ -403,7 +405,7 @@ public abstract class TestPropertySourceUtils {
} }
} }
return sequencedProperties.map; return map;
} }
private static <T extends Annotation> List<List<MergedAnnotation<T>>> findRepeatableAnnotations( private static <T extends Annotation> List<List<MergedAnnotation<T>>> findRepeatableAnnotations(
@ -452,14 +454,17 @@ public abstract class TestPropertySourceUtils {
/** /**
* Extension of {@link Properties} that mimics a {@code SequencedMap} by * Extension of {@link Properties} that mimics a {@code SequencedMap} by
* tracking all added properties in a {@link LinkedHashMap} that can be * tracking all added properties in the supplied {@link LinkedHashMap}.
* accessed directly via the {@code map} field.
* @since 6.1 * @since 6.1
*/ */
@SuppressWarnings("serial") @SuppressWarnings("serial")
private static class SequencedProperties extends Properties { private static class SequencedProperties extends Properties {
final Map<String, Object> map = new LinkedHashMap<>(); private final LinkedHashMap<String, Object> map;
SequencedProperties(LinkedHashMap<String, Object> map) {
this.map = map;
}
@Override @Override
public synchronized Object put(Object key, Object value) { public synchronized Object put(Object key, Object value) {