Merge pull request #3164 from yang-g/route_guide_cpp

Change route_guide.proto package name and fix build

examples/cpp/helloworld/greeter_async_client.cc

@@ -41,7 +41,7 @@
 #include <grpc++/client_context.h>
 #include <grpc++/completion_queue.h>
 #include <grpc++/create_channel.h>
-#include <grpc++/credentials.h>
+#include <grpc++/security/credentials.h>
 #include "helloworld.grpc.pb.h"
 
 using grpc::Channel;

examples/cpp/helloworld/greeter_async_server.cc

@@ -39,10 +39,10 @@
 #include <grpc/grpc.h>
 #include <grpc/support/log.h>
 #include <grpc++/completion_queue.h>
+#include <grpc++/security/server_credentials.h>
 #include <grpc++/server.h>
 #include <grpc++/server_builder.h>
 #include <grpc++/server_context.h>
-#include <grpc++/server_credentials.h>
 #include "helloworld.grpc.pb.h"
 
 using grpc::Server;

examples/cpp/helloworld/greeter_client.cc

@@ -39,7 +39,7 @@
 #include <grpc++/channel.h>
 #include <grpc++/client_context.h>
 #include <grpc++/create_channel.h>
-#include <grpc++/credentials.h>
+#include <grpc++/security/credentials.h>
 #include "helloworld.grpc.pb.h"
 
 using grpc::Channel;

examples/cpp/helloworld/greeter_server.cc

@@ -36,10 +36,10 @@
 #include <string>
 
 #include <grpc/grpc.h>
+#include <grpc++/security/server_credentials.h>
 #include <grpc++/server.h>
 #include <grpc++/server_builder.h>
 #include <grpc++/server_context.h>
-#include <grpc++/server_credentials.h>
 #include "helloworld.grpc.pb.h"
 
 using grpc::Server;

examples/cpp/route_guide/helper.cc

@@ -40,7 +40,7 @@
 #include <vector>
 #include "route_guide.grpc.pb.h"
 
-namespace examples {
+namespace routeguide {
 
 std::string GetDbFileContent(int argc, char** argv) {
   std::string db_path;
@@ -174,5 +174,5 @@ void ParseDb(const std::string& db, std::vector<Feature>* feature_list) {
 }
 
 
-}  // namespace examples
+}  // namespace routeguide
 

examples/cpp/route_guide/helper.h

@@ -37,14 +37,14 @@
 #include <string>
 #include <vector>
 
-namespace examples {
+namespace routeguide {
 class Feature;
 
 std::string GetDbFileContent(int argc, char** argv);
 
 void ParseDb(const std::string& db, std::vector<Feature>* feature_list);
 
-}  // namespace examples
+}  // namespace routeguide
 
 #endif  // GRPC_COMMON_CPP_ROUTE_GUIDE_HELPER_H_
 

examples/cpp/route_guide/route_guide_client.cc

@@ -42,7 +42,7 @@
 #include <grpc++/channel.h>
 #include <grpc++/client_context.h>
 #include <grpc++/create_channel.h>
-#include <grpc++/credentials.h>
+#include <grpc++/security/credentials.h>
 #include "helper.h"
 #include "route_guide.grpc.pb.h"
 
@@ -52,12 +52,12 @@ using grpc::ClientReader;
 using grpc::ClientReaderWriter;
 using grpc::ClientWriter;
 using grpc::Status;
-using examples::Point;
-using examples::Feature;
-using examples::Rectangle;
-using examples::RouteSummary;
-using examples::RouteNote;
-using examples::RouteGuide;
+using routeguide::Point;
+using routeguide::Feature;
+using routeguide::Rectangle;
+using routeguide::RouteSummary;
+using routeguide::RouteNote;
+using routeguide::RouteGuide;
 
 Point MakePoint(long latitude, long longitude) {
   Point p;
@@ -86,7 +86,7 @@ class RouteGuideClient {
  public:
   RouteGuideClient(std::shared_ptr<Channel> channel, const std::string& db)
       : stub_(RouteGuide::NewStub(channel)) {
-    examples::ParseDb(db, &feature_list_);
+    routeguide::ParseDb(db, &feature_list_);
   }
 
   void GetFeature() {
@@ -99,7 +99,7 @@ class RouteGuideClient {
   }
 
   void ListFeatures() {
-    examples::Rectangle rect;
+    routeguide::Rectangle rect;
     Feature feature;
     ClientContext context;
 
@@ -232,7 +232,7 @@ class RouteGuideClient {
 
 int main(int argc, char** argv) {
   // Expect only arg: --db_path=path/to/route_guide_db.json.
-  std::string db = examples::GetDbFileContent(argc, argv);
+  std::string db = routeguide::GetDbFileContent(argc, argv);
   RouteGuideClient guide(
       grpc::CreateChannel("localhost:50051", grpc::InsecureCredentials()),
       db);

examples/cpp/route_guide/route_guide_server.cc

@@ -42,7 +42,7 @@
 #include <grpc++/server.h>
 #include <grpc++/server_builder.h>
 #include <grpc++/server_context.h>
-#include <grpc++/server_credentials.h>
+#include <grpc++/security/server_credentials.h>
 #include "helper.h"
 #include "route_guide.grpc.pb.h"
 
@@ -53,12 +53,12 @@ using grpc::ServerReader;
 using grpc::ServerReaderWriter;
 using grpc::ServerWriter;
 using grpc::Status;
-using examples::Point;
-using examples::Feature;
-using examples::Rectangle;
-using examples::RouteSummary;
-using examples::RouteNote;
-using examples::RouteGuide;
+using routeguide::Point;
+using routeguide::Feature;
+using routeguide::Rectangle;
+using routeguide::RouteSummary;
+using routeguide::RouteNote;
+using routeguide::RouteGuide;
 using std::chrono::system_clock;
 
 
@@ -99,7 +99,7 @@ std::string GetFeatureName(const Point& point,
 class RouteGuideImpl final : public RouteGuide::Service {
  public:
   explicit RouteGuideImpl(const std::string& db) {
-    examples::ParseDb(db, &feature_list_);
+    routeguide::ParseDb(db, &feature_list_);
   }
 
   Status GetFeature(ServerContext* context, const Point* point,
@@ -110,7 +110,7 @@ class RouteGuideImpl final : public RouteGuide::Service {
   }
 
   Status ListFeatures(ServerContext* context,
-                      const examples::Rectangle* rectangle,
+                      const routeguide::Rectangle* rectangle,
                       ServerWriter<Feature>* writer) override {
     auto lo = rectangle->lo();
     auto hi = rectangle->hi();
@@ -195,7 +195,7 @@ void RunServer(const std::string& db_path) {
 
 int main(int argc, char** argv) {
   // Expect only arg: --db_path=path/to/route_guide_db.json.
-  std::string db = examples::GetDbFileContent(argc, argv);
+  std::string db = routeguide::GetDbFileContent(argc, argv);
   RunServer(db);
 
   return 0;

examples/protos/route_guide.proto

@@ -32,7 +32,7 @@ syntax = "proto3";
 option java_package = "ex.grpc";
 option objc_class_prefix = "RTG";
 
-package examples;
+package routeguide;
 
 // Interface exported by the server.
 service RouteGuide {