From 9c7612e681136fb222f351c0e3981dd0708f8317 Mon Sep 17 00:00:00 2001 From: Madhura Bhave Date: Thu, 12 Apr 2018 10:30:36 -0700 Subject: [PATCH] Fix NPE in WaitStrategy used for test containers --- .../boot/testsupport/testcontainers/CassandraContainer.java | 4 ++-- .../boot/testsupport/testcontainers/Neo4jContainer.java | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/spring-boot-project/spring-boot-tools/spring-boot-test-support/src/main/java/org/springframework/boot/testsupport/testcontainers/CassandraContainer.java b/spring-boot-project/spring-boot-tools/spring-boot-test-support/src/main/java/org/springframework/boot/testsupport/testcontainers/CassandraContainer.java index ecee517926..a0dcedc224 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-test-support/src/main/java/org/springframework/boot/testsupport/testcontainers/CassandraContainer.java +++ b/spring-boot-project/spring-boot-tools/spring-boot-test-support/src/main/java/org/springframework/boot/testsupport/testcontainers/CassandraContainer.java @@ -44,7 +44,7 @@ public class CassandraContainer extends Container { private static class WaitStrategy extends HostPortWaitStrategy { @Override - protected void waitUntilReady() { + public void waitUntilReady(GenericContainer container) { super.waitUntilReady(); try { @@ -59,7 +59,7 @@ public class CassandraContainer extends Container { private Callable checkConnection() { return () -> { try (Cluster cluster = Cluster.builder() - .withPort(this.container.getMappedPort(PORT)) + .withPort(container.getMappedPort(PORT)) .addContactPoint("localhost").build()) { cluster.connect(); return true; diff --git a/spring-boot-project/spring-boot-tools/spring-boot-test-support/src/main/java/org/springframework/boot/testsupport/testcontainers/Neo4jContainer.java b/spring-boot-project/spring-boot-tools/spring-boot-test-support/src/main/java/org/springframework/boot/testsupport/testcontainers/Neo4jContainer.java index 6bbb2c9865..7d6591425e 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-test-support/src/main/java/org/springframework/boot/testsupport/testcontainers/Neo4jContainer.java +++ b/spring-boot-project/spring-boot-tools/spring-boot-test-support/src/main/java/org/springframework/boot/testsupport/testcontainers/Neo4jContainer.java @@ -42,10 +42,10 @@ public class Neo4jContainer extends Container { private static class WaitStrategy extends HostPortWaitStrategy { @Override - protected void waitUntilReady() { + public void waitUntilReady(GenericContainer container) { super.waitUntilReady(); Configuration configuration = new Configuration.Builder() - .uri("bolt://localhost:" + this.container.getMappedPort(7687)) + .uri("bolt://localhost:" + container.getMappedPort(7687)) .build(); SessionFactory sessionFactory = new SessionFactory(configuration, "org.springframework.boot.test.autoconfigure.data.neo4j");