Skip to content

Commit cfe90d5

Browse files
authored
Drop module's default constructors (#10385)
Specify a docker image will be required.
1 parent e14ea84 commit cfe90d5

File tree

43 files changed

+126
-208
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

43 files changed

+126
-208
lines changed

modules/cockroachdb/build.gradle

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,3 +7,9 @@ dependencies {
77
testRuntimeOnly 'org.postgresql:postgresql:42.7.4'
88
testImplementation 'org.assertj:assertj-core:3.26.3'
99
}
10+
11+
tasks.japicmp {
12+
classExcludes = [
13+
"org.testcontainers.containers.CockroachContainer"
14+
]
15+
}

modules/cockroachdb/src/main/java/org/testcontainers/containers/CockroachContainer.java

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -52,14 +52,6 @@ public class CockroachContainer extends JdbcDatabaseContainer<CockroachContainer
5252

5353
private boolean isVersionGreaterThanOrEqualTo221;
5454

55-
/**
56-
* @deprecated use {@link #CockroachContainer(DockerImageName)} instead
57-
*/
58-
@Deprecated
59-
public CockroachContainer() {
60-
this(DEFAULT_IMAGE_NAME.withTag(DEFAULT_TAG));
61-
}
62-
6355
public CockroachContainer(final String dockerImageName) {
6456
this(DockerImageName.parse(dockerImageName));
6557
}

modules/couchbase/build.gradle

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,3 +9,9 @@ dependencies {
99
testImplementation 'org.awaitility:awaitility:4.2.0'
1010
testImplementation 'org.assertj:assertj-core:3.26.3'
1111
}
12+
13+
tasks.japicmp {
14+
classExcludes = [
15+
"org.testcontainers.couchbase.CouchbaseContainer"
16+
]
17+
}

modules/couchbase/src/main/java/org/testcontainers/couchbase/CouchbaseContainer.java

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -92,8 +92,6 @@ public class CouchbaseContainer extends GenericContainer<CouchbaseContainer> {
9292

9393
private static final DockerImageName DEFAULT_IMAGE_NAME = DockerImageName.parse("couchbase/server");
9494

95-
private static final String DEFAULT_TAG = "6.5.1";
96-
9795
private static final ObjectMapper MAPPER = new ObjectMapper();
9896

9997
private static final OkHttpClient HTTP_CLIENT = new OkHttpClient();
@@ -125,15 +123,6 @@ public class CouchbaseContainer extends GenericContainer<CouchbaseContainer> {
125123

126124
private boolean hasTlsPorts = false;
127125

128-
/**
129-
* Creates a new couchbase container with the default image and version.
130-
* @deprecated use {@link #CouchbaseContainer(DockerImageName)} instead
131-
*/
132-
@Deprecated
133-
public CouchbaseContainer() {
134-
this(DEFAULT_IMAGE_NAME.withTag(DEFAULT_TAG));
135-
}
136-
137126
/**
138127
* Creates a new couchbase container with the specified image name.
139128
*

modules/db2/build.gradle

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,3 +7,9 @@ dependencies {
77
testRuntimeOnly 'com.ibm.db2:jcc:11.5.9.0'
88
testImplementation 'org.assertj:assertj-core:3.26.3'
99
}
10+
11+
tasks.japicmp {
12+
classExcludes = [
13+
"org.testcontainers.containers.Db2Container"
14+
]
15+
}

modules/db2/src/main/java/org/testcontainers/containers/Db2Container.java

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -42,14 +42,6 @@ public class Db2Container extends JdbcDatabaseContainer<Db2Container> {
4242

4343
private String password = "foobar1234";
4444

45-
/**
46-
* @deprecated use {@link #Db2Container(DockerImageName)} instead
47-
*/
48-
@Deprecated
49-
public Db2Container() {
50-
this(DEFAULT_IMAGE_NAME.withTag(DEFAULT_TAG));
51-
}
52-
5345
public Db2Container(String dockerImageName) {
5446
this(DockerImageName.parse(dockerImageName));
5547
}

modules/elasticsearch/build.gradle

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,3 +6,9 @@ dependencies {
66
testImplementation "org.elasticsearch.client:transport:7.17.24"
77
testImplementation 'org.assertj:assertj-core:3.26.3'
88
}
9+
10+
tasks.japicmp {
11+
classExcludes = [
12+
"org.testcontainers.elasticsearch.ElasticsearchContainer"
13+
]
14+
}

modules/elasticsearch/src/main/java/org/testcontainers/elasticsearch/ElasticsearchContainer.java

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -68,27 +68,13 @@ public class ElasticsearchContainer extends GenericContainer<ElasticsearchContai
6868
// default location of the automatically generated self-signed HTTP cert for versions >= 8
6969
private static final String DEFAULT_CERT_PATH = "/usr/share/elasticsearch/config/certs/http_ca.crt";
7070

71-
/**
72-
* Elasticsearch Default version
73-
*/
74-
@Deprecated
75-
protected static final String DEFAULT_TAG = "7.9.2";
76-
7771
@Deprecated
7872
private boolean isOss = false;
7973

8074
private final boolean isAtLeastMajorVersion8;
8175

8276
private String certPath = "";
8377

84-
/**
85-
* @deprecated use {@link #ElasticsearchContainer(DockerImageName)} instead
86-
*/
87-
@Deprecated
88-
public ElasticsearchContainer() {
89-
this(DEFAULT_IMAGE_NAME.withTag(DEFAULT_TAG));
90-
}
91-
9278
/**
9379
* Create an Elasticsearch Container by passing the full docker image name
9480
*

modules/elasticsearch/src/test/java/org/testcontainers/elasticsearch/ElasticsearchContainerTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ public void stopRestClient() throws IOException {
7777
public void elasticsearchDeprecatedCtorTest() throws IOException {
7878
// Create the elasticsearch container.
7979
try (
80-
ElasticsearchContainer container = new ElasticsearchContainer().withEnv("foo", "bar") // dummy env for compiler checking correct generics usage
80+
ElasticsearchContainer container = new ElasticsearchContainer(ELASTICSEARCH_IMAGE).withEnv("foo", "bar") // dummy env for compiler checking correct generics usage
8181
) {
8282
// Start the container. This step might take some time...
8383
container.start();

modules/influxdb/build.gradle

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,3 +9,9 @@ dependencies {
99
testImplementation 'org.influxdb:influxdb-java:2.24'
1010
testImplementation "com.influxdb:influxdb-client-java:6.12.0"
1111
}
12+
13+
tasks.japicmp {
14+
classExcludes = [
15+
"org.testcontainers.containers.InfluxDBContainer"
16+
]
17+
}

0 commit comments

Comments
 (0)