removed oracle fixes

Author: Aditya Bharadwaj

v2/datastream-to-spanner/pom.xml

@@ -109,7 +109,6 @@
             <artifactId>google-cloud-compute</artifactId>
             <scope>test</scope>
         </dependency>
-
     </dependencies>
 
     <profiles>

v2/datastream-to-spanner/src/main/java/com/google/cloud/teleport/v2/templates/datastream/source/mysql/MySqlSourceConnector.java

@@ -56,8 +56,7 @@ public Map<String, Pair<String, String>> getSortOrder(Dialect dialect) {
   public ChangeEventContext createChangeEventContext(
       JsonNode changeEvent, Ddl ddl, Ddl shadowTableDdl, String shadowTablePrefix)
       throws ChangeEventConvertorException, InvalidChangeEventException, DroppedTableException {
-    return new MySqlChangeEventContext(
-        changeEvent, ddl, shadowTableDdl, shadowTablePrefix);
+    return new MySqlChangeEventContext(changeEvent, ddl, shadowTableDdl, shadowTablePrefix);
   }
 
   @Override

v2/datastream-to-spanner/src/main/java/com/google/cloud/teleport/v2/templates/datastream/source/oracle/OracleSourceConnector.java

@@ -56,8 +56,7 @@ public Map<String, Pair<String, String>> getSortOrder(Dialect dialect) {
   public ChangeEventContext createChangeEventContext(
       JsonNode changeEvent, Ddl ddl, Ddl shadowTableDdl, String shadowTablePrefix)
       throws ChangeEventConvertorException, InvalidChangeEventException, DroppedTableException {
-    return new OracleChangeEventContext(
-        changeEvent, ddl, shadowTableDdl, shadowTablePrefix);
+    return new OracleChangeEventContext(changeEvent, ddl, shadowTableDdl, shadowTablePrefix);
   }
 
   @Override

v2/datastream-to-spanner/src/main/java/com/google/cloud/teleport/v2/templates/datastream/source/postgresql/PostgresqlSourceConnector.java

@@ -56,8 +56,7 @@ public Map<String, Pair<String, String>> getSortOrder(Dialect dialect) {
   public ChangeEventContext createChangeEventContext(
       JsonNode changeEvent, Ddl ddl, Ddl shadowTableDdl, String shadowTablePrefix)
       throws ChangeEventConvertorException, InvalidChangeEventException, DroppedTableException {
-    return new PostgresChangeEventContext(
-        changeEvent, ddl, shadowTableDdl, shadowTablePrefix);
+    return new PostgresChangeEventContext(changeEvent, ddl, shadowTableDdl, shadowTablePrefix);
   }
 
   @Override

v2/datastream-to-spanner/src/test/java/com/google/cloud/teleport/v2/templates/DataStreamToSpannerIT.java

@@ -141,6 +141,7 @@ public void testDataStreamMySqlToSpanner() throws IOException {
   }
 
   @Test
+  @Ignore("This test is flaky, and Oracle is not fully supported migration source yet")
   public void testDataStreamOracleToSpanner() throws IOException {
     // Run a simple IT
     simpleOracleToSpannerTest(
@@ -177,6 +178,7 @@ public void testDataStreamMySqlToSpannerJson() throws IOException {
   }
 
   @Test
+  @Ignore("This test is flaky, and Oracle is not fully supported migration source yet")
   public void testDataStreamOracleToSpannerJson() throws IOException {
     // Run a simple IT
     simpleOracleToSpannerTest(
@@ -209,14 +211,7 @@ private void simpleOracleToSpannerTest(
       throws IOException {
 
     simpleJdbcToSpannerTest(
-        JDBCType.ORACLE,
-        fileFormat,
-        spannerDialect,
-        config ->
-            paramsAdder.apply(
-                config.addParameter(
-                    "sessionFilePath",
-                    getGcsPath("input/oracle-session.json", gcsResourceManager))));
+        JDBCType.ORACLE, fileFormat, spannerDialect, config -> paramsAdder.apply(config));
   }
 
   private void simpleJdbcToSpannerTest(
@@ -251,18 +246,9 @@ private void simpleJdbcToSpannerTest(
       gcsResourceManager.createArtifact(
           "input/mysql-session.json",
           generateSessionFile(
-              "mysql",
               cloudSqlResourceManager.getDatabaseName(),
               spannerResourceManager.getDatabaseId(),
               tableNames));
-    } else if (jdbcType.equals(JDBCType.ORACLE)) {
-      gcsResourceManager.createArtifact(
-          "input/oracle-session.json",
-          generateSessionFile(
-              "oracle",
-              cloudSqlResourceManager.getUsername().toUpperCase(),
-              spannerResourceManager.getDatabaseId(),
-              tableNames));
     }
 
     // Create JDBC tables
@@ -372,23 +358,14 @@ private void simpleJdbcToSpannerTest(
     assertThatResult(result).meetsConditions();
   }
 
-  private String generateSessionFile(
-      String databaseType, String srcDb, String spannerDb, List<String> tableNames)
+  private String generateSessionFile(String srcDb, String spannerDb, List<String> tableNames)
       throws IOException {
-    String sessionTemplate =
-        databaseType.equals("mysql") ? "mysql-session.json" : "oracle-session.json";
     String sessionFile =
         Files.readString(
-            Paths.get(Resources.getResource("DataStreamToSpannerIT/" + sessionTemplate).getPath()));
-    sessionFile =
-        sessionFile.replaceAll("SRC_DATABASE", srcDb).replaceAll("SP_DATABASE", spannerDb);
-    if (databaseType.equals("oracle")) {
-      sessionFile =
-          sessionFile
-              .replaceAll("TABLE1_UPPER", tableNames.get(0).toUpperCase())
-              .replaceAll("TABLE2_UPPER", tableNames.get(1).toUpperCase());
-    }
+            Paths.get(Resources.getResource("DataStreamToSpannerIT/mysql-session.json").getPath()));
     return sessionFile
+        .replaceAll("SRC_DATABASE", srcDb)
+        .replaceAll("SP_DATABASE", spannerDb)
         .replaceAll("TABLE1", tableNames.get(0))
         .replaceAll("TABLE2", tableNames.get(1));
   }