Skip to content

Commit b77f430

Browse files
authored
Merge pull request #210 from ruromero/oss-aggregate
fix: oss-index cannot aggregate big requests
2 parents c3322d4 + fd7dc6f commit b77f430

File tree

2 files changed

+9
-10
lines changed

2 files changed

+9
-10
lines changed

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -79,8 +79,7 @@ public void configure() {
7979
.clientRequestValidation(true);
8080

8181
errorHandler(deadLetterChannel("direct:processInternalError"));
82-
onException(Exception.class)
83-
.log("foo?level=ERROR");
82+
8483
onException(IllegalArgumentException.class)
8584
.routeId("onExhortIllegalArgumentException")
8685
.useOriginalMessage()

src/main/java/com/redhat/exhort/integration/providers/ossindex/OssIndexIntegration.java

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,7 @@ public class OssIndexIntegration extends EndpointRouteBuilder {
5353

5454
@Override
5555
public void configure() {
56+
5657
// fmt:off
5758
from(direct("ossIndexScan"))
5859
.routeId("ossIndexScan")
@@ -63,13 +64,13 @@ public void configure() {
6364
.transform().method(OssIndexResponseHandler.class, "buildReport")
6465
.endChoice()
6566
.otherwise()
66-
.to(direct("ossSplitReq"));
67+
.to(direct("ossSplitReq"))
68+
.transform().method(OssIndexResponseHandler.class, "buildReport");
6769

6870
from(direct("ossSplitReq"))
6971
.routeId("ossSplitReq")
70-
.doTry()
71-
.split(body(), AggregationStrategies.bean(OssIndexResponseHandler.class, "aggregateSplit"))
72-
.stopOnException()
72+
.doTry()
73+
.split(body(), AggregationStrategies.beanAllowNull(OssIndexResponseHandler.class, "aggregateSplit"))
7374
.parallelProcessing()
7475
.transform().method(OssIndexRequestBuilder.class, "buildRequest")
7576
.process(this::processComponentRequest)
@@ -80,10 +81,9 @@ public void configure() {
8081
.end()
8182
.to(vertxHttp("{{api.ossindex.host}}"))
8283
.transform(method(OssIndexResponseHandler.class, "responseToIssues"))
83-
.end()
84-
.transform().method(OssIndexResponseHandler.class, "buildReport")
85-
.endDoTry()
86-
.doCatch(HttpOperationFailedException.class)
84+
.end()
85+
.endDoTry()
86+
.doCatch(HttpOperationFailedException.class)
8787
.process(responseHandler::processResponseError);
8888

8989
from(direct("ossValidateCredentials"))

0 commit comments

Comments
 (0)