Skip to content

fix: Copy super constructors to JDBC and PostgreSQL #7968

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
+31 −22
Open

fix: Copy super constructors to JDBC and PostgreSQL #7968

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 7 additions & 2 deletions modules/jdbc/src/main/java/org/testcontainers/containers/JdbcDatabaseContainer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
import org.testcontainers.containers.traits.LinkableContainer;
import org.testcontainers.delegate.DatabaseDelegate;
import org.testcontainers.ext.ScriptUtils;
import org.testcontainers.images.RemoteDockerImage;
import org.testcontainers.jdbc.JdbcDatabaseDelegate;
import org.testcontainers.utility.DockerImageName;
import org.testcontainers.utility.MountableFile;
Expand Down Expand Up @@ -50,17 +51,21 @@ public abstract class JdbcDatabaseContainer<SELF extends JdbcDatabaseContainer<S
* @deprecated use {@link #JdbcDatabaseContainer(DockerImageName)} instead
*/
public JdbcDatabaseContainer(@NonNull final String dockerImageName) {
this(DockerImageName.parse(dockerImageName));
super(dockerImageName);
}

public JdbcDatabaseContainer(@NonNull final Future<String> image) {
super(image);
}

public JdbcDatabaseContainer(final DockerImageName dockerImageName) {
public JdbcDatabaseContainer(@NonNull final DockerImageName dockerImageName) {
super(dockerImageName);
}

public JdbcDatabaseContainer(@NonNull final RemoteDockerImage image) {
super(image);
}

/**
* @return the name of the actual JDBC driver to use
*/
Expand Down
44 changes: 24 additions & 20 deletions modules/postgresql/src/main/java/org/testcontainers/containers/PostgreSQLContainer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,13 @@
package org.testcontainers.containers;

import org.jetbrains.annotations.NotNull;
import lombok.NonNull;
import org.testcontainers.containers.wait.strategy.LogMessageWaitStrategy;
import org.testcontainers.images.RemoteDockerImage;
import org.testcontainers.utility.DockerImageName;

import java.time.Duration;
import java.time.temporal.ChronoUnit;
import java.util.Set;
import java.util.concurrent.Future;

/**
* Testcontainers implementation for PostgreSQL.
Expand Down Expand Up @@ -47,39 +48,42 @@ public PostgreSQLContainer() {
this(DEFAULT_IMAGE_NAME.withTag(DEFAULT_TAG));
}

public PostgreSQLContainer(final String dockerImageName) {
public PostgreSQLContainer(@NonNull final String dockerImageName) {
this(DockerImageName.parse(dockerImageName));
}

public PostgreSQLContainer(final DockerImageName dockerImageName) {
public PostgreSQLContainer(@NonNull final Future<String> image) {
super(image);
init();
}

public PostgreSQLContainer(@NonNull final DockerImageName dockerImageName) {
super(dockerImageName);
dockerImageName.assertCompatibleWith(DEFAULT_IMAGE_NAME);
init();
}

this.waitStrategy =
public PostgreSQLContainer(@NonNull final RemoteDockerImage image) {
super(image);
init();
}

private void init() {
setWaitStrategy(
new LogMessageWaitStrategy()
.withRegEx(".*database system is ready to accept connections.*\\s")
.withRegEx(".*database system is ready to accept .*connections.*\\s")
.withTimes(2)
.withStartupTimeout(Duration.of(60, ChronoUnit.SECONDS));
this.setCommand("postgres", "-c", FSYNC_OFF_OPTION);
.withStartupTimeout(Duration.of(60, ChronoUnit.SECONDS))
);
setCommand("postgres", "-c", FSYNC_OFF_OPTION);

addExposedPort(POSTGRESQL_PORT);
}

/**
* @return the ports on which to check if the container is ready
* @deprecated use {@link #getLivenessCheckPortNumbers()} instead
*/
@NotNull
@Override
@Deprecated
protected Set<Integer> getLivenessCheckPorts() {
return super.getLivenessCheckPorts();
}

@Override
protected void configure() {
// Disable Postgres driver use of java.util.logging to reduce noise at startup time
withUrlParam("loggerLevel", "OFF");
urlParameters.put("loggerLevel", "OFF");
addEnv("POSTGRES_DB", databaseName);
addEnv("POSTGRES_USER", username);
addEnv("POSTGRES_PASSWORD", password);
Expand Down