diff --git a/spring-cloud-stream-reactive/src/test/java/org/springframework/cloud/stream/converter/TestApplicationJsonMessageMarshallingConverter.java b/spring-cloud-stream-reactive/src/test/java/org/springframework/cloud/stream/converter/TestApplicationJsonMessageMarshallingConverter.java index c90747cb4..8be6d838d 100644 --- a/spring-cloud-stream-reactive/src/test/java/org/springframework/cloud/stream/converter/TestApplicationJsonMessageMarshallingConverter.java +++ b/spring-cloud-stream-reactive/src/test/java/org/springframework/cloud/stream/converter/TestApplicationJsonMessageMarshallingConverter.java @@ -1,15 +1,33 @@ -package org.springframework.cloud.stream.converter; +/* + * Copyright 2019-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. + * You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ -import org.springframework.cloud.stream.reactive.MessageChannelToInputFluxParameterAdapterTests; +package org.springframework.cloud.stream.converter; import com.fasterxml.jackson.databind.DeserializationFeature; import com.fasterxml.jackson.databind.MapperFeature; import com.fasterxml.jackson.databind.ObjectMapper; +import org.springframework.cloud.stream.reactive.MessageChannelToInputFluxParameterAdapterTests; + /** - * This class exists because the {@link ApplicationJsonMessageMarshallingConverter} is package-private scoped, + * This class exists because the {@link ApplicationJsonMessageMarshallingConverter} is package-private scoped, * so it can't be used directly in, e.g. the {@link MessageChannelToInputFluxParameterAdapterTests} class. * In that case, we are just extending it and making it public (but only for tests). + * + * @author Ryan Dunckel */ public class TestApplicationJsonMessageMarshallingConverter extends ApplicationJsonMessageMarshallingConverter { diff --git a/spring-cloud-stream-reactive/src/test/java/org/springframework/cloud/stream/reactive/MessageChannelToInputFluxParameterAdapterTests.java b/spring-cloud-stream-reactive/src/test/java/org/springframework/cloud/stream/reactive/MessageChannelToInputFluxParameterAdapterTests.java index 3433572b1..aa0f7d270 100644 --- a/spring-cloud-stream-reactive/src/test/java/org/springframework/cloud/stream/reactive/MessageChannelToInputFluxParameterAdapterTests.java +++ b/spring-cloud-stream-reactive/src/test/java/org/springframework/cloud/stream/reactive/MessageChannelToInputFluxParameterAdapterTests.java @@ -16,8 +16,6 @@ package org.springframework.cloud.stream.reactive; -import static org.assertj.core.api.Assertions.assertThat; - import java.lang.reflect.Method; import java.util.ArrayList; import java.util.Collections; @@ -28,7 +26,9 @@ import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; import org.junit.Test; -import org.springframework.cloud.stream.annotation.StreamListener; +import reactor.core.publisher.Flux; +import reactor.test.StepVerifier; + import org.springframework.cloud.stream.converter.TestApplicationJsonMessageMarshallingConverter; import org.springframework.core.MethodParameter; import org.springframework.integration.channel.DirectChannel; @@ -38,11 +38,12 @@ import org.springframework.messaging.converter.MappingJackson2MessageConverter; import org.springframework.messaging.support.MessageBuilder; import org.springframework.util.ReflectionUtils; -import reactor.core.publisher.Flux; -import reactor.test.StepVerifier; +import static org.assertj.core.api.Assertions.assertThat; + /** * @author Marius Bogoevici + * @author Ryan Dunckel */ public class MessageChannelToInputFluxParameterAdapterTests {