fix: PR change requests 2

Signed-off-by: Zvi Grinberg <zgrinber@redhat.com>
RHEcosystemAppEng · Dec 12, 2023 · 0b73636 · 0b73636
1 parent 68ed319
commit 0b73636
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 15 deletions.
diff --git a/src/main/java/com/redhat/exhort/integration/trustedcontent/TcResponseHandler.java b/src/main/java/com/redhat/exhort/integration/trustedcontent/TcResponseHandler.java
@@ -22,7 +22,6 @@
 import java.util.*;
 
 import org.apache.camel.Body;
-import org.apache.camel.Exchange;
 
 import com.redhat.exhort.integration.providers.ProviderResponseHandler;
 import com.redhat.exhort.model.DependencyTree;
@@ -36,13 +35,11 @@
 @RegisterForReflection
 public class TcResponseHandler extends ProviderResponseHandler {
 
-  //  ObjectMapper mapper = ObjectMapperProducer.newInstance();
-
   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");
+    Map<String, List> rec = tcResponse.get("recommendations");
     rec.entrySet().stream()
         .forEach(
             (entry) -> {
@@ -54,12 +51,6 @@ public Map<String, String> responseToMap(@Body Map<String, Map<String, List>> tc
     return recommendations;
   }
 
-  @Override
-  public void processResponseError(Exchange exchange) {
-    super.processResponseError(exchange);
-    exchange.getMessage().setBody(Map.of("recommendations", Map.of()));
-  }
-
   @Override
   protected String getProviderName() {
     return "TrustedContent";

diff --git a/src/main/java/com/redhat/exhort/integration/trustedcontent/TrustedContentIntegration.java b/src/main/java/com/redhat/exhort/integration/trustedcontent/TrustedContentIntegration.java
@@ -31,6 +31,7 @@
 
 import jakarta.enterprise.context.ApplicationScoped;
 import jakarta.inject.Inject;
+import jakarta.ws.rs.HttpMethod;
 import jakarta.ws.rs.core.MediaType;
 
 @ApplicationScoped
@@ -57,7 +58,7 @@ public void configure() {
         .marshal()
         .json()
         .setHeader(Exchange.HTTP_PATH, constant(Constants.TRUSTED_CONTENT_PATH))
-        .setHeader(Exchange.HTTP_METHOD, constant("POST"))
+        .setHeader(Exchange.HTTP_METHOD, constant(HttpMethod.POST))
         .setHeader(Exchange.CONTENT_TYPE, constant(MediaType.APPLICATION_JSON))
         .circuitBreaker()
         .faultToleranceConfiguration()
@@ -69,8 +70,8 @@ public void configure() {
         .json(JsonLibrary.Jackson, Map.class)
         .endCircuitBreaker()
         .onFallback()
-        .setBody(constant(Map.of("recommendations", Map.of())))
         .process(responseHandler::processResponseError)
+        .setBody(constant(Map.of("recommendations", Map.of())))
         .end();
   }
 

diff --git a/src/test/java/com/redhat/exhort/integration/AbstractAnalysisTest.java b/src/test/java/com/redhat/exhort/integration/AbstractAnalysisTest.java
@@ -266,9 +266,6 @@ protected void stubTrustedContentRequests() {
     server.stubFor(
         post(Constants.TRUSTED_CONTENT_PATH)
             .willReturn(aResponse().withStatus(200).withBody("{ \"recommendations\": {}\n" + "}")));
-    server.stubFor(
-        get(Constants.TRUSTED_CONTENT_PATH)
-            .willReturn(aResponse().withStatus(200).withBody("{ \"recommendations\": {}\n" + "}")));
   }
 
   protected void stubSnykRequests() {