From 01d05227c8e5b74ec06ab01258ee6c1d92a9674d Mon Sep 17 00:00:00 2001 From: matt62king Date: Mon, 13 Jan 2020 20:32:17 -0600 Subject: [PATCH] Define custom AnnotatedParameterProcessors while keeping defaults, Fixes gh-111 (#268) --- .../cloud/openfeign/support/SpringMvcContract.java | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/spring-cloud-openfeign-core/src/main/java/org/springframework/cloud/openfeign/support/SpringMvcContract.java b/spring-cloud-openfeign-core/src/main/java/org/springframework/cloud/openfeign/support/SpringMvcContract.java index 0e9f5569..7b23f957 100644 --- a/spring-cloud-openfeign-core/src/main/java/org/springframework/cloud/openfeign/support/SpringMvcContract.java +++ b/spring-cloud-openfeign-core/src/main/java/org/springframework/cloud/openfeign/support/SpringMvcContract.java @@ -111,13 +111,9 @@ public class SpringMvcContract extends Contract.BaseContract "Parameter processors can not be null."); Assert.notNull(conversionService, "ConversionService can not be null."); - List processors; - if (!annotatedParameterProcessors.isEmpty()) { - processors = new ArrayList<>(annotatedParameterProcessors); - } - else { - processors = getDefaultAnnotatedArgumentsProcessors(); - } + List processors = getDefaultAnnotatedArgumentsProcessors(); + processors.addAll(annotatedParameterProcessors); + this.annotatedArgumentProcessors = toAnnotatedArgumentProcessorMap(processors); this.conversionService = conversionService; this.convertingExpanderFactory = new ConvertingExpanderFactory(conversionService);