From 5b162fb636a02abed55a4cd914f4fa1718abbee6 Mon Sep 17 00:00:00 2001 From: Ruben Romero Montes Date: Thu, 10 Apr 2025 13:36:19 +0200 Subject: [PATCH 1/2] fix: typo in method signature Signed-off-by: Ruben Romero Montes --- src/main/java/com/redhat/exhort/Api.java | 2 +- src/main/java/com/redhat/exhort/sbom/CycloneDXSbom.java | 8 ++++---- src/main/java/module-info.java | 4 ++-- src/test/java/com/redhat/exhort/impl/ExhortApiIT.java | 3 --- .../exhort/providers/PythonEnvironmentExtension.java | 7 ------- .../com/redhat/exhort/utils/PythonControllerBaseTest.java | 4 ++-- 6 files changed, 9 insertions(+), 19 deletions(-) diff --git a/src/main/java/com/redhat/exhort/Api.java b/src/main/java/com/redhat/exhort/Api.java index 0fa713df..711d2923 100644 --- a/src/main/java/com/redhat/exhort/Api.java +++ b/src/main/java/com/redhat/exhort/Api.java @@ -104,7 +104,7 @@ public int hashCode() { * @return the deserialized Json report as an AnalysisReport wrapped in a CompletableFuture * @throws IOException when failed to load the manifest content */ - CompletableFuture componentAnalysis(String manifest, byte[] manifestContet) + CompletableFuture componentAnalysis(String manifest, byte[] manifestContent) throws IOException; CompletableFuture componentAnalysis(String manifest) throws IOException; diff --git a/src/main/java/com/redhat/exhort/sbom/CycloneDXSbom.java b/src/main/java/com/redhat/exhort/sbom/CycloneDXSbom.java index d9251c55..b4fd435b 100644 --- a/src/main/java/com/redhat/exhort/sbom/CycloneDXSbom.java +++ b/src/main/java/com/redhat/exhort/sbom/CycloneDXSbom.java @@ -44,7 +44,7 @@ public class CycloneDXSbom implements Sbom { private Bom bom; private PackageURL root; - private BiPredicate belongingCriteriaBinaryAlgorithm; + private BiPredicate, Component> belongingCriteriaBinaryAlgorithm; private Predicate genericComparator( BiPredicate binaryBelongingCriteriaAlgorithm, X container) { @@ -63,7 +63,7 @@ public CycloneDXSbom() { this.exhortIgnoreMethod = "insensitive"; } - private static BiPredicate getBelongingConditionByName() { + private static BiPredicate, Component> getBelongingConditionByName() { return (collection, component) -> collection.contains(component.getName()); } @@ -82,7 +82,7 @@ public CycloneDXSbom(BelongingCondition belongingCondition, String exhortIgnoreM this.exhortIgnoreMethod = exhortIgnoreMethod; } - private BiPredicate getBelongingConditionByPurl() { + private BiPredicate, Component> getBelongingConditionByPurl() { return (collection, component) -> collection.contains(componentToPurl(component).getCoordinates()); } @@ -201,7 +201,7 @@ private List createIgnoreFilter(List deps, Collection result = new ArrayList<>(toIgnore); for (Dependency dep : deps) { if (toIgnore.contains(dep.getRef()) && dep.getDependencies() != null) { - List collected = + List collected = dep.getDependencies().stream().map(p -> p.getRef()).collect(Collectors.toList()); result.addAll(collected); if (dep.getDependencies().stream().filter(p -> p != null).count() > 0) { diff --git a/src/main/java/module-info.java b/src/main/java/module-info.java index fd6f5f98..2fff7fe3 100644 --- a/src/main/java/module-info.java +++ b/src/main/java/module-info.java @@ -6,9 +6,9 @@ requires jakarta.annotation; requires java.xml; requires jakarta.mail; - requires exhort.api; + requires transitive exhort.api; requires cyclonedx.core.java; - requires packageurl.java; + requires transitive packageurl.java; requires transitive java.logging; requires org.tomlj; requires java.base; diff --git a/src/test/java/com/redhat/exhort/impl/ExhortApiIT.java b/src/test/java/com/redhat/exhort/impl/ExhortApiIT.java index 3fbf1951..8273d89f 100644 --- a/src/test/java/com/redhat/exhort/impl/ExhortApiIT.java +++ b/src/test/java/com/redhat/exhort/impl/ExhortApiIT.java @@ -28,7 +28,6 @@ import static org.mockito.Mockito.mockStatic; import com.fasterxml.jackson.core.JsonProcessingException; -import com.fasterxml.jackson.databind.ObjectMapper; import com.redhat.exhort.Api; import com.redhat.exhort.ExhortTest; import com.redhat.exhort.api.v4.AnalysisReport; @@ -337,13 +336,11 @@ private static void handleJsonResponse( } private void handleHtmlResponse(String analysisReportHtml) throws JsonProcessingException { - ObjectMapper om = new ObjectMapper(); assertThat(analysisReportHtml).contains("svg", "html"); } private void handleHtmlResponseForImage(String analysisReportHtml) throws JsonProcessingException { - ObjectMapper om = new ObjectMapper(); assertThat(analysisReportHtml).contains("svg", "html"); } diff --git a/src/test/java/com/redhat/exhort/providers/PythonEnvironmentExtension.java b/src/test/java/com/redhat/exhort/providers/PythonEnvironmentExtension.java index f94d773d..6ed891ba 100644 --- a/src/test/java/com/redhat/exhort/providers/PythonEnvironmentExtension.java +++ b/src/test/java/com/redhat/exhort/providers/PythonEnvironmentExtension.java @@ -18,7 +18,6 @@ import com.redhat.exhort.tools.Operations; import com.redhat.exhort.utils.PythonControllerBase; import com.redhat.exhort.utils.PythonControllerTestEnv; -import java.util.List; import org.junit.jupiter.api.extension.*; public class PythonEnvironmentExtension @@ -34,12 +33,6 @@ public class PythonEnvironmentExtension Operations.getCustomPathOrElse("python3"), Operations.getCustomPathOrElse("pip3")); private System.Logger log = System.getLogger(this.getClass().getName()); - // public PythonEnvironmentExtension(List requirementsFiles) { - // this.requirementsFiles = requirementsFiles; - // } - - private List requirementsFiles; - @Override public void afterAll(ExtensionContext extensionContext) throws Exception { log.log(System.Logger.Level.INFO, "Finished all python tests and about to clean environment"); diff --git a/src/test/java/com/redhat/exhort/utils/PythonControllerBaseTest.java b/src/test/java/com/redhat/exhort/utils/PythonControllerBaseTest.java index ea8ad87d..a8ba8d73 100644 --- a/src/test/java/com/redhat/exhort/utils/PythonControllerBaseTest.java +++ b/src/test/java/com/redhat/exhort/utils/PythonControllerBaseTest.java @@ -37,7 +37,7 @@ public boolean matches(String[] command) { // in order to let // custom ArgumentMatcher work correctly. @Override - public Class type() { + public Class type() { return String[].class; } }; @@ -50,7 +50,7 @@ public boolean matches(String[] command) { } @Override - public Class type() { + public Class type() { return String[].class; } }; From 45ef4452eda574325a0cda289b90af7cdd2bb32c Mon Sep 17 00:00:00 2001 From: Ruben Romero Montes Date: Thu, 10 Apr 2025 13:47:26 +0200 Subject: [PATCH 2/2] refactor: improve test feedback Signed-off-by: Ruben Romero Montes --- .../exhort/providers/GoModulesMainModuleVersionTest.java | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/test/java/com/redhat/exhort/providers/GoModulesMainModuleVersionTest.java b/src/test/java/com/redhat/exhort/providers/GoModulesMainModuleVersionTest.java index 34556cc8..eef8cde6 100644 --- a/src/test/java/com/redhat/exhort/providers/GoModulesMainModuleVersionTest.java +++ b/src/test/java/com/redhat/exhort/providers/GoModulesMainModuleVersionTest.java @@ -15,13 +15,13 @@ */ package com.redhat.exhort.providers; +import static org.assertj.core.api.Assertions.assertThat; import static org.junit.jupiter.api.Assertions.*; import com.redhat.exhort.tools.Operations; import java.io.IOException; import java.nio.file.Files; import java.nio.file.Path; -import java.util.regex.Pattern; import org.apache.commons.io.FileUtils; import org.junit.jupiter.api.*; @@ -93,9 +93,7 @@ void determine_Main_Module_Version_GitRepo_commit_is_after_tag() { gitCommit("sample-2"); goModulesProvider.determineMainModuleVersion(testGitRepo); - assertTrue( - Pattern.matches( - "v1.0.1-0.[0-9]{14}-[a-f0-9]{12}", goModulesProvider.getMainModuleVersion())); + assertThat(goModulesProvider.getMainModuleVersion()).matches("v1.0.1-0.[0-9]{14}-[a-f0-9]{12}"); } private void gitInit() {