chore: add warning message in case failed to retrieve TC recommendations

Signed-off-by: Zvi Grinberg <[email protected]>

Author: zvigrinberg

src/main/java/com/redhat/exhort/integration/backend/ExhortIntegration.java

@@ -25,19 +25,15 @@
 import java.io.InputStream;
 import java.util.Arrays;
 
-import com.redhat.exhort.integration.trustedcontent.TcResponseHandler;
-import org.apache.camel.AggregationStrategy;
 import org.apache.camel.Exchange;
 import org.apache.camel.LoggingLevel;
 import org.apache.camel.builder.AggregationStrategies;
 import org.apache.camel.builder.endpoint.EndpointRouteBuilder;
 import org.apache.camel.component.micrometer.MicrometerConstants;
 import org.apache.camel.component.micrometer.routepolicy.MicrometerRoutePolicyFactory;
 
-import com.fasterxml.jackson.databind.ObjectMapper;
 import com.redhat.exhort.analytics.AnalyticsService;
 import com.redhat.exhort.integration.Constants;
-import com.redhat.exhort.integration.VulnerabilityProvider;
 import com.redhat.exhort.integration.backend.sbom.SbomParserFactory;
 import com.redhat.exhort.integration.providers.ProviderAggregationStrategy;
 import com.redhat.exhort.integration.providers.VulnerabilityProvider;
