SpringCloud/spring-cloud-stream
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix merge error

Browse Source
This commit is contained in:
Oleg Zhurakousky
2019-01-14 19:01:39 +01:00
parent fd2b0ebb6a
commit b9fee7f863
1 changed files with 1 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
spring-cloud-stream/src/test/java/org/springframework/cloud/stream/binder/tck/ContentTypeTckTests.java
View File

@@ -26,6 +26,7 @@ import com.fasterxml.jackson.databind.ObjectMapper;
import org.junit.Test;
import org.springframework.boot.WebApplicationType;
import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
import org.springframework.boot.builder.SpringApplicationBuilder;
import org.springframework.cloud.stream.annotation.EnableBinding;
import org.springframework.cloud.stream.annotation.StreamListener;
@@ -612,8 +613,6 @@ public class ContentTypeTckTests {
@EnableBinding(Processor.class)
@Import(TestChannelBinderConfiguration.class)
<<<<<<< HEAD
=======
@EnableAutoConfiguration
public static class TypelessToMessageStreamListener {
@StreamListener(Processor.INPUT)
@@ -637,7 +636,6 @@ public class ContentTypeTckTests {
@EnableBinding(Processor.class)
@Import(TestChannelBinderConfiguration.class)
@EnableAutoConfiguration
>>>>>>> f6381d72... GH-1533 Fixed regression in ObjectStringMessageConverter
public static class ByteArrayToByteArrayStreamListener {
@StreamListener(Processor.INPUT)
@SendTo(Processor.OUTPUT)