Fixing copyrights, spot-bugs and test

thegridman · Dec 8, 2023 · 21a8004 · 21a8004
1 parent 3e00de3
commit 21a8004
Show file tree

Hide file tree

Showing 7 changed files with 49 additions and 8 deletions.
diff --git a/grpc/client/src/main/java/module-info.java b/grpc/client/src/main/java/module-info.java
@@ -20,6 +20,9 @@
 module io.helidon.grpc.client {
     exports io.helidon.grpc.client;
 
+    requires io.grpc.netty;
+    requires io.netty.handler;
+
     requires transitive io.helidon.grpc.core;
 
     requires io.helidon.tracing;

diff --git a/grpc/client/src/test/java/io/helidon/grpc/client/GrpcChannelsProviderIT.java b/grpc/client/src/test/java/io/helidon/grpc/client/GrpcChannelsProviderIT.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019, 2022 Oracle and/or its affiliates.
+ * Copyright (c) 2019, 2023 Oracle and/or its affiliates.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -33,6 +33,8 @@
 import io.helidon.grpc.server.GrpcServerConfiguration;
 import io.grpc.EquivalentAddressGroup;
 import io.grpc.NameResolver;
+import io.grpc.NameResolverProvider;
+import io.grpc.NameResolverRegistry;
 import io.grpc.StatusRuntimeException;
 
 import io.netty.handler.codec.DecoderException;
@@ -209,12 +211,11 @@ public void shouldConnectWithCaCertAndClientCertAndClientKeyTo2WaySslServer() th
 
     @Test
     public void shouldUseTarget() throws Exception {
-        FakeNameResolverFactory factory = new FakeNameResolverFactory(portNoSsl);
+        NameResolverRegistry.getDefaultRegistry().register(new FakeNameResolverProvider("foo", portNoSsl));
         String channelKey = "ChannelKey";
         GrpcChannelDescriptor.Builder builder = GrpcChannelDescriptor
                 .builder()
-                .target("foo://bar.com")
-                .nameResolverFactory(factory);
+                .target("foo://bar.com");
 
         GrpcChannelsProvider provider = GrpcChannelsProvider.builder()
                 .channel(channelKey, builder.build())
@@ -304,6 +305,39 @@ public NameResolver.Args getArgs() {
         }
     }
 
+    private static class FakeNameResolverProvider extends NameResolverProvider {
+        private final String scheme;
+        private final int port;
+        private URI targetUri;
+        private NameResolver.Args args;
+
+        public FakeNameResolverProvider(String scheme, int port) {
+            this.scheme = scheme;
+            this.port = port;
+        }
+
+        @Override
+        protected boolean isAvailable() {
+            return true;
+        }
+
+        @Override
+        protected int priority() {
+            return 0;
+        }
+
+        @Override
+        public NameResolver newNameResolver(URI targetUri, NameResolver.Args args) {
+            this.targetUri = targetUri;
+            this.args = args;
+            return new FakeNameResolver(port);
+        }
+
+        @Override
+        public String getDefaultScheme() {
+            return scheme;
+        }
+    }
 
     private static class FakeNameResolver extends NameResolver {
         private final int port;

diff --git a/grpc/io.grpc/pom.xml b/grpc/io.grpc/pom.xml
@@ -32,6 +32,10 @@
     <name>Helidon grpc-java Bundle</name>
     <description>Bundle of grpc dependencies provided for backwards compatibility</description>
 
+    <properties>
+        <spotbugs.skip>true</spotbugs.skip>
+    </properties>
+
     <dependencies>
         <dependency>
             <groupId>io.grpc</groupId>

diff --git a/grpc/server/src/main/java/io/helidon/grpc/server/GrpcServerBasicConfig.java b/grpc/server/src/main/java/io/helidon/grpc/server/GrpcServerBasicConfig.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019, 2022 Oracle and/or its affiliates.
+ * Copyright (c) 2019, 2023 Oracle and/or its affiliates.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/grpc/server/src/main/java/io/helidon/grpc/server/GrpcServerConfiguration.java b/grpc/server/src/main/java/io/helidon/grpc/server/GrpcServerConfiguration.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019, 2022 Oracle and/or its affiliates.
+ * Copyright (c) 2019, 2023 Oracle and/or its affiliates.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/grpc/server/src/main/java/io/helidon/grpc/server/GrpcServerImpl.java b/grpc/server/src/main/java/io/helidon/grpc/server/GrpcServerImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019, 2021 Oracle and/or its affiliates.
+ * Copyright (c) 2019, 2023 Oracle and/or its affiliates.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/grpc/server/src/test/java/io/helidon/grpc/server/GrpcServerConfigurationTest.java b/grpc/server/src/test/java/io/helidon/grpc/server/GrpcServerConfigurationTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019, 2022 Oracle and/or its affiliates.
+ * Copyright (c) 2019, 2023 Oracle and/or its affiliates.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.