Skip to content

Commit bff6824

Browse files
committed
Drop module's default constructors
Specify a docker image will be required.
1 parent 4366c0c commit bff6824

File tree

23 files changed

+6
-208
lines changed

23 files changed

+6
-208
lines changed

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/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/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/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/src/main/java/org/testcontainers/containers/InfluxDBContainer.java

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -24,11 +24,6 @@ public class InfluxDBContainer<SELF extends InfluxDBContainer<SELF>> extends Gen
2424

2525
private static final DockerImageName DEFAULT_IMAGE_NAME = DockerImageName.parse("influxdb");
2626

27-
private static final String DEFAULT_TAG = "1.4.3";
28-
29-
@Deprecated
30-
public static final String VERSION = DEFAULT_TAG;
31-
3227
private static final int NO_CONTENT_STATUS_CODE = 204;
3328

3429
@Getter
@@ -66,14 +61,6 @@ public class InfluxDBContainer<SELF extends InfluxDBContainer<SELF>> extends Gen
6661

6762
private final boolean isAtLeastMajorVersion2;
6863

69-
/**
70-
* @deprecated use {@link #InfluxDBContainer(DockerImageName)} instead
71-
*/
72-
@Deprecated
73-
public InfluxDBContainer() {
74-
this(DEFAULT_IMAGE_NAME.withTag(DEFAULT_TAG));
75-
}
76-
7764
/**
7865
* @deprecated use {@link #InfluxDBContainer(DockerImageName)} instead
7966
*/

modules/junit-jupiter/src/test/java/org/testcontainers/junit/jupiter/MixedLifecycleTests.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,11 @@ class MixedLifecycleTests {
1212

1313
// will be shared between test methods
1414
@Container
15-
private static final MySQLContainer MY_SQL_CONTAINER = new MySQLContainer();
15+
private static final MySQLContainer MY_SQL_CONTAINER = new MySQLContainer("mysql:8.0.36");
1616

1717
// will be started before and stopped after each test method
1818
@Container
19-
private PostgreSQLContainer postgresqlContainer = new PostgreSQLContainer()
19+
private PostgreSQLContainer postgresqlContainer = new PostgreSQLContainer("postgres:9.6.12")
2020
.withDatabaseName("foo")
2121
.withUsername("foo")
2222
.withPassword("secret");

modules/localstack/src/main/java/org/testcontainers/containers/localstack/LocalStackContainer.java

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -83,14 +83,6 @@ public class LocalStackContainer extends GenericContainer<LocalStackContainer> {
8383

8484
private final boolean isVersion2;
8585

86-
/**
87-
* @deprecated use {@link #LocalStackContainer(DockerImageName)} instead
88-
*/
89-
@Deprecated
90-
public LocalStackContainer() {
91-
this(DEFAULT_IMAGE_NAME.withTag(DEFAULT_TAG));
92-
}
93-
9486
/**
9587
* @deprecated use {@link #LocalStackContainer(DockerImageName)} instead
9688
*/

modules/mariadb/src/main/java/org/testcontainers/containers/MariaDBContainer.java

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -41,14 +41,6 @@ public class MariaDBContainer<SELF extends MariaDBContainer<SELF>> extends JdbcD
4141

4242
private static final String MY_CNF_CONFIG_OVERRIDE_PARAM_NAME = "TC_MY_CNF";
4343

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

modules/mockserver/src/main/java/org/testcontainers/containers/MockServerContainer.java

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -16,14 +16,6 @@ public class MockServerContainer extends GenericContainer<MockServerContainer> {
1616

1717
public static final int PORT = 1080;
1818

19-
/**
20-
* @deprecated use {@link #MockServerContainer(DockerImageName)} instead
21-
*/
22-
@Deprecated
23-
public MockServerContainer() {
24-
this(DEFAULT_IMAGE_NAME.withTag(DEFAULT_TAG));
25-
}
26-
2719
/**
2820
* @deprecated use {@link #MockServerContainer(DockerImageName)} instead
2921
*/

0 commit comments

Comments
 (0)