Skip to content

fix: use same summary format as in js #156

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ruromero merged 2 commits into from
Jul 23, 2025
Merged

fix: use same summary format as in js #156

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9ad3cce
fix: use same summary format as in js
ruromero Jul 23, 2025
8ecad1b
Merge branch 'main' into fix/summary
ruromero Jul 23, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 10 additions & 9 deletions src/main/java/com/redhat/exhort/cli/App.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down Expand Up @@ -161,7 +163,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);
}
Expand All @@ -174,9 +177,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;
}
Expand All @@ -194,12 +196,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;
}
Expand Down
Loading