Merge branch 'er-3.2.2' into main

oracle-japan · Jul 13, 2023 · 9f1efe0 · 9f1efe0
2 parents 9a8ba39 + fd2a86b
commit 9f1efe0
Show file tree

Hide file tree

Showing 3 changed files with 41 additions and 21 deletions.
diff --git a/pom-docker.xml b/pom-docker.xml
@@ -5,7 +5,7 @@
 
     <groupId>oracle.demo</groupId>
     <artifactId>helidon-mp-demo-docker-build</artifactId>
-    <version>3.2.1.0</version>
+    <version>3.2.2.0</version>
     <name>helidon-mp-demo-docker-build</name>
 
     <properties>

diff --git a/pom.xml b/pom.xml
@@ -6,17 +6,17 @@
     <parent>
         <groupId>io.helidon.applications</groupId>
         <artifactId>helidon-mp</artifactId>
-        <version>3.2.1</version>
+        <version>3.2.2</version>
         <relativePath />
     </parent>
 
     <groupId>me.opc-helidon</groupId>
     <artifactId>helidon-mp-demo</artifactId>
-    <version>3.2.1.0</version>
+    <version>3.2.2.0</version>
     <name>${project.artifactId}</name>
 
     <properties>
-        <grpc.version>1.45.1</grpc.version>
+        <grpc.version>1.56.1</grpc.version>
         <apm.tracer.version>[1.8.3326,)</apm.tracer.version>
     </properties>
 

diff --git a/src/main/java/oracle/demo/grpc/protobuf/helloworld/GreeterGrpc.java b/src/main/java/oracle/demo/grpc/protobuf/helloworld/GreeterGrpc.java
@@ -8,7 +8,7 @@
  * </pre>
  */
 @javax.annotation.Generated(
-    value = "by gRPC proto compiler (version 1.45.1)",
+    value = "by gRPC proto compiler (version 1.56.1)",
     comments = "Source: helloworld.proto")
 @io.grpc.stub.annotations.GrpcGenerated
 public final class GreeterGrpc {
@@ -98,37 +98,41 @@ public GreeterFutureStub newStub(io.grpc.Channel channel, io.grpc.CallOptions ca
    * The greeting service definition.
    * </pre>
    */
-  public static abstract class GreeterImplBase implements io.grpc.BindableService {
+  public interface AsyncService {
 
     /**
      * <pre>
      * Sends a greeting
      * </pre>
      */
-    public void sayHello(oracle.demo.grpc.protobuf.helloworld.Helloworld.HelloRequest request,
+    default void sayHello(oracle.demo.grpc.protobuf.helloworld.Helloworld.HelloRequest request,
         io.grpc.stub.StreamObserver<oracle.demo.grpc.protobuf.helloworld.Helloworld.HelloReply> responseObserver) {
       io.grpc.stub.ServerCalls.asyncUnimplementedUnaryCall(getSayHelloMethod(), responseObserver);
     }
+  }
+
+  /**
+   * Base class for the server implementation of the service Greeter.
+   * <pre>
+   * The greeting service definition.
+   * </pre>
+   */
+  public static abstract class GreeterImplBase
+      implements io.grpc.BindableService, AsyncService {
 
     @java.lang.Override public final io.grpc.ServerServiceDefinition bindService() {
-      return io.grpc.ServerServiceDefinition.builder(getServiceDescriptor())
-          .addMethod(
-            getSayHelloMethod(),
-            io.grpc.stub.ServerCalls.asyncUnaryCall(
-              new MethodHandlers<
-                oracle.demo.grpc.protobuf.helloworld.Helloworld.HelloRequest,
-                oracle.demo.grpc.protobuf.helloworld.Helloworld.HelloReply>(
-                  this, METHODID_SAY_HELLO)))
-          .build();
+      return GreeterGrpc.bindService(this);
     }
   }
 
   /**
+   * A stub to allow clients to do asynchronous rpc calls to service Greeter.
    * <pre>
    * The greeting service definition.
    * </pre>
    */
-  public static final class GreeterStub extends io.grpc.stub.AbstractAsyncStub<GreeterStub> {
+  public static final class GreeterStub
+      extends io.grpc.stub.AbstractAsyncStub<GreeterStub> {
     private GreeterStub(
         io.grpc.Channel channel, io.grpc.CallOptions callOptions) {
       super(channel, callOptions);
@@ -153,11 +157,13 @@ public void sayHello(oracle.demo.grpc.protobuf.helloworld.Helloworld.HelloReques
   }
 
   /**
+   * A stub to allow clients to do synchronous rpc calls to service Greeter.
    * <pre>
    * The greeting service definition.
    * </pre>
    */
-  public static final class GreeterBlockingStub extends io.grpc.stub.AbstractBlockingStub<GreeterBlockingStub> {
+  public static final class GreeterBlockingStub
+      extends io.grpc.stub.AbstractBlockingStub<GreeterBlockingStub> {
     private GreeterBlockingStub(
         io.grpc.Channel channel, io.grpc.CallOptions callOptions) {
       super(channel, callOptions);
@@ -181,11 +187,13 @@ public oracle.demo.grpc.protobuf.helloworld.Helloworld.HelloReply sayHello(oracl
   }
 
   /**
+   * A stub to allow clients to do ListenableFuture-style rpc calls to service Greeter.
    * <pre>
    * The greeting service definition.
    * </pre>
    */
-  public static final class GreeterFutureStub extends io.grpc.stub.AbstractFutureStub<GreeterFutureStub> {
+  public static final class GreeterFutureStub
+      extends io.grpc.stub.AbstractFutureStub<GreeterFutureStub> {
     private GreeterFutureStub(
         io.grpc.Channel channel, io.grpc.CallOptions callOptions) {
       super(channel, callOptions);
@@ -216,10 +224,10 @@ private static final class MethodHandlers<Req, Resp> implements
       io.grpc.stub.ServerCalls.ServerStreamingMethod<Req, Resp>,
       io.grpc.stub.ServerCalls.ClientStreamingMethod<Req, Resp>,
       io.grpc.stub.ServerCalls.BidiStreamingMethod<Req, Resp> {
-    private final GreeterImplBase serviceImpl;
+    private final AsyncService serviceImpl;
     private final int methodId;
 
-    MethodHandlers(GreeterImplBase serviceImpl, int methodId) {
+    MethodHandlers(AsyncService serviceImpl, int methodId) {
       this.serviceImpl = serviceImpl;
       this.methodId = methodId;
     }
@@ -248,6 +256,18 @@ public io.grpc.stub.StreamObserver<Req> invoke(
     }
   }
 
+  public static final io.grpc.ServerServiceDefinition bindService(AsyncService service) {
+    return io.grpc.ServerServiceDefinition.builder(getServiceDescriptor())
+        .addMethod(
+          getSayHelloMethod(),
+          io.grpc.stub.ServerCalls.asyncUnaryCall(
+            new MethodHandlers<
+              oracle.demo.grpc.protobuf.helloworld.Helloworld.HelloRequest,
+              oracle.demo.grpc.protobuf.helloworld.Helloworld.HelloReply>(
+                service, METHODID_SAY_HELLO)))
+        .build();
+  }
+
   private static abstract class GreeterBaseDescriptorSupplier
       implements io.grpc.protobuf.ProtoFileDescriptorSupplier, io.grpc.protobuf.ProtoServiceDescriptorSupplier {
     GreeterBaseDescriptorSupplier() {}