Change awaitTerminated to awaitTermination

carl-mastrangelo · carl-mastrangelo · commit aebb58b2002c · 2015-08-06T13:52:17.000-07:00
diff --git a/benchmarks/src/jmh/java/io/grpc/benchmarks/TransportBenchmark.java b/benchmarks/src/jmh/java/io/grpc/benchmarks/TransportBenchmark.java
@@ -147,8 +147,8 @@ public void setUp() throws Exception {
   public void tearDown() throws Exception {
     channel.shutdown();
     server.shutdown();
-    channel.awaitTerminated(1, TimeUnit.SECONDS);
-    server.awaitTerminated(1, TimeUnit.SECONDS);
+    channel.awaitTermination(1, TimeUnit.SECONDS);
+    server.awaitTermination(1, TimeUnit.SECONDS);
     if (!channel.isTerminated()) {
       throw new Exception("failed to shut down channel");
     }
diff --git a/benchmarks/src/jmh/java/io/grpc/benchmarks/netty/AbstractBenchmark.java b/benchmarks/src/jmh/java/io/grpc/benchmarks/netty/AbstractBenchmark.java
@@ -488,7 +488,7 @@ protected void teardown() throws Exception {
     for (ChannelImpl channel : channels) {
       channel.shutdown();
     }
-    server.shutdown().awaitTerminated(5, TimeUnit.SECONDS);
+    server.shutdown().awaitTermination(5, TimeUnit.SECONDS);
   }
 
   /**
diff --git a/benchmarks/src/main/java/io/grpc/benchmarks/qps/AsyncServer.java b/benchmarks/src/main/java/io/grpc/benchmarks/qps/AsyncServer.java
@@ -92,7 +92,7 @@ public void run() {
         try {
           System.out.println("QPS Server shutting down");
           server.shutdown();
-          server.awaitTerminated(5, TimeUnit.SECONDS);
+          server.awaitTermination(5, TimeUnit.SECONDS);
         } catch (Exception e) {
           e.printStackTrace();
         }
diff --git a/core/src/main/java/io/grpc/ChannelImpl.java b/core/src/main/java/io/grpc/ChannelImpl.java
@@ -184,7 +184,7 @@ public boolean isShutdown() {
    *
    * @return whether the channel is terminated, as would be done by {@link #isTerminated()}.
    */
-  public boolean awaitTerminated(long timeout, TimeUnit unit) throws InterruptedException {
+  public boolean awaitTermination(long timeout, TimeUnit unit) throws InterruptedException {
     synchronized (lock) {
       long timeoutNanos = unit.toNanos(timeout);
       long endTimeNanos = System.nanoTime() + timeoutNanos;
diff --git a/core/src/main/java/io/grpc/ServerImpl.java b/core/src/main/java/io/grpc/ServerImpl.java
@@ -182,7 +182,7 @@ public boolean isShutdown() {
    *
    * @return whether the server is terminated, as would be done by {@link #isTerminated()}.
    */
-  public boolean awaitTerminated(long timeout, TimeUnit unit) throws InterruptedException {
+  public boolean awaitTermination(long timeout, TimeUnit unit) throws InterruptedException {
     synchronized (lock) {
       long timeoutNanos = unit.toNanos(timeout);
       long endTimeNanos = System.nanoTime() + timeoutNanos;
@@ -196,7 +196,7 @@ public boolean awaitTerminated(long timeout, TimeUnit unit) throws InterruptedEx
   /**
    * Waits for the server to become terminated.
    */
-  public void awaitTerminated() throws InterruptedException {
+  public void awaitTermination() throws InterruptedException {
     synchronized (lock) {
       while (!terminated) {
         lock.wait();
diff --git a/examples/src/main/java/io/grpc/examples/header/CustomHeaderClient.java b/examples/src/main/java/io/grpc/examples/header/CustomHeaderClient.java
@@ -68,7 +68,7 @@ private CustomHeaderClient(String host, int port) {
   }
 
   private void shutdown() throws InterruptedException {
-    originChannel.shutdown().awaitTerminated(5, TimeUnit.SECONDS);
+    originChannel.shutdown().awaitTermination(5, TimeUnit.SECONDS);
   }
 
   /**
diff --git a/examples/src/main/java/io/grpc/examples/helloworld/HelloWorldClient.java b/examples/src/main/java/io/grpc/examples/helloworld/HelloWorldClient.java
@@ -57,7 +57,7 @@ public HelloWorldClient(String host, int port) {
   }
 
   public void shutdown() throws InterruptedException {
-    channel.shutdown().awaitTerminated(5, TimeUnit.SECONDS);
+    channel.shutdown().awaitTermination(5, TimeUnit.SECONDS);
   }
 
   /** Say hello to server. */
diff --git a/examples/src/main/java/io/grpc/examples/routeguide/RouteGuideClient.java b/examples/src/main/java/io/grpc/examples/routeguide/RouteGuideClient.java
@@ -67,7 +67,7 @@ public RouteGuideClient(String host, int port) {
   }
 
   public void shutdown() throws InterruptedException {
-    channel.shutdown().awaitTerminated(5, TimeUnit.SECONDS);
+    channel.shutdown().awaitTermination(5, TimeUnit.SECONDS);
   }
 
   /**
diff --git a/interop-testing/src/main/java/io/grpc/testing/integration/TestServiceServer.java b/interop-testing/src/main/java/io/grpc/testing/integration/TestServiceServer.java
@@ -147,7 +147,7 @@ private void start() throws Exception {
 
   private void stop() throws Exception {
     server.shutdownNow();
-    if (!server.awaitTerminated(5, TimeUnit.SECONDS)) {
+    if (!server.awaitTermination(5, TimeUnit.SECONDS)) {
       System.err.println("Timed out waiting for server shutdown");
     }
     MoreExecutors.shutdownAndAwaitTermination(executor, 5, TimeUnit.SECONDS);
diff --git a/netty/src/main/java/io/grpc/transport/netty/NettyServerBuilder.java b/netty/src/main/java/io/grpc/transport/netty/NettyServerBuilder.java
@@ -127,7 +127,7 @@ public NettyServerBuilder channelType(Class<? extends ServerChannel> channelType
    * For example, Netty's {@link EventLoopGroup}s use daemon threads by default
    * and thus an application with only daemon threads running besides the main thread will exit as
    * soon as the main thread completes.
-   * A simple solution to this problem is to call {@link io.grpc.ServerImpl#awaitTerminated()} to
+   * A simple solution to this problem is to call {@link io.grpc.ServerImpl#awaitTermination()} to
    * keep the main thread alive until the server has terminated.
    */
   public NettyServerBuilder bossEventLoopGroup(EventLoopGroup group) {
@@ -150,7 +150,7 @@ public NettyServerBuilder bossEventLoopGroup(EventLoopGroup group) {
    * For example, Netty's {@link EventLoopGroup}s use daemon threads by default
    * and thus an application with only daemon threads running besides the main thread will exit as
    * soon as the main thread completes.
-   * A simple solution to this problem is to call {@link io.grpc.ServerImpl#awaitTerminated()} to
+   * A simple solution to this problem is to call {@link io.grpc.ServerImpl#awaitTermination()} to
    * keep the main thread alive until the server has terminated.
    */
   public NettyServerBuilder workerEventLoopGroup(EventLoopGroup group) {

Original file line number	Diff line number	Diff line change
`@@ -488,7 +488,7 @@ protected void teardown() throws Exception {`
`488`	`488`	`for (ChannelImpl channel : channels) {`
`489`	`489`	`channel.shutdown();`
`490`	`490`	`}`
`491`		`- server.shutdown().awaitTerminated(5, TimeUnit.SECONDS);`
	`491`	`+ server.shutdown().awaitTermination(5, TimeUnit.SECONDS);`
`492`	`492`	`}`
`493`	`493`
`494`	`494`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -92,7 +92,7 @@ public void run() {`
`92`	`92`	`try {`
`93`	`93`	`System.out.println("QPS Server shutting down");`
`94`	`94`	`server.shutdown();`
`95`		`- server.awaitTerminated(5, TimeUnit.SECONDS);`
	`95`	`+ server.awaitTermination(5, TimeUnit.SECONDS);`
`96`	`96`	`} catch (Exception e) {`
`97`	`97`	`e.printStackTrace();`
`98`	`98`	`}`
Original file line number	Diff line number	Diff line change
`@@ -184,7 +184,7 @@ public boolean isShutdown() {`
`184`	`184`	`*`
`185`	`185`	`* @return whether the channel is terminated, as would be done by {@link #isTerminated()}.`
`186`	`186`	`*/`
`187`		`- public boolean awaitTerminated(long timeout, TimeUnit unit) throws InterruptedException {`
	`187`	`+ public boolean awaitTermination(long timeout, TimeUnit unit) throws InterruptedException {`
`188`	`188`	`synchronized (lock) {`
`189`	`189`	`long timeoutNanos = unit.toNanos(timeout);`
`190`	`190`	`long endTimeNanos = System.nanoTime() + timeoutNanos;`
Original file line number	Diff line number	Diff line change
`@@ -68,7 +68,7 @@ private CustomHeaderClient(String host, int port) {`
`68`	`68`	`}`
`69`	`69`
`70`	`70`	`private void shutdown() throws InterruptedException {`
`71`		`- originChannel.shutdown().awaitTerminated(5, TimeUnit.SECONDS);`
	`71`	`+ originChannel.shutdown().awaitTermination(5, TimeUnit.SECONDS);`
`72`	`72`	`}`
`73`	`73`
`74`	`74`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -57,7 +57,7 @@ public HelloWorldClient(String host, int port) {`
`57`	`57`	`}`
`58`	`58`
`59`	`59`	`public void shutdown() throws InterruptedException {`
`60`		`- channel.shutdown().awaitTerminated(5, TimeUnit.SECONDS);`
	`60`	`+ channel.shutdown().awaitTermination(5, TimeUnit.SECONDS);`
`61`	`61`	`}`
`62`	`62`
`63`	`63`	`/** Say hello to server. */`
Original file line number	Diff line number	Diff line change
`@@ -67,7 +67,7 @@ public RouteGuideClient(String host, int port) {`
`67`	`67`	`}`
`68`	`68`
`69`	`69`	`public void shutdown() throws InterruptedException {`
`70`		`- channel.shutdown().awaitTerminated(5, TimeUnit.SECONDS);`
	`70`	`+ channel.shutdown().awaitTermination(5, TimeUnit.SECONDS);`
`71`	`71`	`}`
`72`	`72`
`73`	`73`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -147,7 +147,7 @@ private void start() throws Exception {`
`147`	`147`
`148`	`148`	`private void stop() throws Exception {`
`149`	`149`	`server.shutdownNow();`
`150`		`- if (!server.awaitTerminated(5, TimeUnit.SECONDS)) {`
	`150`	`+ if (!server.awaitTermination(5, TimeUnit.SECONDS)) {`
`151`	`151`	`System.err.println("Timed out waiting for server shutdown");`
`152`	`152`	`}`
`153`	`153`	`MoreExecutors.shutdownAndAwaitTermination(executor, 5, TimeUnit.SECONDS);`