nit changes and drop unintended changes.

Author: kannanjgithub

examples/example-tls/src/main/java/io/grpc/examples/helloworldtls/HelloWorldClientTls.java

@@ -16,7 +16,6 @@
 
 package io.grpc.examples.helloworldtls;
 
-import io.grpc.CallOptions;
 import io.grpc.Channel;
 import io.grpc.Grpc;
 import io.grpc.ManagedChannel;
@@ -53,9 +52,7 @@ public void greet(String name) {
         HelloRequest request = HelloRequest.newBuilder().setName(name).build();
         HelloReply response;
         try {
-            // response = blockingStub.sayHello(request);
-            response = io.grpc.stub.ClientCalls.blockingUnaryCall(
-                blockingStub.getChannel(), GreeterGrpc.getSayHelloMethod(), CallOptions.DEFAULT.withAuthority("localhost"), request);
+            response = blockingStub.sayHello(request);
         } catch (StatusRuntimeException e) {
             logger.log(Level.WARNING, "RPC failed: {0}", e.getStatus());
             return;
@@ -71,8 +68,8 @@ public static void main(String[] args) throws Exception {
 
         if (args.length < 2 || args.length == 4 || args.length > 5) {
             System.out.println("USAGE: HelloWorldClientTls host port [trustCertCollectionFilePath " +
-                    "[clientCertChainFilePath clientPrivateKeyFilePath]]\n  Note: clientCertChainFilePath and " +
-                    "clientPrivateKeyFilePath are only needed if mutual auth is desired.");
+                "[clientCertChainFilePath clientPrivateKeyFilePath]]\n  Note: clientCertChainFilePath and " +
+                "clientPrivateKeyFilePath are only needed if mutual auth is desired.");
             System.exit(0);
         }
 
@@ -91,9 +88,9 @@ public static void main(String[] args) throws Exception {
         String host = args[0];
         int port = Integer.parseInt(args[1]);
         ManagedChannel channel = Grpc.newChannelBuilderForAddress(host, port, tlsBuilder.build())
-                /* Only for using provided test certs. */
-                .overrideAuthority("foo.test.google.fr")
-                .build();
+            /* Only for using provided test certs. */
+            .overrideAuthority("foo.test.google.fr")
+            .build();
         try {
             HelloWorldClientTls client = new HelloWorldClientTls(channel);
             client.greet(host);

netty/build.gradle

@@ -17,8 +17,7 @@ tasks.named("jar").configure {
 
 dependencies {
     api project(':grpc-api'),
-            libraries.netty.codec.http2
-    implementation project(':grpc-util'),
+            libraries.netty.codec.http2,
             project(':grpc-core'),
             libs.netty.handler.proxy,
             libraries.guava,

netty/src/main/java/io/grpc/netty/ProtocolNegotiators.java

@@ -1258,9 +1258,7 @@ public boolean isInboundDone() {
     }
 
     @Override
-    public void closeOutbound() {
-
-    }
+    public void closeOutbound() {}
 
     @Override
     public boolean isOutboundDone() {
@@ -1278,9 +1276,7 @@ public String[] getEnabledCipherSuites() {
     }
 
     @Override
-    public void setEnabledCipherSuites(String[] strings) {
-
-    }
+    public void setEnabledCipherSuites(String[] strings) {}
 
     @Override
     public String[] getSupportedProtocols() {
@@ -1293,59 +1289,47 @@ public String[] getEnabledProtocols() {
     }
 
     @Override
-    public void setEnabledProtocols(String[] strings) {
-
-    }
+    public void setEnabledProtocols(String[] strings) {}
 
     @Override
     public SSLSession getSession() {
       return null;
     }
 
     @Override
-    public void beginHandshake() throws SSLException {
-
-    }
+    public void beginHandshake() throws SSLException {}
 
     @Override
     public HandshakeStatus getHandshakeStatus() {
       return null;
     }
 
     @Override
-    public void setUseClientMode(boolean b) {
-
-    }
+    public void setUseClientMode(boolean b) {}
 
     @Override
     public boolean getUseClientMode() {
       return false;
     }
 
     @Override
-    public void setNeedClientAuth(boolean b) {
-
-    }
+    public void setNeedClientAuth(boolean b) {}
 
     @Override
     public boolean getNeedClientAuth() {
       return false;
     }
 
     @Override
-    public void setWantClientAuth(boolean b) {
-
-    }
+    public void setWantClientAuth(boolean b) {}
 
     @Override
     public boolean getWantClientAuth() {
       return false;
     }
 
     @Override
-    public void setEnableSessionCreation(boolean b) {
-
-    }
+    public void setEnableSessionCreation(boolean b) {}
 
     @Override
     public boolean getEnableSessionCreation() {
@@ -1387,29 +1371,23 @@ public long getLastAccessedTime() {
     }
 
     @Override
-    public void invalidate() {
-
-    }
+    public void invalidate() {}
 
     @Override
     public boolean isValid() {
       return false;
     }
 
     @Override
-    public void putValue(String s, Object o) {
-
-    }
+    public void putValue(String s, Object o) {}
 
     @Override
     public Object getValue(String s) {
       return null;
     }
 
     @Override
-    public void removeValue(String s) {
-
-    }
+    public void removeValue(String s) {}
 
     @Override
     public String[] getValueNames() {

netty/src/test/java/io/grpc/netty/NettyClientTransportTest.java

@@ -1271,14 +1271,10 @@ static class FakeClientTransportListener implements ManagedClientTransport.Liste
     private boolean isConnected = false;
 
     @Override
-    public void transportShutdown(Status s) {
-
-    }
+    public void transportShutdown(Status s) {}
 
     @Override
-    public void transportTerminated() {
-
-    }
+    public void transportTerminated() {}
 
     @Override
     public void transportReady() {
@@ -1289,9 +1285,7 @@ public void transportReady() {
     }
 
     @Override
-    public void transportInUse(boolean inUse) {
-
-    }
+    public void transportInUse(boolean inUse) {}
   }
 
   private class FakeTrustManager implements X509TrustManager {