Upgraded testcontainers-redis and spring-batch-redis

Author: jruaux

pom.xml

@@ -29,9 +29,9 @@
 		<lombok.version>1.18.22</lombok.version>
 		<mockito.version>4.1.0</mockito.version>
 		<reactor.version>3.4.12</reactor.version>
-		<spring-batch-redis.version>2.23.6</spring-batch-redis.version>
+		<spring-batch-redis.version>2.23.7</spring-batch-redis.version>
 		<slf4j.version>1.7.30</slf4j.version>
-		<testcontainers-redis.version>1.4.5</testcontainers-redis.version>
+		<testcontainers-redis.version>1.4.6</testcontainers-redis.version>
 		<testcontainers.version>1.15.3</testcontainers.version>
 		<component-owner>redis</component-owner>
 		<component-name>redis-enterprise-kafka</component-name>

src/test/integration/java/com/redis/kafka/connect/RedisEnterpriseSinkTaskIT.java

@@ -56,7 +56,8 @@
 class RedisEnterpriseSinkTaskIT extends AbstractTestcontainersRedisTestBase {
 
 	@Container
-	private static final RedisModulesContainer REDIS = new RedisModulesContainer();
+	private static final RedisModulesContainer REDIS = new RedisModulesContainer(
+			RedisModulesContainer.DEFAULT_IMAGE_NAME.withTag(RedisModulesContainer.DEFAULT_TAG));
 
 	@Override
 	protected Collection<RedisServer> servers() {
@@ -234,8 +235,8 @@ void putRpush(RedisTestContext redis) {
 			records.add(SinkRecordHelper.write(topic, new SchemaAndValue(Schema.STRING_SCHEMA, member),
 					new SchemaAndValue(Schema.STRING_SCHEMA, member)));
 		}
-		put(topic, RedisEnterpriseSinkConfig.DataType.LIST, redis, records, RedisEnterpriseSinkConfig.PUSH_DIRECTION_CONFIG,
-				RedisEnterpriseSinkConfig.PushDirection.RIGHT.name());
+		put(topic, RedisEnterpriseSinkConfig.DataType.LIST, redis, records,
+				RedisEnterpriseSinkConfig.PUSH_DIRECTION_CONFIG, RedisEnterpriseSinkConfig.PushDirection.RIGHT.name());
 		List<String> actual = redis.sync().lrange(topic, 0, -1);
 		assertEquals(expected, actual);
 	}
@@ -354,8 +355,8 @@ public void put(String topic, RedisEnterpriseSinkConfig.DataType type, RedisTest
 		SinkTaskContext taskContext = mock(SinkTaskContext.class);
 		when(taskContext.assignment()).thenReturn(ImmutableSet.of(new TopicPartition(topic, 1)));
 		task.initialize(taskContext);
-		Map<String, String> propsMap = map(RedisEnterpriseSinkConfig.REDIS_URI_CONFIG, context.getServer().getRedisURI(),
-				RedisEnterpriseSinkConfig.TYPE_CONFIG, type.name());
+		Map<String, String> propsMap = map(RedisEnterpriseSinkConfig.REDIS_URI_CONFIG,
+				context.getServer().getRedisURI(), RedisEnterpriseSinkConfig.TYPE_CONFIG, type.name());
 		propsMap.putAll(map(props));
 		task.start(propsMap);
 		task.put(records);

src/test/integration/java/com/redis/kafka/connect/RedisEnterpriseSourceTaskIT.java

@@ -32,9 +32,10 @@
 
 @Slf4j
 class RedisEnterpriseSourceTaskIT extends AbstractTestcontainersRedisTestBase {
-	
+
 	@Container
-	private static final RedisContainer REDIS = new RedisContainer().withKeyspaceNotifications();
+	private static final RedisContainer REDIS = new RedisContainer(
+			RedisContainer.DEFAULT_IMAGE_NAME.withTag(RedisContainer.DEFAULT_TAG)).withKeyspaceNotifications();
 
 	@Override
 	protected Collection<RedisServer> servers() {
@@ -53,16 +54,16 @@ private void startTask(RedisTestContext redis, String... props) {
 		config.put(RedisEnterpriseSourceConfig.REDIS_URI_CONFIG, redis.getServer().getRedisURI());
 		task.start(config);
 	}
-	
-    protected Map<String, String> map(String... args) {
-        Assert.notNull(args, "Args cannot be null");
-        Assert.isTrue(args.length % 2 == 0, "Args length is not a multiple of 2");
-        Map<String, String> body = new LinkedHashMap<>();
-        for (int index = 0; index < args.length / 2; index++) {
-            body.put(args[index * 2], args[index * 2 + 1]);
-        }
-        return body;
-    }
+
+	protected Map<String, String> map(String... args) {
+		Assert.notNull(args, "Args cannot be null");
+		Assert.isTrue(args.length % 2 == 0, "Args length is not a multiple of 2");
+		Map<String, String> body = new LinkedHashMap<>();
+		for (int index = 0; index < args.length / 2; index++) {
+			body.put(args[index * 2], args[index * 2 + 1]);
+		}
+		return body;
+	}
 
 	@AfterEach
 	public void teardown() {
@@ -74,9 +75,10 @@ public void teardown() {
 	void pollStream(RedisTestContext redis) throws InterruptedException {
 		final String stream = "stream1";
 		final String topicPrefix = "testprefix-";
-		startTask(redis, RedisEnterpriseSourceConfig.TOPIC_CONFIG, topicPrefix + RedisEnterpriseSourceConfig.TOKEN_STREAM,
-				RedisEnterpriseSourceConfig.READER_CONFIG, RedisEnterpriseSourceConfig.ReaderType.STREAM.name(),
-				RedisEnterpriseSourceConfig.STREAM_NAME_CONFIG, stream);
+		startTask(redis, RedisEnterpriseSourceConfig.TOPIC_CONFIG,
+				topicPrefix + RedisEnterpriseSourceConfig.TOKEN_STREAM, RedisEnterpriseSourceConfig.READER_CONFIG,
+				RedisEnterpriseSourceConfig.ReaderType.STREAM.name(), RedisEnterpriseSourceConfig.STREAM_NAME_CONFIG,
+				stream);
 		String field1 = "field1";
 		String value1 = "value1";
 		String field2 = "field2";
@@ -107,8 +109,8 @@ private void assertEquals(String expectedId, Map<String, String> expectedBody, S
 	void pollKeys(RedisTestContext redis) throws InterruptedException {
 		String topic = "mytopic";
 		startTask(redis, RedisEnterpriseSourceConfig.READER_CONFIG, RedisEnterpriseSourceConfig.ReaderType.KEYS.name(),
-				RedisEnterpriseSourceConfig.STREAM_NAME_CONFIG, "dummy", RedisEnterpriseSourceConfig.TOPIC_CONFIG, topic,
-				RedisEnterpriseSourceTask.KEYS_IDLE_TIMEOUT, "3000");
+				RedisEnterpriseSourceConfig.STREAM_NAME_CONFIG, "dummy", RedisEnterpriseSourceConfig.TOPIC_CONFIG,
+				topic, RedisEnterpriseSourceTask.KEYS_IDLE_TIMEOUT, "3000");
 		LiveRedisItemReader<String, DataStructure<String>> reader = ((KeySourceRecordReader) task.getReader())
 				.getReader();
 		Awaitility.await().until(reader::isOpen);