From fc8855e1b2f57d39e8906d6e97990eccc2e76807 Mon Sep 17 00:00:00 2001
From: Jonathan Knight <jk@thegridman.com>
Date: Mon, 11 Dec 2023 13:56:46 +0300
Subject: [PATCH] Deprecate GrpcChannelDescriptor methods for setting
 NameResolver due to deprecation of corresponding methods in the gRPC Java
 API.

---
 .../io/helidon/grpc/client/GrpcChannelDescriptor.java  | 10 ++++++++++
 .../io/helidon/grpc/client/GrpcChannelsProvider.java   |  1 +
 .../helidon/grpc/client/GrpcChannelsProviderTest.java  |  1 +
 3 files changed, 12 insertions(+)

diff --git a/grpc/client/src/main/java/io/helidon/grpc/client/GrpcChannelDescriptor.java b/grpc/client/src/main/java/io/helidon/grpc/client/GrpcChannelDescriptor.java
index 25e5324e91e..0fde0ae2b34 100644
--- a/grpc/client/src/main/java/io/helidon/grpc/client/GrpcChannelDescriptor.java
+++ b/grpc/client/src/main/java/io/helidon/grpc/client/GrpcChannelDescriptor.java
@@ -102,9 +102,14 @@ public Optional<String> loadBalancerPolicy() {
 
     /**
      * Get the {@link NameResolver.Factory} to use.
+     * <p/>
+     * This method is deprecated due to the deprecation of the
+     * {@link io.grpc.ManagedChannelBuilder#nameResolverFactory(io.grpc.NameResolver.Factory)}
+     * method in the gRPC Java API.
      *
      * @return the optional {@link NameResolver.Factory} to use
      */
+    @Deprecated
     public Optional<NameResolver.Factory> nameResolverFactory() {
         return Optional.ofNullable(nameResolver);
     }
@@ -223,11 +228,16 @@ public Builder loadBalancerPolicy(String policy) {
         /**
          * Set the {@link io.grpc.NameResolver.Factory} to use.
          * @param factory the {@link io.grpc.NameResolver.Factory} to use
+         * <p/>
+         * This method is deprecated due to the deprecation of the
+         * {@link io.grpc.ManagedChannelBuilder#nameResolverFactory(io.grpc.NameResolver.Factory)}
+         * method in the gRPC Java API.
          *
          * @return this instance for fluent API
          *
          * @see io.grpc.ManagedChannelBuilder#nameResolverFactory(io.grpc.NameResolver.Factory)
          */
+        @Deprecated
         public Builder nameResolverFactory(NameResolver.Factory factory) {
             this.nameResolver = factory;
             return this;
diff --git a/grpc/client/src/main/java/io/helidon/grpc/client/GrpcChannelsProvider.java b/grpc/client/src/main/java/io/helidon/grpc/client/GrpcChannelsProvider.java
index bc00b92fcae..04d9809c3c4 100644
--- a/grpc/client/src/main/java/io/helidon/grpc/client/GrpcChannelsProvider.java
+++ b/grpc/client/src/main/java/io/helidon/grpc/client/GrpcChannelsProvider.java
@@ -155,6 +155,7 @@ Map<String, GrpcChannelDescriptor> channels() {
         return channelConfigs;
     }
 
+    @SuppressWarnings("deprecation")
     private ManagedChannel createChannel(GrpcChannelDescriptor descriptor) {
         ManagedChannelBuilder<?> builder = descriptor.tlsDescriptor()
                 .map(tlsDescriptor -> createNettyChannelBuilder(descriptor, tlsDescriptor))
diff --git a/grpc/client/src/test/java/io/helidon/grpc/client/GrpcChannelsProviderTest.java b/grpc/client/src/test/java/io/helidon/grpc/client/GrpcChannelsProviderTest.java
index c8f06bab816..e305008cff1 100644
--- a/grpc/client/src/test/java/io/helidon/grpc/client/GrpcChannelsProviderTest.java
+++ b/grpc/client/src/test/java/io/helidon/grpc/client/GrpcChannelsProviderTest.java
@@ -36,6 +36,7 @@
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.mockito.Mockito.mock;
 
+@SuppressWarnings("deprecation")
 public class GrpcChannelsProviderTest {
 
     private static final String CLIENT_CERT = "ssl/clientCert.pem";