fix(cli): Print aggregated output just once

kordamp · Feb 22, 2023 · 7eb6a06 · 7eb6a06
1 parent 1740a6e
commit 7eb6a06
Show file tree

Hide file tree

Showing 8 changed files with 8 additions and 16 deletions.
diff --git a/plugins/jarviz-cli/src/main/java/org/kordamp/jarviz/cli/bytecode/BytecodeShow.java b/plugins/jarviz-cli/src/main/java/org/kordamp/jarviz/cli/bytecode/BytecodeShow.java
@@ -71,10 +71,9 @@ private void output(Set<JarProcessor.JarFileResult<BytecodeVersions>> results) {
                 output(result);
             } else {
                 buildReport(outputFormat, root, result);
-                writeOutput(resolveFormatter(outputFormat).write(root));
             }
-            if (results.size() > 1) parent().getOut().println("");
         }
+        writeOutput(resolveFormatter(outputFormat).write(root));
     }
 
     private void output(JarProcessor.JarFileResult<BytecodeVersions> result) {

diff --git a/plugins/jarviz-cli/src/main/java/org/kordamp/jarviz/cli/manifest/ManifestQuery.java b/plugins/jarviz-cli/src/main/java/org/kordamp/jarviz/cli/manifest/ManifestQuery.java
@@ -67,10 +67,9 @@ private void output(Set<JarProcessor.JarFileResult<Optional<String>>> results) {
                 output(result);
             } else {
                 buildReport(root, result);
-                writeOutput(resolveFormatter(outputFormat).write(root));
             }
-            if (results.size() > 1) parent().getOut().println("");
         }
+        writeOutput(resolveFormatter(outputFormat).write(root));
     }
 
     private void output(JarProcessor.JarFileResult<Optional<String>> result) {

diff --git a/plugins/jarviz-cli/src/main/java/org/kordamp/jarviz/cli/manifest/ManifestShow.java b/plugins/jarviz-cli/src/main/java/org/kordamp/jarviz/cli/manifest/ManifestShow.java
@@ -61,10 +61,9 @@ private void output(Set<JarProcessor.JarFileResult<Optional<java.util.jar.Manife
                 output(result);
             } else {
                 buildReport(root, result);
-                writeOutput(resolveFormatter(outputFormat).write(root));
             }
-            if (results.size() > 1) parent().getOut().println("");
         }
+        writeOutput(resolveFormatter(outputFormat).write(root));
     }
 
     private void output(JarProcessor.JarFileResult<Optional<java.util.jar.Manifest>> result) {

diff --git a/plugins/jarviz-cli/src/main/java/org/kordamp/jarviz/cli/modules/ModuleDescriptor.java b/plugins/jarviz-cli/src/main/java/org/kordamp/jarviz/cli/modules/ModuleDescriptor.java
@@ -65,10 +65,9 @@ private void output(Set<JarProcessor.JarFileResult<java.lang.module.ModuleDescri
                 output(result);
             } else {
                 buildReport(outputFormat, root, result);
-                writeOutput(resolveFormatter(outputFormat).write(root));
             }
-            if (results.size() > 1) parent().getOut().println("");
         }
+        writeOutput(resolveFormatter(outputFormat).write(root));
     }
 
     private void output(JarProcessor.JarFileResult<java.lang.module.ModuleDescriptor> result) {

diff --git a/plugins/jarviz-cli/src/main/java/org/kordamp/jarviz/cli/modules/ModuleName.java b/plugins/jarviz-cli/src/main/java/org/kordamp/jarviz/cli/modules/ModuleName.java
@@ -60,10 +60,9 @@ private void output(Set<JarProcessor.JarFileResult<org.kordamp.jarviz.core.model
                 output(result);
             } else {
                 buildReport(root, result);
-                writeOutput(resolveFormatter(outputFormat).write(root));
             }
-            if (results.size() > 1) parent().getOut().println("");
         }
+        writeOutput(resolveFormatter(outputFormat).write(root));
     }
 
     private void output(JarProcessor.JarFileResult<org.kordamp.jarviz.core.model.ModuleName> result) {

diff --git a/plugins/jarviz-cli/src/main/java/org/kordamp/jarviz/cli/packages/PackagesSplit.java b/plugins/jarviz-cli/src/main/java/org/kordamp/jarviz/cli/packages/PackagesSplit.java
@@ -53,10 +53,9 @@ private void output(Set<JarProcessor.JarFileResult<Set<String>>> results) {
                 output(result);
             } else {
                 buildReport(outputFormat, root, result);
-                writeOutput(resolveFormatter(outputFormat).write(root));
             }
-            if (results.size() > 1) parent().getOut().println("");
         }
+        writeOutput(resolveFormatter(outputFormat).write(root));
     }
 
     private void output(JarProcessor.JarFileResult<Set<String>> result) {

diff --git a/plugins/jarviz-cli/src/main/java/org/kordamp/jarviz/cli/services/ServicesList.java b/plugins/jarviz-cli/src/main/java/org/kordamp/jarviz/cli/services/ServicesList.java
@@ -60,10 +60,9 @@ private void output(Set<JarProcessor.JarFileResult<Optional<Set<String>>>> resul
                 output(result);
             } else {
                 buildReport(outputFormat, root, result);
-                writeOutput(resolveFormatter(outputFormat).write(root));
             }
-            if (results.size() > 1) parent().getOut().println("");
         }
+        writeOutput(resolveFormatter(outputFormat).write(root));
     }
 
     private void output(JarProcessor.JarFileResult<Optional<Set<String>>> result) {

diff --git a/plugins/jarviz-cli/src/main/java/org/kordamp/jarviz/cli/services/ServicesShow.java b/plugins/jarviz-cli/src/main/java/org/kordamp/jarviz/cli/services/ServicesShow.java
@@ -64,10 +64,9 @@ private void output(Set<JarProcessor.JarFileResult<Optional<Set<String>>>> resul
                 output(result);
             } else {
                 buildReport(outputFormat, root, result);
-                writeOutput(resolveFormatter(outputFormat).write(root));
             }
-            if (results.size() > 1) parent().getOut().println("");
         }
+        writeOutput(resolveFormatter(outputFormat).write(root));
     }
 
     private void output(JarProcessor.JarFileResult<Optional<Set<String>>> result) {