From 4e9b5bb2c6e0df25a17e68fac8edee9ce91607b1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez?= Date: Tue, 4 Mar 2025 14:21:02 -0600 Subject: [PATCH] Remove linked-container --- docs/examples.md | 1 - examples/linked-container/build.gradle | 17 -------- .../linkedcontainer/RedmineClient.java | 31 --------------- .../LinkedContainerTestImages.java | 9 ----- .../linkedcontainer/RedmineClientTest.java | 39 ------------------- .../linkedcontainer/RedmineContainer.java | 33 ---------------- .../src/test/resources/logback-test.xml | 16 -------- examples/settings.gradle | 1 - 8 files changed, 147 deletions(-) delete mode 100644 examples/linked-container/build.gradle delete mode 100644 examples/linked-container/src/main/java/com/example/linkedcontainer/RedmineClient.java delete mode 100644 examples/linked-container/src/test/java/com/example/linkedcontainer/LinkedContainerTestImages.java delete mode 100644 examples/linked-container/src/test/java/com/example/linkedcontainer/RedmineClientTest.java delete mode 100644 examples/linked-container/src/test/java/com/example/linkedcontainer/RedmineContainer.java delete mode 100644 examples/linked-container/src/test/resources/logback-test.xml diff --git a/docs/examples.md b/docs/examples.md index 05638d00d43..c63fa739817 100644 --- a/docs/examples.md +++ b/docs/examples.md @@ -4,7 +4,6 @@ Examples of different use cases provided by Testcontainers can be found below: - [Hazelcast](https://github.com/testcontainers/testcontainers-java/tree/main/examples/hazelcast) - [Kafka Cluster with multiple brokers](https://github.com/testcontainers/testcontainers-java/tree/main/examples/kafka-cluster) -- [Linked containers](https://github.com/testcontainers/testcontainers-java/tree/main/examples/linked-container) - [Neo4j](https://github.com/testcontainers/testcontainers-java/tree/main/examples/neo4j-container) - [Redis](https://github.com/testcontainers/testcontainers-java/tree/main/examples/redis-backed-cache) - [Selenium](https://github.com/testcontainers/testcontainers-java/tree/main/examples/selenium-container) diff --git a/examples/linked-container/build.gradle b/examples/linked-container/build.gradle deleted file mode 100644 index 028e457fc5d..00000000000 --- a/examples/linked-container/build.gradle +++ /dev/null @@ -1,17 +0,0 @@ -plugins { - id 'java' -} - -repositories { - mavenCentral() -} -dependencies { - compileOnly 'org.slf4j:slf4j-api:1.7.36' - implementation 'com.squareup.okhttp3:okhttp:4.12.0' - implementation 'org.json:json:20240303' - testRuntimeOnly 'org.postgresql:postgresql:42.7.4' - testImplementation 'ch.qos.logback:logback-classic:1.3.14' - testImplementation 'org.testcontainers:postgresql' - testImplementation 'org.assertj:assertj-core:3.26.3' -} - diff --git a/examples/linked-container/src/main/java/com/example/linkedcontainer/RedmineClient.java b/examples/linked-container/src/main/java/com/example/linkedcontainer/RedmineClient.java deleted file mode 100644 index c95ec133e2f..00000000000 --- a/examples/linked-container/src/main/java/com/example/linkedcontainer/RedmineClient.java +++ /dev/null @@ -1,31 +0,0 @@ -package com.example.linkedcontainer; - -import okhttp3.OkHttpClient; -import okhttp3.Request; -import okhttp3.Response; -import org.json.JSONObject; - -import java.io.IOException; - -/** - * A crude, partially implemented Redmine client. - */ -public class RedmineClient { - - private String url; - - private OkHttpClient client; - - public RedmineClient(String url) { - this.url = url; - client = new OkHttpClient(); - } - - public int getIssueCount() throws IOException { - Request request = new Request.Builder().url(url + "/issues.json").build(); - - Response response = client.newCall(request).execute(); - JSONObject jsonObject = new JSONObject(response.body().string()); - return jsonObject.getInt("total_count"); - } -} diff --git a/examples/linked-container/src/test/java/com/example/linkedcontainer/LinkedContainerTestImages.java b/examples/linked-container/src/test/java/com/example/linkedcontainer/LinkedContainerTestImages.java deleted file mode 100644 index af8a823c1de..00000000000 --- a/examples/linked-container/src/test/java/com/example/linkedcontainer/LinkedContainerTestImages.java +++ /dev/null @@ -1,9 +0,0 @@ -package com.example.linkedcontainer; - -import org.testcontainers.utility.DockerImageName; - -public interface LinkedContainerTestImages { - DockerImageName POSTGRES_TEST_IMAGE = DockerImageName.parse("postgres:9.6.12"); - - DockerImageName REDMINE_TEST_IMAGE = DockerImageName.parse("redmine:3.3.2"); -} diff --git a/examples/linked-container/src/test/java/com/example/linkedcontainer/RedmineClientTest.java b/examples/linked-container/src/test/java/com/example/linkedcontainer/RedmineClientTest.java deleted file mode 100644 index 721c00835c9..00000000000 --- a/examples/linked-container/src/test/java/com/example/linkedcontainer/RedmineClientTest.java +++ /dev/null @@ -1,39 +0,0 @@ -package com.example.linkedcontainer; - -import org.junit.Rule; -import org.junit.Test; -import org.junit.rules.RuleChain; -import org.testcontainers.containers.PostgreSQLContainer; - -import static org.assertj.core.api.Assertions.assertThat; - -/** - * Tests for RedmineClient. - */ -public class RedmineClientTest { - - private static final String POSTGRES_USERNAME = "redmine"; - - private static final String POSTGRES_PASSWORD = "secret"; - - private PostgreSQLContainer postgreSQLContainer = new PostgreSQLContainer<>( - LinkedContainerTestImages.POSTGRES_TEST_IMAGE - ) - .withUsername(POSTGRES_USERNAME) - .withPassword(POSTGRES_PASSWORD); - - private RedmineContainer redmineContainer = new RedmineContainer(LinkedContainerTestImages.REDMINE_TEST_IMAGE) - .withLinkToContainer(postgreSQLContainer, "postgres") - .withEnv("POSTGRES_ENV_POSTGRES_USER", POSTGRES_USERNAME) - .withEnv("POSTGRES_ENV_POSTGRES_PASSWORD", POSTGRES_PASSWORD); - - @Rule - public RuleChain chain = RuleChain.outerRule(postgreSQLContainer).around(redmineContainer); - - @Test - public void canGetIssueCount() throws Exception { - RedmineClient redmineClient = new RedmineClient(redmineContainer.getRedmineUrl()); - - assertThat(redmineClient.getIssueCount()).as("The issue count can be retrieved.").isZero(); - } -} diff --git a/examples/linked-container/src/test/java/com/example/linkedcontainer/RedmineContainer.java b/examples/linked-container/src/test/java/com/example/linkedcontainer/RedmineContainer.java deleted file mode 100644 index 0f0bea36c1a..00000000000 --- a/examples/linked-container/src/test/java/com/example/linkedcontainer/RedmineContainer.java +++ /dev/null @@ -1,33 +0,0 @@ -package com.example.linkedcontainer; - -import org.testcontainers.containers.GenericContainer; -import org.testcontainers.containers.traits.LinkableContainer; -import org.testcontainers.containers.wait.strategy.Wait; -import org.testcontainers.utility.DockerImageName; - -/** - * A Redmine container. - */ -public class RedmineContainer extends GenericContainer { - - private static final int REDMINE_PORT = 3000; - - public RedmineContainer(DockerImageName dockerImageName) { - super(dockerImageName); - } - - @Override - protected void configure() { - addExposedPort(REDMINE_PORT); - waitingFor(Wait.forHttp("/")); - } - - public RedmineContainer withLinkToContainer(LinkableContainer otherContainer, String alias) { - addLink(otherContainer, alias); - return this; - } - - public String getRedmineUrl() { - return String.format("http://%s:%d", this.getHost(), this.getMappedPort(REDMINE_PORT)); - } -} diff --git a/examples/linked-container/src/test/resources/logback-test.xml b/examples/linked-container/src/test/resources/logback-test.xml deleted file mode 100644 index 83ef7a1a3ef..00000000000 --- a/examples/linked-container/src/test/resources/logback-test.xml +++ /dev/null @@ -1,16 +0,0 @@ - - - - - - %d{HH:mm:ss.SSS} %-5level %logger - %msg%n - - - - - - - - - diff --git a/examples/settings.gradle b/examples/settings.gradle index 8aed2430fb5..8d144867bbd 100644 --- a/examples/settings.gradle +++ b/examples/settings.gradle @@ -20,7 +20,6 @@ includeBuild '..' // explicit include to allow Dependabot to autodiscover subprojects include 'kafka-cluster' -include 'linked-container' include 'neo4j-container' include 'redis-backed-cache' include 'redis-backed-cache-testng'