Replace custom Neo4j container with Testcontainers version

See gh-15638
This commit is contained in:
Michael Simons
2019-01-07 12:50:04 +01:00
committed by Andy Wilkinson
parent a5aceb35d7
commit 316126e8f0
5 changed files with 20 additions and 94 deletions

View File

@@ -1,84 +0,0 @@
/*
* Copyright 2012-2018 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.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.springframework.boot.testsupport.testcontainers;
import java.util.concurrent.Callable;
import java.util.concurrent.TimeUnit;
import org.neo4j.ogm.config.Configuration;
import org.neo4j.ogm.session.SessionFactory;
import org.rnorth.ducttape.TimeoutException;
import org.rnorth.ducttape.unreliables.Unreliables;
import org.testcontainers.containers.GenericContainer;
import org.testcontainers.containers.wait.strategy.HostPortWaitStrategy;
/**
* A {@link GenericContainer} for Neo4J.
*
* @author Andy Wilkinson
* @author Madhura Bhave
*/
public class Neo4jContainer extends Container {
private static final int PORT = 7687;
public Neo4jContainer() {
super("neo4j:3.3.1", PORT, (container) -> container
.waitingFor(new WaitStrategy(container)).withEnv("NEO4J_AUTH", "none"));
}
private static final class WaitStrategy extends HostPortWaitStrategy {
private final GenericContainer<?> container;
private WaitStrategy(GenericContainer<?> container) {
this.container = container;
}
@Override
public void waitUntilReady() {
super.waitUntilReady();
Configuration configuration = new Configuration.Builder()
.uri("bolt://localhost:"
+ this.container.getMappedPort(Neo4jContainer.PORT))
.build();
SessionFactory sessionFactory = new SessionFactory(configuration,
"org.springframework.boot.test.autoconfigure.data.neo4j");
try {
Unreliables.retryUntilTrue((int) this.startupTimeout.getSeconds(),
TimeUnit.SECONDS, checkConnection(sessionFactory));
}
catch (TimeoutException ex) {
throw new IllegalStateException(ex);
}
}
private Callable<Boolean> checkConnection(SessionFactory sessionFactory) {
return () -> {
try {
sessionFactory.openSession().beginTransaction().close();
return true;
}
catch (Exception ex) {
return false;
}
};
}
}
}