Polish MergedTestPropertySources

Author: sbrannen

spring-test/src/main/java/org/springframework/test/context/support/MergedTestPropertySources.java

@@ -30,20 +30,21 @@
  */
 class MergedTestPropertySources {
 
-	private static final String[] EMPTY_STRING_ARRAY = new String[0];
+	private static final MergedTestPropertySources empty = new MergedTestPropertySources(new String[0], new String[0]);
 
 	private final String[] locations;
 
 	private final String[] properties;
 
 
 	/**
-	 * Create an <em>empty</em> {@code MergedTestPropertySources} instance.
+	 * Factory for an <em>empty</em> {@code MergedTestPropertySources} instance.
 	 */
-	MergedTestPropertySources() {
-		this(EMPTY_STRING_ARRAY, EMPTY_STRING_ARRAY);
+	static MergedTestPropertySources empty() {
+		return empty;
 	}
 
+
 	/**
 	 * Create a {@code MergedTestPropertySources} instance with the supplied
 	 * {@code locations} and {@code properties}.

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

@@ -92,7 +92,7 @@ public abstract class TestPropertySourceUtils {
 	static MergedTestPropertySources buildMergedTestPropertySources(Class<?> testClass) {
 		MergedAnnotations mergedAnnotations = MergedAnnotations.from(testClass, SearchStrategy.EXHAUSTIVE);
 		return (mergedAnnotations.isPresent(TestPropertySource.class) ? mergeTestPropertySources(mergedAnnotations) :
-				new MergedTestPropertySources());
+				MergedTestPropertySources.empty());
 	}
 
 	private static MergedTestPropertySources mergeTestPropertySources(MergedAnnotations mergedAnnotations) {