From d8b74b16748b3a92903b770ea2f209ccc67730b4 Mon Sep 17 00:00:00 2001 From: AnkitCLI Date: Wed, 10 Jan 2024 23:31:46 +0530 Subject: [PATCH] debug --- .../features/Wrangler/DataTypeParsers.feature | 2 +- .../features/Wrangler/ParseAsAvro.feature | 2 +- .../features/Wrangler/ParseAsCsv.feature | 2 +- .../Wrangler/ParseAsFixedLength.feature | 2 +- .../features/Wrangler/ParseAsHl7.feature | 2 +- .../features/Wrangler/ParseAsLog.feature | 2 +- .../wrangler/actions/ValidationHelper.java | 37 +--- .../Directive_parse_log | 2 +- .../resources/pluginParameters.properties | 2 +- .../logParser-cdap-data-pipeline (1).json | 180 ------------------ ..._log_wrangler_copy-cdap-data-pipeline.json | 174 +++++++++++++++++ 11 files changed, 187 insertions(+), 220 deletions(-) delete mode 100644 wrangler-transform/src/e2e-test/resources/testData/Wrangler/logParser-cdap-data-pipeline (1).json create mode 100644 wrangler-transform/src/e2e-test/resources/testData/Wrangler/parse_log_wrangler_copy-cdap-data-pipeline.json diff --git a/wrangler-transform/src/e2e-test/features/Wrangler/DataTypeParsers.feature b/wrangler-transform/src/e2e-test/features/Wrangler/DataTypeParsers.feature index b36377ff8..fefe29a8c 100644 --- a/wrangler-transform/src/e2e-test/features/Wrangler/DataTypeParsers.feature +++ b/wrangler-transform/src/e2e-test/features/Wrangler/DataTypeParsers.feature @@ -12,7 +12,7 @@ # License for the specific language governing permissions and limitations under # the License. -@Wrangler +@Wranglers Feature: datatype parsers @BQ_SOURCE_TS_TEST @BQ_SINK_TEST diff --git a/wrangler-transform/src/e2e-test/features/Wrangler/ParseAsAvro.feature b/wrangler-transform/src/e2e-test/features/Wrangler/ParseAsAvro.feature index 411c47fc1..86742428f 100644 --- a/wrangler-transform/src/e2e-test/features/Wrangler/ParseAsAvro.feature +++ b/wrangler-transform/src/e2e-test/features/Wrangler/ParseAsAvro.feature @@ -15,7 +15,7 @@ @Wrangler Feature: Wrangler - Run time scenarios for Parse Avro - @BQ_SOURCE_AVRO_TEST @BQ_SINK_TEST + @BQ_SOURCE_AVRO_TEST @BQ_SOURCE_TEST @BQ_SINK_TEST Scenario: To verify User is able to run a pipeline using parse avro directive Given Open Datafusion Project to configure pipeline Then Click on the Plus Green Button to import the pipelines diff --git a/wrangler-transform/src/e2e-test/features/Wrangler/ParseAsCsv.feature b/wrangler-transform/src/e2e-test/features/Wrangler/ParseAsCsv.feature index 20883201f..35728ffc0 100644 --- a/wrangler-transform/src/e2e-test/features/Wrangler/ParseAsCsv.feature +++ b/wrangler-transform/src/e2e-test/features/Wrangler/ParseAsCsv.feature @@ -12,7 +12,7 @@ # License for the specific language governing permissions and limitations under # the License. -@Wrangler +@Wranglers Feature: Wrangler - Run time scenarios @BQ_SOURCE_CSV_TEST @BQ_SINK_TEST diff --git a/wrangler-transform/src/e2e-test/features/Wrangler/ParseAsFixedLength.feature b/wrangler-transform/src/e2e-test/features/Wrangler/ParseAsFixedLength.feature index f013614df..a26cc662e 100644 --- a/wrangler-transform/src/e2e-test/features/Wrangler/ParseAsFixedLength.feature +++ b/wrangler-transform/src/e2e-test/features/Wrangler/ParseAsFixedLength.feature @@ -12,7 +12,7 @@ # License for the specific language governing permissions and limitations under # the License. -@Wrangler +@Wranglers Feature: parse as fixed length @BQ_SOURCE_FXDLEN_TEST @BQ_SINK_TEST diff --git a/wrangler-transform/src/e2e-test/features/Wrangler/ParseAsHl7.feature b/wrangler-transform/src/e2e-test/features/Wrangler/ParseAsHl7.feature index a3cd05df1..4edb531bd 100644 --- a/wrangler-transform/src/e2e-test/features/Wrangler/ParseAsHl7.feature +++ b/wrangler-transform/src/e2e-test/features/Wrangler/ParseAsHl7.feature @@ -12,7 +12,7 @@ # License for the specific language governing permissions and limitations under # the License. -@Wrangler +@Wranglers Feature: parse as HL7 @BQ_SOURCE_HL7_TEST @BQ_SINK_TEST diff --git a/wrangler-transform/src/e2e-test/features/Wrangler/ParseAsLog.feature b/wrangler-transform/src/e2e-test/features/Wrangler/ParseAsLog.feature index d75f36016..7bfbf6c48 100644 --- a/wrangler-transform/src/e2e-test/features/Wrangler/ParseAsLog.feature +++ b/wrangler-transform/src/e2e-test/features/Wrangler/ParseAsLog.feature @@ -15,7 +15,7 @@ @Wrangler Feature: Wrangler - Run time scenarios for Parse Log - @BQ_SOURCE_LOG_TEST @BQ_SINK_TEST + @BQ_SOURCE_LOG_TEST @BQ_SOURCE_TEST @BQ_SINK_TEST Scenario: To verify User is able to run a pipeline using parse log directive Given Open Datafusion Project to configure pipeline Then Click on the Plus Green Button to import the pipelines diff --git a/wrangler-transform/src/e2e-test/java/io/cdap/plugin/wrangler/actions/ValidationHelper.java b/wrangler-transform/src/e2e-test/java/io/cdap/plugin/wrangler/actions/ValidationHelper.java index 572fc738c..f35d6d311 100644 --- a/wrangler-transform/src/e2e-test/java/io/cdap/plugin/wrangler/actions/ValidationHelper.java +++ b/wrangler-transform/src/e2e-test/java/io/cdap/plugin/wrangler/actions/ValidationHelper.java @@ -61,36 +61,21 @@ public static void getFileData(String fileName, Map fileMap) String line; while ((line = br.readLine()) != null) { JsonObject json = gson.fromJson(line, JsonObject.class); - - // Check if "id" or "ID" (case-insensitive) exists in the JSON object - boolean idFound = false; - if (json.has("id")) { + if (json.has("id")) { // Check if the JSON object has the "id" key JsonElement idElement = json.get("id"); if (idElement.isJsonPrimitive()) { String idKey = idElement.getAsString(); fileMap.put(idKey, json); - idFound = true; } else { - LOG.error("Data Mismatched"); + Log.error("ID key not found"); } } - - if (!idFound && json.has("ID")) { - JsonElement idElement = json.get("ID"); - if (idElement.isJsonPrimitive()) { - String idKey = idElement.getAsString(); - fileMap.put(idKey, json); - } else { - LOG.error("Data Mismatched"); - } - } else if (!idFound) { - LOG.error("ID Key not found in JSON object"); - } } } catch (IOException e) { System.err.println("Error reading the file: " + e.getMessage()); } } + private static void getBigQueryTableData(String targetTable, Map bigQueryMap) throws IOException, InterruptedException { String dataset = PluginPropertyUtils.pluginProp("dataset"); @@ -100,27 +85,15 @@ private static void getBigQueryTableData(String targetTable, Map