From edd32284d59062a926e170ffd4881705bb6362f2 Mon Sep 17 00:00:00 2001 From: Soby Chacko Date: Mon, 28 Nov 2022 21:26:22 -0500 Subject: [PATCH] Remove custom argument resolvers (#246) - Remove custom argument resolvers from PulsarListenerEndpointRegistrar, as this is an un-used feature at the moment. - The default HandlerMethodArgumentResolver is capable of adapting the all the method arguments in all the PulsarListener use cases we encountered so far. We will add it back if custom argument resolution is necessary. --- ...ctivePulsarListenerAnnotationBeanPostProcessor.java | 9 --------- .../PulsarListenerAnnotationBeanPostProcessor.java | 8 -------- .../pulsar/config/PulsarListenerEndpointRegistrar.java | 10 ---------- 3 files changed, 27 deletions(-) diff --git a/spring-pulsar-reactive/src/main/java/org/springframework/pulsar/reactive/config/annotation/ReactivePulsarListenerAnnotationBeanPostProcessor.java b/spring-pulsar-reactive/src/main/java/org/springframework/pulsar/reactive/config/annotation/ReactivePulsarListenerAnnotationBeanPostProcessor.java index 2adcf728..3c7e550d 100644 --- a/spring-pulsar-reactive/src/main/java/org/springframework/pulsar/reactive/config/annotation/ReactivePulsarListenerAnnotationBeanPostProcessor.java +++ b/spring-pulsar-reactive/src/main/java/org/springframework/pulsar/reactive/config/annotation/ReactivePulsarListenerAnnotationBeanPostProcessor.java @@ -74,7 +74,6 @@ import org.springframework.lang.Nullable; import org.springframework.messaging.converter.GenericMessageConverter; import org.springframework.messaging.handler.annotation.support.DefaultMessageHandlerMethodFactory; import org.springframework.messaging.handler.annotation.support.MessageHandlerMethodFactory; -import org.springframework.messaging.handler.invocation.HandlerMethodArgumentResolver; import org.springframework.messaging.handler.invocation.InvocableHandlerMethod; import org.springframework.pulsar.annotation.PulsarListenerConfigurer; import org.springframework.pulsar.config.PulsarListenerBeanNames; @@ -658,14 +657,6 @@ public class ReactivePulsarListenerAnnotationBeanPostProcessor this.defaultFormattingConversionService); defaultFactory.setMessageConverter(messageConverter); - List customArgumentsResolver = new ArrayList<>( - ReactivePulsarListenerAnnotationBeanPostProcessor.this.registrar - .getCustomMethodArgumentResolvers()); - // Has to be at the end - look at PayloadMethodArgumentResolver documentation - // customArgumentsResolver.add(new - // PulsarNullAwarePayloadArgumentResolver(messageConverter, validator)); - defaultFactory.setCustomArgumentResolvers(customArgumentsResolver); - defaultFactory.afterPropertiesSet(); return defaultFactory; diff --git a/spring-pulsar/src/main/java/org/springframework/pulsar/annotation/PulsarListenerAnnotationBeanPostProcessor.java b/spring-pulsar/src/main/java/org/springframework/pulsar/annotation/PulsarListenerAnnotationBeanPostProcessor.java index f7f543ac..6529681c 100644 --- a/spring-pulsar/src/main/java/org/springframework/pulsar/annotation/PulsarListenerAnnotationBeanPostProcessor.java +++ b/spring-pulsar/src/main/java/org/springframework/pulsar/annotation/PulsarListenerAnnotationBeanPostProcessor.java @@ -75,7 +75,6 @@ import org.springframework.lang.Nullable; import org.springframework.messaging.converter.GenericMessageConverter; import org.springframework.messaging.handler.annotation.support.DefaultMessageHandlerMethodFactory; import org.springframework.messaging.handler.annotation.support.MessageHandlerMethodFactory; -import org.springframework.messaging.handler.invocation.HandlerMethodArgumentResolver; import org.springframework.messaging.handler.invocation.InvocableHandlerMethod; import org.springframework.pulsar.config.MethodPulsarListenerEndpoint; import org.springframework.pulsar.config.PulsarListenerBeanNames; @@ -713,13 +712,6 @@ public class PulsarListenerAnnotationBeanPostProcessor this.defaultFormattingConversionService); defaultFactory.setMessageConverter(messageConverter); - List customArgumentsResolver = new ArrayList<>( - PulsarListenerAnnotationBeanPostProcessor.this.registrar.getCustomMethodArgumentResolvers()); - // Has to be at the end - look at PayloadMethodArgumentResolver documentation - // customArgumentsResolver.add(new - // PulsarNullAwarePayloadArgumentResolver(messageConverter, validator)); - defaultFactory.setCustomArgumentResolvers(customArgumentsResolver); - defaultFactory.afterPropertiesSet(); return defaultFactory; diff --git a/spring-pulsar/src/main/java/org/springframework/pulsar/config/PulsarListenerEndpointRegistrar.java b/spring-pulsar/src/main/java/org/springframework/pulsar/config/PulsarListenerEndpointRegistrar.java index e5e841ad..bc70ee6d 100644 --- a/spring-pulsar/src/main/java/org/springframework/pulsar/config/PulsarListenerEndpointRegistrar.java +++ b/spring-pulsar/src/main/java/org/springframework/pulsar/config/PulsarListenerEndpointRegistrar.java @@ -17,8 +17,6 @@ package org.springframework.pulsar.config; import java.util.ArrayList; -import java.util.Arrays; -import java.util.Collections; import java.util.List; import org.springframework.beans.factory.BeanFactory; @@ -73,14 +71,6 @@ public class PulsarListenerEndpointRegistrar implements BeanFactoryAware, Initia return this.endpointRegistry; } - public List getCustomMethodArgumentResolvers() { - return Collections.unmodifiableList(this.customMethodArgumentResolvers); - } - - public void setCustomMethodArgumentResolvers(HandlerMethodArgumentResolver... methodArgumentResolvers) { - this.customMethodArgumentResolvers = Arrays.asList(methodArgumentResolvers); - } - public void setMessageHandlerMethodFactory(MessageHandlerMethodFactory PulsarHandlerMethodFactory) { Assert.isNull(this.validator, "A validator cannot be provided with a custom message handler factory"); this.messageHandlerMethodFactory = PulsarHandlerMethodFactory;