From d7d0d7314651f32a1e5e28fe836bf10b58c41a05 Mon Sep 17 00:00:00 2001 From: Eric Anderson Date: Fri, 3 Mar 2017 09:23:16 -0800 Subject: [PATCH] examples: Update imports to new-style --- .../grpc/examples/advanced/HelloJsonClient.java | 1 - .../grpc/examples/advanced/HelloJsonServer.java | 1 - .../examples/errorhandling/DetailErrorSample.java | 3 --- .../errorhandling/ErrorHandlingClient.java | 3 --- .../experimental/CompressingHelloWorldClient.java | 1 - .../grpc/examples/header/CustomHeaderClient.java | 1 - .../grpc/examples/header/CustomHeaderServer.java | 1 - .../examples/header/HeaderClientInterceptor.java | 2 -- .../examples/header/HeaderServerInterceptor.java | 2 -- .../examples/helloworld/HelloWorldClient.java | 1 - .../examples/helloworld/HelloWorldServer.java | 1 - .../examples/routeguide/RouteGuideClient.java | 2 -- .../examples/routeguide/RouteGuideServer.java | 1 - .../grpc/examples/routeguide/RouteGuideUtil.java | 1 - .../header/HeaderClientInterceptorTest.java | 1 - .../header/HeaderServerInterceptorTest.java | 1 - .../examples/helloworld/HelloWorldClientTest.java | 1 - .../examples/helloworld/HelloWorldServerTest.java | 1 - .../examples/routeguide/RouteGuideClientTest.java | 15 ++++++--------- .../examples/routeguide/RouteGuideServerTest.java | 14 ++++++-------- .../thrift/helloworld/HelloWorldClient.java | 3 +-- .../thrift/helloworld/HelloWorldServer.java | 3 +-- 22 files changed, 14 insertions(+), 46 deletions(-) diff --git a/examples/src/main/java/io/grpc/examples/advanced/HelloJsonClient.java b/examples/src/main/java/io/grpc/examples/advanced/HelloJsonClient.java index 308e418205..a07675fe76 100644 --- a/examples/src/main/java/io/grpc/examples/advanced/HelloJsonClient.java +++ b/examples/src/main/java/io/grpc/examples/advanced/HelloJsonClient.java @@ -45,7 +45,6 @@ import io.grpc.examples.helloworld.HelloRequest; import io.grpc.examples.helloworld.HelloWorldClient; import io.grpc.protobuf.ProtoUtils; import io.grpc.stub.AbstractStub; - import java.util.concurrent.TimeUnit; import java.util.logging.Level; import java.util.logging.Logger; diff --git a/examples/src/main/java/io/grpc/examples/advanced/HelloJsonServer.java b/examples/src/main/java/io/grpc/examples/advanced/HelloJsonServer.java index 54d923210d..fbbd173c67 100644 --- a/examples/src/main/java/io/grpc/examples/advanced/HelloJsonServer.java +++ b/examples/src/main/java/io/grpc/examples/advanced/HelloJsonServer.java @@ -43,7 +43,6 @@ import io.grpc.examples.helloworld.HelloRequest; import io.grpc.examples.helloworld.HelloWorldServer; import io.grpc.stub.ServerCalls.UnaryMethod; import io.grpc.stub.StreamObserver; - import java.io.IOException; import java.util.logging.Logger; diff --git a/examples/src/main/java/io/grpc/examples/errorhandling/DetailErrorSample.java b/examples/src/main/java/io/grpc/examples/errorhandling/DetailErrorSample.java index 25fdc25577..e7e9c2c8e5 100644 --- a/examples/src/main/java/io/grpc/examples/errorhandling/DetailErrorSample.java +++ b/examples/src/main/java/io/grpc/examples/errorhandling/DetailErrorSample.java @@ -38,7 +38,6 @@ import com.google.common.util.concurrent.Futures; import com.google.common.util.concurrent.ListenableFuture; import com.google.common.util.concurrent.Uninterruptibles; import com.google.rpc.DebugInfo; - import io.grpc.CallOptions; import io.grpc.ClientCall; import io.grpc.ManagedChannel; @@ -55,11 +54,9 @@ import io.grpc.examples.helloworld.HelloReply; import io.grpc.examples.helloworld.HelloRequest; import io.grpc.protobuf.ProtoUtils; import io.grpc.stub.StreamObserver; - import java.util.concurrent.CountDownLatch; import java.util.concurrent.ExecutionException; import java.util.concurrent.TimeUnit; - import javax.annotation.Nullable; /** diff --git a/examples/src/main/java/io/grpc/examples/errorhandling/ErrorHandlingClient.java b/examples/src/main/java/io/grpc/examples/errorhandling/ErrorHandlingClient.java index bdfdb8ed12..a0057f3d85 100644 --- a/examples/src/main/java/io/grpc/examples/errorhandling/ErrorHandlingClient.java +++ b/examples/src/main/java/io/grpc/examples/errorhandling/ErrorHandlingClient.java @@ -36,7 +36,6 @@ import com.google.common.util.concurrent.FutureCallback; import com.google.common.util.concurrent.Futures; import com.google.common.util.concurrent.ListenableFuture; import com.google.common.util.concurrent.Uninterruptibles; - import io.grpc.CallOptions; import io.grpc.ClientCall; import io.grpc.ManagedChannel; @@ -52,11 +51,9 @@ import io.grpc.examples.helloworld.GreeterGrpc.GreeterStub; import io.grpc.examples.helloworld.HelloReply; import io.grpc.examples.helloworld.HelloRequest; import io.grpc.stub.StreamObserver; - import java.util.concurrent.CountDownLatch; import java.util.concurrent.ExecutionException; import java.util.concurrent.TimeUnit; - import javax.annotation.Nullable; /** diff --git a/examples/src/main/java/io/grpc/examples/experimental/CompressingHelloWorldClient.java b/examples/src/main/java/io/grpc/examples/experimental/CompressingHelloWorldClient.java index 22b621e81a..6189aab41d 100644 --- a/examples/src/main/java/io/grpc/examples/experimental/CompressingHelloWorldClient.java +++ b/examples/src/main/java/io/grpc/examples/experimental/CompressingHelloWorldClient.java @@ -37,7 +37,6 @@ import io.grpc.StatusRuntimeException; import io.grpc.examples.helloworld.GreeterGrpc; import io.grpc.examples.helloworld.HelloReply; import io.grpc.examples.helloworld.HelloRequest; - import java.util.concurrent.TimeUnit; import java.util.logging.Level; import java.util.logging.Logger; diff --git a/examples/src/main/java/io/grpc/examples/header/CustomHeaderClient.java b/examples/src/main/java/io/grpc/examples/header/CustomHeaderClient.java index b07516e802..e2e4bd1fb1 100644 --- a/examples/src/main/java/io/grpc/examples/header/CustomHeaderClient.java +++ b/examples/src/main/java/io/grpc/examples/header/CustomHeaderClient.java @@ -40,7 +40,6 @@ import io.grpc.StatusRuntimeException; import io.grpc.examples.helloworld.GreeterGrpc; import io.grpc.examples.helloworld.HelloReply; import io.grpc.examples.helloworld.HelloRequest; - import java.util.concurrent.TimeUnit; import java.util.logging.Level; import java.util.logging.Logger; diff --git a/examples/src/main/java/io/grpc/examples/header/CustomHeaderServer.java b/examples/src/main/java/io/grpc/examples/header/CustomHeaderServer.java index b6c62cff60..13b0827430 100644 --- a/examples/src/main/java/io/grpc/examples/header/CustomHeaderServer.java +++ b/examples/src/main/java/io/grpc/examples/header/CustomHeaderServer.java @@ -38,7 +38,6 @@ import io.grpc.examples.helloworld.GreeterGrpc; import io.grpc.examples.helloworld.HelloReply; import io.grpc.examples.helloworld.HelloRequest; import io.grpc.stub.StreamObserver; - import java.io.IOException; import java.util.logging.Logger; diff --git a/examples/src/main/java/io/grpc/examples/header/HeaderClientInterceptor.java b/examples/src/main/java/io/grpc/examples/header/HeaderClientInterceptor.java index a7042e33c1..1fe380122d 100644 --- a/examples/src/main/java/io/grpc/examples/header/HeaderClientInterceptor.java +++ b/examples/src/main/java/io/grpc/examples/header/HeaderClientInterceptor.java @@ -32,7 +32,6 @@ package io.grpc.examples.header; import com.google.common.annotations.VisibleForTesting; - import io.grpc.CallOptions; import io.grpc.Channel; import io.grpc.ClientCall; @@ -41,7 +40,6 @@ import io.grpc.ForwardingClientCall.SimpleForwardingClientCall; import io.grpc.ForwardingClientCallListener.SimpleForwardingClientCallListener; import io.grpc.Metadata; import io.grpc.MethodDescriptor; - import java.util.logging.Logger; /** diff --git a/examples/src/main/java/io/grpc/examples/header/HeaderServerInterceptor.java b/examples/src/main/java/io/grpc/examples/header/HeaderServerInterceptor.java index 2d1f52a9cf..ebd955f928 100644 --- a/examples/src/main/java/io/grpc/examples/header/HeaderServerInterceptor.java +++ b/examples/src/main/java/io/grpc/examples/header/HeaderServerInterceptor.java @@ -32,13 +32,11 @@ package io.grpc.examples.header; import com.google.common.annotations.VisibleForTesting; - import io.grpc.ForwardingServerCall.SimpleForwardingServerCall; import io.grpc.Metadata; import io.grpc.ServerCall; import io.grpc.ServerCallHandler; import io.grpc.ServerInterceptor; - import java.util.logging.Logger; /** diff --git a/examples/src/main/java/io/grpc/examples/helloworld/HelloWorldClient.java b/examples/src/main/java/io/grpc/examples/helloworld/HelloWorldClient.java index fc2e1672e0..a41f59888b 100644 --- a/examples/src/main/java/io/grpc/examples/helloworld/HelloWorldClient.java +++ b/examples/src/main/java/io/grpc/examples/helloworld/HelloWorldClient.java @@ -34,7 +34,6 @@ package io.grpc.examples.helloworld; import io.grpc.ManagedChannel; import io.grpc.ManagedChannelBuilder; import io.grpc.StatusRuntimeException; - import java.util.concurrent.TimeUnit; import java.util.logging.Level; import java.util.logging.Logger; diff --git a/examples/src/main/java/io/grpc/examples/helloworld/HelloWorldServer.java b/examples/src/main/java/io/grpc/examples/helloworld/HelloWorldServer.java index ce1158a43d..07e6b6ff70 100644 --- a/examples/src/main/java/io/grpc/examples/helloworld/HelloWorldServer.java +++ b/examples/src/main/java/io/grpc/examples/helloworld/HelloWorldServer.java @@ -34,7 +34,6 @@ package io.grpc.examples.helloworld; import io.grpc.Server; import io.grpc.ServerBuilder; import io.grpc.stub.StreamObserver; - import java.io.IOException; import java.util.logging.Logger; diff --git a/examples/src/main/java/io/grpc/examples/routeguide/RouteGuideClient.java b/examples/src/main/java/io/grpc/examples/routeguide/RouteGuideClient.java index 64066995a1..1de06e9088 100644 --- a/examples/src/main/java/io/grpc/examples/routeguide/RouteGuideClient.java +++ b/examples/src/main/java/io/grpc/examples/routeguide/RouteGuideClient.java @@ -33,7 +33,6 @@ package io.grpc.examples.routeguide; import com.google.common.annotations.VisibleForTesting; import com.google.protobuf.Message; - import io.grpc.ManagedChannel; import io.grpc.ManagedChannelBuilder; import io.grpc.Status; @@ -41,7 +40,6 @@ import io.grpc.StatusRuntimeException; import io.grpc.examples.routeguide.RouteGuideGrpc.RouteGuideBlockingStub; import io.grpc.examples.routeguide.RouteGuideGrpc.RouteGuideStub; import io.grpc.stub.StreamObserver; - import java.io.IOException; import java.util.Iterator; import java.util.List; diff --git a/examples/src/main/java/io/grpc/examples/routeguide/RouteGuideServer.java b/examples/src/main/java/io/grpc/examples/routeguide/RouteGuideServer.java index c890e25276..82dc38dd4f 100644 --- a/examples/src/main/java/io/grpc/examples/routeguide/RouteGuideServer.java +++ b/examples/src/main/java/io/grpc/examples/routeguide/RouteGuideServer.java @@ -43,7 +43,6 @@ import static java.util.concurrent.TimeUnit.NANOSECONDS; import io.grpc.Server; import io.grpc.ServerBuilder; import io.grpc.stub.StreamObserver; - import java.io.IOException; import java.net.URL; import java.util.ArrayList; diff --git a/examples/src/main/java/io/grpc/examples/routeguide/RouteGuideUtil.java b/examples/src/main/java/io/grpc/examples/routeguide/RouteGuideUtil.java index ec85c916d3..49950f73ba 100644 --- a/examples/src/main/java/io/grpc/examples/routeguide/RouteGuideUtil.java +++ b/examples/src/main/java/io/grpc/examples/routeguide/RouteGuideUtil.java @@ -32,7 +32,6 @@ package io.grpc.examples.routeguide; import com.google.protobuf.util.JsonFormat; - import java.io.IOException; import java.io.InputStream; import java.io.InputStreamReader; diff --git a/examples/src/test/java/io/grpc/examples/header/HeaderClientInterceptorTest.java b/examples/src/test/java/io/grpc/examples/header/HeaderClientInterceptorTest.java index b01c08f167..30bd90cf46 100644 --- a/examples/src/test/java/io/grpc/examples/header/HeaderClientInterceptorTest.java +++ b/examples/src/test/java/io/grpc/examples/header/HeaderClientInterceptorTest.java @@ -52,7 +52,6 @@ import io.grpc.examples.helloworld.HelloReply; import io.grpc.examples.helloworld.HelloRequest; import io.grpc.inprocess.InProcessChannelBuilder; import io.grpc.inprocess.InProcessServerBuilder; - import org.junit.After; import org.junit.Before; import org.junit.Test; diff --git a/examples/src/test/java/io/grpc/examples/header/HeaderServerInterceptorTest.java b/examples/src/test/java/io/grpc/examples/header/HeaderServerInterceptorTest.java index e1c8a1e8a4..c000e17da6 100644 --- a/examples/src/test/java/io/grpc/examples/header/HeaderServerInterceptorTest.java +++ b/examples/src/test/java/io/grpc/examples/header/HeaderServerInterceptorTest.java @@ -54,7 +54,6 @@ import io.grpc.examples.helloworld.HelloRequest; import io.grpc.inprocess.InProcessChannelBuilder; import io.grpc.inprocess.InProcessServerBuilder; import io.grpc.stub.StreamObserver; - import org.junit.After; import org.junit.Before; import org.junit.Test; diff --git a/examples/src/test/java/io/grpc/examples/helloworld/HelloWorldClientTest.java b/examples/src/test/java/io/grpc/examples/helloworld/HelloWorldClientTest.java index 2a726513a1..4e649486f7 100644 --- a/examples/src/test/java/io/grpc/examples/helloworld/HelloWorldClientTest.java +++ b/examples/src/test/java/io/grpc/examples/helloworld/HelloWorldClientTest.java @@ -39,7 +39,6 @@ import io.grpc.Server; import io.grpc.inprocess.InProcessChannelBuilder; import io.grpc.inprocess.InProcessServerBuilder; import io.grpc.stub.StreamObserver; - import org.junit.After; import org.junit.Before; import org.junit.Test; diff --git a/examples/src/test/java/io/grpc/examples/helloworld/HelloWorldServerTest.java b/examples/src/test/java/io/grpc/examples/helloworld/HelloWorldServerTest.java index 9f51258fea..9c10612ba3 100644 --- a/examples/src/test/java/io/grpc/examples/helloworld/HelloWorldServerTest.java +++ b/examples/src/test/java/io/grpc/examples/helloworld/HelloWorldServerTest.java @@ -38,7 +38,6 @@ import io.grpc.Server; import io.grpc.examples.helloworld.HelloWorldServer.GreeterImpl; import io.grpc.inprocess.InProcessChannelBuilder; import io.grpc.inprocess.InProcessServerBuilder; - import org.junit.After; import org.junit.Before; import org.junit.Test; diff --git a/examples/src/test/java/io/grpc/examples/routeguide/RouteGuideClientTest.java b/examples/src/test/java/io/grpc/examples/routeguide/RouteGuideClientTest.java index c5a61ea778..562304b8b3 100644 --- a/examples/src/test/java/io/grpc/examples/routeguide/RouteGuideClientTest.java +++ b/examples/src/test/java/io/grpc/examples/routeguide/RouteGuideClientTest.java @@ -39,7 +39,6 @@ import static org.mockito.Mockito.never; import static org.mockito.Mockito.verify; import com.google.protobuf.Message; - import io.grpc.Server; import io.grpc.Status; import io.grpc.StatusRuntimeException; @@ -49,14 +48,6 @@ import io.grpc.inprocess.InProcessChannelBuilder; import io.grpc.inprocess.InProcessServerBuilder; import io.grpc.stub.StreamObserver; import io.grpc.util.MutableHandlerRegistry; - -import org.junit.After; -import org.junit.Before; -import org.junit.Test; -import org.junit.runner.RunWith; -import org.junit.runners.JUnit4; -import org.mockito.ArgumentCaptor; - import java.util.ArrayList; import java.util.Arrays; import java.util.List; @@ -64,6 +55,12 @@ import java.util.Random; import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicReference; +import org.junit.After; +import org.junit.Before; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.junit.runners.JUnit4; +import org.mockito.ArgumentCaptor; /** * Unit tests for {@link RouteGuideClient}. diff --git a/examples/src/test/java/io/grpc/examples/routeguide/RouteGuideServerTest.java b/examples/src/test/java/io/grpc/examples/routeguide/RouteGuideServerTest.java index 3197776505..81aca313b3 100644 --- a/examples/src/test/java/io/grpc/examples/routeguide/RouteGuideServerTest.java +++ b/examples/src/test/java/io/grpc/examples/routeguide/RouteGuideServerTest.java @@ -44,20 +44,18 @@ import io.grpc.ManagedChannel; import io.grpc.inprocess.InProcessChannelBuilder; import io.grpc.inprocess.InProcessServerBuilder; import io.grpc.stub.StreamObserver; - -import org.junit.After; -import org.junit.Before; -import org.junit.Test; -import org.junit.runner.RunWith; -import org.junit.runners.JUnit4; -import org.mockito.ArgumentCaptor; - import java.util.ArrayList; import java.util.Arrays; import java.util.Collection; import java.util.HashSet; import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; +import org.junit.After; +import org.junit.Before; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.junit.runners.JUnit4; +import org.mockito.ArgumentCaptor; /** * Unit tests for {@link RouteGuideServer}. diff --git a/examples/thrift/src/main/java/io/grpc/examples/thrift/helloworld/HelloWorldClient.java b/examples/thrift/src/main/java/io/grpc/examples/thrift/helloworld/HelloWorldClient.java index 5d89c43a78..29f007061a 100644 --- a/examples/thrift/src/main/java/io/grpc/examples/thrift/helloworld/HelloWorldClient.java +++ b/examples/thrift/src/main/java/io/grpc/examples/thrift/helloworld/HelloWorldClient.java @@ -34,7 +34,6 @@ package io.grpc.examples.thrift.helloworld; import io.grpc.ManagedChannel; import io.grpc.ManagedChannelBuilder; import io.grpc.StatusRuntimeException; - import java.util.concurrent.TimeUnit; import java.util.logging.Level; import java.util.logging.Logger; @@ -86,4 +85,4 @@ public class HelloWorldClient { client.shutdown(); } } -} \ No newline at end of file +} diff --git a/examples/thrift/src/main/java/io/grpc/examples/thrift/helloworld/HelloWorldServer.java b/examples/thrift/src/main/java/io/grpc/examples/thrift/helloworld/HelloWorldServer.java index 48da768ae5..774789afa2 100644 --- a/examples/thrift/src/main/java/io/grpc/examples/thrift/helloworld/HelloWorldServer.java +++ b/examples/thrift/src/main/java/io/grpc/examples/thrift/helloworld/HelloWorldServer.java @@ -34,7 +34,6 @@ package io.grpc.examples.thrift.helloworld; import io.grpc.Server; import io.grpc.ServerBuilder; import io.grpc.stub.StreamObserver; - import java.io.IOException; import java.util.logging.Logger; @@ -90,4 +89,4 @@ public class HelloWorldServer { responseObserver.onCompleted(); } } -} \ No newline at end of file +}