Skip to content

Fixes CAMEL-14893: fix 2.25.x branch #3742

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
davsclaus merged 1 commit into from
Apr 15, 2020
Merged

Fixes CAMEL-14893: fix 2.25.x branch #3742

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
26 changes: 18 additions & 8 deletions ...ts/camel-grpc/src/main/java/org/apache/camel/component/grpc/server/GrpcMethodHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
import java.util.List;
import java.util.Map;

import io.grpc.Status;
import io.grpc.stub.StreamObserver;
import javassist.util.proxy.MethodHandler;
import org.apache.camel.Exchange;
Expand Down Expand Up @@ -64,16 +65,25 @@ public Object invoke(Object self, Method thisMethod, Method proceed, Object[] ar
}

StreamObserver<Object> responseObserver = (StreamObserver<Object>)args[1];
Object responseBody = exchange.getIn().getBody();
if (responseBody instanceof List) {
List<Object> responseList = (List<Object>)responseBody;
responseList.forEach((responseItem) -> {
responseObserver.onNext(responseItem);
});

if (exchange.isFailed()) {
responseObserver.onError(Status.INTERNAL
.withDescription(exchange.getException().getMessage())
.withCause(exchange.getException()) // This can be attached to the Status locally, but NOT transmitted to the client!
.asRuntimeException());
} else {
responseObserver.onNext(responseBody);
Object responseBody = exchange.getIn().getBody();
if (responseBody instanceof List) {
List<Object> responseList = (List<Object>) responseBody;
responseList.forEach((responseItem) -> {
responseObserver.onNext(responseItem);
});
} else {
responseObserver.onNext(responseBody);
}
responseObserver.onCompleted();
}
responseObserver.onCompleted();

} else if (args.length == 1 && args[0] instanceof StreamObserver) {
// Single incoming parameter is instance of the io.grpc.stub.StreamObserver
final StreamObserver<Object> responseObserver = (StreamObserver<Object>)args[0];
Expand Down