From dedc79d92b7f41d7634e4facf5f13d795fdc62e1 Mon Sep 17 00:00:00 2001 From: Soby Chacko Date: Fri, 11 Mar 2022 12:56:32 -0500 Subject: [PATCH] Tests cleanup --- .../binder/BinderErrorChannelTests.java | 4 +- .../stream/binder/BindingTargetTests.java | 2 +- .../stream/binder/DefaultBinderTests.java | 2 +- .../stream/binder/ErrorBindingTests.java | 6 +- .../ExtendedPropertiesDefaultTests.java | 4 +- .../binder/InputOutputBindingOrderTest.java | 2 +- .../stream/binder/MessageConverterTests.java | 12 +-- .../stream/binder/PollableConsumerTests.java | 28 +++--- .../binder/SinkBindingWithDefaultsTests.java | 2 +- .../binder/tck/ContentTypeTckTests.java | 56 +++++------ .../stream/binder/tck/ErrorHandlingTests.java | 4 +- .../stream/binding/BindingLifecycleTests.java | 4 +- .../stream/binding/BindingServiceTests.java | 28 +++--- .../CustomPartitionedProducerTest.java | 6 +- .../stream/binding/ExplicitBindingTests.java | 6 +- .../FluxMessageChannelBindingTests.java | 2 +- .../MessageConverterConfigurerTests.java | 4 +- .../stream/config/ArgumentResolversTests.java | 2 +- .../stream/config/BinderPropertiesTests.java | 2 +- .../config/BindingHandlerAdviseTests.java | 8 +- .../BindingServiceConfigurationTests.java | 4 +- .../stream/config/RetryTemplateTests.java | 4 +- ...ExpressionConverterConfigurationTests.java | 2 +- .../stream/endpoint/ActuatorBindingsTest.java | 2 +- .../DynamicDestinationFunctionTests.java | 2 +- .../function/FunctionBatchingTests.java | 12 +-- .../GreenfieldFunctionEnableBindingTests.java | 4 +- .../ImplicitFunctionBindingTests.java | 96 +++++++++---------- .../MultipleInputOutputFunctionTests.java | 26 ++--- .../stream/function/PollableSourceTests.java | 2 +- .../stream/function/RoutingFunctionTests.java | 22 ++--- .../cloud/stream/function/ScenarioTests.java | 8 +- .../stream/function/StreamBridgeTests.java | 38 ++++---- .../stream/function/edgecases/GH1801Test.java | 2 +- .../partitioning/PartitionedConsumerTest.java | 2 +- 35 files changed, 204 insertions(+), 206 deletions(-) diff --git a/core/spring-cloud-stream/src/test/java/org/springframework/cloud/stream/binder/BinderErrorChannelTests.java b/core/spring-cloud-stream/src/test/java/org/springframework/cloud/stream/binder/BinderErrorChannelTests.java index 95fa7b0fd..becdcdeb4 100644 --- a/core/spring-cloud-stream/src/test/java/org/springframework/cloud/stream/binder/BinderErrorChannelTests.java +++ b/core/spring-cloud-stream/src/test/java/org/springframework/cloud/stream/binder/BinderErrorChannelTests.java @@ -45,7 +45,7 @@ public class BinderErrorChannelTests { }; @Test - public void testExceptionIsThrownWhenNoSubscribers() { + void testExceptionIsThrownWhenNoSubscribers() { BinderErrorChannel channel = new BinderErrorChannel(); Assertions.assertThrows(MessageDeliveryException.class, () -> { channel.send(new GenericMessage("hello")); @@ -53,7 +53,7 @@ public class BinderErrorChannelTests { } @Test - public void testSubscribeUnsubscribe() { + void testSubscribeUnsubscribe() { BinderErrorChannel channel = new BinderErrorChannel(); DirectFieldAccessor fieldAccessor = new DirectFieldAccessor(channel); AbstractDispatcher dispatcher = (AbstractDispatcher) fieldAccessor diff --git a/core/spring-cloud-stream/src/test/java/org/springframework/cloud/stream/binder/BindingTargetTests.java b/core/spring-cloud-stream/src/test/java/org/springframework/cloud/stream/binder/BindingTargetTests.java index 5963c686c..e4108f482 100644 --- a/core/spring-cloud-stream/src/test/java/org/springframework/cloud/stream/binder/BindingTargetTests.java +++ b/core/spring-cloud-stream/src/test/java/org/springframework/cloud/stream/binder/BindingTargetTests.java @@ -50,7 +50,7 @@ public class BindingTargetTests { @SuppressWarnings({"rawtypes", "unchecked"}) @Test - public void testArbitraryInterfaceChannelsBound() { + void testArbitraryInterfaceChannelsBound() { Binder binder = this.binderFactory.getBinder(null, MessageChannel.class); verify(binder).bindConsumer(eq("someQueue.0"), isNull(), Mockito.any(MessageChannel.class), Mockito.any()); diff --git a/core/spring-cloud-stream/src/test/java/org/springframework/cloud/stream/binder/DefaultBinderTests.java b/core/spring-cloud-stream/src/test/java/org/springframework/cloud/stream/binder/DefaultBinderTests.java index 9f5cf0a55..16c1e4171 100644 --- a/core/spring-cloud-stream/src/test/java/org/springframework/cloud/stream/binder/DefaultBinderTests.java +++ b/core/spring-cloud-stream/src/test/java/org/springframework/cloud/stream/binder/DefaultBinderTests.java @@ -28,7 +28,7 @@ import static org.assertj.core.api.Assertions.assertThat; public class DefaultBinderTests { @Test - public void testDefaultBinderIsPaused() { + void testDefaultBinderIsPaused() { @SuppressWarnings({ "rawtypes" }) DefaultBinding binding = new DefaultBinding<>("foo", "bar", "target", (Binding) () -> { }); diff --git a/core/spring-cloud-stream/src/test/java/org/springframework/cloud/stream/binder/ErrorBindingTests.java b/core/spring-cloud-stream/src/test/java/org/springframework/cloud/stream/binder/ErrorBindingTests.java index 9f2b98f75..3f07dd0be 100644 --- a/core/spring-cloud-stream/src/test/java/org/springframework/cloud/stream/binder/ErrorBindingTests.java +++ b/core/spring-cloud-stream/src/test/java/org/springframework/cloud/stream/binder/ErrorBindingTests.java @@ -49,7 +49,7 @@ public class ErrorBindingTests { @SuppressWarnings({ "rawtypes", "unchecked" }) @Test - public void testErrorChannelNotBoundByDefault() { + void testErrorChannelNotBoundByDefault() { ConfigurableApplicationContext applicationContext = SpringApplication.run( TestProcessor.class, "--server.port=0", "--spring.cloud.stream.default-binder=mock", @@ -67,7 +67,7 @@ public class ErrorBindingTests { } @Test - public void testConfigurationWithDefaultErrorHandler() { + void testConfigurationWithDefaultErrorHandler() { ApplicationContext context = new SpringApplicationBuilder( TestChannelBinderConfiguration.getCompleteConfiguration( ErrorBindingTests.ErrorConfigurationDefault.class)) @@ -86,7 +86,7 @@ public class ErrorBindingTests { } @Test - public void testConfigurationWithCustomErrorHandler() { + void testConfigurationWithCustomErrorHandler() { ApplicationContext context = new SpringApplicationBuilder( TestChannelBinderConfiguration.getCompleteConfiguration( ErrorBindingTests.ErrorConfigurationWithCustomErrorHandler.class)) diff --git a/core/spring-cloud-stream/src/test/java/org/springframework/cloud/stream/binder/ExtendedPropertiesDefaultTests.java b/core/spring-cloud-stream/src/test/java/org/springframework/cloud/stream/binder/ExtendedPropertiesDefaultTests.java index 966909011..69654b13b 100644 --- a/core/spring-cloud-stream/src/test/java/org/springframework/cloud/stream/binder/ExtendedPropertiesDefaultTests.java +++ b/core/spring-cloud-stream/src/test/java/org/springframework/cloud/stream/binder/ExtendedPropertiesDefaultTests.java @@ -34,7 +34,7 @@ import static org.assertj.core.api.Assertions.assertThat; public class ExtendedPropertiesDefaultTests { @Test - public void testExtendedDefaultProducerProperties() { + void testExtendedDefaultProducerProperties() { DefaultBinderFactory binderFactory = createMockExtendedBinderFactory(); Binder binder = binderFactory.getBinder(null, MessageChannel.class); @@ -46,7 +46,7 @@ public class ExtendedPropertiesDefaultTests { } @Test - public void testExtendedDefaultConsumerProperties() { + void testExtendedDefaultConsumerProperties() { DefaultBinderFactory binderFactory = createMockExtendedBinderFactory(); Binder binder = binderFactory.getBinder(null, MessageChannel.class); diff --git a/core/spring-cloud-stream/src/test/java/org/springframework/cloud/stream/binder/InputOutputBindingOrderTest.java b/core/spring-cloud-stream/src/test/java/org/springframework/cloud/stream/binder/InputOutputBindingOrderTest.java index 4560bf794..808a8244b 100644 --- a/core/spring-cloud-stream/src/test/java/org/springframework/cloud/stream/binder/InputOutputBindingOrderTest.java +++ b/core/spring-cloud-stream/src/test/java/org/springframework/cloud/stream/binder/InputOutputBindingOrderTest.java @@ -46,7 +46,7 @@ public class InputOutputBindingOrderTest { @SuppressWarnings({ "rawtypes", "unchecked" }) @Test - public void testInputOutputBindingOrder() { + void testInputOutputBindingOrder() { ConfigurableApplicationContext applicationContext = new SpringApplicationBuilder( TestSource.class).web(WebApplicationType.NONE).run( "--spring.cloud.stream.defaultBinder=mock", diff --git a/core/spring-cloud-stream/src/test/java/org/springframework/cloud/stream/binder/MessageConverterTests.java b/core/spring-cloud-stream/src/test/java/org/springframework/cloud/stream/binder/MessageConverterTests.java index 6f73983bc..d6bbe42ce 100644 --- a/core/spring-cloud-stream/src/test/java/org/springframework/cloud/stream/binder/MessageConverterTests.java +++ b/core/spring-cloud-stream/src/test/java/org/springframework/cloud/stream/binder/MessageConverterTests.java @@ -35,7 +35,7 @@ import static org.assertj.core.api.Assertions.fail; public class MessageConverterTests { @Test - public void testHeaderEmbedding() throws Exception { + void testHeaderEmbedding() throws Exception { Message message = MessageBuilder.withPayload("Hello".getBytes()) .setHeader("foo", "bar").setHeader("baz", "quxx").build(); byte[] embedded = EmbeddedHeaderUtils.embedHeaders(new MessageValues(message), @@ -52,7 +52,7 @@ public class MessageConverterTests { } @Test - public void testConfigurableHeaders() throws Exception { + void testConfigurableHeaders() throws Exception { Message message = MessageBuilder.withPayload("Hello".getBytes()) .setHeader("foo", "bar").setHeader("baz", "quxx") .setHeader("contentType", "text/plain").build(); @@ -79,7 +79,7 @@ public class MessageConverterTests { } @Test - public void testHeaderExtractionWithDirectPayload() throws Exception { + void testHeaderExtractionWithDirectPayload() throws Exception { Message message = MessageBuilder.withPayload("Hello".getBytes()) .setHeader("foo", "bar").setHeader("baz", "quxx").build(); byte[] embedded = EmbeddedHeaderUtils.embedHeaders(new MessageValues(message), @@ -95,7 +95,7 @@ public class MessageConverterTests { } @Test - public void testUnicodeHeader() throws Exception { + void testUnicodeHeader() throws Exception { Message message = MessageBuilder.withPayload("Hello".getBytes()) .setHeader("foo", "bar").setHeader("baz", "ØØØØØØØØ").build(); byte[] embedded = EmbeddedHeaderUtils.embedHeaders(new MessageValues(message), @@ -112,7 +112,7 @@ public class MessageConverterTests { } @Test - public void testHeaderEmbeddingMissingHeader() throws Exception { + void testHeaderEmbeddingMissingHeader() throws Exception { Message message = MessageBuilder.withPayload("Hello".getBytes()) .setHeader("foo", "bar").build(); byte[] embedded = EmbeddedHeaderUtils.embedHeaders(new MessageValues(message), @@ -123,7 +123,7 @@ public class MessageConverterTests { } @Test - public void testBadDecode() throws Exception { + void testBadDecode() throws Exception { byte[] bytes = new byte[] { (byte) 0xff, 99 }; Message message = new GenericMessage<>(bytes); try { diff --git a/core/spring-cloud-stream/src/test/java/org/springframework/cloud/stream/binder/PollableConsumerTests.java b/core/spring-cloud-stream/src/test/java/org/springframework/cloud/stream/binder/PollableConsumerTests.java index 7bf1591b9..5a469fb2d 100644 --- a/core/spring-cloud-stream/src/test/java/org/springframework/cloud/stream/binder/PollableConsumerTests.java +++ b/core/spring-cloud-stream/src/test/java/org/springframework/cloud/stream/binder/PollableConsumerTests.java @@ -81,7 +81,7 @@ public class PollableConsumerTests { } @Test - public void testDefaultMessageSource() { + void testDefaultMessageSource() { TestChannelBinder binder = createBinder(); MessageConverterConfigurer configurer = this.context .getBean(MessageConverterConfigurer.class); @@ -103,7 +103,7 @@ public class PollableConsumerTests { } @Test - public void testSimple() { + void testSimple() { TestChannelBinder binder = createBinder(); MessageConverterConfigurer configurer = this.context .getBean(MessageConverterConfigurer.class); @@ -139,7 +139,7 @@ public class PollableConsumerTests { } @Test - public void testConvertSimple() { + void testConvertSimple() { TestChannelBinder binder = createBinder(); MessageConverterConfigurer configurer = this.context .getBean(MessageConverterConfigurer.class); @@ -172,7 +172,7 @@ public class PollableConsumerTests { } @Test - public void testConvertSimpler() { + void testConvertSimpler() { TestChannelBinder binder = createBinder(); MessageConverterConfigurer configurer = this.context .getBean(MessageConverterConfigurer.class); @@ -209,7 +209,7 @@ public class PollableConsumerTests { } @Test - public void testConvertList() { + void testConvertList() { TestChannelBinder binder = createBinder(); MessageConverterConfigurer configurer = this.context .getBean(MessageConverterConfigurer.class); @@ -240,7 +240,7 @@ public class PollableConsumerTests { } @Test - public void testConvertMap() { + void testConvertMap() { TestChannelBinder binder = createBinder(); MessageConverterConfigurer configurer = this.context .getBean(MessageConverterConfigurer.class); @@ -268,7 +268,7 @@ public class PollableConsumerTests { } @Test - public void testEmbedded() { + void testEmbedded() { TestChannelBinder binder = createBinder(); MessageConverterConfigurer configurer = this.context .getBean(MessageConverterConfigurer.class); @@ -313,7 +313,7 @@ public class PollableConsumerTests { } @Test - public void testErrors() { + void testErrors() { TestChannelBinder binder = createBinder(); MessageConverterConfigurer configurer = this.context .getBean(MessageConverterConfigurer.class); @@ -364,7 +364,7 @@ public class PollableConsumerTests { } @Test - public void testErrorsNoRetry() { + void testErrorsNoRetry() { TestChannelBinder binder = createBinder(); MessageConverterConfigurer configurer = this.context .getBean(MessageConverterConfigurer.class); @@ -400,7 +400,7 @@ public class PollableConsumerTests { } @Test - public void testRequeue() { + void testRequeue() { TestChannelBinder binder = createBinder(); MessageConverterConfigurer configurer = this.context .getBean(MessageConverterConfigurer.class); @@ -440,7 +440,7 @@ public class PollableConsumerTests { } @Test - public void testRequeueWithNoAcknowledgementCallback() { + void testRequeueWithNoAcknowledgementCallback() { TestChannelBinder binder = createBinder(); MessageConverterConfigurer configurer = this.context .getBean(MessageConverterConfigurer.class); @@ -473,7 +473,7 @@ public class PollableConsumerTests { } @Test - public void testRequeueFromErrorFlow() { + void testRequeueFromErrorFlow() { TestChannelBinder binder = createBinder(); MessageConverterConfigurer configurer = this.context .getBean(MessageConverterConfigurer.class); @@ -515,7 +515,7 @@ public class PollableConsumerTests { @SuppressWarnings("unchecked") @Test - public void testAutoStartupOff() { + void testAutoStartupOff() { TestChannelBinder binder = createBinder(); binder.setMessageSourceDelegate(new LifecycleMessageSource( () -> new GenericMessage<>("{\"foo\":\"bar\"}".getBytes()))); @@ -537,7 +537,7 @@ public class PollableConsumerTests { @SuppressWarnings("unchecked") @Test - public void testAutoStartupOn() { + void testAutoStartupOn() { TestChannelBinder binder = createBinder(); binder.setMessageSourceDelegate(new LifecycleMessageSource( () -> new GenericMessage<>("{\"foo\":\"bar\"}".getBytes()))); diff --git a/core/spring-cloud-stream/src/test/java/org/springframework/cloud/stream/binder/SinkBindingWithDefaultsTests.java b/core/spring-cloud-stream/src/test/java/org/springframework/cloud/stream/binder/SinkBindingWithDefaultsTests.java index bb32ed22a..c547c1f08 100644 --- a/core/spring-cloud-stream/src/test/java/org/springframework/cloud/stream/binder/SinkBindingWithDefaultsTests.java +++ b/core/spring-cloud-stream/src/test/java/org/springframework/cloud/stream/binder/SinkBindingWithDefaultsTests.java @@ -48,7 +48,7 @@ public class SinkBindingWithDefaultsTests { @SuppressWarnings({ "rawtypes", "unchecked" }) @Test - public void testSinkInputChannelBound() { + void testSinkInputChannelBound() { Binder binder = this.binderFactory.getBinder(null, MessageChannel.class); verify(binder).bindConsumer(eq("consumer-in-0"), isNull(), Mockito.any(MessageChannel.class), Mockito.any()); diff --git a/core/spring-cloud-stream/src/test/java/org/springframework/cloud/stream/binder/tck/ContentTypeTckTests.java b/core/spring-cloud-stream/src/test/java/org/springframework/cloud/stream/binder/tck/ContentTypeTckTests.java index 3925b8fda..bf42fbe43 100644 --- a/core/spring-cloud-stream/src/test/java/org/springframework/cloud/stream/binder/tck/ContentTypeTckTests.java +++ b/core/spring-cloud-stream/src/test/java/org/springframework/cloud/stream/binder/tck/ContentTypeTckTests.java @@ -62,7 +62,7 @@ import static org.assertj.core.api.Assertions.assertThat; public class ContentTypeTckTests { @Test - public void stringToMapMessageStreamListener() { + void stringToMapMessageStreamListener() { ApplicationContext context = new SpringApplicationBuilder( StringToMapMessageConfiguration.class).web(WebApplicationType.NONE) .run("--spring.jmx.enabled=false"); @@ -75,7 +75,7 @@ public class ContentTypeTckTests { } @Test - public void pojoToPojo() { + void pojoToPojo() { ApplicationContext context = new SpringApplicationBuilder( PojoToPojoConfiguration.class).web(WebApplicationType.NONE) .run("--spring.jmx.enabled=false"); @@ -91,7 +91,7 @@ public class ContentTypeTckTests { } @Test - public void pojoToString() { + void pojoToString() { ApplicationContext context = new SpringApplicationBuilder( PojoToStringConfiguration.class).web(WebApplicationType.NONE) .run("--spring.jmx.enabled=false"); @@ -107,7 +107,7 @@ public class ContentTypeTckTests { } @Test - public void pojoToStringOutboundContentTypeBinding() { + void pojoToStringOutboundContentTypeBinding() { ApplicationContext context = new SpringApplicationBuilder( PojoToStringConfiguration.class).web(WebApplicationType.NONE).run( "--spring.cloud.stream.bindings.echo-out-0.contentType=text/plain", @@ -124,7 +124,7 @@ public class ContentTypeTckTests { } @Test - public void pojoToByteArray() { + void pojoToByteArray() { ApplicationContext context = new SpringApplicationBuilder( PojoToByteArrayConfiguration.class).web(WebApplicationType.NONE) .run("--spring.jmx.enabled=false"); @@ -138,7 +138,7 @@ public class ContentTypeTckTests { } @Test - public void pojoToByteArrayOutboundContentTypeBinding() { + void pojoToByteArrayOutboundContentTypeBinding() { ApplicationContext context = new SpringApplicationBuilder( PojoToByteArrayConfiguration.class).web(WebApplicationType.NONE).run( "--spring.jmx.enabled=false"); @@ -152,7 +152,7 @@ public class ContentTypeTckTests { } @Test - public void stringToPojoInboundContentTypeBinding() { + void stringToPojoInboundContentTypeBinding() { ApplicationContext context = new SpringApplicationBuilder( StringToPojoConfiguration.class).web(WebApplicationType.NONE).run( "--spring.cloud.stream.bindings.echo-on-0.contentType=text/plain", @@ -169,7 +169,7 @@ public class ContentTypeTckTests { } @Test - public void typelessToPojoInboundContentTypeBinding() { + void typelessToPojoInboundContentTypeBinding() { ApplicationContext context = new SpringApplicationBuilder( TypelessToPojoConfiguration.class).web(WebApplicationType.NONE).run( "--spring.cloud.stream.bindings.echo-in-0.contentType=text/plain", @@ -186,7 +186,7 @@ public class ContentTypeTckTests { } @Test - public void typelessToPojoInboundContentTypeBindingJson() { + void typelessToPojoInboundContentTypeBindingJson() { ApplicationContext context = new SpringApplicationBuilder( TypelessToPojoConfiguration.class).web(WebApplicationType.NONE).run( "--spring.cloud.stream.bindings.echo-in-0.contentType=application/json", @@ -203,7 +203,7 @@ public class ContentTypeTckTests { } @Test - public void typelessMessageToPojoInboundContentTypeBinding() { + void typelessMessageToPojoInboundContentTypeBinding() { ApplicationContext context = new SpringApplicationBuilder( TypelessMessageToPojoConfiguration.class).web(WebApplicationType.NONE) .run("--spring.cloud.stream.bindings.echo-in-0.contentType=text/plain", @@ -220,7 +220,7 @@ public class ContentTypeTckTests { } @Test - public void typelessMessageToPojoInboundContentTypeBindingJson() { + void typelessMessageToPojoInboundContentTypeBindingJson() { ApplicationContext context = new SpringApplicationBuilder( TypelessMessageToPojoConfiguration.class).web(WebApplicationType.NONE) .run("--spring.cloud.stream.bindings.echo-in-0.contentType=application/json", @@ -237,7 +237,7 @@ public class ContentTypeTckTests { } @Test - public void typelessToPojoWithTextHeaderContentTypeBinding() { + void typelessToPojoWithTextHeaderContentTypeBinding() { ApplicationContext context = new SpringApplicationBuilder( TypelessToPojoConfiguration.class).web(WebApplicationType.NONE) .run("--spring.jmx.enabled=false"); @@ -255,7 +255,7 @@ public class ContentTypeTckTests { } @Test - public void typelessToPojoOutboundContentTypeBinding() { + void typelessToPojoOutboundContentTypeBinding() { ApplicationContext context = new SpringApplicationBuilder( TypelessToMessageConfiguration.class).web(WebApplicationType.NONE).run( "--spring.cloud.stream.bindings.echo-out-0.contentType=text/plain", @@ -274,7 +274,7 @@ public class ContentTypeTckTests { } @Test - public void outboundMessageWithTextContentTypeOnly() { + void outboundMessageWithTextContentTypeOnly() { ApplicationContext context = new SpringApplicationBuilder( TypelessToMessageTextOnlyContentTypeConfiguration.class) .web(WebApplicationType.NONE).run("--spring.jmx.enabled=false"); @@ -292,7 +292,7 @@ public class ContentTypeTckTests { } @Test - public void stringToPojoInboundContentTypeHeader() { + void stringToPojoInboundContentTypeHeader() { ApplicationContext context = new SpringApplicationBuilder( StringToPojoConfiguration.class).web(WebApplicationType.NONE) .run("--spring.jmx.enabled=false"); @@ -310,7 +310,7 @@ public class ContentTypeTckTests { } @Test - public void byteArrayToPojoInboundContentTypeBinding() { + void byteArrayToPojoInboundContentTypeBinding() { ApplicationContext context = new SpringApplicationBuilder( ByteArrayToPojoConfiguration.class).web(WebApplicationType.NONE).run( "--spring.cloud.stream.bindings.echo-in-0.contentType=text/plain", @@ -327,7 +327,7 @@ public class ContentTypeTckTests { } @Test - public void byteArrayToPojoInboundContentTypeHeader() { + void byteArrayToPojoInboundContentTypeHeader() { ApplicationContext context = new SpringApplicationBuilder( StringToPojoConfiguration.class).web(WebApplicationType.NONE) .run("--spring.jmx.enabled=false"); @@ -345,7 +345,7 @@ public class ContentTypeTckTests { } @Test - public void byteArrayToByteArray() { + void byteArrayToByteArray() { ApplicationContext context = new SpringApplicationBuilder( ByteArrayToByteArrayConfiguration.class).web(WebApplicationType.NONE) .run("--spring.jmx.enabled=false"); @@ -359,7 +359,7 @@ public class ContentTypeTckTests { } @Test - public void byteArrayToByteArrayInboundOutboundContentTypeBinding() { + void byteArrayToByteArrayInboundOutboundContentTypeBinding() { ApplicationContext context = new SpringApplicationBuilder( ByteArrayToByteArrayConfiguration.class).web(WebApplicationType.NONE) .run("--spring.cloud.stream.bindings.input.contentType=text/plain", @@ -375,7 +375,7 @@ public class ContentTypeTckTests { } @Test - public void pojoMessageToStringMessage() { + void pojoMessageToStringMessage() { ApplicationContext context = new SpringApplicationBuilder( PojoMessageToStringMessageConfiguration.class) .web(WebApplicationType.NONE).run("--spring.jmx.enabled=false"); @@ -391,7 +391,7 @@ public class ContentTypeTckTests { } @Test - public void customMessageConverter_defaultContentTypeBinding() { + void customMessageConverter_defaultContentTypeBinding() { ApplicationContext context = new SpringApplicationBuilder( StringToStringConfiguration.class, CustomConverters.class) .web(WebApplicationType.NONE) @@ -412,7 +412,7 @@ public class ContentTypeTckTests { // Failure tests @Test - public void _jsonToPojoWrongDefaultContentTypeProperty() { + void _jsonToPojoWrongDefaultContentTypeProperty() { ApplicationContext context = new SpringApplicationBuilder( PojoToPojoConfiguration.class).web(WebApplicationType.NONE).run( "--spring.cloud.stream.default.contentType=text/plain", @@ -427,7 +427,7 @@ public class ContentTypeTckTests { @Test @Disabled - public void _toStringDefaultContentTypePropertyUnknownContentType() { + void _toStringDefaultContentTypePropertyUnknownContentType() { ApplicationContext context = new SpringApplicationBuilder( StringToStringConfiguration.class).web(WebApplicationType.NONE).run( "--spring.cloud.stream.default.contentType=foo/bar", @@ -442,7 +442,7 @@ public class ContentTypeTckTests { } @Test - public void toCollectionWithParameterizedType() { + void toCollectionWithParameterizedType() { ApplicationContext context = new SpringApplicationBuilder( CollectionWithParameterizedTypes.class).web(WebApplicationType.NONE) .run("--spring.jmx.enabled=false"); @@ -456,7 +456,7 @@ public class ContentTypeTckTests { // ====== @Test - public void testWithMapInputParameter() { + void testWithMapInputParameter() { ApplicationContext context = new SpringApplicationBuilder( MapInputConfiguration.class).web(WebApplicationType.NONE) .run("--spring.jmx.enabled=false"); @@ -470,7 +470,7 @@ public class ContentTypeTckTests { } @Test - public void testWithMapPayloadParameter() { + void testWithMapPayloadParameter() { ApplicationContext context = new SpringApplicationBuilder( MapInputConfiguration.class).web(WebApplicationType.NONE) .run("--spring.jmx.enabled=false"); @@ -484,7 +484,7 @@ public class ContentTypeTckTests { } @Test - public void testWithListInputParameter() { + void testWithListInputParameter() { ApplicationContext context = new SpringApplicationBuilder( ListInputConfiguration.class).web(WebApplicationType.NONE) .run("--spring.jmx.enabled=false", "--debug"); @@ -499,7 +499,7 @@ public class ContentTypeTckTests { @Test @Disabled // TODO fix it. We can recognize MessageHeaders and parse it out of the message properly - public void testWithMessageHeadersInputParameter() { + void testWithMessageHeadersInputParameter() { ApplicationContext context = new SpringApplicationBuilder( MessageHeadersInputConfiguration.class).web(WebApplicationType.NONE) .run("--spring.jmx.enabled=false"); diff --git a/core/spring-cloud-stream/src/test/java/org/springframework/cloud/stream/binder/tck/ErrorHandlingTests.java b/core/spring-cloud-stream/src/test/java/org/springframework/cloud/stream/binder/tck/ErrorHandlingTests.java index 2726fe667..5248bf3b8 100644 --- a/core/spring-cloud-stream/src/test/java/org/springframework/cloud/stream/binder/tck/ErrorHandlingTests.java +++ b/core/spring-cloud-stream/src/test/java/org/springframework/cloud/stream/binder/tck/ErrorHandlingTests.java @@ -41,7 +41,7 @@ import static org.assertj.core.api.Assertions.assertThat; public class ErrorHandlingTests { @Test - public void testGlobalErrorWithMessage() { + void testGlobalErrorWithMessage() { ApplicationContext context = new SpringApplicationBuilder(GlobalErrorHandlerWithErrorMessageConfig.class) .web(WebApplicationType.NONE).run("--spring.jmx.enabled=false"); InputDestination source = context.getBean(InputDestination.class); @@ -52,7 +52,7 @@ public class ErrorHandlingTests { } @Test - public void testGlobalErrorWithThrowable() { + void testGlobalErrorWithThrowable() { ApplicationContext context = new SpringApplicationBuilder(GlobalErrorHandlerWithThrowableConfig.class) .web(WebApplicationType.NONE).run("--spring.jmx.enabled=false"); InputDestination source = context.getBean(InputDestination.class); diff --git a/core/spring-cloud-stream/src/test/java/org/springframework/cloud/stream/binding/BindingLifecycleTests.java b/core/spring-cloud-stream/src/test/java/org/springframework/cloud/stream/binding/BindingLifecycleTests.java index 67e256e8a..2e301557c 100644 --- a/core/spring-cloud-stream/src/test/java/org/springframework/cloud/stream/binding/BindingLifecycleTests.java +++ b/core/spring-cloud-stream/src/test/java/org/springframework/cloud/stream/binding/BindingLifecycleTests.java @@ -37,7 +37,7 @@ import static org.mockito.Mockito.mock; public class BindingLifecycleTests { @Test - public void testInputBindingLifecycle() { + void testInputBindingLifecycle() { Map bindables = new HashMap<>(); Bindable bindableWithTwo = new Bindable() { @@ -71,7 +71,7 @@ public class BindingLifecycleTests { } @Test - public void testOutputBindingLifecycle() { + void testOutputBindingLifecycle() { Map bindables = new HashMap<>(); Bindable bindableWithTwo = new Bindable() { diff --git a/core/spring-cloud-stream/src/test/java/org/springframework/cloud/stream/binding/BindingServiceTests.java b/core/spring-cloud-stream/src/test/java/org/springframework/cloud/stream/binding/BindingServiceTests.java index 5752b1b5a..373c3082f 100644 --- a/core/spring-cloud-stream/src/test/java/org/springframework/cloud/stream/binding/BindingServiceTests.java +++ b/core/spring-cloud-stream/src/test/java/org/springframework/cloud/stream/binding/BindingServiceTests.java @@ -90,7 +90,7 @@ public class BindingServiceTests { @SuppressWarnings({ "unchecked", "rawtypes" }) @Test - public void testDefaultGroup() throws Exception { + void testDefaultGroup() throws Exception { BindingServiceProperties properties = new BindingServiceProperties(); Map bindingProperties = new HashMap<>(); BindingProperties props = new BindingProperties(); @@ -119,7 +119,7 @@ public class BindingServiceTests { @SuppressWarnings({ "unchecked", "rawtypes" }) @Test - public void testMultipleConsumerBindings() throws Exception { + void testMultipleConsumerBindings() throws Exception { BindingServiceProperties properties = new BindingServiceProperties(); Map bindingProperties = new HashMap<>(); BindingProperties props = new BindingProperties(); @@ -168,7 +168,7 @@ public class BindingServiceTests { @SuppressWarnings({ "unchecked", "rawtypes" }) @Test - public void testMultipleConsumerBindingsFromIndexList() throws Exception { + void testMultipleConsumerBindingsFromIndexList() throws Exception { BindingServiceProperties properties = new BindingServiceProperties(); Map bindingProperties = new HashMap<>(); BindingProperties props = new BindingProperties(); @@ -229,7 +229,7 @@ public class BindingServiceTests { @SuppressWarnings({ "unchecked", "rawtypes" }) @Test - public void testConsumerBindingWhenMultiplexingIsEnabled() throws Exception { + void testConsumerBindingWhenMultiplexingIsEnabled() throws Exception { BindingServiceProperties properties = new BindingServiceProperties(); Map bindingProperties = new HashMap<>(); BindingProperties props = new BindingProperties(); @@ -275,7 +275,7 @@ public class BindingServiceTests { @SuppressWarnings({ "unchecked", "rawtypes" }) @Test - public void testExplicitGroup() throws Exception { + void testExplicitGroup() throws Exception { BindingServiceProperties properties = new BindingServiceProperties(); Map bindingProperties = new HashMap<>(); BindingProperties props = new BindingProperties(); @@ -305,7 +305,7 @@ public class BindingServiceTests { } @Test - public void testProducerPropertiesValidation() { + void testProducerPropertiesValidation() { BindingServiceProperties serviceProperties = new BindingServiceProperties(); Map bindingProperties = new HashMap<>(); BindingProperties props = new BindingProperties(); @@ -330,7 +330,7 @@ public class BindingServiceTests { } @Test - public void testDefaultPropertyBehavior() { + void testDefaultPropertyBehavior() { ConfigurableApplicationContext run = SpringApplication.run( DefaultConsumerPropertiesTestSink.class, "--server.port=0", @@ -379,7 +379,7 @@ public class BindingServiceTests { } @Test - public void testConsumerPropertiesValidation() { + void testConsumerPropertiesValidation() { BindingServiceProperties serviceProperties = new BindingServiceProperties(); Map bindingProperties = new HashMap<>(); BindingProperties props = new BindingProperties(); @@ -404,7 +404,7 @@ public class BindingServiceTests { } @Test - public void testUnknownBinderOnBindingFailure() { + void testUnknownBinderOnBindingFailure() { HashMap properties = new HashMap<>(); properties.put("spring.cloud.stream.bindings.input.destination", "fooInput"); properties.put("spring.cloud.stream.bindings.input.binder", "mock"); @@ -426,7 +426,7 @@ public class BindingServiceTests { @SuppressWarnings("unchecked") @Test - public void testUnrecognizedBinderAllowedIfNotUsed() { + void testUnrecognizedBinderAllowedIfNotUsed() { HashMap properties = new HashMap<>(); properties.put("spring.cloud.stream.bindings.input.destination", "fooInput"); properties.put("spring.cloud.stream.bindings.output.destination", "fooOutput"); @@ -445,7 +445,7 @@ public class BindingServiceTests { @SuppressWarnings("unchecked") @Test - public void testUnrecognizedBinderDisallowedIfUsed() { + void testUnrecognizedBinderDisallowedIfUsed() { HashMap properties = new HashMap<>(); properties.put("spring.cloud.stream.bindings.input.destination", "fooInput"); properties.put("spring.cloud.stream.bindings.input.binder", "mock1"); @@ -470,7 +470,7 @@ public class BindingServiceTests { } @Test - public void testResolveBindableType() { + void testResolveBindableType() { Class bindableType = GenericsUtils.getParameterType(FooBinder.class, Binder.class, 0); assertThat(bindableType).isSameAs(SomeBindableType.class); @@ -478,7 +478,7 @@ public class BindingServiceTests { @SuppressWarnings({ "rawtypes", "unchecked" }) @Test - public void testLateBindingProducer() throws Exception { + void testLateBindingProducer() throws Exception { BindingServiceProperties properties = new BindingServiceProperties(); properties.setBindingRetryInterval(1); Map bindingProperties = new HashMap<>(); @@ -524,7 +524,7 @@ public class BindingServiceTests { @SuppressWarnings("unchecked") @Test - public void testBindingAutostartup() throws Exception { + void testBindingAutostartup() throws Exception { ApplicationContext context = new SpringApplicationBuilder(FooConfiguration.class) .web(WebApplicationType.NONE).run("--spring.jmx.enabled=false", "--spring.cloud.stream.bindings.input-in-0.consumer.auto-startup=false"); diff --git a/core/spring-cloud-stream/src/test/java/org/springframework/cloud/stream/binding/CustomPartitionedProducerTest.java b/core/spring-cloud-stream/src/test/java/org/springframework/cloud/stream/binding/CustomPartitionedProducerTest.java index 9ba2d9678..f1716f0af 100644 --- a/core/spring-cloud-stream/src/test/java/org/springframework/cloud/stream/binding/CustomPartitionedProducerTest.java +++ b/core/spring-cloud-stream/src/test/java/org/springframework/cloud/stream/binding/CustomPartitionedProducerTest.java @@ -48,7 +48,7 @@ import static org.assertj.core.api.Assertions.assertThat; public class CustomPartitionedProducerTest { @Test - public void testCustomPartitionedProducer() { + void testCustomPartitionedProducer() { ApplicationContext context = SpringApplication.run( CustomPartitionedProducerTest.TestSource.class, "--spring.cloud.stream.output-bindings=output", @@ -85,7 +85,7 @@ public class CustomPartitionedProducerTest { } @Test - public void testCustomPartitionedProducerByName() { + void testCustomPartitionedProducerByName() { ApplicationContext context = SpringApplication.run( CustomPartitionedProducerTest.TestSource.class, "--spring.cloud.stream.output-bindings=output", @@ -120,7 +120,7 @@ public class CustomPartitionedProducerTest { } @Test - public void testCustomPartitionedProducerAsSingletons() { + void testCustomPartitionedProducerAsSingletons() { ApplicationContext context = SpringApplication.run( CustomPartitionedProducerTest.TestSource.class, "--spring.cloud.stream.output-bindings=output", diff --git a/core/spring-cloud-stream/src/test/java/org/springframework/cloud/stream/binding/ExplicitBindingTests.java b/core/spring-cloud-stream/src/test/java/org/springframework/cloud/stream/binding/ExplicitBindingTests.java index 8d3788844..009c65628 100644 --- a/core/spring-cloud-stream/src/test/java/org/springframework/cloud/stream/binding/ExplicitBindingTests.java +++ b/core/spring-cloud-stream/src/test/java/org/springframework/cloud/stream/binding/ExplicitBindingTests.java @@ -39,7 +39,7 @@ import static org.assertj.core.api.Assertions.assertThat; public class ExplicitBindingTests { @Test - public void testExplicitBindings() { + void testExplicitBindings() { try (ConfigurableApplicationContext context = new SpringApplicationBuilder( TestChannelBinderConfiguration.getCompleteConfiguration(EmptyConfiguration.class)) .web(WebApplicationType.NONE) @@ -55,7 +55,7 @@ public class ExplicitBindingTests { } @Test - public void testExplicitBindingsWithExistingConsumer() { + void testExplicitBindingsWithExistingConsumer() { try (ConfigurableApplicationContext context = new SpringApplicationBuilder( TestChannelBinderConfiguration.getCompleteConfiguration(ConsumerConfiguration.class)) .web(WebApplicationType.NONE) @@ -68,7 +68,7 @@ public class ExplicitBindingTests { } @Test - public void testExplicitBindingsWithExistingSupplier() { + void testExplicitBindingsWithExistingSupplier() { try (ConfigurableApplicationContext context = new SpringApplicationBuilder( TestChannelBinderConfiguration.getCompleteConfiguration(SupplierConfiguration.class)) .web(WebApplicationType.NONE) diff --git a/core/spring-cloud-stream/src/test/java/org/springframework/cloud/stream/binding/FluxMessageChannelBindingTests.java b/core/spring-cloud-stream/src/test/java/org/springframework/cloud/stream/binding/FluxMessageChannelBindingTests.java index 252f31251..fd0ff04b3 100644 --- a/core/spring-cloud-stream/src/test/java/org/springframework/cloud/stream/binding/FluxMessageChannelBindingTests.java +++ b/core/spring-cloud-stream/src/test/java/org/springframework/cloud/stream/binding/FluxMessageChannelBindingTests.java @@ -39,7 +39,7 @@ import static org.assertj.core.api.Assertions.assertThat; public class FluxMessageChannelBindingTests { @Test - public void testFluxMessageChannelBindingWhenReactiveOptIn() { + void testFluxMessageChannelBindingWhenReactiveOptIn() { try (ConfigurableApplicationContext context = new SpringApplicationBuilder( TestChannelBinderConfiguration.getCompleteConfiguration(ReactiveFunctionConfiguration.class)) .web(WebApplicationType.NONE) diff --git a/core/spring-cloud-stream/src/test/java/org/springframework/cloud/stream/binding/MessageConverterConfigurerTests.java b/core/spring-cloud-stream/src/test/java/org/springframework/cloud/stream/binding/MessageConverterConfigurerTests.java index fac0f76e9..cdd87b15d 100644 --- a/core/spring-cloud-stream/src/test/java/org/springframework/cloud/stream/binding/MessageConverterConfigurerTests.java +++ b/core/spring-cloud-stream/src/test/java/org/springframework/cloud/stream/binding/MessageConverterConfigurerTests.java @@ -45,7 +45,7 @@ import static org.assertj.core.api.Assertions.fail; public class MessageConverterConfigurerTests { // @Test - public void testConfigureOutputChannelWithBadContentType() { + void testConfigureOutputChannelWithBadContentType() { BindingServiceProperties props = new BindingServiceProperties(); BindingProperties bindingProps = new BindingProperties(); bindingProps.setContentType("application/json"); @@ -65,7 +65,7 @@ public class MessageConverterConfigurerTests { @Test @Disabled - public void testConfigureOutputChannelCannotConvert() { + void testConfigureOutputChannelCannotConvert() { BindingServiceProperties props = new BindingServiceProperties(); BindingProperties bindingProps = new BindingProperties(); bindingProps.setContentType("foo/bar"); diff --git a/core/spring-cloud-stream/src/test/java/org/springframework/cloud/stream/config/ArgumentResolversTests.java b/core/spring-cloud-stream/src/test/java/org/springframework/cloud/stream/config/ArgumentResolversTests.java index 45742fc45..85de21b38 100644 --- a/core/spring-cloud-stream/src/test/java/org/springframework/cloud/stream/config/ArgumentResolversTests.java +++ b/core/spring-cloud-stream/src/test/java/org/springframework/cloud/stream/config/ArgumentResolversTests.java @@ -40,7 +40,7 @@ public class ArgumentResolversTests { @SuppressWarnings({ "rawtypes", "unchecked" }) @Test - public void testSmartPayloadArgumentResolver() throws Exception { + void testSmartPayloadArgumentResolver() throws Exception { SmartPayloadArgumentResolver resolver = new SmartPayloadArgumentResolver(new TestMessageConverter()); diff --git a/core/spring-cloud-stream/src/test/java/org/springframework/cloud/stream/config/BinderPropertiesTests.java b/core/spring-cloud-stream/src/test/java/org/springframework/cloud/stream/config/BinderPropertiesTests.java index e8286f187..1cda1069b 100644 --- a/core/spring-cloud-stream/src/test/java/org/springframework/cloud/stream/config/BinderPropertiesTests.java +++ b/core/spring-cloud-stream/src/test/java/org/springframework/cloud/stream/config/BinderPropertiesTests.java @@ -43,7 +43,7 @@ public class BinderPropertiesTests { @SuppressWarnings("unchecked") @Test @Disabled - public void testSerializationWithNonStringValues() { + void testSerializationWithNonStringValues() { StaticApplicationContext context = new StaticApplicationContext(); DefaultListableBeanFactory bf = (DefaultListableBeanFactory) context .getBeanFactory(); diff --git a/core/spring-cloud-stream/src/test/java/org/springframework/cloud/stream/config/BindingHandlerAdviseTests.java b/core/spring-cloud-stream/src/test/java/org/springframework/cloud/stream/config/BindingHandlerAdviseTests.java index 3cb3a6d78..5869fe72d 100644 --- a/core/spring-cloud-stream/src/test/java/org/springframework/cloud/stream/config/BindingHandlerAdviseTests.java +++ b/core/spring-cloud-stream/src/test/java/org/springframework/cloud/stream/config/BindingHandlerAdviseTests.java @@ -47,14 +47,14 @@ import static org.assertj.core.api.Assertions.assertThatExceptionOfType; public class BindingHandlerAdviseTests { @Test - public void testFailureWithWrongValue() { + void testFailureWithWrongValue() { assertThatExceptionOfType(BeanCreationException.class) .isThrownBy(() -> new SpringApplicationBuilder(SampleConfiguration.class).web(WebApplicationType.NONE).run("--props.value=-1", "--spring.jmx.enabled=false")); } @Test - public void testValidatedValueValue() { + void testValidatedValueValue() { ValidatedProps validatedProps = new SpringApplicationBuilder(SampleConfiguration.class) .web(WebApplicationType.NONE).run("--props.value=2", "--spring.jmx.enabled=false") .getBean(ValidatedProps.class); @@ -62,14 +62,14 @@ public class BindingHandlerAdviseTests { } @Test - public void nonValidatedConfigProperties() { + void nonValidatedConfigProperties() { new SpringApplicationBuilder(NonValidatedConfiguration.class).web(WebApplicationType.NONE) .run("--spring.jmx.enabled=false"); // simply should not fail } @Test - public void validatedConfigProperties() { + void validatedConfigProperties() { assertThatExceptionOfType(ConfigurationPropertiesBindException.class) .isThrownBy(() -> new SpringApplicationBuilder(ValidatedConfiguration.class).web(WebApplicationType.NONE) .run("--spring.jmx.enabled=false")); diff --git a/core/spring-cloud-stream/src/test/java/org/springframework/cloud/stream/config/BindingServiceConfigurationTests.java b/core/spring-cloud-stream/src/test/java/org/springframework/cloud/stream/config/BindingServiceConfigurationTests.java index ae8b533da..acb7588ea 100644 --- a/core/spring-cloud-stream/src/test/java/org/springframework/cloud/stream/config/BindingServiceConfigurationTests.java +++ b/core/spring-cloud-stream/src/test/java/org/springframework/cloud/stream/config/BindingServiceConfigurationTests.java @@ -42,7 +42,7 @@ import static org.assertj.core.api.Assertions.assertThat; public class BindingServiceConfigurationTests { @Test - public void testErroChannelDistributesMessagesInCaseOfException() { + void testErroChannelDistributesMessagesInCaseOfException() { try (ConfigurableApplicationContext context = new SpringApplicationBuilder( TestChannelBinderConfiguration .getCompleteConfiguration(EmptyConfiguration.class)) @@ -68,7 +68,7 @@ public class BindingServiceConfigurationTests { } @Test - public void valdateImportedConfiguartionHandlerPostProcessing() { + void valdateImportedConfiguartionHandlerPostProcessing() { ApplicationContext context = new SpringApplicationBuilder( TestChannelBinderConfiguration .getCompleteConfiguration(RootConfiguration.class)) diff --git a/core/spring-cloud-stream/src/test/java/org/springframework/cloud/stream/config/RetryTemplateTests.java b/core/spring-cloud-stream/src/test/java/org/springframework/cloud/stream/config/RetryTemplateTests.java index 02ea3ace6..a1a842e6c 100644 --- a/core/spring-cloud-stream/src/test/java/org/springframework/cloud/stream/config/RetryTemplateTests.java +++ b/core/spring-cloud-stream/src/test/java/org/springframework/cloud/stream/config/RetryTemplateTests.java @@ -45,7 +45,7 @@ public class RetryTemplateTests { @SuppressWarnings("rawtypes") @Test - public void testSingleCustomRetryTemplate() throws Exception { + void testSingleCustomRetryTemplate() throws Exception { ApplicationContext context = new SpringApplicationBuilder( SingleCustomRetryTemplateConfiguration.class).web(WebApplicationType.NONE) .run("--spring.jmx.enabled=false"); @@ -60,7 +60,7 @@ public class RetryTemplateTests { @SuppressWarnings("rawtypes") @Test - public void testSpecificCustomRetryTemplate() throws Exception { + void testSpecificCustomRetryTemplate() throws Exception { ApplicationContext context = new SpringApplicationBuilder( SpecificCustomRetryTemplateConfiguration.class) .web(WebApplicationType.NONE).run("--spring.jmx.enabled=false", diff --git a/core/spring-cloud-stream/src/test/java/org/springframework/cloud/stream/config/SpelExpressionConverterConfigurationTests.java b/core/spring-cloud-stream/src/test/java/org/springframework/cloud/stream/config/SpelExpressionConverterConfigurationTests.java index c9ef390fd..958c5f6be 100644 --- a/core/spring-cloud-stream/src/test/java/org/springframework/cloud/stream/config/SpelExpressionConverterConfigurationTests.java +++ b/core/spring-cloud-stream/src/test/java/org/springframework/cloud/stream/config/SpelExpressionConverterConfigurationTests.java @@ -66,7 +66,7 @@ public class SpelExpressionConverterConfigurationTests { @Test @SuppressWarnings("unchecked") - public void converterCorrectlyInstalled() { + void converterCorrectlyInstalled() { Expression expression = this.pojo.getExpression(); assertThat(expression.getValue("{\"a\": {\"b\": 5}}").toString()).isEqualTo("5"); diff --git a/core/spring-cloud-stream/src/test/java/org/springframework/cloud/stream/endpoint/ActuatorBindingsTest.java b/core/spring-cloud-stream/src/test/java/org/springframework/cloud/stream/endpoint/ActuatorBindingsTest.java index 5164bfd23..a230f6fa9 100644 --- a/core/spring-cloud-stream/src/test/java/org/springframework/cloud/stream/endpoint/ActuatorBindingsTest.java +++ b/core/spring-cloud-stream/src/test/java/org/springframework/cloud/stream/endpoint/ActuatorBindingsTest.java @@ -42,7 +42,7 @@ public class ActuatorBindingsTest { * it does not result in recursive exception described in https://github.com/spring-cloud/spring-cloud-stream/issues/2253 */ @Test - public void test_2253() { + void test_2253() { try (ConfigurableApplicationContext context = new SpringApplicationBuilder( TestChannelBinderConfiguration.getCompleteConfiguration(Bindings.class)) .web(WebApplicationType.NONE).run("--spring.jmx.enabled=false", diff --git a/core/spring-cloud-stream/src/test/java/org/springframework/cloud/stream/function/DynamicDestinationFunctionTests.java b/core/spring-cloud-stream/src/test/java/org/springframework/cloud/stream/function/DynamicDestinationFunctionTests.java index 3d333a93c..99b1ab177 100644 --- a/core/spring-cloud-stream/src/test/java/org/springframework/cloud/stream/function/DynamicDestinationFunctionTests.java +++ b/core/spring-cloud-stream/src/test/java/org/springframework/cloud/stream/function/DynamicDestinationFunctionTests.java @@ -50,7 +50,7 @@ public class DynamicDestinationFunctionTests { @Test @Disabled - public void testEmptyConfiguration() { + void testEmptyConfiguration() { TestChannelBinderConfiguration.applicationContextRunner(SampleConfiguration.class) .withPropertyValues( "spring.jmx.enabled=false", diff --git a/core/spring-cloud-stream/src/test/java/org/springframework/cloud/stream/function/FunctionBatchingTests.java b/core/spring-cloud-stream/src/test/java/org/springframework/cloud/stream/function/FunctionBatchingTests.java index d75ac1d4c..396a8d4e3 100644 --- a/core/spring-cloud-stream/src/test/java/org/springframework/cloud/stream/function/FunctionBatchingTests.java +++ b/core/spring-cloud-stream/src/test/java/org/springframework/cloud/stream/function/FunctionBatchingTests.java @@ -44,7 +44,7 @@ import static org.assertj.core.api.Assertions.assertThat; public class FunctionBatchingTests { @Test - public void testMessageBatchConfiguration() { + void testMessageBatchConfiguration() { TestChannelBinderConfiguration.applicationContextRunner(MessageBatchConfiguration.class) .withPropertyValues("spring.jmx.enabled=false", "spring.cloud.stream.function.definition=func", @@ -72,7 +72,7 @@ public class FunctionBatchingTests { } @Test - public void testListPayloadConfiguration() { + void testListPayloadConfiguration() { TestChannelBinderConfiguration.applicationContextRunner(ListPayloadNotBatchConfiguration.class) .withPropertyValues("spring.jmx.enabled=false", "spring.cloud.stream.function.definition=func") @@ -96,7 +96,7 @@ public class FunctionBatchingTests { } @Test - public void testListStringPayloadConfigurationTextPlain() { + void testListStringPayloadConfigurationTextPlain() { TestChannelBinderConfiguration.applicationContextRunner(ListStringPayloadConfiguration.class) .withPropertyValues("spring.jmx.enabled=false", "spring.cloud.stream.function.definition=func", @@ -117,7 +117,7 @@ public class FunctionBatchingTests { } @Test - public void testListObjectPayloadObjectConfigurationTextPlain() { + void testListObjectPayloadObjectConfigurationTextPlain() { TestChannelBinderConfiguration.applicationContextRunner(ListObjectPayloadConfiguration.class) .withPropertyValues("spring.jmx.enabled=false", "spring.cloud.stream.function.definition=func", @@ -138,7 +138,7 @@ public class FunctionBatchingTests { } @Test - public void testSimpleBatchConfiguration() { + void testSimpleBatchConfiguration() { TestChannelBinderConfiguration.applicationContextRunner(SimpleBatchConfiguration.class) .withPropertyValues( "spring.jmx.enabled=false", @@ -166,7 +166,7 @@ public class FunctionBatchingTests { } @Test - public void testNestedBatchConfiguration() { + void testNestedBatchConfiguration() { TestChannelBinderConfiguration.applicationContextRunner(NestedBatchConfiguration.class) .withPropertyValues("spring.jmx.enabled=false", "spring.cloud.stream.function.definition=func", diff --git a/core/spring-cloud-stream/src/test/java/org/springframework/cloud/stream/function/GreenfieldFunctionEnableBindingTests.java b/core/spring-cloud-stream/src/test/java/org/springframework/cloud/stream/function/GreenfieldFunctionEnableBindingTests.java index 4d2cb3210..382c63e37 100644 --- a/core/spring-cloud-stream/src/test/java/org/springframework/cloud/stream/function/GreenfieldFunctionEnableBindingTests.java +++ b/core/spring-cloud-stream/src/test/java/org/springframework/cloud/stream/function/GreenfieldFunctionEnableBindingTests.java @@ -48,7 +48,7 @@ import static org.assertj.core.api.Assertions.assertThat; public class GreenfieldFunctionEnableBindingTests { @Test - public void testProcessorFromFunction() { + void testProcessorFromFunction() { try (ConfigurableApplicationContext context = new SpringApplicationBuilder( TestChannelBinderConfiguration.getCompleteConfiguration( ProcessorFromFunction.class)).web(WebApplicationType.NONE).run( @@ -64,7 +64,7 @@ public class GreenfieldFunctionEnableBindingTests { } @Test - public void testSinkFromConsumer() { + void testSinkFromConsumer() { try (ConfigurableApplicationContext context = new SpringApplicationBuilder( TestChannelBinderConfiguration .getCompleteConfiguration(SinkFromConsumer.class)) diff --git a/core/spring-cloud-stream/src/test/java/org/springframework/cloud/stream/function/ImplicitFunctionBindingTests.java b/core/spring-cloud-stream/src/test/java/org/springframework/cloud/stream/function/ImplicitFunctionBindingTests.java index 810459322..69a10e30f 100644 --- a/core/spring-cloud-stream/src/test/java/org/springframework/cloud/stream/function/ImplicitFunctionBindingTests.java +++ b/core/spring-cloud-stream/src/test/java/org/springframework/cloud/stream/function/ImplicitFunctionBindingTests.java @@ -88,7 +88,7 @@ public class ImplicitFunctionBindingTests { @Test - public void testFailedApplicationListenerConfiguration() { + void testFailedApplicationListenerConfiguration() { try (ConfigurableApplicationContext context = new SpringApplicationBuilder( TestChannelBinderConfiguration.getCompleteConfiguration(FailedApplicationListenerConfiguration.class)) .web(WebApplicationType.NONE) @@ -105,7 +105,7 @@ public class ImplicitFunctionBindingTests { @SuppressWarnings({"rawtypes" }) @Test - public void testDisableAutodetect() { + void testDisableAutodetect() { try (ConfigurableApplicationContext context = new SpringApplicationBuilder( TestChannelBinderConfiguration.getCompleteConfiguration(SendToDestinationConfiguration.class)) .web(WebApplicationType.NONE) @@ -122,7 +122,7 @@ public class ImplicitFunctionBindingTests { @SuppressWarnings({"rawtypes" }) @Test - public void testBindingControl() { + void testBindingControl() { try (ConfigurableApplicationContext context = new SpringApplicationBuilder( TestChannelBinderConfiguration.getCompleteConfiguration(SendToDestinationConfiguration.class)) .web(WebApplicationType.NONE) @@ -139,7 +139,7 @@ public class ImplicitFunctionBindingTests { @SuppressWarnings({ "unchecked", "rawtypes" }) @Test - public void dynamicBindingTestWithFunctionRegistrationAndExplicitDestination() { + void dynamicBindingTestWithFunctionRegistrationAndExplicitDestination() { try (ConfigurableApplicationContext context = new SpringApplicationBuilder( TestChannelBinderConfiguration.getCompleteConfiguration(EmptyConfiguration.class)) .web(WebApplicationType.NONE) @@ -167,7 +167,7 @@ public class ImplicitFunctionBindingTests { } @Test - public void dynamicBindingTestWithFunction() { + void dynamicBindingTestWithFunction() { try (ConfigurableApplicationContext context = new SpringApplicationBuilder( TestChannelBinderConfiguration.getCompleteConfiguration(EmptyConfiguration.class)) .web(WebApplicationType.NONE) @@ -192,7 +192,7 @@ public class ImplicitFunctionBindingTests { } @Test - public void testEmptyConfiguration() { + void testEmptyConfiguration() { try (ConfigurableApplicationContext context = new SpringApplicationBuilder( TestChannelBinderConfiguration.getCompleteConfiguration(EmptyConfiguration.class)) @@ -205,7 +205,7 @@ public class ImplicitFunctionBindingTests { } @Test - public void testNullMessage() { + void testNullMessage() { try (ConfigurableApplicationContext context = new SpringApplicationBuilder( TestChannelBinderConfiguration.getCompleteConfiguration(NullMessagerConfiguration.class)) @@ -230,7 +230,7 @@ public class ImplicitFunctionBindingTests { } @Test - public void testSimpleFunctionWithStreamProperty() { + void testSimpleFunctionWithStreamProperty() { try (ConfigurableApplicationContext context = new SpringApplicationBuilder( TestChannelBinderConfiguration.getCompleteConfiguration(NoEnableBindingConfiguration.class)) @@ -250,7 +250,7 @@ public class ImplicitFunctionBindingTests { } @Test - public void testHeaderRetentionWithComposition() { + void testHeaderRetentionWithComposition() { try (ConfigurableApplicationContext context = new SpringApplicationBuilder( TestChannelBinderConfiguration.getCompleteConfiguration(NoEnableBindingConfiguration.class)) @@ -272,7 +272,7 @@ public class ImplicitFunctionBindingTests { } @Test - public void testReactiveFunctionWithState() { + void testReactiveFunctionWithState() { try (ConfigurableApplicationContext context = new SpringApplicationBuilder( TestChannelBinderConfiguration.getCompleteConfiguration(NoEnableBindingConfiguration.class)) @@ -299,7 +299,7 @@ public class ImplicitFunctionBindingTests { @SuppressWarnings("rawtypes") @Test - public void testFunctionWithUseNativeEncoding() { + void testFunctionWithUseNativeEncoding() { try (ConfigurableApplicationContext context = new SpringApplicationBuilder( TestChannelBinderConfiguration.getCompleteConfiguration(NoEnableBindingConfiguration.class)) @@ -318,7 +318,7 @@ public class ImplicitFunctionBindingTests { } @Test - public void testSimpleFunctionWithNativeProperty() { + void testSimpleFunctionWithNativeProperty() { try (ConfigurableApplicationContext context = new SpringApplicationBuilder( TestChannelBinderConfiguration.getCompleteConfiguration(NoEnableBindingConfiguration.class)) @@ -338,7 +338,7 @@ public class ImplicitFunctionBindingTests { } @Test - public void testSimpleFunctionWithoutDefinitionProperty() { + void testSimpleFunctionWithoutDefinitionProperty() { System.clearProperty("spring.cloud.function.definition"); try (ConfigurableApplicationContext context = new SpringApplicationBuilder( TestChannelBinderConfiguration.getCompleteConfiguration(SingleFunctionConfiguration.class)) @@ -357,7 +357,7 @@ public class ImplicitFunctionBindingTests { } @Test - public void testSimpleConsumerWithoutDefinitionProperty() { + void testSimpleConsumerWithoutDefinitionProperty() { System.clearProperty("spring.cloud.function.definition"); try (ConfigurableApplicationContext context = new SpringApplicationBuilder( TestChannelBinderConfiguration.getCompleteConfiguration(SingleConsumerConfiguration.class)) @@ -373,7 +373,7 @@ public class ImplicitFunctionBindingTests { } @Test - public void fooFunctionComposedWithConsumerNoOutputChannel() { + void fooFunctionComposedWithConsumerNoOutputChannel() { System.clearProperty("spring.cloud.function.definition"); try (ConfigurableApplicationContext context = new SpringApplicationBuilder( TestChannelBinderConfiguration.getCompleteConfiguration(ReactiveFunctionConfiguration.class, SingleReactiveConsumerConfiguration.class)) @@ -391,7 +391,7 @@ public class ImplicitFunctionBindingTests { } @Test - public void fooFunctionComposedWithConsumerNonReactive() { + void fooFunctionComposedWithConsumerNonReactive() { System.clearProperty("spring.cloud.function.definition"); try (ConfigurableApplicationContext context = new SpringApplicationBuilder( TestChannelBinderConfiguration.getCompleteConfiguration(FunctionConsumerCopositionConfiguration.class)) @@ -408,10 +408,8 @@ public class ImplicitFunctionBindingTests { } } - - @Test - public void testReactiveConsumerWithoutDefinitionProperty() { + void testReactiveConsumerWithoutDefinitionProperty() { System.clearProperty("spring.cloud.function.definition"); try (ConfigurableApplicationContext context = new SpringApplicationBuilder( TestChannelBinderConfiguration.getCompleteConfiguration(SingleReactiveConsumerConfiguration.class)) @@ -427,7 +425,7 @@ public class ImplicitFunctionBindingTests { } @Test - public void testConsumer() { + void testConsumer() { try (ConfigurableApplicationContext context = new SpringApplicationBuilder( TestChannelBinderConfiguration.getCompleteConfiguration(SingleConsumerConfiguration.class)) .web(WebApplicationType.NONE).run("--spring.cloud.function.definition=consumer", @@ -440,7 +438,7 @@ public class ImplicitFunctionBindingTests { } @Test - public void testBindingWithReactiveFunction() { + void testBindingWithReactiveFunction() { System.clearProperty("spring.cloud.function.definition"); try (ConfigurableApplicationContext context = new SpringApplicationBuilder( TestChannelBinderConfiguration.getCompleteConfiguration(ReactiveFunctionConfiguration.class)) @@ -474,7 +472,7 @@ public class ImplicitFunctionBindingTests { // } @Test - public void testDeclaredTypeVsActualInstance() { + void testDeclaredTypeVsActualInstance() { System.clearProperty("spring.cloud.function.definition"); try (ConfigurableApplicationContext context = new SpringApplicationBuilder( TestChannelBinderConfiguration.getCompleteConfiguration(SCF_GH_409Configuration.class)) @@ -493,7 +491,7 @@ public class ImplicitFunctionBindingTests { } @Test - public void testWithContextTypeApplicationProperty() { + void testWithContextTypeApplicationProperty() { System.clearProperty("spring.cloud.function.definition"); try (ConfigurableApplicationContext context = new SpringApplicationBuilder( TestChannelBinderConfiguration.getCompleteConfiguration(SingleFunctionConfiguration.class)) @@ -516,7 +514,7 @@ public class ImplicitFunctionBindingTests { } @Test - public void testWithIntegrationFlowAsFunction() { + void testWithIntegrationFlowAsFunction() { System.clearProperty("spring.cloud.function.definition"); try (ConfigurableApplicationContext context = new SpringApplicationBuilder(TestChannelBinderConfiguration .getCompleteConfiguration(FunctionSampleSpringIntegrationConfiguration.class)) @@ -535,7 +533,7 @@ public class ImplicitFunctionBindingTests { } @Test - public void testSupplierWithCustomPoller() { + void testSupplierWithCustomPoller() { System.clearProperty("spring.cloud.function.definition"); try (ConfigurableApplicationContext context = new SpringApplicationBuilder( TestChannelBinderConfiguration.getCompleteConfiguration(SupplierWithExplicitPollerConfiguration.class)) @@ -554,7 +552,7 @@ public class ImplicitFunctionBindingTests { @Test @Disabled - public void testImperativeSupplierReactiveFunctionComposition() { + void testImperativeSupplierReactiveFunctionComposition() { System.clearProperty("spring.cloud.function.definition"); try (ConfigurableApplicationContext context = new SpringApplicationBuilder( TestChannelBinderConfiguration.getCompleteConfiguration(ImperativeSupplierComposedWithReactiveFunctionConfiguration.class)) @@ -582,7 +580,7 @@ public class ImplicitFunctionBindingTests { @Test - public void testSupplierWithCustomPollerAndMappedOutput() { + void testSupplierWithCustomPollerAndMappedOutput() { System.clearProperty("spring.cloud.function.definition"); try (ConfigurableApplicationContext context = new SpringApplicationBuilder( TestChannelBinderConfiguration.getCompleteConfiguration(SupplierWithExplicitPollerConfiguration.class)) @@ -601,7 +599,7 @@ public class ImplicitFunctionBindingTests { } @Test - public void testNoFunctionEnabledConfiguration() { + void testNoFunctionEnabledConfiguration() { System.clearProperty("spring.cloud.function.definition"); try (ConfigurableApplicationContext context = new SpringApplicationBuilder( TestChannelBinderConfiguration.getCompleteConfiguration(NoFunctionEnabledConfiguration.class)) @@ -619,7 +617,7 @@ public class ImplicitFunctionBindingTests { } @Test - public void testCollectionAndMapConversionDuringComposition() { + void testCollectionAndMapConversionDuringComposition() { System.clearProperty("spring.cloud.function.definition"); try (ConfigurableApplicationContext context = new SpringApplicationBuilder(TestChannelBinderConfiguration .getCompleteConfiguration(CompositionWithCollectionConfiguration.class)) @@ -640,7 +638,7 @@ public class ImplicitFunctionBindingTests { // see https://github.com/spring-cloud/spring-cloud-stream/issues/1896 @Test - public void testOutputAsCollectionOfMessages() { + void testOutputAsCollectionOfMessages() { System.clearProperty("spring.cloud.function.definition"); try (ConfigurableApplicationContext context = new SpringApplicationBuilder(TestChannelBinderConfiguration .getCompleteConfiguration(SplittableTypesConfiguration.class)) @@ -663,7 +661,7 @@ public class ImplicitFunctionBindingTests { } @Test - public void testOutputAsArrayOfMessages() { + void testOutputAsArrayOfMessages() { System.clearProperty("spring.cloud.function.definition"); try (ConfigurableApplicationContext context = new SpringApplicationBuilder(TestChannelBinderConfiguration .getCompleteConfiguration(SplittableTypesConfiguration.class)) @@ -686,7 +684,7 @@ public class ImplicitFunctionBindingTests { } @Test - public void testWithExplicitBindingInstructions() { + void testWithExplicitBindingInstructions() { System.clearProperty("spring.cloud.function.definition"); try (ConfigurableApplicationContext context = new SpringApplicationBuilder(TestChannelBinderConfiguration .getCompleteConfiguration(SplittableTypesConfiguration.class)) @@ -713,7 +711,7 @@ public class ImplicitFunctionBindingTests { } @Test - public void testWithExplicitBindingInstructionsOnlyDestination() { + void testWithExplicitBindingInstructionsOnlyDestination() { System.clearProperty("spring.cloud.function.definition"); try (ConfigurableApplicationContext context = new SpringApplicationBuilder(TestChannelBinderConfiguration .getCompleteConfiguration(SplittableTypesConfiguration.class)) @@ -739,7 +737,7 @@ public class ImplicitFunctionBindingTests { } @Test - public void partitionOnOutputPayloadTest() { + void partitionOnOutputPayloadTest() { System.clearProperty("spring.cloud.function.definition"); try (ConfigurableApplicationContext context = new SpringApplicationBuilder(TestChannelBinderConfiguration .getCompleteConfiguration(PojoFunctionConfiguration.class)) @@ -762,7 +760,7 @@ public class ImplicitFunctionBindingTests { } @Test - public void partitionOnOutputPayloadAsListAndFunctionAroundWrapperTest() { + void partitionOnOutputPayloadAsListAndFunctionAroundWrapperTest() { System.clearProperty("spring.cloud.function.definition"); try (ConfigurableApplicationContext context = new SpringApplicationBuilder(TestChannelBinderConfiguration .getCompleteConfiguration(PojoFunctionConfiguration.class)) @@ -785,7 +783,7 @@ public class ImplicitFunctionBindingTests { } @Test - public void partitionOnOutputPayloadTestReactive() { + void partitionOnOutputPayloadTestReactive() { System.clearProperty("spring.cloud.function.definition"); try (ConfigurableApplicationContext context = new SpringApplicationBuilder(TestChannelBinderConfiguration .getCompleteConfiguration(PojoFunctionConfiguration.class)) @@ -808,7 +806,7 @@ public class ImplicitFunctionBindingTests { } @Test - public void partitionOnOutputPayloadWithSupplierTest() { + void partitionOnOutputPayloadWithSupplierTest() { System.clearProperty("spring.cloud.function.definition"); try (ConfigurableApplicationContext context = new SpringApplicationBuilder(TestChannelBinderConfiguration .getCompleteConfiguration(PojoFunctionConfiguration.class)) @@ -826,7 +824,7 @@ public class ImplicitFunctionBindingTests { } @Test - public void partitionOnOutputPayloadWithReactiveSupplierTest() { + void partitionOnOutputPayloadWithReactiveSupplierTest() { System.clearProperty("spring.cloud.function.definition"); try (ConfigurableApplicationContext context = new SpringApplicationBuilder(TestChannelBinderConfiguration .getCompleteConfiguration(PojoFunctionConfiguration.class)) @@ -844,7 +842,7 @@ public class ImplicitFunctionBindingTests { } @Test - public void contentTypeAsByteArrayTest() { + void contentTypeAsByteArrayTest() { System.clearProperty("spring.cloud.function.definition"); try (ConfigurableApplicationContext context = new SpringApplicationBuilder(TestChannelBinderConfiguration .getCompleteConfiguration(PojoFunctionConfiguration.class)) @@ -865,7 +863,7 @@ public class ImplicitFunctionBindingTests { } @Test - public void testReactiveFunctionWithOutputAsMonoVoid() { + void testReactiveFunctionWithOutputAsMonoVoid() { System.clearProperty("spring.cloud.function.definition"); try (ConfigurableApplicationContext context = new SpringApplicationBuilder( TestChannelBinderConfiguration.getCompleteConfiguration(FunctionalConsumerConfiguration.class)) @@ -882,7 +880,7 @@ public class ImplicitFunctionBindingTests { } @Test - public void testReactiveSendToDestinationConfiguration() { + void testReactiveSendToDestinationConfiguration() { System.clearProperty("spring.cloud.function.definition"); try (ConfigurableApplicationContext context = new SpringApplicationBuilder( TestChannelBinderConfiguration.getCompleteConfiguration(SendToDestinationConfiguration.class)) @@ -907,7 +905,7 @@ public class ImplicitFunctionBindingTests { } @Test - public void testReactiveConsumerWithConcurrencyFailureConfiguration() { + void testReactiveConsumerWithConcurrencyFailureConfiguration() { System.clearProperty("spring.cloud.function.definition"); try { new SpringApplicationBuilder( @@ -922,7 +920,7 @@ public class ImplicitFunctionBindingTests { } @Test - public void testGh1973() { + void testGh1973() { System.clearProperty("spring.cloud.function.definition"); try (ConfigurableApplicationContext context = new SpringApplicationBuilder( TestChannelBinderConfiguration.getCompleteConfiguration(SupplierAndProcessorConfiguration.class)) @@ -944,7 +942,7 @@ public class ImplicitFunctionBindingTests { } @Test - public void testGh1944() { + void testGh1944() { System.clearProperty("spring.cloud.function.definition"); try (ConfigurableApplicationContext context = new SpringApplicationBuilder( TestChannelBinderConfiguration.getCompleteConfiguration(SupplierAndPojoConfiguration.class)) @@ -958,7 +956,7 @@ public class ImplicitFunctionBindingTests { } @Test - public void testGh2054() { + void testGh2054() { System.clearProperty("spring.cloud.function.definition"); try (ConfigurableApplicationContext context = new SpringApplicationBuilder( TestChannelBinderConfiguration.getCompleteConfiguration(ReactiveFunctionConfiguration.class)) @@ -978,7 +976,7 @@ public class ImplicitFunctionBindingTests { @Test - public void testGh2062() { + void testGh2062() { System.clearProperty("spring.cloud.function.definition"); try (ConfigurableApplicationContext context = new SpringApplicationBuilder( TestChannelBinderConfiguration.getCompleteConfiguration(ReactiveFunctionConfiguration.class)) @@ -994,7 +992,7 @@ public class ImplicitFunctionBindingTests { @SuppressWarnings("rawtypes") @Test - public void testWithNativeEncodingImperative() { + void testWithNativeEncodingImperative() { System.clearProperty("spring.cloud.function.definition"); try (ConfigurableApplicationContext context = new SpringApplicationBuilder( TestChannelBinderConfiguration.getCompleteConfiguration(SingleFunctionConfiguration2.class)) @@ -1032,7 +1030,7 @@ public class ImplicitFunctionBindingTests { @SuppressWarnings("rawtypes") @Test - public void testWithNativeEncodingReactive() { + void testWithNativeEncodingReactive() { System.clearProperty("spring.cloud.function.definition"); try (ConfigurableApplicationContext context = new SpringApplicationBuilder( TestChannelBinderConfiguration.getCompleteConfiguration(SingleFunctionConfiguration2.class)) @@ -1098,7 +1096,7 @@ public class ImplicitFunctionBindingTests { } @Test - public void testHeaderPropagation() { + void testHeaderPropagation() { System.clearProperty("spring.cloud.function.definition"); try (ConfigurableApplicationContext context = new SpringApplicationBuilder( TestChannelBinderConfiguration.getCompleteConfiguration(SingleFunctionConfiguration.class)) diff --git a/core/spring-cloud-stream/src/test/java/org/springframework/cloud/stream/function/MultipleInputOutputFunctionTests.java b/core/spring-cloud-stream/src/test/java/org/springframework/cloud/stream/function/MultipleInputOutputFunctionTests.java index f123d22d3..93e6dd252 100644 --- a/core/spring-cloud-stream/src/test/java/org/springframework/cloud/stream/function/MultipleInputOutputFunctionTests.java +++ b/core/spring-cloud-stream/src/test/java/org/springframework/cloud/stream/function/MultipleInputOutputFunctionTests.java @@ -55,7 +55,7 @@ import static org.assertj.core.api.Assertions.assertThatExceptionOfType; public class MultipleInputOutputFunctionTests { @Test - public void testFailureWithNonReactiveFunction() { + void testFailureWithNonReactiveFunction() { assertThatExceptionOfType(BeanCreationException.class) .isThrownBy(() -> new SpringApplicationBuilder( TestChannelBinderConfiguration.getCompleteConfiguration( @@ -66,7 +66,7 @@ public class MultipleInputOutputFunctionTests { } @Test - public void testFailureWithReactiveArrayOutput() { + void testFailureWithReactiveArrayOutput() { assertThatExceptionOfType(BeanCreationException.class) .isThrownBy(() -> new SpringApplicationBuilder( TestChannelBinderConfiguration.getCompleteConfiguration( @@ -77,7 +77,7 @@ public class MultipleInputOutputFunctionTests { } @Test - public void testFailureWithReactiveArrayOutputNonGeneric() { + void testFailureWithReactiveArrayOutputNonGeneric() { assertThatExceptionOfType(BeanCreationException.class) .isThrownBy(() -> new SpringApplicationBuilder( TestChannelBinderConfiguration.getCompleteConfiguration( @@ -88,7 +88,7 @@ public class MultipleInputOutputFunctionTests { } @Test - public void testFailureWithReactiveArrayInput() { + void testFailureWithReactiveArrayInput() { assertThatExceptionOfType(BeanCreationException.class) .isThrownBy(() -> new SpringApplicationBuilder( TestChannelBinderConfiguration.getCompleteConfiguration( @@ -99,7 +99,7 @@ public class MultipleInputOutputFunctionTests { } @Test - public void testFailureWithReactiveArrayInputNonGeneric() { + void testFailureWithReactiveArrayInputNonGeneric() { assertThatExceptionOfType(BeanCreationException.class) .isThrownBy(() -> new SpringApplicationBuilder( TestChannelBinderConfiguration.getCompleteConfiguration( @@ -110,7 +110,7 @@ public class MultipleInputOutputFunctionTests { } @Test - public void testFailureWithConsumer() { + void testFailureWithConsumer() { assertThatExceptionOfType(BeanCreationException.class) .isThrownBy(() -> new SpringApplicationBuilder( TestChannelBinderConfiguration.getCompleteConfiguration( @@ -121,7 +121,7 @@ public class MultipleInputOutputFunctionTests { } @Test - public void testMultiInputSingleOutput() { + void testMultiInputSingleOutput() { try (ConfigurableApplicationContext context = new SpringApplicationBuilder( TestChannelBinderConfiguration.getCompleteConfiguration( ReactiveFunctionConfiguration.class)) @@ -146,7 +146,7 @@ public class MultipleInputOutputFunctionTests { } @Test - public void testMultiInputMessageSingleOutput() { + void testMultiInputMessageSingleOutput() { try (ConfigurableApplicationContext context = new SpringApplicationBuilder( TestChannelBinderConfiguration.getCompleteConfiguration( ReactiveFunctionConfiguration.class)) @@ -171,7 +171,7 @@ public class MultipleInputOutputFunctionTests { } @Test - public void testSingleInputMultiOutput() { + void testSingleInputMultiOutput() { try (ConfigurableApplicationContext context = new SpringApplicationBuilder( TestChannelBinderConfiguration.getCompleteConfiguration( ReactiveFunctionConfiguration.class)) @@ -198,7 +198,7 @@ public class MultipleInputOutputFunctionTests { } @Test - public void testMultipleFunctions() { + void testMultipleFunctions() { try (ConfigurableApplicationContext context = new SpringApplicationBuilder( TestChannelBinderConfiguration.getCompleteConfiguration( ReactiveFunctionConfiguration.class)) @@ -223,7 +223,7 @@ public class MultipleInputOutputFunctionTests { } @Test - public void testMultipleFunctionsWithComposition() { + void testMultipleFunctionsWithComposition() { try (ConfigurableApplicationContext context = new SpringApplicationBuilder( TestChannelBinderConfiguration.getCompleteConfiguration( ReactiveFunctionConfiguration.class)) @@ -249,7 +249,7 @@ public class MultipleInputOutputFunctionTests { } @Test - public void testMultiInputSingleOutputWithCustomContentType() { + void testMultiInputSingleOutputWithCustomContentType() { try (ConfigurableApplicationContext context = new SpringApplicationBuilder( TestChannelBinderConfiguration.getCompleteConfiguration( ContentTypeConfiguration.class)) @@ -276,7 +276,7 @@ public class MultipleInputOutputFunctionTests { } @Test - public void testMultiInputSingleOutputWithCustomContentType2() { + void testMultiInputSingleOutputWithCustomContentType2() { try (ConfigurableApplicationContext context = new SpringApplicationBuilder( TestChannelBinderConfiguration.getCompleteConfiguration( ContentTypeConfiguration.class)) diff --git a/core/spring-cloud-stream/src/test/java/org/springframework/cloud/stream/function/PollableSourceTests.java b/core/spring-cloud-stream/src/test/java/org/springframework/cloud/stream/function/PollableSourceTests.java index 679ba886c..7a702b45d 100644 --- a/core/spring-cloud-stream/src/test/java/org/springframework/cloud/stream/function/PollableSourceTests.java +++ b/core/spring-cloud-stream/src/test/java/org/springframework/cloud/stream/function/PollableSourceTests.java @@ -37,7 +37,7 @@ import static org.assertj.core.api.Assertions.assertThat; public class PollableSourceTests { @Test - public void test() { + void test() { try (ConfigurableApplicationContext context = new SpringApplicationBuilder(TestChannelBinderConfiguration .getCompleteConfiguration(PollableAppSampleConfiguration.class)) .web(WebApplicationType.NONE).run( diff --git a/core/spring-cloud-stream/src/test/java/org/springframework/cloud/stream/function/RoutingFunctionTests.java b/core/spring-cloud-stream/src/test/java/org/springframework/cloud/stream/function/RoutingFunctionTests.java index b5126de95..24c02f5be 100644 --- a/core/spring-cloud-stream/src/test/java/org/springframework/cloud/stream/function/RoutingFunctionTests.java +++ b/core/spring-cloud-stream/src/test/java/org/springframework/cloud/stream/function/RoutingFunctionTests.java @@ -62,7 +62,7 @@ public class RoutingFunctionTests { } @Test - public void testRoutingViaExplicitEnablingAndDefinitionHeader() { + void testRoutingViaExplicitEnablingAndDefinitionHeader() { try (ConfigurableApplicationContext context = new SpringApplicationBuilder( TestChannelBinderConfiguration.getCompleteConfiguration( RoutingFunctionConfiguration.class)) @@ -87,7 +87,7 @@ public class RoutingFunctionTests { } @Test - public void testRoutingViaExplicitEnablingAndRoutingExpressionProperty() { + void testRoutingViaExplicitEnablingAndRoutingExpressionProperty() { try (ConfigurableApplicationContext context = new SpringApplicationBuilder( TestChannelBinderConfiguration.getCompleteConfiguration( RoutingFunctionConfiguration.class)) @@ -112,7 +112,7 @@ public class RoutingFunctionTests { } @Test - public void testRoutingViaExplicitEnablingAndRoutingExpressionHeader() { + void testRoutingViaExplicitEnablingAndRoutingExpressionHeader() { try (ConfigurableApplicationContext context = new SpringApplicationBuilder( TestChannelBinderConfiguration.getCompleteConfiguration( RoutingFunctionConfiguration.class)) @@ -137,7 +137,7 @@ public class RoutingFunctionTests { } @Test - public void testRoutingViaExplicitDefinitionAndDefinitionHeader() { + void testRoutingViaExplicitDefinitionAndDefinitionHeader() { try (ConfigurableApplicationContext context = new SpringApplicationBuilder( TestChannelBinderConfiguration.getCompleteConfiguration( RoutingFunctionConfiguration.class)) @@ -162,7 +162,7 @@ public class RoutingFunctionTests { } @Test - public void testDefaultRoutingFunctionBindingFlux() { + void testDefaultRoutingFunctionBindingFlux() { try (ConfigurableApplicationContext context = new SpringApplicationBuilder( TestChannelBinderConfiguration.getCompleteConfiguration( RoutingFunctionConfiguration.class)) @@ -188,7 +188,7 @@ public class RoutingFunctionTests { @Test - public void testPojoFunction() { + void testPojoFunction() { try (ConfigurableApplicationContext context = new SpringApplicationBuilder( TestChannelBinderConfiguration.getCompleteConfiguration( RoutingFunctionConfiguration.class)) @@ -213,7 +213,7 @@ public class RoutingFunctionTests { } @Test - public void testExplicitRoutingFunctionBindingWithCompositionAndRoutingEnabledExplicitly() { + void testExplicitRoutingFunctionBindingWithCompositionAndRoutingEnabledExplicitly() { try (ConfigurableApplicationContext context = new SpringApplicationBuilder( TestChannelBinderConfiguration.getCompleteConfiguration( RoutingFunctionConfiguration.class)) @@ -236,7 +236,7 @@ public class RoutingFunctionTests { } @Test - public void testExplicitRoutingFunctionBindingWithCompositionAndRoutingEnabledImplicitly() { + void testExplicitRoutingFunctionBindingWithCompositionAndRoutingEnabledImplicitly() { try (ConfigurableApplicationContext context = new SpringApplicationBuilder( TestChannelBinderConfiguration.getCompleteConfiguration( RoutingFunctionConfiguration.class)) @@ -258,7 +258,7 @@ public class RoutingFunctionTests { } @Test - public void testExplicitRoutingFunctionBindingWithCompositionAndRoutingEnabledExplicitlyAndMoreComposition() { + void testExplicitRoutingFunctionBindingWithCompositionAndRoutingEnabledExplicitlyAndMoreComposition() { try (ConfigurableApplicationContext context = new SpringApplicationBuilder( TestChannelBinderConfiguration.getCompleteConfiguration( RoutingFunctionConfiguration.class)) @@ -282,7 +282,7 @@ public class RoutingFunctionTests { } @Test - public void testExplicitRoutingFunctionBindingWithCompositionAndRoutingEnabledImplicitlyAndMoreComposition() { + void testExplicitRoutingFunctionBindingWithCompositionAndRoutingEnabledImplicitlyAndMoreComposition() { try (ConfigurableApplicationContext context = new SpringApplicationBuilder( TestChannelBinderConfiguration.getCompleteConfiguration( RoutingFunctionConfiguration.class)) @@ -305,7 +305,7 @@ public class RoutingFunctionTests { @SuppressWarnings("unchecked") @Test - public void testRoutingToConsumers() throws Exception { + void testRoutingToConsumers() throws Exception { try (ConfigurableApplicationContext context = new SpringApplicationBuilder( TestChannelBinderConfiguration.getCompleteConfiguration( RoutingConsumerConfiguration.class)) diff --git a/core/spring-cloud-stream/src/test/java/org/springframework/cloud/stream/function/ScenarioTests.java b/core/spring-cloud-stream/src/test/java/org/springframework/cloud/stream/function/ScenarioTests.java index 9f36ef470..229a99f1e 100644 --- a/core/spring-cloud-stream/src/test/java/org/springframework/cloud/stream/function/ScenarioTests.java +++ b/core/spring-cloud-stream/src/test/java/org/springframework/cloud/stream/function/ScenarioTests.java @@ -44,7 +44,7 @@ import static org.assertj.core.api.Assertions.assertThat; public class ScenarioTests { @Test - public void test2106() { + void test2106() { try (ConfigurableApplicationContext context = new SpringApplicationBuilder(TestChannelBinderConfiguration .getCompleteConfiguration(ConsumerConfiguration.class)) .web(WebApplicationType.NONE).run( @@ -82,7 +82,7 @@ public class ScenarioTests { } @Test - public void testComposingSupplierWuthTypelessMessageFunction() throws Exception { + void testComposingSupplierWuthTypelessMessageFunction() throws Exception { try (ConfigurableApplicationContext context = new SpringApplicationBuilder( TestChannelBinderConfiguration.getCompleteConfiguration(SupplierConfiguration.class)) .web(WebApplicationType.NONE) @@ -97,7 +97,7 @@ public class ScenarioTests { } @Test - public void test2107() { + void test2107() { try (ConfigurableApplicationContext context = new SpringApplicationBuilder( TestChannelBinderConfiguration.getCompleteConfiguration(FunctionReturningNullConfiguration.class)) .web(WebApplicationType.NONE) @@ -114,7 +114,7 @@ public class ScenarioTests { } @Test - public void test2113() { + void test2113() { try (ConfigurableApplicationContext context = new SpringApplicationBuilder( TestChannelBinderConfiguration.getCompleteConfiguration(TestConfiguration.class)) .web(WebApplicationType.NONE) diff --git a/core/spring-cloud-stream/src/test/java/org/springframework/cloud/stream/function/StreamBridgeTests.java b/core/spring-cloud-stream/src/test/java/org/springframework/cloud/stream/function/StreamBridgeTests.java index cfdef9a15..c171470ab 100644 --- a/core/spring-cloud-stream/src/test/java/org/springframework/cloud/stream/function/StreamBridgeTests.java +++ b/core/spring-cloud-stream/src/test/java/org/springframework/cloud/stream/function/StreamBridgeTests.java @@ -83,7 +83,7 @@ public class StreamBridgeTests { * See https://github.com/spring-cloud/spring-cloud-stream/issues/2249 for more details */ @Test - public void test_2249() throws Exception { + void test_2249() throws Exception { try (ConfigurableApplicationContext context = new SpringApplicationBuilder( TestChannelBinderConfiguration.getCompleteConfiguration( EmptyConfiguration.class)).web(WebApplicationType.NONE).run( @@ -108,7 +108,7 @@ public class StreamBridgeTests { } @Test - public void testWithOutputContentTypeWildCardBindings() throws Exception { + void testWithOutputContentTypeWildCardBindings() throws Exception { try (ConfigurableApplicationContext context = new SpringApplicationBuilder(TestChannelBinderConfiguration .getCompleteConfiguration(ConsumerConfiguration.class, EmptyConfigurationWithCustomConverters.class)) .web(WebApplicationType.NONE).run( @@ -131,7 +131,7 @@ public class StreamBridgeTests { @SuppressWarnings("unchecked") @Test - public void testNoCachingOfStreamBridgeFunction() throws Exception { + void testNoCachingOfStreamBridgeFunction() throws Exception { try (ConfigurableApplicationContext context = new SpringApplicationBuilder(TestChannelBinderConfiguration .getCompleteConfiguration(ConsumerConfiguration.class, InterceptorConfiguration.class)) .web(WebApplicationType.NONE).run( @@ -150,7 +150,7 @@ public class StreamBridgeTests { } @Test - public void testDelayedSend() { + void testDelayedSend() { ScheduledExecutorService executor = Executors.newScheduledThreadPool(1); try (ConfigurableApplicationContext context = new SpringApplicationBuilder(TestChannelBinderConfiguration .getCompleteConfiguration(ConsumerConfiguration.class, EmptyConfiguration.class)) @@ -171,7 +171,7 @@ public class StreamBridgeTests { } @Test - public void testWithInterceptorsMatchedAgainstAllPatterns() { + void testWithInterceptorsMatchedAgainstAllPatterns() { try (ConfigurableApplicationContext context = new SpringApplicationBuilder(TestChannelBinderConfiguration .getCompleteConfiguration(ConsumerConfiguration.class, InterceptorConfiguration.class)) .web(WebApplicationType.NONE).run( @@ -188,7 +188,7 @@ public class StreamBridgeTests { } @Test // validate that there is no exception thrown when sending to null channel - public void test_2268() { + void test_2268() { try (ConfigurableApplicationContext context = new SpringApplicationBuilder(TestChannelBinderConfiguration .getCompleteConfiguration(InterceptorConfiguration.class)) .web(WebApplicationType.NONE).run( @@ -200,7 +200,7 @@ public class StreamBridgeTests { } @Test - public void testInterceptorIsNotAddedMultipleTimesToTheMessageChannel() { + void testInterceptorIsNotAddedMultipleTimesToTheMessageChannel() { try (ConfigurableApplicationContext context = new SpringApplicationBuilder(TestChannelBinderConfiguration .getCompleteConfiguration(InterceptorConfiguration.class)) .web(WebApplicationType.NONE).run( @@ -223,7 +223,7 @@ public class StreamBridgeTests { } @Test - public void testWithInterceptorsRegisteredOnlyOnOutputChannel() throws InterruptedException { + void testWithInterceptorsRegisteredOnlyOnOutputChannel() throws InterruptedException { try (ConfigurableApplicationContext context = new SpringApplicationBuilder(TestChannelBinderConfiguration .getCompleteConfiguration(GH2180Configuration.class)) .web(WebApplicationType.NONE).run( @@ -244,7 +244,7 @@ public class StreamBridgeTests { } @Test - public void testBindingPropertiesAreHonored() { + void testBindingPropertiesAreHonored() { try (ConfigurableApplicationContext context = new SpringApplicationBuilder(TestChannelBinderConfiguration .getCompleteConfiguration(ConsumerConfiguration.class)) .web(WebApplicationType.NONE).run( @@ -270,7 +270,7 @@ public class StreamBridgeTests { //see https://github.com/spring-cloud/spring-cloud-function/issues/573 for more details @Test - public void testBridgeActivationWhenFunctionDefinitionIsPresent() { + void testBridgeActivationWhenFunctionDefinitionIsPresent() { try (ConfigurableApplicationContext context = new SpringApplicationBuilder(TestChannelBinderConfiguration .getCompleteConfiguration(SimpleConfiguration.class)) .web(WebApplicationType.NONE).run( @@ -286,7 +286,7 @@ public class StreamBridgeTests { } @Test - public void testNoBridgeIfNoSourcePropertyDefined() { + void testNoBridgeIfNoSourcePropertyDefined() { assertThatExceptionOfType(NoSuchBeanDefinitionException.class) .isThrownBy(() -> { ConfigurableApplicationContext context = new SpringApplicationBuilder(TestChannelBinderConfiguration @@ -297,7 +297,7 @@ public class StreamBridgeTests { } @Test - public void testBridgeFunctions() { + void testBridgeFunctions() { try (ConfigurableApplicationContext context = new SpringApplicationBuilder(TestChannelBinderConfiguration .getCompleteConfiguration(EmptyConfiguration.class)) .web(WebApplicationType.NONE).run("--spring.cloud.stream.source=foo;bar", @@ -315,7 +315,7 @@ public class StreamBridgeTests { } @Test - public void testBridgeFunctionsSendingMessagePreservingHeaders() { + void testBridgeFunctionsSendingMessagePreservingHeaders() { try (ConfigurableApplicationContext context = new SpringApplicationBuilder(TestChannelBinderConfiguration .getCompleteConfiguration(EmptyConfiguration.class)) .web(WebApplicationType.NONE).run("--spring.cloud.stream.source=foo;bar", @@ -340,7 +340,7 @@ public class StreamBridgeTests { } @Test - public void testBridgeFunctionsWitthPartitionInformation() { + void testBridgeFunctionsWitthPartitionInformation() { try (ConfigurableApplicationContext context = new SpringApplicationBuilder(TestChannelBinderConfiguration .getCompleteConfiguration(EmptyConfiguration.class)) .web(WebApplicationType.NONE).run("--spring.cloud.stream.source=foo;bar", @@ -395,7 +395,7 @@ public class StreamBridgeTests { } @Test - public void testSendingMessageToOutputOfExistingSupplier() throws Exception { + void testSendingMessageToOutputOfExistingSupplier() throws Exception { try (ConfigurableApplicationContext context = new SpringApplicationBuilder(TestChannelBinderConfiguration .getCompleteConfiguration(TestConfiguration.class)) .web(WebApplicationType.NONE).run("--spring.cloud.stream.source=supplier;foo", @@ -417,7 +417,7 @@ public class StreamBridgeTests { } @Test - public void testDynamicDestination() { + void testDynamicDestination() { try (ConfigurableApplicationContext context = new SpringApplicationBuilder(TestChannelBinderConfiguration .getCompleteConfiguration(TestConfiguration.class)) .web(WebApplicationType.NONE).run("--spring.jmx.enabled=false")) { @@ -441,7 +441,7 @@ public class StreamBridgeTests { } @Test - public void testWithIntegrationFlowBecauseMarcinSaidSo() { + void testWithIntegrationFlowBecauseMarcinSaidSo() { try (ConfigurableApplicationContext context = new SpringApplicationBuilder(TestChannelBinderConfiguration .getCompleteConfiguration(IntegrationFlowConfiguration.class)) .web(WebApplicationType.NONE).run("--spring.jmx.enabled=false")) { @@ -456,7 +456,7 @@ public class StreamBridgeTests { } @Test - public void testNewBindingCallback() { + void testNewBindingCallback() { try (ConfigurableApplicationContext context = new SpringApplicationBuilder(TestChannelBinderConfiguration .getCompleteConfiguration(BindingCallbackConfiguration.class)) .web(WebApplicationType.NONE).run("--spring.cloud.stream.source=uppercase", @@ -469,7 +469,7 @@ public class StreamBridgeTests { } @Test - public void testDynamicProducerDestination() { + void testDynamicProducerDestination() { System.clearProperty("spring.cloud.function.definition"); ConfigurableApplicationContext context = new SpringApplicationBuilder( TestChannelBinderConfiguration.getCompleteConfiguration(DynamicProducerDestinationConfig.class)) diff --git a/core/spring-cloud-stream/src/test/java/org/springframework/cloud/stream/function/edgecases/GH1801Test.java b/core/spring-cloud-stream/src/test/java/org/springframework/cloud/stream/function/edgecases/GH1801Test.java index 2e2aaafe2..a02c1796b 100644 --- a/core/spring-cloud-stream/src/test/java/org/springframework/cloud/stream/function/edgecases/GH1801Test.java +++ b/core/spring-cloud-stream/src/test/java/org/springframework/cloud/stream/function/edgecases/GH1801Test.java @@ -37,7 +37,7 @@ import org.springframework.messaging.Message; public class GH1801Test { @Test - public void test() { + void test() { SampleBootApplication.main("--spring.cloud.stream.defaultBinder=integration"); } diff --git a/core/spring-cloud-stream/src/test/java/org/springframework/cloud/stream/partitioning/PartitionedConsumerTest.java b/core/spring-cloud-stream/src/test/java/org/springframework/cloud/stream/partitioning/PartitionedConsumerTest.java index d090a16ec..f38737f28 100644 --- a/core/spring-cloud-stream/src/test/java/org/springframework/cloud/stream/partitioning/PartitionedConsumerTest.java +++ b/core/spring-cloud-stream/src/test/java/org/springframework/cloud/stream/partitioning/PartitionedConsumerTest.java @@ -57,7 +57,7 @@ public class PartitionedConsumerTest { @Test @SuppressWarnings({ "rawtypes", "unchecked" }) - public void testBindingPartitionedConsumer() { + void testBindingPartitionedConsumer() { Binder binder = this.binderFactory.getBinder(null, MessageChannel.class); ArgumentCaptor argumentCaptor = ArgumentCaptor .forClass(ConsumerProperties.class);