diff options
| author |  Craig Tiller <craig.tiller@gmail.com> | 2015-02-23 08:50:19 -0800 |
|---|---|---|
| committer |  Craig Tiller <ctiller@google.com> | 2015-02-23 09:58:23 -0800 |
| commit | 42bc87c0979f7a9f3084366fd466d382cf86ec17 (patch) | |
| tree | 3e233e2126465227bbaa09fa3a6166f43585c944 /examples | |
| parent | 759026cbf0419dae4edddd9e75fa338e1028a3d8 (diff) | |
Update C++ server with new core API
And reflects the C++ API in ServerBuilder.
Diffstat (limited to 'examples')
| -rw-r--r-- | examples/pubsub/main.cc | 4 | ||||
| -rw-r--r-- | examples/pubsub/publisher_test.cc | 5 | ||||
| -rw-r--r-- | examples/pubsub/subscriber_test.cc | 5 |
3 files changed, 8 insertions, 6 deletions
diff --git a/examples/pubsub/main.cc b/examples/pubsub/main.cc index 39fb8aea15..066cfa1e01 100644 --- a/examples/pubsub/main.cc +++ b/examples/pubsub/main.cc @@ -96,10 +96,10 @@ int main(int argc, char** argv) { std::unique_ptr<grpc::Credentials> creds; if (FLAGS_service_account_key_file != "") { grpc::string json_key = GetServiceAccountJsonKey(); - creds = grpc::CredentialsFactory::ServiceAccountCredentials( + creds = grpc::ServiceAccountCredentials( json_key, FLAGS_oauth_scope, std::chrono::hours(1)); } else { - creds = grpc::CredentialsFactory::ComputeEngineCredentials(); + creds = grpc::ComputeEngineCredentials(); } ss << FLAGS_server_host << ":" << FLAGS_server_port; diff --git a/examples/pubsub/publisher_test.cc b/examples/pubsub/publisher_test.cc index b7bea5b1bd..0bb4b84217 100644 --- a/examples/pubsub/publisher_test.cc +++ b/examples/pubsub/publisher_test.cc @@ -40,6 +40,7 @@ #include <grpc++/server.h> #include <grpc++/server_builder.h> #include <grpc++/server_context.h> +#include <grpc++/server_credentials.h> #include <grpc++/status.h> #include <gtest/gtest.h> @@ -106,11 +107,11 @@ class PublisherTest : public ::testing::Test { int port = grpc_pick_unused_port_or_die(); server_address_ << "localhost:" << port; ServerBuilder builder; - builder.AddPort(server_address_.str()); + builder.AddPort(server_address_.str(), grpc::InsecureServerCredentials()); builder.RegisterService(&service_); server_ = builder.BuildAndStart(); - channel_ = CreateChannel(server_address_.str(), ChannelArguments()); + channel_ = CreateChannel(server_address_.str(), grpc::InsecureCredentials(), ChannelArguments()); publisher_.reset(new grpc::examples::pubsub::Publisher(channel_)); } diff --git a/examples/pubsub/subscriber_test.cc b/examples/pubsub/subscriber_test.cc index 1fdcc8f755..49738fcda6 100644 --- a/examples/pubsub/subscriber_test.cc +++ b/examples/pubsub/subscriber_test.cc @@ -40,6 +40,7 @@ #include <grpc++/server.h> #include <grpc++/server_builder.h> #include <grpc++/server_context.h> +#include <grpc++/server_credentials.h> #include <grpc++/status.h> #include <gtest/gtest.h> @@ -105,11 +106,11 @@ class SubscriberTest : public ::testing::Test { int port = grpc_pick_unused_port_or_die(); server_address_ << "localhost:" << port; ServerBuilder builder; - builder.AddPort(server_address_.str()); + builder.AddPort(server_address_.str(), grpc::InsecureServerCredentials()); builder.RegisterService(&service_); server_ = builder.BuildAndStart(); - channel_ = CreateChannel(server_address_.str(), ChannelArguments()); + channel_ = CreateChannel(server_address_.str(), grpc::InsecureCredentials(), ChannelArguments()); subscriber_.reset(new grpc::examples::pubsub::Subscriber(channel_)); } |