fix: use same summary format as in js

Signed-off-by: Ruben Romero Montes <rromerom@redhat.com>

Author: ruromero

src/main/java/com/redhat/exhort/cli/App.java

@@ -25,12 +25,14 @@
 import com.redhat.exhort.Api;
 import com.redhat.exhort.api.v4.AnalysisReport;
 import com.redhat.exhort.api.v4.ProviderReport;
-import com.redhat.exhort.api.v4.Source;
+import com.redhat.exhort.api.v4.SourceSummary;
 import com.redhat.exhort.impl.ExhortApi;
 import java.io.IOException;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.Paths;
+import java.util.HashMap;
+import java.util.Map;
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.ExecutionException;
 
@@ -91,28 +93,32 @@ private static CliArgs parseArgs(String[] args) {
 
   private static Command parseCommand(String commandStr) {
     switch (commandStr) {
-      case "stack":
+      case "stack" -> {
         return Command.STACK;
-      case "component":
+      }
+      case "component" -> {
         return Command.COMPONENT;
-      default:
-        throw new IllegalArgumentException(
-            "Unknown command: " + commandStr + ". Use 'stack' or 'component'");
+      }
+      default ->
+          throw new IllegalArgumentException(
+              "Unknown command: " + commandStr + ". Use 'stack' or 'component'");
     }
   }
 
   private static OutputFormat parseOutputFormat(Command command, String formatArg) {
     switch (formatArg) {
-      case "--summary":
+      case "--summary" -> {
         return OutputFormat.SUMMARY;
-      case "--html":
+      }
+      case "--html" -> {
         if (command != Command.STACK) {
           throw new IllegalArgumentException("HTML format is only supported for stack command");
         }
         return OutputFormat.HTML;
-      default:
-        throw new IllegalArgumentException(
-            "Unknown option for " + command + " command: " + formatArg);
+      }
+      default ->
+          throw new IllegalArgumentException(
+              "Unknown option for " + command + " command: " + formatArg);
     }
   }
 
@@ -129,30 +135,33 @@ private static Path validateFile(String filePath) {
 
   private static CompletableFuture<String> executeCommand(CliArgs args) throws IOException {
     switch (args.command) {
-      case STACK:
+      case STACK -> {
         return executeStackAnalysis(args.filePath.toAbsolutePath().toString(), args.outputFormat);
-      case COMPONENT:
+      }
+      case COMPONENT -> {
         return executeComponentAnalysis(
             args.filePath.toAbsolutePath().toString(), args.outputFormat);
-      default:
-        throw new AssertionError();
+      }
+      default -> throw new AssertionError();
     }
   }
 
   private static CompletableFuture<String> executeStackAnalysis(
       String filePath, OutputFormat outputFormat) throws IOException {
     Api api = new ExhortApi();
     switch (outputFormat) {
-      case JSON:
+      case JSON -> {
         return api.stackAnalysis(filePath).thenApply(App::toJsonString);
-      case HTML:
+      }
+      case HTML -> {
         return api.stackAnalysisHtml(filePath).thenApply(bytes -> new String(bytes));
-      case SUMMARY:
+      }
+      case SUMMARY -> {
         return api.stackAnalysis(filePath)
             .thenApply(App::extractSummary)
             .thenApply(App::toJsonString);
-      default:
-        throw new AssertionError();
+      }
+      default -> throw new AssertionError();
     }
   }
 
@@ -161,7 +170,8 @@ private static CompletableFuture<String> executeComponentAnalysis(
     Api api = new ExhortApi();
     CompletableFuture<AnalysisReport> analysis = api.componentAnalysis(filePath);
     if (outputFormat.equals(OutputFormat.SUMMARY)) {
-      analysis = analysis.thenApply(App::extractSummary);
+      var summary = analysis.thenApply(App::extractSummary);
+      return summary.thenApply(App::toJsonString);
     }
     return analysis.thenApply(App::toJsonString);
   }
@@ -174,9 +184,8 @@ private static String toJsonString(Object obj) {
     }
   }
 
-  private static AnalysisReport extractSummary(AnalysisReport report) {
-    AnalysisReport summary = new AnalysisReport();
-    summary.setScanned(report.getScanned());
+  private static Map<String, SourceSummary> extractSummary(AnalysisReport report) {
+    Map<String, SourceSummary> summary = new HashMap<>();
     if (report.getProviders() == null) {
       return summary;
     }
@@ -194,12 +203,11 @@ private static AnalysisReport extractSummary(AnalysisReport report) {
                     .entrySet()
                     .forEach(
                         sourceEntry -> {
-                          var source = new Source();
-                          source.setSummary(sourceEntry.getValue().getSummary());
-                          provider.putSourcesItem(sourceEntry.getKey(), source);
+                          if (sourceEntry.getValue().getSummary() != null) {
+                            summary.put(sourceEntry.getKey(), sourceEntry.getValue().getSummary());
+                          }
                         });
               }
-              summary.putProvidersItem(entry.getKey(), provider);
             });
     return summary;
   }