Move schema utils to test folder and resolve comments

Author: Deep1998

v2/spanner-common/src/main/java/com/google/cloud/teleport/v2/spanner/migrations/utils/SchemaUtils.java

@@ -563,25 +563,7 @@ public static PipelineResult run(Options options) {
       LOG.info("Cassandra config is: {}", shards.get(0));
       shardingMode = Constants.SHARDING_MODE_SINGLE_SHARD;
     }
-    SourceSchemaScanner scanner = null;
-    SourceSchema sourceSchema = null;
-    try {
-      if (options.getSourceType().equals(MYSQL_SOURCE_TYPE)) {
-        Connection connection = createJdbcConnection(shards.get(0));
-        scanner = new MySqlInformationSchemaScanner(connection, shards.get(0).getDbName());
-        sourceSchema = scanner.scan();
-        connection.close();
-      } else {
-        try (CqlSession session = createCqlSession((CassandraShard) shards.get(0))) {
-          scanner =
-              new CassandraInformationSchemaScanner(
-                  session, ((CassandraShard) shards.get(0)).getKeySpaceName());
-          sourceSchema = scanner.scan();
-        }
-      }
-    } catch (SQLException e) {
-      throw new RuntimeException("Unable to discover jdbc schema", e);
-    }
+    SourceSchema sourceSchema = fetchSourceSchema(options, shards);
     LOG.info("Source schema: {}", sourceSchema);
 
     if (shards.size() == 1 && !options.getIsShardedMigration()) {
@@ -892,4 +874,27 @@ private static CqlSession createCqlSession(CassandraShard cassandraShard) {
     builder.withConfigLoader(configLoader);
     return builder.build();
   }
+
+  private static SourceSchema fetchSourceSchema(Options options, List<Shard> shards) {
+    SourceSchemaScanner scanner = null;
+    SourceSchema sourceSchema = null;
+    try {
+      if (options.getSourceType().equals(MYSQL_SOURCE_TYPE)) {
+        Connection connection = createJdbcConnection(shards.get(0));
+        scanner = new MySqlInformationSchemaScanner(connection, shards.get(0).getDbName());
+        sourceSchema = scanner.scan();
+        connection.close();
+      } else {
+        try (CqlSession session = createCqlSession((CassandraShard) shards.get(0))) {
+          scanner =
+              new CassandraInformationSchemaScanner(
+                  session, ((CassandraShard) shards.get(0)).getKeySpaceName());
+          sourceSchema = scanner.scan();
+        }
+      }
+    } catch (SQLException e) {
+      throw new RuntimeException("Unable to discover jdbc schema", e);
+    }
+    return sourceSchema;
+  }
 }

v2/spanner-common/src/test/java/com/google/cloud/teleport/v2/spanner/migrations/utils/SchemaUtilsTest.java

@@ -81,18 +81,18 @@ public DMLGeneratorResponse getDMLStatement(DMLGeneratorRequest dmlGeneratorRequ
 
     String spannerTableName = dmlGeneratorRequest.getSpannerTableName();
     Schema schema = dmlGeneratorRequest.getSchema();
-    Ddl ddl = dmlGeneratorRequest.getDdl();
+    Ddl spannerDdl = dmlGeneratorRequest.getSpannerDdl();
     SourceSchema sourceSchema = dmlGeneratorRequest.getSourceSchema();
-    if (schema == null || ddl == null || sourceSchema == null) {
+    if (schema == null || spannerDdl == null || sourceSchema == null) {
       LOG.warn(
           "Schema, Ddl and SourceSchema must be not null, respectively found {},{},{}.",
           schema,
-          ddl,
+          spannerDdl,
           sourceSchema);
       return new DMLGeneratorResponse("");
     }
 
-    Table spannerTable = ddl.table(spannerTableName);
+    Table spannerTable = spannerDdl.table(spannerTableName);
     if (spannerTable == null) {
       LOG.warn("Spanner table {} not found. Dropping the record.", spannerTableName);
       return new DMLGeneratorResponse("");