diff --git a/v2/sourcedb-to-spanner/src/main/java/com/google/cloud/teleport/v2/source/reader/io/cassandra/iowrapper/CassandraConnector.java b/v2/sourcedb-to-spanner/src/main/java/com/google/cloud/teleport/v2/source/reader/io/cassandra/iowrapper/CassandraConnector.java index 15bcfc2ee5..bc62085707 100644 --- a/v2/sourcedb-to-spanner/src/main/java/com/google/cloud/teleport/v2/source/reader/io/cassandra/iowrapper/CassandraConnector.java +++ b/v2/sourcedb-to-spanner/src/main/java/com/google/cloud/teleport/v2/source/reader/io/cassandra/iowrapper/CassandraConnector.java @@ -22,7 +22,6 @@ import com.google.common.annotations.VisibleForTesting; import org.apache.beam.sdk.io.astra.db.CqlSessionHolder; import org.apache.beam.sdk.options.ValueProvider.StaticValueProvider; -import org.jline.utils.Log; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -43,7 +42,7 @@ public CassandraConnector( case ASTRA -> getSessionAstra(cassandraDataSource.astra(), schemaReference); default -> getSessionOss(cassandraDataSource.oss(), schemaReference); }; - Log.info( + LOG.info( "Connected to Cassandra Source dataSource = {}, schemaReference = {}", cassandraDataSource, schemaReference); @@ -51,7 +50,7 @@ public CassandraConnector( private CqlSession getSessionOss( CassandraDataSourceOss dataSourceOss, CassandraSchemaReference schemaReference) { - Log.info( + LOG.info( "Connecting to Cassandra OSS Source dataSource = {}, schemaReference = {}", dataSourceOss, schemaReference); @@ -66,7 +65,7 @@ private CqlSession getSessionOss( private CqlSession getSessionAstra( AstraDbDataSource astraDbDataSource, CassandraSchemaReference schemaReference) { - Log.info( + LOG.info( "Connecting to Cassandra Astra Source dataSource = {}, schemaReference = {}", astraDbDataSource, schemaReference); diff --git a/v2/sourcedb-to-spanner/src/main/java/com/google/cloud/teleport/v2/source/reader/io/cassandra/schema/CassandraSchemaDiscovery.java b/v2/sourcedb-to-spanner/src/main/java/com/google/cloud/teleport/v2/source/reader/io/cassandra/schema/CassandraSchemaDiscovery.java index 5360571b75..d51b881dd3 100644 --- a/v2/sourcedb-to-spanner/src/main/java/com/google/cloud/teleport/v2/source/reader/io/cassandra/schema/CassandraSchemaDiscovery.java +++ b/v2/sourcedb-to-spanner/src/main/java/com/google/cloud/teleport/v2/source/reader/io/cassandra/schema/CassandraSchemaDiscovery.java @@ -31,7 +31,6 @@ import com.google.common.base.Preconditions; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; -import org.jline.utils.Log; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -54,7 +53,7 @@ public final class CassandraSchemaDiscovery implements RetriableSchemaDiscovery public ImmutableList discoverTables( DataSource dataSource, SourceSchemaReference sourceSchemaReference) throws SchemaDiscoveryException, RetriableSchemaDiscoveryException { - Log.info( + LOG.info( "CassandraSchemaDiscovery discoverTables started dataSource = {}, sourceSchemaReference = {}", dataSource, sourceSchemaReference); @@ -63,7 +62,7 @@ public ImmutableList discoverTables( sourceSchemaReference.getKind().equals(SourceSchemaReference.Kind.CASSANDRA)); ImmutableList tables = discoverTables(dataSource.cassandra(), sourceSchemaReference.cassandra()); - Log.info( + LOG.info( "CassandraSchemaDiscovery discoverTables completed dataSource = {}, sourceSchemaReference = {}, tables = {}", dataSource, sourceSchemaReference, @@ -87,7 +86,7 @@ private ImmutableList discoverTables( .map(n -> n.asCql(true)) .collect(ImmutableList.toImmutableList()); } catch (DriverException e) { - Log.error( + LOG.error( "CassandraSchemaDiscovery discoverTables dataSource = {}, sourceSchemaReference = {}", dataSource, sourceSchemaReference, @@ -112,7 +111,7 @@ private ImmutableList discoverTables( public ImmutableMap> discoverTableSchema( DataSource dataSource, SourceSchemaReference schemaReference, ImmutableList tables) throws SchemaDiscoveryException, RetriableSchemaDiscoveryException { - Log.info( + LOG.info( "CassandraSchemaDiscovery discoverTableSchema started dataSource = {}, sourceSchemaReference = {}, tables = {}", dataSource, schemaReference, @@ -122,7 +121,7 @@ public ImmutableMap> discoverTabl schemaReference.getKind().equals(SourceSchemaReference.Kind.CASSANDRA)); ImmutableMap> schema = this.discoverTableSchema(dataSource.cassandra(), schemaReference.cassandra(), tables); - Log.info( + LOG.info( "CassandraSchemaDiscovery discoverTableSchema completed dataSource = {}, sourceSchemaReference = {}, tables = {}, schema = {}", dataSource, schemaReference, @@ -146,7 +145,7 @@ private ImmutableMap> discoverTab } return builder.build(); } catch (DriverException e) { - Log.error( + LOG.error( "CassandraSchemaDiscovery discoverTableSchema dataSource = {}, sourceSchemaReference = {}, tables = {}", dataSource, schemaReference, diff --git a/v2/sourcedb-to-spanner/src/main/java/com/google/cloud/teleport/v2/source/reader/io/jdbc/iowrapper/JdbcDataSource.java b/v2/sourcedb-to-spanner/src/main/java/com/google/cloud/teleport/v2/source/reader/io/jdbc/iowrapper/JdbcDataSource.java index 229ba2da4f..27603db749 100644 --- a/v2/sourcedb-to-spanner/src/main/java/com/google/cloud/teleport/v2/source/reader/io/jdbc/iowrapper/JdbcDataSource.java +++ b/v2/sourcedb-to-spanner/src/main/java/com/google/cloud/teleport/v2/source/reader/io/jdbc/iowrapper/JdbcDataSource.java @@ -26,7 +26,6 @@ import javax.sql.DataSource; import org.apache.commons.dbcp2.BasicDataSource; import org.apache.commons.lang3.StringUtils; -import org.jline.utils.Log; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -139,7 +138,7 @@ public JdbcDataSource(JdbcIOWrapperConfig jdbcIOWrapperConfig) { private void initializeSuper() { - Log.info("Initializing {}", this); + LOG.info("Initializing {}", this); super.setDriverClassName(jdbcDriverClassName); diff --git a/v2/sourcedb-to-spanner/src/test/java/com/google/cloud/teleport/v2/templates/CassandraAllDataTypesIT.java b/v2/sourcedb-to-spanner/src/test/java/com/google/cloud/teleport/v2/templates/CassandraAllDataTypesIT.java index 064c487a07..afc0106082 100644 --- a/v2/sourcedb-to-spanner/src/test/java/com/google/cloud/teleport/v2/templates/CassandraAllDataTypesIT.java +++ b/v2/sourcedb-to-spanner/src/test/java/com/google/cloud/teleport/v2/templates/CassandraAllDataTypesIT.java @@ -51,7 +51,6 @@ import org.checkerframework.checker.nullness.qual.NonNull; import org.checkerframework.checker.nullness.qual.UnknownKeyFor; import org.jetbrains.annotations.NotNull; -import org.jline.utils.Log; import org.junit.After; import org.junit.Before; import org.junit.Test; @@ -252,7 +251,7 @@ public void allTypesTest() throws Exception { : row.getValue(colName).toString())); readValues.add(rowMapBuilder.build()); } - Log.info("Spanner Cassandra Values are: {}", readValues); + LOG.info("Spanner Cassandra Values are: {}", readValues); assertThat(readValues).isEqualTo(entry.getValue()); } } diff --git a/v2/spanner-common/src/main/java/com/google/cloud/teleport/v2/spanner/migrations/convertors/ChangeEventToMapConvertor.java b/v2/spanner-common/src/main/java/com/google/cloud/teleport/v2/spanner/migrations/convertors/ChangeEventToMapConvertor.java index b62c6c5cc2..c18744becc 100644 --- a/v2/spanner-common/src/main/java/com/google/cloud/teleport/v2/spanner/migrations/convertors/ChangeEventToMapConvertor.java +++ b/v2/spanner-common/src/main/java/com/google/cloud/teleport/v2/spanner/migrations/convertors/ChangeEventToMapConvertor.java @@ -24,10 +24,14 @@ import java.util.Iterator; import java.util.List; import java.util.Map; -import org.jline.utils.Log; import org.json.JSONObject; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; public class ChangeEventToMapConvertor { + + private static final Logger LOG = LoggerFactory.getLogger(ChangeEventToMapConvertor.class); + public static Map convertChangeEventToMap(JsonNode changeEvent) throws InvalidChangeEventException { Map sourceRecord = new HashMap<>(); @@ -83,7 +87,7 @@ public static JsonNode transformChangeEventViaCustomTransformation( } else if (columnValue instanceof String) { ((ObjectNode) changeEvent).put(columnName, (String) columnValue); } else { - Log.error( + LOG.error( "Column name(" + columnName + ") has unsupported column value(" + columnValue + ")"); throw new InvalidTransformationException( "Column name(" + columnName + ") has unsupported column value(" + columnValue + ")");