clean up if condition

cdapio · May 19, 2020 · 519f129 · 519f129
1 parent 5834faa
commit 519f129
Showing 1 changed file with 9 additions and 8 deletions.
diff --git a/...emplates/cdap-etl/cdap-etl-api/src/main/java/io/cdap/cdap/etl/api/join/JoinCondition.java b/...emplates/cdap-etl/cdap-etl-api/src/main/java/io/cdap/cdap/etl/api/join/JoinCondition.java
@@ -115,14 +115,15 @@ public void validate(List<JoinStage> joinStages) {
         // for example, when joining on A.id = B.uid, check that 'id' is in the fields for stage A and 'uid' for stage B
         Set<String> keysCopy = new HashSet<>(joinKey.getFields());
         keysCopy.removeAll(fields);
-        if (!keysCopy.isEmpty()) {
-          String message = "Join key for stage '%s' is invalid.";
-          if (keysCopy.size() == 1) {
-            message += String.format("Field '%s' does not exist.", keysCopy.iterator().next());
-          } else {
-            message += String.format("Fields %s do not exist.", String.join(", ", keysCopy));
-          }
-          throw new InvalidJoinConditionException(message);
+        if (keysCopy.size() == 1) {
+          throw new InvalidJoinConditionException(String.format(
+            "Join key for stage '%s' is invalid. Field '%s' does not exist in the stage.",
+            joinStageName, keysCopy.iterator().next()));
+        }
+        if (keysCopy.size() > 1) {
+          throw new InvalidJoinConditionException(String.format(
+            "Join key for stage '%s' is invalid. Fields %s do not exist in the stage.",
+            joinStageName, String.join(", ", keysCopy)));
         }
       }