From 8bc72b8e9f6280968942ddb89fcff32e1ec7062e Mon Sep 17 00:00:00 2001 From: nmittler Date: Thu, 29 Jan 2015 09:14:20 -0800 Subject: [PATCH] Updating examples based on recent changes. --- .../main/java/io/grpc/examples/MathClient.java | 14 +++++++------- .../main/java/io/grpc/examples/MathServer.java | 16 +++++++--------- .../main/java/io/grpc/examples/StockClient.java | 10 +++++----- .../main/java/io/grpc/examples/StockServer.java | 9 ++++----- 4 files changed, 23 insertions(+), 26 deletions(-) diff --git a/examples/src/main/java/io/grpc/examples/MathClient.java b/examples/src/main/java/io/grpc/examples/MathClient.java index a67469d0d0..dd1b3dc0b2 100644 --- a/examples/src/main/java/io/grpc/examples/MathClient.java +++ b/examples/src/main/java/io/grpc/examples/MathClient.java @@ -32,13 +32,13 @@ package io.grpc.examples; import com.google.common.util.concurrent.SettableFuture; -import com.google.protos.net.stubby.examples.CalcGrpc; -import com.google.protos.net.stubby.examples.CalcGrpc.CalcBlockingStub; -import com.google.protos.net.stubby.examples.CalcGrpc.CalcStub; -import com.google.protos.net.stubby.examples.Math.DivArgs; -import com.google.protos.net.stubby.examples.Math.DivReply; -import com.google.protos.net.stubby.examples.Math.FibArgs; -import com.google.protos.net.stubby.examples.Math.Num; +import com.google.protos.io.grpc.examples.CalcGrpc; +import com.google.protos.io.grpc.examples.CalcGrpc.CalcBlockingStub; +import com.google.protos.io.grpc.examples.CalcGrpc.CalcStub; +import com.google.protos.io.grpc.examples.Math.DivArgs; +import com.google.protos.io.grpc.examples.Math.DivReply; +import com.google.protos.io.grpc.examples.Math.FibArgs; +import com.google.protos.io.grpc.examples.Math.Num; import io.grpc.ChannelImpl; import io.grpc.stub.StreamObserver; diff --git a/examples/src/main/java/io/grpc/examples/MathServer.java b/examples/src/main/java/io/grpc/examples/MathServer.java index 49e1191eaf..680cbb5d82 100644 --- a/examples/src/main/java/io/grpc/examples/MathServer.java +++ b/examples/src/main/java/io/grpc/examples/MathServer.java @@ -31,11 +31,11 @@ package io.grpc.examples; -import com.google.protos.net.stubby.examples.CalcGrpc; -import com.google.protos.net.stubby.examples.Math.DivArgs; -import com.google.protos.net.stubby.examples.Math.DivReply; -import com.google.protos.net.stubby.examples.Math.FibArgs; -import com.google.protos.net.stubby.examples.Math.Num; +import com.google.protos.io.grpc.examples.CalcGrpc; +import com.google.protos.io.grpc.examples.Math.DivArgs; +import com.google.protos.io.grpc.examples.Math.DivReply; +import com.google.protos.io.grpc.examples.Math.FibArgs; +import com.google.protos.io.grpc.examples.Math.Num; import io.grpc.ServerImpl; import io.grpc.stub.StreamObserver; @@ -60,7 +60,7 @@ public class MathServer { public void start() { gRpcServer = NettyServerBuilder.forPort(port) .addService(CalcGrpc.bindService(new CalcService())) - .buildAndWaitForRunning(); + .build().start(); logger.info("Server started, listening on " + port); // TODO(simonma): gRPC server should register JVM shutdown hook to shutdown itself, remove this // after we support that. @@ -77,15 +77,13 @@ public class MathServer { public void stop() { if (gRpcServer != null) { - gRpcServer.stopAsync(); - gRpcServer.awaitTerminated(); + gRpcServer.shutdown(); } } public static void main(String[] args) throws Exception { MathServer server = new MathServer(8980); server.start(); - server.gRpcServer.awaitTerminated(); } /** diff --git a/examples/src/main/java/io/grpc/examples/StockClient.java b/examples/src/main/java/io/grpc/examples/StockClient.java index e63c81ad9d..b6d5e9fe18 100644 --- a/examples/src/main/java/io/grpc/examples/StockClient.java +++ b/examples/src/main/java/io/grpc/examples/StockClient.java @@ -31,11 +31,11 @@ package io.grpc.examples; -import com.google.protos.net.stubby.examples.StockGrpc; -import com.google.protos.net.stubby.examples.StockGrpc.StockBlockingStub; -import com.google.protos.net.stubby.examples.StockGrpc.StockStub; -import com.google.protos.net.stubby.examples.StockOuterClass.StockReply; -import com.google.protos.net.stubby.examples.StockOuterClass.StockRequest; +import com.google.protos.io.grpc.examples.StockGrpc; +import com.google.protos.io.grpc.examples.StockGrpc.StockBlockingStub; +import com.google.protos.io.grpc.examples.StockGrpc.StockStub; +import com.google.protos.io.grpc.examples.StockOuterClass.StockReply; +import com.google.protos.io.grpc.examples.StockOuterClass.StockRequest; import io.grpc.ChannelImpl; import io.grpc.stub.StreamObserver; diff --git a/examples/src/main/java/io/grpc/examples/StockServer.java b/examples/src/main/java/io/grpc/examples/StockServer.java index 4844f68ed3..bffd7964e2 100644 --- a/examples/src/main/java/io/grpc/examples/StockServer.java +++ b/examples/src/main/java/io/grpc/examples/StockServer.java @@ -31,9 +31,9 @@ package io.grpc.examples; -import com.google.protos.net.stubby.examples.StockGrpc; -import com.google.protos.net.stubby.examples.StockOuterClass.StockReply; -import com.google.protos.net.stubby.examples.StockOuterClass.StockRequest; +import com.google.protos.io.grpc.examples.StockGrpc; +import com.google.protos.io.grpc.examples.StockOuterClass.StockReply; +import com.google.protos.io.grpc.examples.StockOuterClass.StockRequest; import io.grpc.ServerImpl; import io.grpc.stub.StreamObserver; @@ -134,8 +134,7 @@ public class StockServer implements StockGrpc.Stock { public static void main(String[] args) throws Exception { ServerImpl server = NettyServerBuilder.forPort(8980) .addService(StockGrpc.bindService(new StockServer())) - .buildAndWaitForRunning(); + .build().start(); System.out.println("Server started"); - server.awaitTerminated(); } }