Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,8 @@

import com.datastax.driver.core.AuthProvider;
import com.datastax.driver.core.Host;
import com.datastax.driver.core.JdkSSLOptions;
import com.datastax.driver.core.NettyOptions;
import com.datastax.driver.core.RemoteEndpointAwareJdkSSLOptions;
import com.datastax.driver.core.SSLOptions;
import com.datastax.driver.core.policies.AddressTranslator;
import com.datastax.driver.core.policies.ConstantReconnectionPolicy;
Expand Down Expand Up @@ -95,7 +95,7 @@ public TestSSLOptionsFactory() {}

@Override
public SSLOptions createSSLOptions() {
return JdkSSLOptions.builder().build();
return RemoteEndpointAwareJdkSSLOptions.builder().build();
}
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -73,15 +73,15 @@ protected D getReadDataSource() {
return readDataSource;
}

protected void setReadDataSource(D readDataSource) {
protected final void setReadDataSource(D readDataSource) {
this.readDataSource = readDataSource;
}

protected D getWriteDataSource() {
return writeDataSource;
}

protected void setWriteDataSource(D writeDataSource) {
protected final void setWriteDataSource(D writeDataSource) {
this.writeDataSource = writeDataSource;
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -74,13 +74,13 @@ public class JdbcCpoAdapter extends CpoBaseAdapter<DataSource> {
private static final Logger logger = LoggerFactory.getLogger(JdbcCpoAdapter.class);

/** The JNDI context used to resolve a {@code jndiName}-configured data source, if any. */
private Context context_ = null;
private transient Context context_ = null;

/** The capabilities of the database behind this adapter, probed once at construction. */
private final JdbcDatabaseCapabilities capabilities;

/** How this adapter obtains and releases its connections; see JdbcConnectionStrategy. */
private JdbcConnectionStrategy connectionStrategy;
private transient JdbcConnectionStrategy connectionStrategy;

/** CpoMetaDescriptor allows you to get the metadata for a class. */
private JdbcCpoMetaDescriptor metaDescriptor = null;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -44,8 +44,8 @@ class JdbcPooledConnectionStrategy implements JdbcConnectionStrategy {

private static final Logger logger = LoggerFactory.getLogger(JdbcPooledConnectionStrategy.class);

private final DataSource readDataSource;
private final DataSource writeDataSource;
private final transient DataSource readDataSource;
private final transient DataSource writeDataSource;
private boolean invalidReadDataSource = false;

/**
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ public class JdbcCpoXaAdapter extends CpoBaseXaResource<JdbcCpoAdapter> implemen
private static final Logger logger = LoggerFactory.getLogger(JdbcCpoXaAdapter.class);

/** The factory used to create/retrieve the underlying {@link JdbcCpoAdapter}. */
private JdbcCpoAdapterFactory jdbcCpoAdapterFactory;
private transient JdbcCpoAdapterFactory jdbcCpoAdapterFactory;

/**
* Construct a JdbcCpoXaAdapter
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -49,10 +49,10 @@ public class JdbcMethodMapEntry<J, D> extends MethodMapEntry<J, D>
public static final int METHOD_TYPE_OBJECT = 3;

/** The {@code CallableStatement} getter method used to read an OUT parameter's value. */
private Method csGetter = null;
private transient Method csGetter = null;

/** The {@code CallableStatement} setter method used to register an IN parameter's type. */
private Method csSetter = null;
private transient Method csSetter = null;

/**
* Constructs a JdbcMethodMapEntry
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,11 @@
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.synchronoss.cpo.core.CpoAdapterFactoryManager;
import org.testcontainers.containers.*;
import org.testcontainers.containers.JdbcDatabaseContainer;
import org.testcontainers.containers.OracleContainer;
import org.testcontainers.mariadb.MariaDBContainer;
import org.testcontainers.mysql.MySQLContainer;
import org.testcontainers.postgresql.PostgreSQLContainer;
import org.testcontainers.utility.DockerImageName;
import org.testng.ISuite;
import org.testng.ISuiteListener;
Expand Down Expand Up @@ -123,19 +127,19 @@ private JdbcDatabaseContainer<?> createJdbcContainer(
logger.debug("Creating a container for:" + dbType);
switch (dbType) {
case MYSQL:
return new MySQLContainer<>(DockerImageName.parse(image))
return new MySQLContainer(DockerImageName.parse(image))
.withInitScript(initScript)
.withUsername(dbUser)
.withPassword(dbPswd)
.withDatabaseName(dbName);
case MARIADB:
return new MariaDBContainer<>(DockerImageName.parse(image))
return new MariaDBContainer(DockerImageName.parse(image))
.withInitScript(initScript)
.withUsername(dbUser)
.withPassword(dbPswd)
.withDatabaseName(dbName);
case POSTGRES:
return new PostgreSQLContainer<>(DockerImageName.parse(image))
return new PostgreSQLContainer(DockerImageName.parse(image))
.withInitScript(initScript)
.withUsername(dbUser)
.withPassword(dbPswd)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -158,7 +158,7 @@ public void execute() throws MojoExecutionException {
String fileName = cpoConfig.substring(filenameStart + 1);
getLog().info("Filename: " + fileName);

FileFilter fileFilter = new WildcardFileFilter(fileName);
FileFilter fileFilter = WildcardFileFilter.builder().setWildcards(fileName).get();
File foundFiles[] = dir.listFiles(fileFilter);
if (foundFiles == null || foundFiles.length == 0) {
throw new MojoExecutionException("Could not find file: " + cpoConfig);
Expand Down
Loading