Simplify DynamicPropertyRegistrar support

See spring-projectsgh-33501

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

@@ -79,10 +79,11 @@ public void customizeContext(ConfigurableApplicationContext context, MergedConte
 
 		if (!this.methods.isEmpty()) {
 			ConfigurableEnvironment environment = context.getEnvironment();
-			DefaultDynamicPropertyRegistry dynamicPropertyRegistry = new DefaultDynamicPropertyRegistry(environment);
+			DynamicValuesPropertySource propertySource = DynamicValuesPropertySource.getOrCreate(environment);
+			DynamicPropertyRegistry registry = propertySource.dynamicPropertyRegistry;
 			this.methods.forEach(method -> {
 				ReflectionUtils.makeAccessible(method);
-				ReflectionUtils.invokeMethod(method, null, dynamicPropertyRegistry);
+				ReflectionUtils.invokeMethod(method, null, registry);
 			});
 		}
 	}

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

@@ -27,6 +27,7 @@
 import org.springframework.core.env.Environment;
 import org.springframework.lang.Nullable;
 import org.springframework.test.context.DynamicPropertyRegistrar;
+import org.springframework.test.context.DynamicPropertyRegistry;
 
 /**
  * Internal component which eagerly initializes {@link DynamicPropertyRegistrar}
@@ -60,13 +61,14 @@ public void initialize(ListableBeanFactory beanFactory) {
 		String[] beanNames = BeanFactoryUtils.beanNamesForTypeIncludingAncestors(
 				beanFactory, DynamicPropertyRegistrar.class);
 		if (beanNames.length > 0) {
-			DefaultDynamicPropertyRegistry dynamicPropertyRegistry = new DefaultDynamicPropertyRegistry(this.environment);
+			DynamicValuesPropertySource propertySource = DynamicValuesPropertySource.getOrCreate(this.environment);
+			DynamicPropertyRegistry registry = propertySource.dynamicPropertyRegistry;
 			for (String name : beanNames) {
 				if (logger.isDebugEnabled()) {
 					logger.debug("Eagerly initializing DynamicPropertyRegistrar bean '%s'".formatted(name));
 				}
 				DynamicPropertyRegistrar registrar = beanFactory.getBean(name, DynamicPropertyRegistrar.class);
-				registrar.accept(dynamicPropertyRegistry);
+				registrar.accept(registry);
 			}
 		}
 	}

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

@@ -19,15 +19,15 @@
 import java.util.Collections;
 import java.util.LinkedHashMap;
 import java.util.Map;
-import java.util.concurrent.locks.Lock;
-import java.util.concurrent.locks.ReentrantLock;
 import java.util.function.Supplier;
 
 import org.springframework.core.env.ConfigurableEnvironment;
 import org.springframework.core.env.MapPropertySource;
 import org.springframework.core.env.MutablePropertySources;
 import org.springframework.core.env.PropertySource;
 import org.springframework.lang.Nullable;
+import org.springframework.test.context.DynamicPropertyRegistry;
+import org.springframework.util.Assert;
 import org.springframework.util.function.SupplierUtils;
 
 /**
@@ -42,9 +42,7 @@ class DynamicValuesPropertySource extends MapPropertySource {
 
 	static final String PROPERTY_SOURCE_NAME = "Dynamic Test Properties";
 
-	private static final Lock propertySourcesLock = new ReentrantLock();
-
-	final Map<String, Supplier<Object>> valueSuppliers;
+	final DynamicPropertyRegistry dynamicPropertyRegistry;
 
 
 	DynamicValuesPropertySource() {
@@ -53,7 +51,11 @@ class DynamicValuesPropertySource extends MapPropertySource {
 
 	DynamicValuesPropertySource(Map<String, Supplier<Object>> valueSuppliers) {
 		super(PROPERTY_SOURCE_NAME, Collections.unmodifiableMap(valueSuppliers));
-		this.valueSuppliers = valueSuppliers;
+		this.dynamicPropertyRegistry = (name, valueSupplier) -> {
+			Assert.hasText(name, "'name' must not be null or blank");
+			Assert.notNull(valueSupplier, "'valueSupplier' must not be null");
+			valueSuppliers.put(name, valueSupplier);
+		};
 	}
 
 
@@ -64,27 +66,25 @@ public Object getProperty(String name) {
 	}
 
 
+	/**
+	 * Get the {@code DynamicValuesPropertySource} registered in the environment
+	 * or create and register a new {@code DynamicValuesPropertySource} in the
+	 * environment.
+	 */
 	static DynamicValuesPropertySource getOrCreate(ConfigurableEnvironment environment) {
-		propertySourcesLock.lock();
-		try {
-			MutablePropertySources propertySources = environment.getPropertySources();
-			PropertySource<?> ps = propertySources.get(PROPERTY_SOURCE_NAME);
-			if (ps instanceof DynamicValuesPropertySource dynamicValuesPropertySource) {
-				return dynamicValuesPropertySource;
-			}
-			else if (ps == null) {
-				DynamicValuesPropertySource dynamicValuesPropertySource = new DynamicValuesPropertySource();
-				propertySources.addFirst(dynamicValuesPropertySource);
-				return dynamicValuesPropertySource;
-			}
-			else {
-				throw new IllegalStateException(
-						"PropertySource with name '%s' must be a DynamicValuesPropertySource"
-							.formatted(PROPERTY_SOURCE_NAME));
-			}
+		MutablePropertySources propertySources = environment.getPropertySources();
+		PropertySource<?> propertySource = propertySources.get(PROPERTY_SOURCE_NAME);
+		if (propertySource instanceof DynamicValuesPropertySource dynamicValuesPropertySource) {
+			return dynamicValuesPropertySource;
+		}
+		else if (propertySource == null) {
+			DynamicValuesPropertySource dynamicValuesPropertySource = new DynamicValuesPropertySource();
+			propertySources.addFirst(dynamicValuesPropertySource);
+			return dynamicValuesPropertySource;
 		}
-		finally {
-			propertySourcesLock.unlock();
+		else {
+			throw new IllegalStateException("PropertySource with name '%s' must be a DynamicValuesPropertySource"
+					.formatted(PROPERTY_SOURCE_NAME));
 		}
 	}