From 4de98320b206f1fdeec48adb3e5c5720e07ffc24 Mon Sep 17 00:00:00 2001 From: Oleg Zhurakousky Date: Thu, 31 Jan 2019 08:17:10 +0100 Subject: [PATCH] GH-1595 Inherited @Bean from @StreamMessageConverter Resolves #1595 --- .../cloud/stream/annotation/StreamMessageConverter.java | 2 ++ .../cloud/stream/function/FunctionInvokerTests.java | 2 -- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/spring-cloud-stream/src/main/java/org/springframework/cloud/stream/annotation/StreamMessageConverter.java b/spring-cloud-stream/src/main/java/org/springframework/cloud/stream/annotation/StreamMessageConverter.java index dd31a18ca..773b5b8f2 100644 --- a/spring-cloud-stream/src/main/java/org/springframework/cloud/stream/annotation/StreamMessageConverter.java +++ b/spring-cloud-stream/src/main/java/org/springframework/cloud/stream/annotation/StreamMessageConverter.java @@ -23,6 +23,7 @@ import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; import org.springframework.beans.factory.annotation.Qualifier; +import org.springframework.context.annotation.Bean; /** * Marker to tag {@link org.springframework.messaging.converter.MessageConverter} beans @@ -35,6 +36,7 @@ import org.springframework.beans.factory.annotation.Qualifier; @Retention(RetentionPolicy.RUNTIME) @Documented @Qualifier +@Bean public @interface StreamMessageConverter { } diff --git a/spring-cloud-stream/src/test/java/org/springframework/cloud/stream/function/FunctionInvokerTests.java b/spring-cloud-stream/src/test/java/org/springframework/cloud/stream/function/FunctionInvokerTests.java index b5f7bd906..af7b59b82 100644 --- a/spring-cloud-stream/src/test/java/org/springframework/cloud/stream/function/FunctionInvokerTests.java +++ b/spring-cloud-stream/src/test/java/org/springframework/cloud/stream/function/FunctionInvokerTests.java @@ -92,7 +92,6 @@ public class FunctionInvokerTests { } @StreamMessageConverter - @Bean public MessageConverter customConverter() { return new MessageConverter() { @@ -145,7 +144,6 @@ public class FunctionInvokerTests { } @StreamMessageConverter - @Bean public MessageConverter customConverter() { return new MessageConverter() {