From a16a4d551f9035bd720107732ab71bb9bf337dda Mon Sep 17 00:00:00 2001
From: Tim Emiola <temiola@google.com>
Date: Wed, 18 Feb 2015 17:43:41 -0800
Subject: [PATCH] Complete the change s/Greetings/Greeter

---
 README.md                                                 | 6 +++---
 java/{run_greetings_client.sh => run_greeter_client.sh}   | 4 ++--
 java/{run_greetings_server.sh => run_greeter_server.sh}   | 4 ++--
 .../ex/grpc/{GreetingsClient.java => GreeterClient.java}  | 8 ++++----
 .../ex/grpc/{GreetingsServer.java => GreeterServer.java}  | 6 +++---
 5 files changed, 14 insertions(+), 14 deletions(-)
 rename java/{run_greetings_client.sh => run_greeter_client.sh} (80%)
 rename java/{run_greetings_server.sh => run_greeter_server.sh} (78%)
 rename java/src/main/java/ex/grpc/{GreetingsClient.java => GreeterClient.java} (89%)
 rename java/src/main/java/ex/grpc/{GreetingsServer.java => GreeterServer.java} (88%)

diff --git a/README.md b/README.md
index 1203465660d..71f3004c71d 100644
--- a/README.md
+++ b/README.md
@@ -369,7 +369,7 @@ We'll look at using a client to access the server in the next section.
 Client-side gRPC is pretty simple. In this step, we'll use the generated code
 to write a simple client that can access the `Greeter` server we created
 in the [previous section](#server). You can see the complete client code in
-[GreetingClient.java](java/src/main/java/ex/grpc/GreetingsClient.java).
+[GreeterClient.java](java/src/main/java/ex/grpc/GreeterClient.java).
 
 Again, we're not going to go into much detail about how to implement a client
 - we'll leave that for the tutorial.
@@ -462,13 +462,13 @@ We've added simple shell scripts to simplifying running the examples. Now
 that they are built, you can run the server with:
 
 ```sh
-$ ./run_greetings_server.sh
+$ ./run_greeter_server.sh
 ```
 
 and in another terminal window confirm that it receives a message.
 
 ```sh
-$ ./run_greetings_client.sh
+$ ./run_greeter_client.sh
 ```
 
 ### Adding another client
diff --git a/java/run_greetings_client.sh b/java/run_greeter_client.sh
similarity index 80%
rename from java/run_greetings_client.sh
rename to java/run_greeter_client.sh
index 8155589adf7..e86ab4ae891 100755
--- a/java/run_greetings_client.sh
+++ b/java/run_greeter_client.sh
@@ -1,6 +1,6 @@
 #!/bin/bash -e
-TARGET='Greetings Client'
-TARGET_CLASS='ex.grpc.GreetingsClient'
+TARGET='Greeter Client'
+TARGET_CLASS='ex.grpc.GreeterClient'
 TARGET_ARGS="$@"
 
 cd "$(dirname "$0")"
diff --git a/java/run_greetings_server.sh b/java/run_greeter_server.sh
similarity index 78%
rename from java/run_greetings_server.sh
rename to java/run_greeter_server.sh
index 248229e129e..836abc7f48a 100755
--- a/java/run_greetings_server.sh
+++ b/java/run_greeter_server.sh
@@ -1,6 +1,6 @@
 #!/bin/bash -e
-TARGET='Greetings Server'
-TARGET_CLASS='ex.grpc.GreetingsServer'
+TARGET='Greeter Server'
+TARGET_CLASS='ex.grpc.GreeterServer'
 
 cd "$(dirname "$0")"
 mvn -q -nsu -am package -Dcheckstyle.skip=true -DskipTests
diff --git a/java/src/main/java/ex/grpc/GreetingsClient.java b/java/src/main/java/ex/grpc/GreeterClient.java
similarity index 89%
rename from java/src/main/java/ex/grpc/GreetingsClient.java
rename to java/src/main/java/ex/grpc/GreeterClient.java
index 141ad1e20a6..9a4615132d6 100644
--- a/java/src/main/java/ex/grpc/GreetingsClient.java
+++ b/java/src/main/java/ex/grpc/GreeterClient.java
@@ -9,13 +9,13 @@ import java.util.logging.Level;
 import java.util.logging.Logger;
 import java.util.concurrent.TimeUnit;
 
-public class GreetingsClient {
+public class GreeterClient {
   private final Logger logger = Logger.getLogger(
-      GreetingsClient.class.getName());
+      GreeterClient.class.getName());
   private final ChannelImpl channel;
   private final GreeterGrpc.GreeterBlockingStub blockingStub;
 
-  public GreetingsClient(String host, int port) {
+  public GreeterClient(String host, int port) {
     channel = NettyChannelBuilder.forAddress(host, port)
               .negotiationType(NegotiationType.PLAINTEXT)
               .build();
@@ -40,7 +40,7 @@ public class GreetingsClient {
   }
 
   public static void main(String[] args) throws Exception {
-    GreetingsClient client = new GreetingsClient("localhost", 50051);
+    GreeterClient client = new GreeterClient("localhost", 50051);
     try {
       /* Access a service running on the local machine on port 50051 */
       String user = "world";
diff --git a/java/src/main/java/ex/grpc/GreetingsServer.java b/java/src/main/java/ex/grpc/GreeterServer.java
similarity index 88%
rename from java/src/main/java/ex/grpc/GreetingsServer.java
rename to java/src/main/java/ex/grpc/GreeterServer.java
index 237309d13c7..bb05680b0a6 100644
--- a/java/src/main/java/ex/grpc/GreetingsServer.java
+++ b/java/src/main/java/ex/grpc/GreeterServer.java
@@ -7,9 +7,9 @@ import com.google.net.stubby.transport.netty.NettyServerBuilder;
 import java.util.concurrent.TimeUnit;
 
 /**
- * Server that manages startup/shutdown of a {@code Greetings} server.
+ * Server that manages startup/shutdown of a {@code Greeter} server.
  */
-public class GreetingsServer {
+public class GreeterServer {
   /* The port on which the server should run */
   private int port = 50051;
   private ServerImpl server;
@@ -33,7 +33,7 @@ public class GreetingsServer {
    * Main launches the server from the command line.
    */
   public static void main(String[] args) throws Exception {
-    final GreetingsServer server = new GreetingsServer();
+    final GreeterServer server = new GreeterServer();
 
     Runtime.getRuntime().addShutdownHook(new Thread() {
       @Override