use grpc-netty-shaded (#2832)

pongad · web-flow · commit e4fdfad64ab3 · 2018-02-07T11:52:18.000+11:00
Fixes #2813.
diff --git a/google-cloud-bigquerydatatransfer/pom.xml b/google-cloud-bigquerydatatransfer/pom.xml
@@ -19,10 +19,6 @@
     <artifact.version>${project.version}</artifact.version>
   </properties>
   <dependencies>
-    <dependency>
-      <groupId>io.netty</groupId>
-      <artifactId>netty-tcnative-boringssl-static</artifactId>
-    </dependency>
     <dependency>
       <groupId>${project.groupId}</groupId>
       <artifactId>google-cloud-core</artifactId>
@@ -41,7 +37,7 @@
     </dependency>
     <dependency>
       <groupId>io.grpc</groupId>
-      <artifactId>grpc-netty</artifactId>
+      <artifactId>grpc-netty-shaded</artifactId>
     </dependency>
     <dependency>
       <groupId>io.grpc</groupId>
diff --git a/google-cloud-bigtable/pom.xml b/google-cloud-bigtable/pom.xml
@@ -18,10 +18,6 @@
     <site.installationModule>google-cloud-bigtable</site.installationModule>
   </properties>
   <dependencies>
-    <dependency>
-      <groupId>io.netty</groupId>
-      <artifactId>netty-tcnative-boringssl-static</artifactId>
-    </dependency>
     <dependency>
       <groupId>${project.groupId}</groupId>
       <artifactId>google-cloud-core</artifactId>
@@ -50,7 +46,7 @@
     </dependency>
     <dependency>
       <groupId>io.grpc</groupId>
-      <artifactId>grpc-netty</artifactId>
+      <artifactId>grpc-netty-shaded</artifactId>
     </dependency>
     <dependency>
       <groupId>io.grpc</groupId>
diff --git a/google-cloud-bom/pom.xml b/google-cloud-bom/pom.xml
@@ -127,9 +127,9 @@
     <api-client.version>1.23.0</api-client.version>
 
     <api-common.version>1.2.0</api-common.version>
-    <gax.version>1.17.0</gax.version>
-    <gax-grpc.version>1.17.0</gax-grpc.version>
-    <gax-httpjson.version>0.34.0</gax-httpjson.version>
+    <gax.version>1.18.0</gax.version>
+    <gax-grpc.version>1.18.0</gax-grpc.version>
+    <gax-httpjson.version>0.35.0</gax-httpjson.version>
     <generated-proto-beta.version>0.1.29</generated-proto-beta.version>
     <generated-proto-ga.version>1.0.5</generated-proto-ga.version>
     <google.auth.version>0.9.0</google.auth.version>
@@ -897,6 +897,11 @@
         <artifactId>grpc-netty</artifactId>
         <version>${grpc.version}</version>
       </dependency>
+      <dependency>
+        <groupId>io.grpc</groupId>
+        <artifactId>grpc-netty-shaded</artifactId>
+        <version>${grpc.version}</version>
+      </dependency>
       <dependency>
         <groupId>io.grpc</groupId>
         <artifactId>grpc-stub</artifactId>
diff --git a/google-cloud-container/pom.xml b/google-cloud-container/pom.xml
@@ -19,10 +19,6 @@
     <artifact.version>${project.version}</artifact.version>
   </properties>
   <dependencies>
-    <dependency>
-      <groupId>io.netty</groupId>
-      <artifactId>netty-tcnative-boringssl-static</artifactId>
-    </dependency>
     <dependency>
       <groupId>${project.groupId}</groupId>
       <artifactId>google-cloud-core</artifactId>
@@ -41,7 +37,7 @@
     </dependency>
     <dependency>
       <groupId>io.grpc</groupId>
-      <artifactId>grpc-netty</artifactId>
+      <artifactId>grpc-netty-shaded</artifactId>
     </dependency>
     <dependency>
       <groupId>io.grpc</groupId>
diff --git a/google-cloud-core-grpc/pom.xml b/google-cloud-core-grpc/pom.xml
@@ -18,10 +18,6 @@
     <site.installationModule>google-cloud-core-grpc</site.installationModule>
   </properties>
   <dependencies>
-    <dependency>
-      <groupId>io.netty</groupId>
-      <artifactId>netty-tcnative-boringssl-static</artifactId>
-    </dependency>
     <dependency>
       <groupId>com.google.auth</groupId>
       <artifactId>google-auth-library-credentials</artifactId>
@@ -67,7 +63,7 @@
     </dependency>
     <dependency>
       <groupId>io.grpc</groupId>
-      <artifactId>grpc-netty</artifactId>
+      <artifactId>grpc-netty-shaded</artifactId>
     </dependency>
     <dependency>
       <groupId>io.grpc</groupId>
diff --git a/google-cloud-dataproc/pom.xml b/google-cloud-dataproc/pom.xml
@@ -18,10 +18,6 @@
     <site.installationModule>google-cloud-dataproc</site.installationModule>
   </properties>
   <dependencies>
-    <dependency>
-      <groupId>io.netty</groupId>
-      <artifactId>netty-tcnative-boringssl-static</artifactId>
-    </dependency>
     <dependency>
       <groupId>${project.groupId}</groupId>
       <artifactId>google-cloud-core</artifactId>
@@ -40,7 +36,7 @@
     </dependency>
     <dependency>
       <groupId>io.grpc</groupId>
-      <artifactId>grpc-netty</artifactId>
+      <artifactId>grpc-netty-shaded</artifactId>
     </dependency>
     <dependency>
       <groupId>io.grpc</groupId>
diff --git a/google-cloud-dialogflow/pom.xml b/google-cloud-dialogflow/pom.xml
@@ -18,10 +18,6 @@
     <site.installationModule>google-cloud-dialogflow-v2beta1</site.installationModule>
   </properties>
   <dependencies>
-    <dependency>
-      <groupId>io.netty</groupId>
-      <artifactId>netty-tcnative-boringssl-static</artifactId>
-    </dependency>
     <dependency>
       <groupId>${project.groupId}</groupId>
       <artifactId>google-cloud-core</artifactId>
@@ -36,7 +32,7 @@
     </dependency>
     <dependency>
       <groupId>io.grpc</groupId>
-      <artifactId>grpc-netty</artifactId>
+      <artifactId>grpc-netty-shaded</artifactId>
     </dependency>
     <dependency>
       <groupId>io.grpc</groupId>
diff --git a/google-cloud-dlp/pom.xml b/google-cloud-dlp/pom.xml
@@ -18,10 +18,6 @@
     <site.installationModule>google-cloud-dlp-v2beta1</site.installationModule>
   </properties>
   <dependencies>
-    <dependency>
-      <groupId>io.netty</groupId>
-      <artifactId>netty-tcnative-boringssl-static</artifactId>
-    </dependency>
     <dependency>
       <groupId>${project.groupId}</groupId>
       <artifactId>google-cloud-core</artifactId>
@@ -36,7 +32,7 @@
     </dependency>
     <dependency>
       <groupId>io.grpc</groupId>
-      <artifactId>grpc-netty</artifactId>
+      <artifactId>grpc-netty-shaded</artifactId>
     </dependency>
     <dependency>
       <groupId>io.grpc</groupId>
diff --git a/google-cloud-errorreporting/pom.xml b/google-cloud-errorreporting/pom.xml
@@ -18,10 +18,6 @@
     <site.installationModule>google-cloud-errorreporting</site.installationModule>
   </properties>
   <dependencies>
-    <dependency>
-      <groupId>io.netty</groupId>
-      <artifactId>netty-tcnative-boringssl-static</artifactId>
-    </dependency>
     <dependency>
       <groupId>${project.groupId}</groupId>
       <artifactId>google-cloud-core</artifactId>
@@ -36,7 +32,7 @@
     </dependency>
     <dependency>
       <groupId>io.grpc</groupId>
-      <artifactId>grpc-netty</artifactId>
+      <artifactId>grpc-netty-shaded</artifactId>
     </dependency>
     <dependency>
       <groupId>io.grpc</groupId>
diff --git a/google-cloud-firestore/pom.xml b/google-cloud-firestore/pom.xml
@@ -21,10 +21,6 @@
     <site.installationModule>google-cloud-firestore</site.installationModule>
   </properties>
   <dependencies>
-    <dependency>
-      <groupId>io.netty</groupId>
-      <artifactId>netty-tcnative-boringssl-static</artifactId>
-    </dependency>
     <dependency>
       <groupId>${project.groupId}</groupId>
       <artifactId>google-cloud-core</artifactId>
@@ -57,7 +53,7 @@
     </dependency>
     <dependency>
       <groupId>io.grpc</groupId>
-      <artifactId>grpc-netty</artifactId>
+      <artifactId>grpc-netty-shaded</artifactId>
     </dependency>
     <dependency>
       <groupId>io.grpc</groupId>
diff --git a/google-cloud-language/pom.xml b/google-cloud-language/pom.xml
@@ -18,10 +18,6 @@
     <site.installationModule>google-cloud-language</site.installationModule>
   </properties>
   <dependencies>
-    <dependency>
-      <groupId>io.netty</groupId>
-      <artifactId>netty-tcnative-boringssl-static</artifactId>
-    </dependency>
     <dependency>
       <groupId>${project.groupId}</groupId>
       <artifactId>google-cloud-core</artifactId>
@@ -40,7 +36,7 @@
     </dependency>
     <dependency>
       <groupId>io.grpc</groupId>
-      <artifactId>grpc-netty</artifactId>
+      <artifactId>grpc-netty-shaded</artifactId>
     </dependency>
     <dependency>
       <groupId>io.grpc</groupId>
diff --git a/google-cloud-logging/pom.xml b/google-cloud-logging/pom.xml
@@ -18,10 +18,6 @@
     <site.installationModule>google-cloud-logging</site.installationModule>
   </properties>
   <dependencies>
-    <dependency>
-      <groupId>io.netty</groupId>
-      <artifactId>netty-tcnative-boringssl-static</artifactId>
-    </dependency>
     <dependency>
       <groupId>${project.groupId}</groupId>
       <artifactId>google-cloud-core</artifactId>
@@ -40,7 +36,7 @@
     </dependency>
     <dependency>
       <groupId>io.grpc</groupId>
-      <artifactId>grpc-netty</artifactId>
+      <artifactId>grpc-netty-shaded</artifactId>
     </dependency>
     <dependency>
       <groupId>io.grpc</groupId>
diff --git a/google-cloud-logging/src/test/java/com/google/cloud/logging/v2/testing/LocalLoggingHelper.java b/google-cloud-logging/src/test/java/com/google/cloud/logging/v2/testing/LocalLoggingHelper.java
@@ -14,42 +14,26 @@
 
 package com.google.cloud.logging.v2.testing;
 
-
 import io.grpc.ManagedChannel;
 import io.grpc.Server;
-import io.grpc.netty.NegotiationType;
-import io.grpc.netty.NettyChannelBuilder;
-import io.grpc.netty.NettyServerBuilder;
-import io.netty.channel.local.LocalAddress;
-import io.netty.channel.local.LocalChannel;
-import io.netty.channel.local.LocalServerChannel;
-
+import io.grpc.inprocess.InProcessChannelBuilder;
+import io.grpc.inprocess.InProcessServerBuilder;
 import java.io.IOException;
-import java.net.SocketAddress;
 
 /**
  * LocalLoggingHelper runs an in-memory Logging server for use in tests.
  */
 public class LocalLoggingHelper {
-  private static final int FLOW_CONTROL_WINDOW = 65 * 1024;
-
-  private final SocketAddress address;
+  private final String address;
   private final Server server;
   private final LocalLoggingImpl loggingImpl;
 
-  /**
-   * Constructs a new LocalLoggingHelper. The method start() must
-   * be called before it is used.
-   */
-  public LocalLoggingHelper(String addressString) {
-    address = new LocalAddress(addressString);
-    loggingImpl = new LocalLoggingImpl();
-    NettyServerBuilder builder =
-        NettyServerBuilder.forAddress(address)
-            .flowControlWindow(FLOW_CONTROL_WINDOW)
-            .channelType(LocalServerChannel.class);
-    builder.addService(loggingImpl.bindService());
-    server = builder.build();
+  /** Constructs a new LocalLoggingHelper. The method start() must be called before it is used. */
+  public LocalLoggingHelper(String address) {
+    this.address = address;
+    this.loggingImpl = new LocalLoggingImpl();
+    this.server =
+        InProcessServerBuilder.forName(address).addService(loggingImpl.bindService()).build();
   }
   /**
    * Starts the in-memory service.
@@ -77,10 +61,7 @@ public LocalLoggingImpl getLoggingImpl() {
    * Creates a channel for making requests to the in-memory service.
    */
   public ManagedChannel createChannel() {
-    return NettyChannelBuilder.forAddress(address)
-        .negotiationType(NegotiationType.PLAINTEXT)
-        .channelType(LocalChannel.class)
-        .build();
+    return InProcessChannelBuilder.forName(address).usePlaintext(true).build();
   }
   /**
    * Shuts down the in-memory service.
diff --git a/google-cloud-monitoring/pom.xml b/google-cloud-monitoring/pom.xml
@@ -18,10 +18,6 @@
     <site.installationModule>google-cloud-monitoring</site.installationModule>
   </properties>
   <dependencies>
-    <dependency>
-      <groupId>io.netty</groupId>
-      <artifactId>netty-tcnative-boringssl-static</artifactId>
-    </dependency>
     <dependency>
       <groupId>${project.groupId}</groupId>
       <artifactId>google-cloud-core</artifactId>
@@ -36,7 +32,7 @@
     </dependency>
     <dependency>
       <groupId>io.grpc</groupId>
-      <artifactId>grpc-netty</artifactId>
+      <artifactId>grpc-netty-shaded</artifactId>
     </dependency>
     <dependency>
       <groupId>io.grpc</groupId>
diff --git a/google-cloud-notification/pom.xml b/google-cloud-notification/pom.xml
@@ -21,10 +21,6 @@
     <site.installationModule>google-cloud-notification</site.installationModule>
   </properties>
   <dependencies>
-    <dependency>
-      <groupId>io.netty</groupId>
-      <artifactId>netty-tcnative-boringssl-static</artifactId>
-    </dependency>
     <dependency>
       <groupId>${project.groupId}</groupId>
       <artifactId>google-cloud-core</artifactId>
@@ -60,7 +56,7 @@
     </dependency>
     <dependency>
       <groupId>io.grpc</groupId>
-      <artifactId>grpc-netty</artifactId>
+      <artifactId>grpc-netty-shaded</artifactId>
     </dependency>
     <dependency>
       <groupId>io.grpc</groupId>
diff --git a/google-cloud-os-login/pom.xml b/google-cloud-os-login/pom.xml
@@ -18,10 +18,6 @@
     <site.installationModule>google-cloud-os-login</site.installationModule>
   </properties>
   <dependencies>
-    <dependency>
-      <groupId>io.netty</groupId>
-      <artifactId>netty-tcnative-boringssl-static</artifactId>
-    </dependency>
     <dependency>
       <groupId>${project.groupId}</groupId>
       <artifactId>google-cloud-core</artifactId>
@@ -40,7 +36,7 @@
     </dependency>
     <dependency>
       <groupId>io.grpc</groupId>
-      <artifactId>grpc-netty</artifactId>
+      <artifactId>grpc-netty-shaded</artifactId>
     </dependency>
     <dependency>
       <groupId>io.grpc</groupId>
diff --git a/google-cloud-pubsub/pom.xml b/google-cloud-pubsub/pom.xml
@@ -18,10 +18,6 @@
     <site.installationModule>google-cloud-pubsub</site.installationModule>
   </properties>
   <dependencies>
-    <dependency>
-      <groupId>io.netty</groupId>
-      <artifactId>netty-tcnative-boringssl-static</artifactId>
-    </dependency>
     <dependency>
       <groupId>${project.groupId}</groupId>
       <artifactId>google-cloud-core</artifactId>
@@ -40,7 +36,7 @@
     </dependency>
     <dependency>
       <groupId>io.grpc</groupId>
-      <artifactId>grpc-netty</artifactId>
+      <artifactId>grpc-netty-shaded</artifactId>
     </dependency>
     <dependency>
       <groupId>io.grpc</groupId>
diff --git a/google-cloud-spanner/pom.xml b/google-cloud-spanner/pom.xml
diff --git a/google-cloud-spanner/src/main/java/com/google/cloud/spanner/SpannerOptions.java b/google-cloud-spanner/src/main/java/com/google/cloud/spanner/SpannerOptions.java
diff --git a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/SpannerOptionsTest.java b/google-cloud-spanner/src/test/java/com/google/cloud/spanner/SpannerOptionsTest.java
diff --git a/google-cloud-speech/pom.xml b/google-cloud-speech/pom.xml
diff --git a/google-cloud-trace/pom.xml b/google-cloud-trace/pom.xml
diff --git a/google-cloud-video-intelligence/pom.xml b/google-cloud-video-intelligence/pom.xml
diff --git a/google-cloud-vision/pom.xml b/google-cloud-vision/pom.xml
