From 0cd669fee939e2937d21200a6210ffa569a6d3e6 Mon Sep 17 00:00:00 2001 From: Artem Bilan Date: Thu, 22 Oct 2020 12:06:07 -0400 Subject: [PATCH] Revert "Fix `@InChAdapter` for several suppliers" This reverts commit cd9173cd95fe71d5a55baa834c618c8962a62ae0. --- .../InboundChannelAdapterAnnotationPostProcessor.java | 11 ++++------- .../endpoint/ReactiveInboundChannelAdapterTests.java | 6 ------ 2 files changed, 4 insertions(+), 13 deletions(-) diff --git a/spring-integration-core/src/main/java/org/springframework/integration/config/annotation/InboundChannelAdapterAnnotationPostProcessor.java b/spring-integration-core/src/main/java/org/springframework/integration/config/annotation/InboundChannelAdapterAnnotationPostProcessor.java index 528b7e2fb4..ddabc5f874 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/config/annotation/InboundChannelAdapterAnnotationPostProcessor.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/config/annotation/InboundChannelAdapterAnnotationPostProcessor.java @@ -1,5 +1,5 @@ /* - * Copyright 2014-2020 the original author or authors. + * Copyright 2014-2019 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -64,7 +64,7 @@ public class InboundChannelAdapterAnnotationPostProcessor extends MessagingAnnotationUtils.resolveAttribute(annotations, AnnotationUtils.VALUE, String.class); Assert.hasText(channelName, "The channel ('value' attribute of @InboundChannelAdapter) can't be empty."); - MessageSource messageSource; + MessageSource messageSource = null; try { messageSource = createMessageSource(bean, beanName, method); } @@ -85,11 +85,10 @@ public class InboundChannelAdapterAnnotationPostProcessor extends return adapter; } - private MessageSource createMessageSource(Object beanArg, String beanNameArg, Method methodArg) { + private MessageSource createMessageSource(Object beanArg, String beanName, Method methodArg) { MessageSource messageSource = null; Object bean = beanArg; Method method = methodArg; - String beanName = beanNameArg; if (AnnotatedElementUtils.isAnnotated(method, Bean.class.getName())) { Object target = resolveTargetBeanFromMethodWithBeanAnnotation(method); Class targetClass = target.getClass(); @@ -107,12 +106,10 @@ public class InboundChannelAdapterAnnotationPostProcessor extends else if (target instanceof Supplier) { method = ClassUtils.SUPPLIER_GET_METHOD; bean = target; - beanName += '.' + methodArg.getName(); } else if (ClassUtils.KOTLIN_FUNCTION_0_INVOKE_METHOD != null) { method = ClassUtils.KOTLIN_FUNCTION_0_INVOKE_METHOD; bean = target; - beanName += '.' + methodArg.getName(); } } if (messageSource == null) { @@ -133,7 +130,7 @@ public class InboundChannelAdapterAnnotationPostProcessor extends @Override protected String generateHandlerBeanName(String originalBeanName, Method method) { return super.generateHandlerBeanName(originalBeanName, method) - .replaceFirst(IntegrationConfigUtils.HANDLER_ALIAS_SUFFIX + '$', ".source"); + .replaceFirst(IntegrationConfigUtils.HANDLER_ALIAS_SUFFIX + "$", ".source"); } @Override diff --git a/spring-integration-core/src/test/java/org/springframework/integration/endpoint/ReactiveInboundChannelAdapterTests.java b/spring-integration-core/src/test/java/org/springframework/integration/endpoint/ReactiveInboundChannelAdapterTests.java index 5b2065de33..6e50f8c759 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/endpoint/ReactiveInboundChannelAdapterTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/endpoint/ReactiveInboundChannelAdapterTests.java @@ -87,12 +87,6 @@ public class ReactiveInboundChannelAdapterTests { }; } - @Bean - @InboundChannelAdapter(value = "fluxChannel", autoStartup = "false", poller = @Poller(fixedDelay = "100000")) - public Supplier anotherSupplier() { - return () -> "void"; - } - @Bean public MessageChannel fluxChannel() { return new FluxMessageChannel();