diff --git a/pom.xml b/pom.xml index b9b8d010e3..acb03cd111 100644 --- a/pom.xml +++ b/pom.xml @@ -86,7 +86,7 @@ 1.3.0 4.7.7 2.63.1 - 3.25.5 + 4.33.0 1.7.0 2.0.17 2.12.3 diff --git a/src/main/java/emissary/grpc/GrpcRoutingPlace.java b/src/main/java/emissary/grpc/GrpcRoutingPlace.java index 413fed5762..e4020c346d 100644 --- a/src/main/java/emissary/grpc/GrpcRoutingPlace.java +++ b/src/main/java/emissary/grpc/GrpcRoutingPlace.java @@ -9,7 +9,7 @@ import emissary.place.ServiceProviderPlace; import com.google.common.util.concurrent.ListenableFuture; -import com.google.protobuf.GeneratedMessageV3; +import com.google.protobuf.Message; import io.grpc.ManagedChannel; import io.grpc.StatusRuntimeException; import io.grpc.stub.AbstractBlockingStub; @@ -170,8 +170,8 @@ protected void passivateConnection(ManagedChannel managedChannel) { /* No-op */ * @param the protobuf response type * @param the gRPC stub type */ - protected > R invokeGrpc( - String targetId, Function stubFactory, BiFunction callLogic, Q request) { + protected > R invokeGrpc(String targetId, + Function stubFactory, BiFunction callLogic, Q request) { return retryHandler.execute(() -> { ObjectPool channelPool = channelPoolLookup(targetId); @@ -207,9 +207,8 @@ protected the protobuf response type * @param the gRPC stub type */ - protected > List invokeBatchedGrpc( - String targetId, Function stubFactory, - BiFunction> callLogic, List requestList) { + protected > List invokeBatchedGrpc(String targetId, + Function stubFactory, BiFunction> callLogic, List requestList) { throw new UnsupportedOperationException("Not yet implemented"); } diff --git a/src/main/java/emissary/grpc/sample/GrpcSampleServicePlace.java b/src/main/java/emissary/grpc/sample/GrpcSampleServicePlace.java index 412ab21fb8..9f2b2a839e 100644 --- a/src/main/java/emissary/grpc/sample/GrpcSampleServicePlace.java +++ b/src/main/java/emissary/grpc/sample/GrpcSampleServicePlace.java @@ -96,7 +96,11 @@ private void processWithMockBehavior( SampleRequest request = SampleRequest.newBuilder() .setQuery(ByteString.copyFrom(o.data())) .build(); - SampleResponse response = invokeGrpc(targetId, SampleServiceGrpc::newBlockingStub, callLogic, request); + SampleResponse response = invokeGrpc( + targetId, + SampleServiceGrpc::newBlockingStub, // or: (ManagedChannel c) -> SampleServiceGrpc.newBlockingStub(c) + callLogic, + request); o.addAlternateView(ALTERNATE_VIEW_NAME, response.getResult().toByteArray()); } }