Remove extra function

data-integrations · Aug 1, 2023 · bec9679 · bec9679
1 parent ed0e9a4
commit bec9679
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 12 deletions.
diff --git a/wrangler-core/src/main/java/io/cdap/directives/column/CreateRecord.java b/wrangler-core/src/main/java/io/cdap/directives/column/CreateRecord.java
@@ -115,11 +115,9 @@ public Relation transform(RelationalTranformContext relationalTranformContext,
     if (!expressionFactory.isPresent()) {
       return new InvalidRelation("Cannot find an Expression Factory");
     }
+    String getColumnString = String.join(",", columns);
     return relation.setColumn(targetColumn, expressionFactory.get().compile(String
-            .format("struct(%s)", getColumnString(columns))));
+            .format("struct(%s)", getColumnString)));
   }
 
-  public String getColumnString(String[] columns) {
-      return String.join(",", columns);
-  }
 }
diff --git a/wrangler-core/src/main/java/io/cdap/directives/parser/FixedLengthParser.java b/wrangler-core/src/main/java/io/cdap/directives/parser/FixedLengthParser.java
@@ -167,12 +167,13 @@ public Relation transform(RelationalTranformContext relationalTranformContext,
     int columncounter = 1;
 
     for (int width : widths) {
+      String fixedLengthParseExpression = String.format("replace(substr(%s, %d, %d), '%s', \"\")",
+              col, currentpos, width, padding);
+      String filterExcessLengthExpression = String.format("%d <= (length(%s) - %d + 1)", width, col, currentpos);
+
       relation = relation.setColumn(String.format("%s_%d", col, columncounter),
-              expressionFactory.get().compile(String
-                      .format("replace(substr(%s, %d, %d), '%s', \"\")"
-                              , col, currentpos, width, padding)))
-              .filter(expressionFactory.get().compile(String.format("%d <= (length(%s) - %d + 1)",
-                      width, col, currentpos)));
+              expressionFactory.get().compile(fixedLengthParseExpression))
+              .filter(expressionFactory.get().compile(filterExcessLengthExpression));
 
       currentpos += width;
       columncounter++;

diff --git a/wrangler-core/src/main/java/io/cdap/directives/writer/WriteAsJsonObject.java b/wrangler-core/src/main/java/io/cdap/directives/writer/WriteAsJsonObject.java
@@ -129,9 +129,9 @@ public Relation transform(RelationalTranformContext relationalTranformContext,
     if (!expressionFactory.isPresent()) {
       return new InvalidRelation("Cannot find an Expression Factory");
     }
-    return relation.setColumn(
-            column, expressionFactory.get()
-                    .compile(String.format("struct(%s)", String.join(",", columns))));
+    String getColumnString = String.join(",", columns);
+    return relation.setColumn(column, expressionFactory.get()
+                    .compile(String.format("struct(%s)", getColumnString)));
   }
 
 }