From 0dfc97289fdf185c055b5b476b70e191a85ed16c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez?= Date: Sat, 14 May 2022 19:12:39 -0500 Subject: [PATCH] Polish related to testcontainers * Use getHost instead of getContainerIpAddress * Rely on OracleContainer and it's improvements which involve the log wait strategy --- .../AbstractMongoRepositoryITest.java | 6 +++--- ...bDeleteJacksonSessionVerificationTest.java | 6 +++--- .../MongoDbLogoutVerificationTest.java | 6 +++--- .../data/redis/AbstractRedisITests.java | 6 +++--- ...elcast4IndexedSessionRepositoryITests.java | 3 +-- ...zelcastIndexedSessionRepositoryITests.java | 5 ++--- .../session/jdbc/DatabaseContainers.java | 21 ++----------------- .../java/sample/FindByUsernameTests.java | 5 ++--- .../java/sample/HttpRedisJsonTest.java | 5 ++--- .../java/sample/RedisSerializerTest.java | 5 ++--- .../java/sample/BootTests.java | 5 ++--- .../java/sample/BootTests.java | 5 ++--- .../java/sample/AttributeTests.java | 5 ++--- .../java/sample/AttributeTests.java | 5 ++--- .../java/sample/ApplicationTests.java | 5 ++--- .../main/java/sample/EmbeddedRedisConfig.java | 5 ++--- .../main/java/sample/EmbeddedRedisConfig.java | 5 ++--- .../java/rest/RestMockMvcTests.java | 5 ++--- .../main/java/sample/EmbeddedRedisConfig.java | 5 ++--- .../main/java/sample/EmbeddedRedisConfig.java | 5 ++--- .../main/java/sample/EmbeddedRedisConfig.java | 5 ++--- 21 files changed, 45 insertions(+), 78 deletions(-) diff --git a/spring-session-data-mongodb/src/integration-test/java/org/springframework/session/data/mongo/integration/AbstractMongoRepositoryITest.java b/spring-session-data-mongodb/src/integration-test/java/org/springframework/session/data/mongo/integration/AbstractMongoRepositoryITest.java index a451e32e..919b1ac4 100644 --- a/spring-session-data-mongodb/src/integration-test/java/org/springframework/session/data/mongo/integration/AbstractMongoRepositoryITest.java +++ b/spring-session-data-mongodb/src/integration-test/java/org/springframework/session/data/mongo/integration/AbstractMongoRepositoryITest.java @@ -1,5 +1,5 @@ /* - * Copyright 2014-2016 the original author or authors. + * Copyright 2014-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. @@ -399,8 +399,8 @@ public abstract class AbstractMongoRepositoryITest extends AbstractITest { @Bean public MongoOperations mongoOperations(MongoDBContainer mongoContainer) { - MongoClient mongo = MongoClients.create( - "mongodb://" + mongoContainer.getContainerIpAddress() + ":" + mongoContainer.getFirstMappedPort()); + MongoClient mongo = MongoClients + .create("mongodb://" + mongoContainer.getHost() + ":" + mongoContainer.getFirstMappedPort()); return new MongoTemplate(mongo, "test"); } diff --git a/spring-session-data-mongodb/src/integration-test/java/org/springframework/session/data/mongo/integration/MongoDbDeleteJacksonSessionVerificationTest.java b/spring-session-data-mongodb/src/integration-test/java/org/springframework/session/data/mongo/integration/MongoDbDeleteJacksonSessionVerificationTest.java index 87326471..b1fbf86f 100644 --- a/spring-session-data-mongodb/src/integration-test/java/org/springframework/session/data/mongo/integration/MongoDbDeleteJacksonSessionVerificationTest.java +++ b/spring-session-data-mongodb/src/integration-test/java/org/springframework/session/data/mongo/integration/MongoDbDeleteJacksonSessionVerificationTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2019 the original author or authors. + * Copyright 2014-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. @@ -185,8 +185,8 @@ public class MongoDbDeleteJacksonSessionVerificationTest { @Bean ReactiveMongoOperations mongoOperations(MongoDBContainer mongoContainer) { - MongoClient mongo = MongoClients.create( - "mongodb://" + mongoContainer.getContainerIpAddress() + ":" + mongoContainer.getFirstMappedPort()); + MongoClient mongo = MongoClients + .create("mongodb://" + mongoContainer.getHost() + ":" + mongoContainer.getFirstMappedPort()); return new ReactiveMongoTemplate(mongo, "DB_Name_DeleteJacksonSessionVerificationTest"); } diff --git a/spring-session-data-mongodb/src/integration-test/java/org/springframework/session/data/mongo/integration/MongoDbLogoutVerificationTest.java b/spring-session-data-mongodb/src/integration-test/java/org/springframework/session/data/mongo/integration/MongoDbLogoutVerificationTest.java index 188f7b84..bf91a879 100644 --- a/spring-session-data-mongodb/src/integration-test/java/org/springframework/session/data/mongo/integration/MongoDbLogoutVerificationTest.java +++ b/spring-session-data-mongodb/src/integration-test/java/org/springframework/session/data/mongo/integration/MongoDbLogoutVerificationTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2019 the original author or authors. + * Copyright 2014-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. @@ -180,8 +180,8 @@ public class MongoDbLogoutVerificationTest { @Bean ReactiveMongoOperations mongoOperations(MongoDBContainer mongoContainer) { - MongoClient mongo = MongoClients.create( - "mongodb://" + mongoContainer.getContainerIpAddress() + ":" + mongoContainer.getFirstMappedPort()); + MongoClient mongo = MongoClients + .create("mongodb://" + mongoContainer.getHost() + ":" + mongoContainer.getFirstMappedPort()); return new ReactiveMongoTemplate(mongo, "test"); } diff --git a/spring-session-data-redis/src/integration-test/java/org/springframework/session/data/redis/AbstractRedisITests.java b/spring-session-data-redis/src/integration-test/java/org/springframework/session/data/redis/AbstractRedisITests.java index b1e32db9..ca1a2e64 100644 --- a/spring-session-data-redis/src/integration-test/java/org/springframework/session/data/redis/AbstractRedisITests.java +++ b/spring-session-data-redis/src/integration-test/java/org/springframework/session/data/redis/AbstractRedisITests.java @@ -1,5 +1,5 @@ /* - * Copyright 2014-2019 the original author or authors. + * Copyright 2014-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. @@ -42,8 +42,8 @@ public abstract class AbstractRedisITests { @Bean public LettuceConnectionFactory redisConnectionFactory() { - RedisStandaloneConfiguration configuration = new RedisStandaloneConfiguration( - redisContainer().getContainerIpAddress(), redisContainer().getFirstMappedPort()); + RedisStandaloneConfiguration configuration = new RedisStandaloneConfiguration(redisContainer().getHost(), + redisContainer().getFirstMappedPort()); return new LettuceConnectionFactory(configuration); } diff --git a/spring-session-hazelcast/hazelcast4/src/integration-test/java/org/springframework/session/hazelcast/ClientServerHazelcast4IndexedSessionRepositoryITests.java b/spring-session-hazelcast/hazelcast4/src/integration-test/java/org/springframework/session/hazelcast/ClientServerHazelcast4IndexedSessionRepositoryITests.java index e7eb2b90..5722d77b 100644 --- a/spring-session-hazelcast/hazelcast4/src/integration-test/java/org/springframework/session/hazelcast/ClientServerHazelcast4IndexedSessionRepositoryITests.java +++ b/spring-session-hazelcast/hazelcast4/src/integration-test/java/org/springframework/session/hazelcast/ClientServerHazelcast4IndexedSessionRepositoryITests.java @@ -66,8 +66,7 @@ class ClientServerHazelcast4IndexedSessionRepositoryITests extends AbstractHazel @Bean HazelcastInstance hazelcastInstance() { ClientConfig clientConfig = new ClientConfig(); - clientConfig.getNetworkConfig() - .addAddress(container.getContainerIpAddress() + ":" + container.getFirstMappedPort()); + clientConfig.getNetworkConfig().addAddress(container.getHost() + ":" + container.getFirstMappedPort()); clientConfig.getUserCodeDeploymentConfig().setEnabled(true).addClass(Session.class) .addClass(MapSession.class).addClass(Hazelcast4SessionUpdateEntryProcessor.class); return HazelcastClient.newHazelcastClient(clientConfig); diff --git a/spring-session-hazelcast/src/integration-test/java/org/springframework/session/hazelcast/ClientServerHazelcastIndexedSessionRepositoryITests.java b/spring-session-hazelcast/src/integration-test/java/org/springframework/session/hazelcast/ClientServerHazelcastIndexedSessionRepositoryITests.java index 94fc3626..d9fd94f6 100644 --- a/spring-session-hazelcast/src/integration-test/java/org/springframework/session/hazelcast/ClientServerHazelcastIndexedSessionRepositoryITests.java +++ b/spring-session-hazelcast/src/integration-test/java/org/springframework/session/hazelcast/ClientServerHazelcastIndexedSessionRepositoryITests.java @@ -1,5 +1,5 @@ /* - * Copyright 2014-2019 the original author or authors. + * Copyright 2014-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. @@ -67,8 +67,7 @@ class ClientServerHazelcastIndexedSessionRepositoryITests extends AbstractHazelc @Bean HazelcastInstance hazelcastInstance() { ClientConfig clientConfig = new ClientConfig(); - clientConfig.getNetworkConfig() - .addAddress(container.getContainerIpAddress() + ":" + container.getFirstMappedPort()); + clientConfig.getNetworkConfig().addAddress(container.getHost() + ":" + container.getFirstMappedPort()); clientConfig.getUserCodeDeploymentConfig().setEnabled(true).addClass(Session.class) .addClass(MapSession.class).addClass(SessionUpdateEntryProcessor.class); return HazelcastClient.newHazelcastClient(clientConfig); diff --git a/spring-session-jdbc/src/integration-test/java/org/springframework/session/jdbc/DatabaseContainers.java b/spring-session-jdbc/src/integration-test/java/org/springframework/session/jdbc/DatabaseContainers.java index f42a939d..3a3c2ac9 100644 --- a/spring-session-jdbc/src/integration-test/java/org/springframework/session/jdbc/DatabaseContainers.java +++ b/spring-session-jdbc/src/integration-test/java/org/springframework/session/jdbc/DatabaseContainers.java @@ -1,5 +1,5 @@ /* - * Copyright 2014-2021 the original author or authors. + * Copyright 2014-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. @@ -16,8 +16,6 @@ package org.springframework.session.jdbc; -import java.time.Duration; - import org.testcontainers.containers.Db2Container; import org.testcontainers.containers.JdbcDatabaseContainer; import org.testcontainers.containers.MSSQLServerContainer; @@ -25,7 +23,6 @@ import org.testcontainers.containers.MariaDBContainer; import org.testcontainers.containers.MySQLContainer; import org.testcontainers.containers.OracleContainer; import org.testcontainers.containers.PostgreSQLContainer; -import org.testcontainers.containers.wait.strategy.LogMessageWaitStrategy; /** * Factories for various {@link JdbcDatabaseContainer}s. @@ -50,21 +47,7 @@ final class DatabaseContainers { } static OracleContainer oracle() { - return new OracleContainer() { - - @Override - protected void configure() { - this.waitStrategy = new LogMessageWaitStrategy().withRegEx(".*DATABASE IS READY TO USE!.*\\s") - .withStartupTimeout(Duration.ofMinutes(10)); - addEnv("ORACLE_PWD", getPassword()); - } - - @Override - protected void waitUntilContainerStarted() { - getWaitStrategy().waitUntilReady(this); - } - - }; + return new OracleContainer("gvenzl/oracle-xe:18.4.0-slim"); } static PostgreSQLContainer postgreSql() { diff --git a/spring-session-samples/spring-session-sample-boot-findbyusername/src/integration-test/java/sample/FindByUsernameTests.java b/spring-session-samples/spring-session-sample-boot-findbyusername/src/integration-test/java/sample/FindByUsernameTests.java index 0ebd4400..a41875dd 100644 --- a/spring-session-samples/spring-session-sample-boot-findbyusername/src/integration-test/java/sample/FindByUsernameTests.java +++ b/spring-session-samples/spring-session-sample-boot-findbyusername/src/integration-test/java/sample/FindByUsernameTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2014-2019 the original author or authors. + * Copyright 2014-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. @@ -115,8 +115,7 @@ class FindByUsernameTests { @Bean LettuceConnectionFactory redisConnectionFactory() { - return new LettuceConnectionFactory(redisContainer().getContainerIpAddress(), - redisContainer().getFirstMappedPort()); + return new LettuceConnectionFactory(redisContainer().getHost(), redisContainer().getFirstMappedPort()); } } diff --git a/spring-session-samples/spring-session-sample-boot-redis-json/src/integration-test/java/sample/HttpRedisJsonTest.java b/spring-session-samples/spring-session-sample-boot-redis-json/src/integration-test/java/sample/HttpRedisJsonTest.java index 2f7b54c4..3b8998b9 100644 --- a/spring-session-samples/spring-session-sample-boot-redis-json/src/integration-test/java/sample/HttpRedisJsonTest.java +++ b/spring-session-samples/spring-session-sample-boot-redis-json/src/integration-test/java/sample/HttpRedisJsonTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2014-2019 the original author or authors. + * Copyright 2014-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. @@ -115,8 +115,7 @@ class HttpRedisJsonTest { @Bean LettuceConnectionFactory redisConnectionFactory() { - return new LettuceConnectionFactory(redisContainer().getContainerIpAddress(), - redisContainer().getFirstMappedPort()); + return new LettuceConnectionFactory(redisContainer().getHost(), redisContainer().getFirstMappedPort()); } } diff --git a/spring-session-samples/spring-session-sample-boot-redis-json/src/integration-test/java/sample/RedisSerializerTest.java b/spring-session-samples/spring-session-sample-boot-redis-json/src/integration-test/java/sample/RedisSerializerTest.java index 9bcbfacb..445aa549 100644 --- a/spring-session-samples/spring-session-sample-boot-redis-json/src/integration-test/java/sample/RedisSerializerTest.java +++ b/spring-session-samples/spring-session-sample-boot-redis-json/src/integration-test/java/sample/RedisSerializerTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2014-2019 the original author or authors. + * Copyright 2014-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. @@ -64,8 +64,7 @@ class RedisSerializerTest { @Bean LettuceConnectionFactory redisConnectionFactory() { - return new LettuceConnectionFactory(redisContainer().getContainerIpAddress(), - redisContainer().getFirstMappedPort()); + return new LettuceConnectionFactory(redisContainer().getHost(), redisContainer().getFirstMappedPort()); } } diff --git a/spring-session-samples/spring-session-sample-boot-redis-simple/src/integration-test/java/sample/BootTests.java b/spring-session-samples/spring-session-sample-boot-redis-simple/src/integration-test/java/sample/BootTests.java index c1691981..6e1f381d 100644 --- a/spring-session-samples/spring-session-sample-boot-redis-simple/src/integration-test/java/sample/BootTests.java +++ b/spring-session-samples/spring-session-sample-boot-redis-simple/src/integration-test/java/sample/BootTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2014-2019 the original author or authors. + * Copyright 2014-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. @@ -93,8 +93,7 @@ class BootTests { @Bean LettuceConnectionFactory redisConnectionFactory() { - return new LettuceConnectionFactory(redisContainer().getContainerIpAddress(), - redisContainer().getFirstMappedPort()); + return new LettuceConnectionFactory(redisContainer().getHost(), redisContainer().getFirstMappedPort()); } } diff --git a/spring-session-samples/spring-session-sample-boot-redis/src/integration-test/java/sample/BootTests.java b/spring-session-samples/spring-session-sample-boot-redis/src/integration-test/java/sample/BootTests.java index a595b96b..311c1797 100644 --- a/spring-session-samples/spring-session-sample-boot-redis/src/integration-test/java/sample/BootTests.java +++ b/spring-session-samples/spring-session-sample-boot-redis/src/integration-test/java/sample/BootTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2014-2019 the original author or authors. + * Copyright 2014-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. @@ -97,8 +97,7 @@ class BootTests { @Bean LettuceConnectionFactory redisConnectionFactory() { - return new LettuceConnectionFactory(redisContainer().getContainerIpAddress(), - redisContainer().getFirstMappedPort()); + return new LettuceConnectionFactory(redisContainer().getHost(), redisContainer().getFirstMappedPort()); } } diff --git a/spring-session-samples/spring-session-sample-boot-webflux-custom-cookie/src/integration-test/java/sample/AttributeTests.java b/spring-session-samples/spring-session-sample-boot-webflux-custom-cookie/src/integration-test/java/sample/AttributeTests.java index 4cebe0b7..383e2caa 100644 --- a/spring-session-samples/spring-session-sample-boot-webflux-custom-cookie/src/integration-test/java/sample/AttributeTests.java +++ b/spring-session-samples/spring-session-sample-boot-webflux-custom-cookie/src/integration-test/java/sample/AttributeTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2014-2020 the original author or authors. + * Copyright 2014-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. @@ -103,8 +103,7 @@ class AttributeTests { @Bean LettuceConnectionFactory redisConnectionFactory() { - return new LettuceConnectionFactory(redisContainer().getContainerIpAddress(), - redisContainer().getFirstMappedPort()); + return new LettuceConnectionFactory(redisContainer().getHost(), redisContainer().getFirstMappedPort()); } } diff --git a/spring-session-samples/spring-session-sample-boot-webflux/src/integration-test/java/sample/AttributeTests.java b/spring-session-samples/spring-session-sample-boot-webflux/src/integration-test/java/sample/AttributeTests.java index b320a94c..8e8ef252 100644 --- a/spring-session-samples/spring-session-sample-boot-webflux/src/integration-test/java/sample/AttributeTests.java +++ b/spring-session-samples/spring-session-sample-boot-webflux/src/integration-test/java/sample/AttributeTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2014-2019 the original author or authors. + * Copyright 2014-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. @@ -105,8 +105,7 @@ class AttributeTests { @Bean LettuceConnectionFactory redisConnectionFactory() { - return new LettuceConnectionFactory(redisContainer().getContainerIpAddress(), - redisContainer().getFirstMappedPort()); + return new LettuceConnectionFactory(redisContainer().getHost(), redisContainer().getFirstMappedPort()); } } diff --git a/spring-session-samples/spring-session-sample-boot-websocket/src/integration-test/java/sample/ApplicationTests.java b/spring-session-samples/spring-session-sample-boot-websocket/src/integration-test/java/sample/ApplicationTests.java index 77e6b6df..9fbc147c 100644 --- a/spring-session-samples/spring-session-sample-boot-websocket/src/integration-test/java/sample/ApplicationTests.java +++ b/spring-session-samples/spring-session-sample-boot-websocket/src/integration-test/java/sample/ApplicationTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2014-2019 the original author or authors. + * Copyright 2014-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. @@ -86,8 +86,7 @@ class ApplicationTests { @Bean LettuceConnectionFactory redisConnectionFactory() { - return new LettuceConnectionFactory(redisContainer().getContainerIpAddress(), - redisContainer().getFirstMappedPort()); + return new LettuceConnectionFactory(redisContainer().getHost(), redisContainer().getFirstMappedPort()); } } diff --git a/spring-session-samples/spring-session-sample-javaconfig-custom-cookie/src/main/java/sample/EmbeddedRedisConfig.java b/spring-session-samples/spring-session-sample-javaconfig-custom-cookie/src/main/java/sample/EmbeddedRedisConfig.java index 5077d3e7..045b6adf 100644 --- a/spring-session-samples/spring-session-sample-javaconfig-custom-cookie/src/main/java/sample/EmbeddedRedisConfig.java +++ b/spring-session-samples/spring-session-sample-javaconfig-custom-cookie/src/main/java/sample/EmbeddedRedisConfig.java @@ -1,5 +1,5 @@ /* - * Copyright 2014-2019 the original author or authors. + * Copyright 2014-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. @@ -40,8 +40,7 @@ public class EmbeddedRedisConfig { @Bean @Primary public LettuceConnectionFactory redisConnectionFactory() { - return new LettuceConnectionFactory(redisContainer().getContainerIpAddress(), - redisContainer().getFirstMappedPort()); + return new LettuceConnectionFactory(redisContainer().getHost(), redisContainer().getFirstMappedPort()); } } diff --git a/spring-session-samples/spring-session-sample-javaconfig-redis/src/main/java/sample/EmbeddedRedisConfig.java b/spring-session-samples/spring-session-sample-javaconfig-redis/src/main/java/sample/EmbeddedRedisConfig.java index 5077d3e7..045b6adf 100644 --- a/spring-session-samples/spring-session-sample-javaconfig-redis/src/main/java/sample/EmbeddedRedisConfig.java +++ b/spring-session-samples/spring-session-sample-javaconfig-redis/src/main/java/sample/EmbeddedRedisConfig.java @@ -1,5 +1,5 @@ /* - * Copyright 2014-2019 the original author or authors. + * Copyright 2014-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. @@ -40,8 +40,7 @@ public class EmbeddedRedisConfig { @Bean @Primary public LettuceConnectionFactory redisConnectionFactory() { - return new LettuceConnectionFactory(redisContainer().getContainerIpAddress(), - redisContainer().getFirstMappedPort()); + return new LettuceConnectionFactory(redisContainer().getHost(), redisContainer().getFirstMappedPort()); } } diff --git a/spring-session-samples/spring-session-sample-javaconfig-rest/src/integration-test/java/rest/RestMockMvcTests.java b/spring-session-samples/spring-session-sample-javaconfig-rest/src/integration-test/java/rest/RestMockMvcTests.java index a74448a0..cbcaa820 100644 --- a/spring-session-samples/spring-session-sample-javaconfig-rest/src/integration-test/java/rest/RestMockMvcTests.java +++ b/spring-session-samples/spring-session-sample-javaconfig-rest/src/integration-test/java/rest/RestMockMvcTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2014-2019 the original author or authors. + * Copyright 2014-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. @@ -99,8 +99,7 @@ class RestMockMvcTests { @Bean LettuceConnectionFactory redisConnectionFactory() { - return new LettuceConnectionFactory(redisContainer().getContainerIpAddress(), - redisContainer().getFirstMappedPort()); + return new LettuceConnectionFactory(redisContainer().getHost(), redisContainer().getFirstMappedPort()); } @Bean diff --git a/spring-session-samples/spring-session-sample-javaconfig-rest/src/main/java/sample/EmbeddedRedisConfig.java b/spring-session-samples/spring-session-sample-javaconfig-rest/src/main/java/sample/EmbeddedRedisConfig.java index 5077d3e7..045b6adf 100644 --- a/spring-session-samples/spring-session-sample-javaconfig-rest/src/main/java/sample/EmbeddedRedisConfig.java +++ b/spring-session-samples/spring-session-sample-javaconfig-rest/src/main/java/sample/EmbeddedRedisConfig.java @@ -1,5 +1,5 @@ /* - * Copyright 2014-2019 the original author or authors. + * Copyright 2014-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. @@ -40,8 +40,7 @@ public class EmbeddedRedisConfig { @Bean @Primary public LettuceConnectionFactory redisConnectionFactory() { - return new LettuceConnectionFactory(redisContainer().getContainerIpAddress(), - redisContainer().getFirstMappedPort()); + return new LettuceConnectionFactory(redisContainer().getHost(), redisContainer().getFirstMappedPort()); } } diff --git a/spring-session-samples/spring-session-sample-javaconfig-security/src/main/java/sample/EmbeddedRedisConfig.java b/spring-session-samples/spring-session-sample-javaconfig-security/src/main/java/sample/EmbeddedRedisConfig.java index 5077d3e7..045b6adf 100644 --- a/spring-session-samples/spring-session-sample-javaconfig-security/src/main/java/sample/EmbeddedRedisConfig.java +++ b/spring-session-samples/spring-session-sample-javaconfig-security/src/main/java/sample/EmbeddedRedisConfig.java @@ -1,5 +1,5 @@ /* - * Copyright 2014-2019 the original author or authors. + * Copyright 2014-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. @@ -40,8 +40,7 @@ public class EmbeddedRedisConfig { @Bean @Primary public LettuceConnectionFactory redisConnectionFactory() { - return new LettuceConnectionFactory(redisContainer().getContainerIpAddress(), - redisContainer().getFirstMappedPort()); + return new LettuceConnectionFactory(redisContainer().getHost(), redisContainer().getFirstMappedPort()); } } diff --git a/spring-session-samples/spring-session-sample-xml-redis/src/main/java/sample/EmbeddedRedisConfig.java b/spring-session-samples/spring-session-sample-xml-redis/src/main/java/sample/EmbeddedRedisConfig.java index 5077d3e7..045b6adf 100644 --- a/spring-session-samples/spring-session-sample-xml-redis/src/main/java/sample/EmbeddedRedisConfig.java +++ b/spring-session-samples/spring-session-sample-xml-redis/src/main/java/sample/EmbeddedRedisConfig.java @@ -1,5 +1,5 @@ /* - * Copyright 2014-2019 the original author or authors. + * Copyright 2014-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. @@ -40,8 +40,7 @@ public class EmbeddedRedisConfig { @Bean @Primary public LettuceConnectionFactory redisConnectionFactory() { - return new LettuceConnectionFactory(redisContainer().getContainerIpAddress(), - redisContainer().getFirstMappedPort()); + return new LettuceConnectionFactory(redisContainer().getHost(), redisContainer().getFirstMappedPort()); } }