@@ -64,7 +60,7 @@ public class ExhortIntegration extends EndpointRouteBuilder {
 
   @Inject AnalyticsService analytics;
 
-  @Inject ObjectMapper mapper;
+  //  @Inject ObjectMapper mapper;
 
   @Inject MonitoringProcessor monitoringProcessor;
 

src/main/java/com/redhat/exhort/integration/trustedcontent/TcResponseHandler.java

@@ -33,14 +33,17 @@ public class TcResponseHandler {
 
   //  ObjectMapper mapper = ObjectMapperProducer.newInstance();
 
-  public Map<String, String> responseToMap(@Body Map<String, Map<String,List>> tcResponse) throws IOException {
+  public Map<String, String> responseToMap(@Body Map<String, Map<String, List>> tcResponse)
+      throws IOException {
     HashMap<String, String> recommendations = new HashMap<>();
 
     Map<String, List> rec = (Map<String, List>) tcResponse.get("recommendations");
     rec.entrySet().stream()
         .forEach(
             (entry) -> {
-              recommendations.put(entry.getKey(), (String)((Map)entry.getValue().stream().findFirst().get()).get("package"));
+              recommendations.put(
+                  entry.getKey(),
+                  (String) ((Map) entry.getValue().stream().findFirst().get()).get("package"));
             });
 
     return recommendations;

src/main/java/com/redhat/exhort/integration/trustedcontent/TrustedContentIntegration.java

@@ -21,17 +21,21 @@
 import java.util.*;
 
 import org.apache.camel.Exchange;
+import org.apache.camel.LoggingLevel;
 import org.apache.camel.builder.endpoint.EndpointRouteBuilder;
+import org.apache.camel.model.dataformat.JsonLibrary;
 
 import com.redhat.exhort.api.PackageRef;
 import com.redhat.exhort.integration.Constants;
 import com.redhat.exhort.model.DependencyTree;
 
+import io.quarkus.runtime.annotations.RegisterForReflection;
+
 import jakarta.enterprise.context.ApplicationScoped;
 import jakarta.ws.rs.core.MediaType;
-import org.apache.camel.model.dataformat.JsonLibrary;
 
 @ApplicationScoped
+@RegisterForReflection
 public class TrustedContentIntegration extends EndpointRouteBuilder {
 
   @Override
@@ -59,6 +63,10 @@ public void configure() {
         .endCircuitBreaker()
         .onFallback()
         .setBody(constant(Map.of("recommendations", Map.of())))
+        .log(
+            LoggingLevel.WARN,
+            "Failed to retrieve recommendations from Trusted content service' /recommend endpoint,"
+                + " error message => ${exception.message}")
         .end();
   }
 

src/test/java/com/redhat/exhort/integration/trustedcontent/TcResponseAggregationTest.java

@@ -121,15 +121,13 @@ void Check_Integration_With_Empty_Map_Of_Recommendations() {
     newMessageWithRecommendations.getMessage().setBody(Map.of());
     int hashCodeBefore = analysisReport.hashCode();
     Exchange aggregate =
-            tcResponseAggregation.aggregate(originalMessage, newMessageWithRecommendations);
+        tcResponseAggregation.aggregate(originalMessage, newMessageWithRecommendations);
 
     int hashCodeAfter = aggregate.getMessage().getBody().hashCode();
-    //Empty recommendations list must not touch AnalysisReport instance and let it remain the same.
-    assertEquals(hashCodeBefore,hashCodeAfter);
-
+    // Empty recommendations list must not touch AnalysisReport instance and let it remain the same.
+    assertEquals(hashCodeBefore, hashCodeAfter);
   }
 
-
   @Test
   void Check_Integration_With_Map_Of_Recommendations() {
     TcResponseAggregation tcResponseAggregation = new TcResponseAggregation();
@@ -145,8 +143,6 @@ void Check_Integration_With_Map_Of_Recommendations() {
     AnalysisReport result = (AnalysisReport) aggregate.getMessage().getBody();
     Source resultDummySourceRef =
         result.getProviders().get("dummy-provider").getSources().get("dummy-source");
-    assertEquals(5, resultDummySourceRef.getSummary().getDirect());
-    assertEquals(5, resultDummySourceRef.getSummary().getDependencies());
     assertEquals(5, resultDummySourceRef.getSummary().getRecommendations());
     assertEquals(
         4,
@@ -1041,7 +1037,6 @@ public void setAutowiredEnabled(Boolean autowiredEnabled) {}
     };
   }
 
-
   private static Issue buildIssue(String id, Float score) {
     return new Issue()
         .id(String.format("ISSUE-00-%s", id))

src/test/java/com/redhat/exhort/integration/trustedcontent/TcResponseHandlerTest.java

@@ -43,14 +43,22 @@ private static Stream<Arguments> getPayload() {
                 Map.of(
                     "pkg:mgr/io.group/[email protected]",
                     List.of(
-                        Map.of("package","pkg:mgr/io.group/[email protected]"  + REDHAT_REPOSITORY_SUFFIX)),
+                        Map.of(
+                            "package",
+                            "pkg:mgr/io.group/[email protected]"
+                                + REDHAT_REPOSITORY_SUFFIX)),
                     "pkg:mgr/io.group/[email protected]",
                     List.of(
-                        Map.of("package","pkg:mgr/io.group/[email protected]" + REDHAT_REPOSITORY_SUFFIX)),
+                        Map.of(
+                            "package",
+                            "pkg:mgr/io.group/[email protected]"
+                                + REDHAT_REPOSITORY_SUFFIX)),
                     "pkg:mgr/io.group/[email protected]",
                     List.of(
-                        Map.of("package","pkg:mgr/io.group/[email protected]" + REDHAT_REPOSITORY_SUFFIX)))
-            ),
+                        Map.of(
+                            "package",
+                            "pkg:mgr/io.group/[email protected]"
+                                + REDHAT_REPOSITORY_SUFFIX)))),
             Map.of(
                 "pkg:mgr/io.group/[email protected]",
                 "pkg:mgr/io.group/[email protected]" + REDHAT_REPOSITORY_SUFFIX,
@@ -64,7 +72,8 @@ private static Stream<Arguments> getPayload() {
 
   @ParameterizedTest
   @MethodSource("getPayload")
-  void test_Payload_With_Purls(Map<String, Map<String,List>> input, Map<String, String> expectedOutput) {
+  void test_Payload_With_Purls(
+      Map<String, Map<String, List>> input, Map<String, String> expectedOutput) {
     TcResponseHandler tcResponseHandler = new TcResponseHandler();
     try {
       Map<String, String> actualOutput = tcResponseHandler.responseToMap(input);