weekly cleanup: errorprone, javastyle, unused (grpc#2566)

dapengzhang0 · web-flow · commit 4a4f25ada4c6 · 2017-01-05T16:13:25.000-08:00
diff --git a/grpclb/src/main/java/io/grpc/grpclb/GrpclbLoadBalancer2.java b/grpclb/src/main/java/io/grpc/grpclb/GrpclbLoadBalancer2.java
@@ -279,7 +279,7 @@ private void startLbComm() {
 
     LoadBalanceRequest initRequest = LoadBalanceRequest.newBuilder()
         .setInitialRequest(InitialLoadBalanceRequest.newBuilder()
-            .setName(helper.getAuthority()).build())
+            .setName(serviceName).build())
         .build();
     lbRequestWriter.onNext(initRequest);
   }
diff --git a/grpclb/src/test/java/io/grpc/grpclb/GrpclbLoadBalancer2Test.java b/grpclb/src/test/java/io/grpc/grpclb/GrpclbLoadBalancer2Test.java
@@ -301,7 +301,6 @@ public void nameResolutionFailsThenRecoverToDelegate() {
 
     // Recover with a subsequent success
     List<ResolvedServerInfoGroup> resolvedServers = createResolvedServerInfoGroupList(false);
-    EquivalentAddressGroup eag = resolvedServers.get(0).toEquivalentAddressGroup();
 
     Attributes resolutionAttrs = Attributes.newBuilder().set(RESOLUTION_ATTR, "yeah").build();
     deliverResolvedAddresses(resolvedServers, resolutionAttrs);
@@ -406,6 +405,7 @@ public void grpclbThenNameResolutionFails() {
     inOrder.verify(helper).updatePicker(pickerCaptor.capture());
     ErrorPicker errorPicker = (ErrorPicker) pickerCaptor.getValue();
     assertSame(error, errorPicker.result.getStatus());
+    assertFalse(oobChannel.isShutdown());
 
     // Simulate receiving LB response
     List<InetSocketAddress> backends = Arrays.asList(
@@ -446,8 +446,6 @@ public void switchPolicy() {
     Attributes pickFirstResolutionAttrs = Attributes.newBuilder()
         .set(GrpclbConstants.ATTR_LB_POLICY, LbPolicy.PICK_FIRST).build();
     verify(pickFirstBalancerFactory, never()).newLoadBalancer(any(Helper.class));
-    verify(mockLbService).balanceLoad(lbResponseObserverCaptor.capture());
-    StreamObserver<LoadBalanceResponse> lbResponseObserver = lbResponseObserverCaptor.getValue();
     assertEquals(1, lbRequestObservers.size());
     StreamObserver<LoadBalanceRequest> lbRequestObserver = lbRequestObservers.poll();
 
diff --git a/interop-testing/src/main/java/io/grpc/testing/integration/TestServiceImpl.java b/interop-testing/src/main/java/io/grpc/testing/integration/TestServiceImpl.java
@@ -454,8 +454,8 @@ private ByteString createBufferFromFile(String fileClassPath) {
     } finally {
       try {
         inputStream.close();
-      } catch (IOException e) {
-        throw new RuntimeException(e);
+      } catch (IOException ignorable) {
+        // ignore
       }
     }
     return buffer;
diff --git a/testing/src/main/java/io/grpc/testing/TestUtils.java b/testing/src/main/java/io/grpc/testing/TestUtils.java
@@ -31,6 +31,8 @@
 
 package io.grpc.testing;
 
+import static com.google.common.base.Charsets.UTF_8;
+
 import io.grpc.ExperimentalApi;
 import io.grpc.ForwardingServerCall.SimpleForwardingServerCall;
 import io.grpc.Metadata;
@@ -43,9 +45,10 @@
 import java.io.BufferedWriter;
 import java.io.File;
 import java.io.FileInputStream;
-import java.io.FileWriter;
+import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
+import java.io.OutputStreamWriter;
 import java.net.InetAddress;
 import java.net.InetSocketAddress;
 import java.net.UnknownHostException;
@@ -256,7 +259,8 @@ public static File loadCert(String name) throws IOException {
     File tmpFile = File.createTempFile(name, "");
     tmpFile.deleteOnExit();
 
-    BufferedWriter writer = new BufferedWriter(new FileWriter(tmpFile));
+    BufferedWriter writer =
+        new BufferedWriter(new OutputStreamWriter(new FileOutputStream(tmpFile), UTF_8));
     try {
       int b;
       while ((b = in.read()) != -1) {

Original file line number	Diff line number	Diff line change
`@@ -279,7 +279,7 @@ private void startLbComm() {`
`279`	`279`
`280`	`280`	`LoadBalanceRequest initRequest = LoadBalanceRequest.newBuilder()`
`281`	`281`	`.setInitialRequest(InitialLoadBalanceRequest.newBuilder()`
`282`		`- .setName(helper.getAuthority()).build())`
	`282`	`+ .setName(serviceName).build())`
`283`	`283`	`.build();`
`284`	`284`	`lbRequestWriter.onNext(initRequest);`
`285`	`285`	`}`
Original file line number	Diff line number	Diff line change
`@@ -454,8 +454,8 @@ private ByteString createBufferFromFile(String fileClassPath) {`
`454`	`454`	`} finally {`
`455`	`455`	`try {`
`456`	`456`	`inputStream.close();`
`457`		`- } catch (IOException e) {`
`458`		`- throw new RuntimeException(e);`
	`457`	`+ } catch (IOException ignorable) {`
	`458`	`+ // ignore`
`459`	`459`	`}`
`460`	`460`	`}`
`461`	`461`	`return buffer;`