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

Conventions lazily retrieves shared ReactiveAdapterRegistry 

Issue: SPR-16981
This commit is contained in:
Juergen Hoeller 2018-06-28 14:47:52 +02:00
parent 7a02e438e7
commit b68e692854
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
spring-core/src/main/java/org/springframework/core/Conventions.java
View File

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