From 3f34f25d10fd0f3ae27d657e715ec50c4e882a9e Mon Sep 17 00:00:00 2001 From: Madhura Bhave Date: Thu, 12 Apr 2018 10:10:04 -0700 Subject: [PATCH 1/2] Use the right image --- ci/pipeline.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/ci/pipeline.yml b/ci/pipeline.yml index a2b306975b3..574c0eae13a 100644 --- a/ci/pipeline.yml +++ b/ci/pipeline.yml @@ -213,7 +213,7 @@ jobs: - put: repo-status-jdk9-build params: { state: "failure", commit: "git-repo" } - task: determine-email-body - image: spring-boot-ci-image + image: spring-boot-jdk9-ci-image file: git-repo/ci/tasks/determine-email-body.yml params: STATE: failure @@ -226,7 +226,7 @@ jobs: body: email-details/body - do: - task: determine-email-body - image: spring-boot-ci-image + image: spring-boot-jdk9-ci-image file: git-repo/ci/tasks/determine-email-body.yml params: STATE: success @@ -272,7 +272,7 @@ jobs: - put: repo-status-jdk10-build params: { state: "failure", commit: "git-repo" } - task: determine-email-body - image: spring-boot-ci-image + image: spring-boot-jdk10-ci-image file: git-repo/ci/tasks/determine-email-body.yml params: STATE: failure @@ -285,7 +285,7 @@ jobs: body: email-details/body - do: - task: determine-email-body - image: spring-boot-ci-image + image: spring-boot-jdk10-ci-image file: git-repo/ci/tasks/determine-email-body.yml params: STATE: success From 9c7612e681136fb222f351c0e3981dd0708f8317 Mon Sep 17 00:00:00 2001 From: Madhura Bhave Date: Thu, 12 Apr 2018 10:30:36 -0700 Subject: [PATCH 2/2] 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 ecee5179268..a0dcedc2247 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 6bbb2c98657..7d6591425ed 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");