From 82189dd68487e1dbd4e66caa6d60ace88d8587fb Mon Sep 17 00:00:00 2001 From: Artem Bilan Date: Wed, 9 Jun 2021 12:44:52 -0400 Subject: [PATCH] Fix Redis modules for proper dependencies According `testcontainers-spring-boot` project we have to use now a `spring-cloud-starter-bootstrap` dependency to make it compatible with Spring Boot `2.4.x` or higher: https://github.com/Playtika/testcontainers-spring-boot#how-to-use --- applications/sink/redis-sink/pom.xml | 6 +++--- .../cloud/stream/app/sink/redis/RedisSinkTests.java | 5 ++--- functions/consumer/redis-consumer/pom.xml | 12 ++++++------ .../consumer/redis/RedisConsumerConfiguration.java | 4 ++-- .../consumer/redis/AbstractRedisConsumerTests.java | 1 + .../fn/consumer/redis/RedisConsumerKeyTests.java | 1 - .../fn/consumer/redis/RedisConsumerQueueTests.java | 1 - .../fn/consumer/redis/RedisConsumerTopicTests.java | 1 - 8 files changed, 14 insertions(+), 17 deletions(-) diff --git a/applications/sink/redis-sink/pom.xml b/applications/sink/redis-sink/pom.xml index fb0e9a94..75b8bec3 100644 --- a/applications/sink/redis-sink/pom.xml +++ b/applications/sink/redis-sink/pom.xml @@ -16,8 +16,8 @@ - 2.2.0.RELEASE - 1.85 + 3.0.3 + 2.0.9 @@ -45,7 +45,7 @@ org.springframework.cloud - spring-cloud-starter + spring-cloud-starter-bootstrap ${spring-cloud-starters.version} test diff --git a/applications/sink/redis-sink/src/test/java/org/springframework/cloud/stream/app/sink/redis/RedisSinkTests.java b/applications/sink/redis-sink/src/test/java/org/springframework/cloud/stream/app/sink/redis/RedisSinkTests.java index a882c780..bbe0c441 100644 --- a/applications/sink/redis-sink/src/test/java/org/springframework/cloud/stream/app/sink/redis/RedisSinkTests.java +++ b/applications/sink/redis-sink/src/test/java/org/springframework/cloud/stream/app/sink/redis/RedisSinkTests.java @@ -19,7 +19,6 @@ package org.springframework.cloud.stream.app.sink.redis; import java.util.ArrayList; import java.util.List; -import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; import org.springframework.boot.WebApplicationType; @@ -40,12 +39,12 @@ import static org.assertj.core.api.Assertions.assertThat; /** * @author Soby Chacko + * @author Artem Bilan */ public class RedisSinkTests { @Test - @Disabled - public void testRedisSink() throws Exception { + public void testRedisSink() { try (ConfigurableApplicationContext context = new SpringApplicationBuilder( TestChannelBinderConfiguration .getCompleteConfiguration(RedisSinkTestApplication.class)) diff --git a/functions/consumer/redis-consumer/pom.xml b/functions/consumer/redis-consumer/pom.xml index 62032436..da21e983 100644 --- a/functions/consumer/redis-consumer/pom.xml +++ b/functions/consumer/redis-consumer/pom.xml @@ -38,12 +38,12 @@ test - - - - - - + + org.springframework.cloud + spring-cloud-starter-bootstrap + ${spring-cloud-starters.version} + test + diff --git a/functions/consumer/redis-consumer/src/main/java/org/springframework/cloud/fn/consumer/redis/RedisConsumerConfiguration.java b/functions/consumer/redis-consumer/src/main/java/org/springframework/cloud/fn/consumer/redis/RedisConsumerConfiguration.java index 5641b63a..a3ab67b0 100644 --- a/functions/consumer/redis-consumer/src/main/java/org/springframework/cloud/fn/consumer/redis/RedisConsumerConfiguration.java +++ b/functions/consumer/redis-consumer/src/main/java/org/springframework/cloud/fn/consumer/redis/RedisConsumerConfiguration.java @@ -40,8 +40,8 @@ import org.springframework.messaging.MessageHandler; public class RedisConsumerConfiguration { @Bean - public Consumer> redisConsumer() { - return redisConsumerMessageHandler(null, null)::handleMessage; + public Consumer> redisConsumer(MessageHandler redisConsumerMessageHandler) { + return redisConsumerMessageHandler::handleMessage; } @Bean diff --git a/functions/consumer/redis-consumer/src/test/java/org/springframework/cloud/fn/consumer/redis/AbstractRedisConsumerTests.java b/functions/consumer/redis-consumer/src/test/java/org/springframework/cloud/fn/consumer/redis/AbstractRedisConsumerTests.java index d742afc9..36134db1 100644 --- a/functions/consumer/redis-consumer/src/test/java/org/springframework/cloud/fn/consumer/redis/AbstractRedisConsumerTests.java +++ b/functions/consumer/redis-consumer/src/test/java/org/springframework/cloud/fn/consumer/redis/AbstractRedisConsumerTests.java @@ -30,6 +30,7 @@ import org.springframework.test.annotation.DirtiesContext; /** * @author Soby Chacko + * @author Artem Bilan */ @SpringBootTest @DirtiesContext diff --git a/functions/consumer/redis-consumer/src/test/java/org/springframework/cloud/fn/consumer/redis/RedisConsumerKeyTests.java b/functions/consumer/redis-consumer/src/test/java/org/springframework/cloud/fn/consumer/redis/RedisConsumerKeyTests.java index 4e1fa1c3..b396b3f1 100644 --- a/functions/consumer/redis-consumer/src/test/java/org/springframework/cloud/fn/consumer/redis/RedisConsumerKeyTests.java +++ b/functions/consumer/redis-consumer/src/test/java/org/springframework/cloud/fn/consumer/redis/RedisConsumerKeyTests.java @@ -36,7 +36,6 @@ import static org.assertj.core.api.Assertions.assertThat; * @author Gary Russell */ @TestPropertySource(properties = "redis.consumer.key = foo") -@Disabled public class RedisConsumerKeyTests extends AbstractRedisConsumerTests { @Test diff --git a/functions/consumer/redis-consumer/src/test/java/org/springframework/cloud/fn/consumer/redis/RedisConsumerQueueTests.java b/functions/consumer/redis-consumer/src/test/java/org/springframework/cloud/fn/consumer/redis/RedisConsumerQueueTests.java index 41b023ba..415a0279 100644 --- a/functions/consumer/redis-consumer/src/test/java/org/springframework/cloud/fn/consumer/redis/RedisConsumerQueueTests.java +++ b/functions/consumer/redis-consumer/src/test/java/org/springframework/cloud/fn/consumer/redis/RedisConsumerQueueTests.java @@ -31,7 +31,6 @@ import static org.assertj.core.api.Assertions.assertThat; * @author Soby Chacko */ @TestPropertySource(properties = "redis.consumer.queue = test-queue") -@Disabled public class RedisConsumerQueueTests extends AbstractRedisConsumerTests { @Test diff --git a/functions/consumer/redis-consumer/src/test/java/org/springframework/cloud/fn/consumer/redis/RedisConsumerTopicTests.java b/functions/consumer/redis-consumer/src/test/java/org/springframework/cloud/fn/consumer/redis/RedisConsumerTopicTests.java index d6c9ce19..1e0ade25 100644 --- a/functions/consumer/redis-consumer/src/test/java/org/springframework/cloud/fn/consumer/redis/RedisConsumerTopicTests.java +++ b/functions/consumer/redis-consumer/src/test/java/org/springframework/cloud/fn/consumer/redis/RedisConsumerTopicTests.java @@ -43,7 +43,6 @@ import static org.assertj.core.api.Assertions.assertThat; * @author Soby Chacko */ @TestPropertySource(properties = "redis.consumer.topic = foo-topic") -@Disabled public class RedisConsumerTopicTests extends AbstractRedisConsumerTests { @Autowired