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

Avoid unnecessary synchronization in SequencedProperties

This commit is contained in:
Sam Brannen 2023-08-19 15:32:37 +02:00
parent 94d9a71bb5
commit 8f71bea553
1 changed files with 14 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -393,9 +393,7 @@ public abstract class TestPropertySourceUtils {
public static Map<String, Object> convertInlinedPropertiesToMap(String... inlinedProperties) {
Assert.notNull(inlinedProperties, "'inlinedProperties' must not be null");
LinkedHashMap<String, Object> map = new LinkedHashMap<>();
SequencedProperties sequencedProperties = new SequencedProperties(map);
SequencedProperties sequencedProperties = new SequencedProperties();
for (String input : inlinedProperties) {
if (!StringUtils.hasText(input)) {
continue;
@ -407,8 +405,7 @@ public abstract class TestPropertySourceUtils {
throw new IllegalStateException("Failed to load test environment properties from [" + input + "]", ex);
}
}
return map;
return sequencedProperties.getSequencedMap();
}
private static <T extends Annotation> List<List<MergedAnnotation<T>>> findRepeatableAnnotations(
@ -452,26 +449,28 @@ public abstract class TestPropertySourceUtils {
}
/**
* Extension of {@link Properties} that mimics a {@code SequencedMap} by
* tracking all added properties in the supplied {@link LinkedHashMap}.
* Extension of {@link Properties} that mimics a {@code SequencedMap} by tracking
* all added properties with a {@link String} key in a {@link LinkedHashMap}.
* @since 6.1
*/
@SuppressWarnings("serial")
private static class SequencedProperties extends Properties {
private final LinkedHashMap<String, Object> map;
SequencedProperties(LinkedHashMap<String, Object> map) {
this.map = map;
}
private final LinkedHashMap<String, Object> map = new LinkedHashMap<>();
@Override
public synchronized Object put(Object key, Object value) {
public Object put(Object key, Object value) {
if (key instanceof String str) {
this.map.put(str, value);
return this.map.put(str, value);
}
return super.put(key, value);
// No need to invoke super.put(key, value);
return null;
}
public Map<String, Object> getSequencedMap() {
return this.map;
}
}
}