From b68e692854d4494c141259c924c667c21784c3eb Mon Sep 17 00:00:00 2001 From: Juergen Hoeller Date: Thu, 28 Jun 2018 14:47:52 +0200 Subject: [PATCH] Conventions lazily retrieves shared ReactiveAdapterRegistry Issue: SPR-16981 --- .../src/main/java/org/springframework/core/Conventions.java | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/spring-core/src/main/java/org/springframework/core/Conventions.java b/spring-core/src/main/java/org/springframework/core/Conventions.java index 16efaa851d..0d333c96d6 100644 --- a/spring-core/src/main/java/org/springframework/core/Conventions.java +++ b/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 @@ public abstract class Conventions { } 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 @@ public abstract class Conventions { } else { valueClass = resolvedType; + ReactiveAdapterRegistry reactiveAdapterRegistry = ReactiveAdapterRegistry.getSharedInstance(); if (reactiveAdapterRegistry.hasAdapters()) { ReactiveAdapter adapter = reactiveAdapterRegistry.getAdapter(valueClass); if (adapter != null && !adapter.getDescriptor().isNoValue()) {