Code cleanup - joinSummaryDoubleLine (#354)

Extract the formatting of the summary double-line to the separate method `joinSummaryDoubleLine`.
google · Feb 8, 2024 · 3a6be98 · 3a6be98
1 parent b6b4126
commit 3a6be98
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 6 deletions.
diff --git a/...r/app/src/main/java/com/google/edwmigration/dumper/application/dumper/SummaryPrinter.java b/...r/app/src/main/java/com/google/edwmigration/dumper/application/dumper/SummaryPrinter.java
@@ -54,4 +54,8 @@ default void println(String s, Object... parameters) {
       println(String.format(s, parameters));
     }
   }
+
+  public static String joinSummaryDoubleLine(String firstLine, String secondLine) {
+    return firstLine + "\n        " + secondLine;
+  }
 }
diff --git a/...e/edwmigration/dumper/application/dumper/connector/redshift/RedshiftClusterNodesTask.java b/...e/edwmigration/dumper/application/dumper/connector/redshift/RedshiftClusterNodesTask.java
@@ -16,6 +16,7 @@
  */
 package com.google.edwmigration.dumper.application.dumper.connector.redshift;
 
+import static com.google.edwmigration.dumper.application.dumper.SummaryPrinter.joinSummaryDoubleLine;
 import static java.util.stream.Collectors.toList;
 
 import com.amazonaws.auth.AWSCredentialsProvider;
@@ -65,9 +66,7 @@ private String toCallDescription() {
 
   @Override
   public String describeSourceData() {
-    return "Write "
-        + ClusterNodes.ZIP_ENTRY_NAME
-        + " from AWS API request:\n        "
-        + toCallDescription();
+    return joinSummaryDoubleLine(
+        "Write " + ClusterNodes.ZIP_ENTRY_NAME + " from AWS API request:", toCallDescription());
   }
 }
diff --git a/...gration/dumper/application/dumper/connector/redshift/RedshiftClusterUsageMetricsTask.java b/...gration/dumper/application/dumper/connector/redshift/RedshiftClusterUsageMetricsTask.java
@@ -17,6 +17,7 @@
 package com.google.edwmigration.dumper.application.dumper.connector.redshift;
 
 import static com.google.common.collect.ImmutableList.toImmutableList;
+import static com.google.edwmigration.dumper.application.dumper.SummaryPrinter.joinSummaryDoubleLine;
 import static java.util.stream.Collectors.groupingBy;
 import static java.util.stream.Collectors.toList;
 import static java.util.stream.Collectors.toMap;
@@ -212,6 +213,7 @@ private String toCallDescription() {
 
   @Override
   public String describeSourceData() {
-    return "Write " + zipEntryName + " from AWS API request:\n        " + toCallDescription();
+    return joinSummaryDoubleLine(
+        "Write " + zipEntryName + " from AWS API request:", toCallDescription());
   }
 }
diff --git a/...pp/src/main/java/com/google/edwmigration/dumper/application/dumper/task/AbstractTask.java b/...pp/src/main/java/com/google/edwmigration/dumper/application/dumper/task/AbstractTask.java
@@ -16,6 +16,7 @@
  */
 package com.google.edwmigration.dumper.application.dumper.task;
 
+import static com.google.edwmigration.dumper.application.dumper.SummaryPrinter.joinSummaryDoubleLine;
 import static java.lang.String.format;
 
 import com.google.common.io.ByteSink;
@@ -120,7 +121,7 @@ protected String describeSourceData() {
    * @return the source data description
    */
   protected static String createSourceDataDescriptionForQuery(String query) {
-    return "from\n        " + query;
+    return joinSummaryDoubleLine("from", query);
   }
 
   @Override