From b723384c8cfef75fc1460671d8c40782cecac410 Mon Sep 17 00:00:00 2001 From: Soby Chacko Date: Fri, 14 Jan 2022 17:05:51 -0500 Subject: [PATCH] Restore SpelExpressionConverterConfigurationTests. --- .../cloud/stream/binder/tck/ContentTypeTckTests.java | 6 ------ .../config}/SpelExpressionConverterConfigurationTests.java | 7 ++----- .../stream/function/ImplicitFunctionBindingTests.java | 4 ++-- 3 files changed, 4 insertions(+), 13 deletions(-) rename spring-cloud-stream/{deleted-tests => src/test/java/org/springframework/cloud/stream/config}/SpelExpressionConverterConfigurationTests.java (96%) diff --git a/spring-cloud-stream/src/test/java/org/springframework/cloud/stream/binder/tck/ContentTypeTckTests.java b/spring-cloud-stream/src/test/java/org/springframework/cloud/stream/binder/tck/ContentTypeTckTests.java index f8d19cc3f..e8fdce5fb 100644 --- a/spring-cloud-stream/src/test/java/org/springframework/cloud/stream/binder/tck/ContentTypeTckTests.java +++ b/spring-cloud-stream/src/test/java/org/springframework/cloud/stream/binder/tck/ContentTypeTckTests.java @@ -22,7 +22,6 @@ import java.util.List; import java.util.Map; import java.util.function.Function; -import com.fasterxml.jackson.databind.ObjectMapper; import org.junit.Ignore; import org.junit.Test; @@ -38,17 +37,12 @@ import org.springframework.context.ApplicationContext; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Import; -import org.springframework.integration.annotation.ServiceActivator; -import org.springframework.integration.channel.DirectChannel; import org.springframework.lang.Nullable; import org.springframework.messaging.Message; -import org.springframework.messaging.MessageChannel; import org.springframework.messaging.MessageHeaders; import org.springframework.messaging.MessagingException; import org.springframework.messaging.converter.AbstractMessageConverter; import org.springframework.messaging.converter.MessageConversionException; -import org.springframework.messaging.handler.annotation.Payload; -import org.springframework.messaging.handler.annotation.SendTo; import org.springframework.messaging.support.GenericMessage; import org.springframework.messaging.support.MessageBuilder; import org.springframework.util.MimeType; diff --git a/spring-cloud-stream/deleted-tests/SpelExpressionConverterConfigurationTests.java b/spring-cloud-stream/src/test/java/org/springframework/cloud/stream/config/SpelExpressionConverterConfigurationTests.java similarity index 96% rename from spring-cloud-stream/deleted-tests/SpelExpressionConverterConfigurationTests.java rename to spring-cloud-stream/src/test/java/org/springframework/cloud/stream/config/SpelExpressionConverterConfigurationTests.java index 61e3c1413..38b982fdd 100644 --- a/spring-cloud-stream/deleted-tests/SpelExpressionConverterConfigurationTests.java +++ b/spring-cloud-stream/src/test/java/org/springframework/cloud/stream/config/SpelExpressionConverterConfigurationTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2015-2018 the original author or authors. + * Copyright 2015-2022 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -31,7 +31,6 @@ import org.springframework.boot.autoconfigure.EnableAutoConfiguration; import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.boot.context.properties.EnableConfigurationProperties; import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.cloud.stream.annotation.EnableBinding; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.expression.EvaluationContext; @@ -49,6 +48,7 @@ import static org.assertj.core.api.Assertions.assertThat; * * @author Eric Bottard * @author Artem Bilan + * @author Soby Chacko */ @RunWith(SpringJUnit4ClassRunner.class) @SpringBootTest(classes = SpelExpressionConverterConfigurationTests.Config.class, properties = { @@ -99,7 +99,6 @@ public class SpelExpressionConverterConfigurationTests { } @Configuration - @EnableBinding @EnableAutoConfiguration @EnableConfigurationProperties(Pojo.class) public static class Config implements BeanFactoryAware { @@ -123,7 +122,5 @@ public class SpelExpressionConverterConfigurationTests { this.evaluationContext = ExpressionUtils .createStandardEvaluationContext(this.beanFactory); } - } - } diff --git a/spring-cloud-stream/src/test/java/org/springframework/cloud/stream/function/ImplicitFunctionBindingTests.java b/spring-cloud-stream/src/test/java/org/springframework/cloud/stream/function/ImplicitFunctionBindingTests.java index 7f225cc57..f38579605 100644 --- a/spring-cloud-stream/src/test/java/org/springframework/cloud/stream/function/ImplicitFunctionBindingTests.java +++ b/spring-cloud-stream/src/test/java/org/springframework/cloud/stream/function/ImplicitFunctionBindingTests.java @@ -41,8 +41,8 @@ import org.springframework.boot.WebApplicationType; import org.springframework.boot.autoconfigure.EnableAutoConfiguration; import org.springframework.boot.builder.SpringApplicationBuilder; import org.springframework.cloud.function.context.FunctionRegistration; -import org.springframework.cloud.function.context.FunctionType; import org.springframework.cloud.function.context.catalog.FunctionAroundWrapper; +import org.springframework.cloud.function.context.catalog.FunctionTypeUtils; import org.springframework.cloud.function.context.catalog.SimpleFunctionRegistry.FunctionInvocationWrapper; import org.springframework.cloud.function.context.config.ContextFunctionCatalogAutoConfiguration; import org.springframework.cloud.stream.binder.Binding; @@ -157,7 +157,7 @@ public class ImplicitFunctionBindingTests { Function function = v -> v; FunctionRegistration functionRegistration = new FunctionRegistration(function, "function"); - functionRegistration = functionRegistration.type(FunctionType.from(byte[].class).to(byte[].class)); + functionRegistration = functionRegistration.type(FunctionTypeUtils.functionType(byte[].class, byte[].class)); FunctionBindingTestUtils.bind(context, functionRegistration); input.send(new GenericMessage("hello".getBytes()), "input");