From 4493da63ea6bc88d38bda54e59820ba885fe5c4b Mon Sep 17 00:00:00 2001 From: berryware <231598+berryware@users.noreply.github.com> Date: Wed, 22 Jul 2026 15:28:17 -0400 Subject: [PATCH] clean up build warnings ____________________________________________________________________ Signed-off-by: berryware <231598+berryware@users.noreply.github.com> --- .../cpo/cassandra/config/ConfigFactoryTest.java | 4 ++-- .../org/synchronoss/cpo/core/CpoBaseAdapter.java | 4 ++-- .../org/synchronoss/cpo/jdbc/JdbcCpoAdapter.java | 4 ++-- .../cpo/jdbc/JdbcPooledConnectionStrategy.java | 4 ++-- .../synchronoss/cpo/jdbc/jta/JdbcCpoXaAdapter.java | 2 +- .../cpo/jdbc/meta/JdbcMethodMapEntry.java | 4 ++-- .../org/synchronoss/cpo/jdbc/JdbcSuiteListener.java | 12 ++++++++---- .../synchronoss/cpo/plugin/GenerateJavaSources.java | 2 +- 8 files changed, 20 insertions(+), 16 deletions(-) diff --git a/cpo-cassandra/src/test/java/org/synchronoss/cpo/cassandra/config/ConfigFactoryTest.java b/cpo-cassandra/src/test/java/org/synchronoss/cpo/cassandra/config/ConfigFactoryTest.java index 60f4e63a2..680b2e797 100644 --- a/cpo-cassandra/src/test/java/org/synchronoss/cpo/cassandra/config/ConfigFactoryTest.java +++ b/cpo-cassandra/src/test/java/org/synchronoss/cpo/cassandra/config/ConfigFactoryTest.java @@ -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; @@ -95,7 +95,7 @@ public TestSSLOptionsFactory() {} @Override public SSLOptions createSSLOptions() { - return JdkSSLOptions.builder().build(); + return RemoteEndpointAwareJdkSSLOptions.builder().build(); } } diff --git a/cpo-core/src/main/java/org/synchronoss/cpo/core/CpoBaseAdapter.java b/cpo-core/src/main/java/org/synchronoss/cpo/core/CpoBaseAdapter.java index a3c09f2f0..07045295e 100644 --- a/cpo-core/src/main/java/org/synchronoss/cpo/core/CpoBaseAdapter.java +++ b/cpo-core/src/main/java/org/synchronoss/cpo/core/CpoBaseAdapter.java @@ -73,7 +73,7 @@ protected D getReadDataSource() { return readDataSource; } - protected void setReadDataSource(D readDataSource) { + protected final void setReadDataSource(D readDataSource) { this.readDataSource = readDataSource; } @@ -81,7 +81,7 @@ protected D getWriteDataSource() { return writeDataSource; } - protected void setWriteDataSource(D writeDataSource) { + protected final void setWriteDataSource(D writeDataSource) { this.writeDataSource = writeDataSource; } diff --git a/cpo-jdbc/src/main/java/org/synchronoss/cpo/jdbc/JdbcCpoAdapter.java b/cpo-jdbc/src/main/java/org/synchronoss/cpo/jdbc/JdbcCpoAdapter.java index 153f3656e..c404fd31a 100644 --- a/cpo-jdbc/src/main/java/org/synchronoss/cpo/jdbc/JdbcCpoAdapter.java +++ b/cpo-jdbc/src/main/java/org/synchronoss/cpo/jdbc/JdbcCpoAdapter.java @@ -74,13 +74,13 @@ public class JdbcCpoAdapter extends CpoBaseAdapter { 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; diff --git a/cpo-jdbc/src/main/java/org/synchronoss/cpo/jdbc/JdbcPooledConnectionStrategy.java b/cpo-jdbc/src/main/java/org/synchronoss/cpo/jdbc/JdbcPooledConnectionStrategy.java index d35135954..b22e19a25 100644 --- a/cpo-jdbc/src/main/java/org/synchronoss/cpo/jdbc/JdbcPooledConnectionStrategy.java +++ b/cpo-jdbc/src/main/java/org/synchronoss/cpo/jdbc/JdbcPooledConnectionStrategy.java @@ -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; /** diff --git a/cpo-jdbc/src/main/java/org/synchronoss/cpo/jdbc/jta/JdbcCpoXaAdapter.java b/cpo-jdbc/src/main/java/org/synchronoss/cpo/jdbc/jta/JdbcCpoXaAdapter.java index abad014f1..d7262c871 100644 --- a/cpo-jdbc/src/main/java/org/synchronoss/cpo/jdbc/jta/JdbcCpoXaAdapter.java +++ b/cpo-jdbc/src/main/java/org/synchronoss/cpo/jdbc/jta/JdbcCpoXaAdapter.java @@ -75,7 +75,7 @@ public class JdbcCpoXaAdapter extends CpoBaseXaResource 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 diff --git a/cpo-jdbc/src/main/java/org/synchronoss/cpo/jdbc/meta/JdbcMethodMapEntry.java b/cpo-jdbc/src/main/java/org/synchronoss/cpo/jdbc/meta/JdbcMethodMapEntry.java index 3c8898deb..4a4bad8cb 100644 --- a/cpo-jdbc/src/main/java/org/synchronoss/cpo/jdbc/meta/JdbcMethodMapEntry.java +++ b/cpo-jdbc/src/main/java/org/synchronoss/cpo/jdbc/meta/JdbcMethodMapEntry.java @@ -49,10 +49,10 @@ public class JdbcMethodMapEntry extends MethodMapEntry 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 diff --git a/cpo-jdbc/src/test/java/org/synchronoss/cpo/jdbc/JdbcSuiteListener.java b/cpo-jdbc/src/test/java/org/synchronoss/cpo/jdbc/JdbcSuiteListener.java index 1de654fc2..57997abe7 100644 --- a/cpo-jdbc/src/test/java/org/synchronoss/cpo/jdbc/JdbcSuiteListener.java +++ b/cpo-jdbc/src/test/java/org/synchronoss/cpo/jdbc/JdbcSuiteListener.java @@ -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; @@ -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) diff --git a/cpo-plugin/src/main/java/org/synchronoss/cpo/plugin/GenerateJavaSources.java b/cpo-plugin/src/main/java/org/synchronoss/cpo/plugin/GenerateJavaSources.java index d4578fbd0..c3fd798a4 100644 --- a/cpo-plugin/src/main/java/org/synchronoss/cpo/plugin/GenerateJavaSources.java +++ b/cpo-plugin/src/main/java/org/synchronoss/cpo/plugin/GenerateJavaSources.java @@ -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);