Conventions lazily retrieves shared ReactiveAdapterRegistry

Issue: SPR-16981

Author: jhoeller

spring-core/src/main/java/org/springframework/core/Conventions.java

@@ -41,8 +41,6 @@ public abstract class Conventions {
 	 */
 	private static final String PLURAL_SUFFIX = "List";
 
-	private static final ReactiveAdapterRegistry reactiveAdapterRegistry = ReactiveAdapterRegistry.getSharedInstance();
-
 
 	/**
 	 * Determine the conventional variable name for the supplied {@code Object}
@@ -116,7 +114,7 @@ else if (Collection.class.isAssignableFrom(parameter.getParameterType())) {
 		}
 		else {
 			valueClass = parameter.getParameterType();
-
+			ReactiveAdapterRegistry reactiveAdapterRegistry = ReactiveAdapterRegistry.getSharedInstance();
 			if (reactiveAdapterRegistry.hasAdapters()) {
 				ReactiveAdapter adapter = reactiveAdapterRegistry.getAdapter(valueClass);
 				if (adapter != null && !adapter.getDescriptor().isNoValue()) {
@@ -205,6 +203,7 @@ else if (Collection.class.isAssignableFrom(resolvedType)) {
 		}
 		else {
 			valueClass = resolvedType;
+			ReactiveAdapterRegistry reactiveAdapterRegistry = ReactiveAdapterRegistry.getSharedInstance();
 			if (reactiveAdapterRegistry.hasAdapters()) {
 				ReactiveAdapter adapter = reactiveAdapterRegistry.getAdapter(valueClass);
 				if (adapter != null && !adapter.getDescriptor().isNoValue()) {