refine code and add README

Makefile

@@ -3924,7 +3924,6 @@ PUBLIC_HEADERS_CXX += \
     include/grpc++/impl/codegen/proto_utils.h \
     include/grpc++/impl/codegen/config_protobuf.h \
     include/grpc++/impl/codegen/thrift_serializer.h \
-    include/grpc++/impl/codegen/thrift_serializer_inl.h \
     include/grpc++/impl/codegen/thrift_utils.h \
 
 LIBGRPC++_TEST_UTIL_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(LIBGRPC++_TEST_UTIL_SRC))))

build.yaml

@@ -784,7 +784,6 @@ filegroups:
   language: c++
   public_headers:
   - include/grpc++/impl/codegen/thrift_serializer.h
-  - include/grpc++/impl/codegen/thrift_serializer_inl.h
   - include/grpc++/impl/codegen/thrift_utils.h
   uses:
   - grpc++_codegen_base

include/grpc++/impl/codegen/thrift_serializer.h

@@ -36,12 +36,16 @@
 
 #include <memory>
 #include <string>
-
+#include <stdexcept>
+#include <grpc/impl/codegen/byte_buffer.h>
+#include <grpc/impl/codegen/byte_buffer_reader.h>
+#include <grpc/impl/codegen/slice.h>
+#include <grpc/impl/codegen/slice_buffer.h>
 #include <thrift/protocol/TBinaryProtocol.h>
 #include <thrift/protocol/TCompactProtocol.h>
+#include <thrift/protocol/TProtocolException.h>
 #include <thrift/transport/TBufferTransports.h>
 #include <thrift/transport/TTransportUtils.h>
-#include <grpc/impl/codegen/byte_buffer.h>
 
 namespace apache {
 namespace thrift {
@@ -49,100 +53,165 @@ namespace util {
 
 using apache::thrift::protocol::TBinaryProtocolT;
 using apache::thrift::protocol::TCompactProtocolT;
+using apache::thrift::protocol::TMessageType;
 using apache::thrift::protocol::TNetworkBigEndian;
 using apache::thrift::transport::TMemoryBuffer;
 using apache::thrift::transport::TBufferBase;
 using apache::thrift::transport::TTransport;
-using std::shared_ptr;
 
-
-template <typename Dummy, typename P>
-class ThriftSerializer {
+template <typename Dummy, typename Protocol> class ThriftSerializer {
 public:
   ThriftSerializer()
-  : prepared_ (false)
-  , lastDeserialized_ (false)
-  , serializeVersion_ (false) {}
-
-  /**
-   * Serialize the passed type into the internal buffer
-   * and returns a pointer to internal buffer and its size
-   *
-   */
-  template <typename T>
-  void serialize(const T& fields, const uint8_t** serializedBuffer,
-      size_t* serializedLen);
-
-  /**
-   * Serialize the passed type into the byte buffer
-   */
-  template <typename T>
-  void serialize(const T& fields, grpc_byte_buffer** bp);
-
-  /**
-   * Deserialize the passed char array into  the passed type, returns the number
-   * of bytes that have been consumed from the passed string.
-   */
-  template <typename T>
-  uint32_t deserialize(const uint8_t* serializedBuffer, size_t length,
-      T* fields);
-
-  /**
-   * Deserialize the passed byte buffer to passed type, returns the number
-   * of bytes consumed from byte buffer
-   */
-  template <typename T>
-  uint32_t deserialize(grpc_byte_buffer* buffer, T* msg);
-
-  void setSerializeVersion(bool value);
+      : prepared_ (false)
+      , last_deserialized_ (false)
+      , serialize_version_ (false) {}
 
   virtual ~ThriftSerializer() {}
 
+  // Serialize the passed type into the internal buffer
+  // and returns a pointer to internal buffer and its size
+  template <typename T> void Serialize(const T& fields, const uint8_t** serializedBuffer,
+      size_t* serializedLen) {
+     // prepare or reset buffer
+    if (!prepared_ || last_deserialized_) {
+      prepare();
+    } else {
+      buffer_->resetBuffer();
+    }
+    last_deserialized_ = false;
+
+    // if required serialize protocol version
+    if (serialize_version_) {
+      protocol_->writeMessageBegin("", TMessageType(0), 0);
+    }
+
+    // serilaize fields into buffer
+    fields.write(protocol_.get());
+
+    // write the end of message
+    if (serialize_version_) {
+      protocol_->writeMessageEnd();
+    }
+
+    uint8_t* byteBuffer;
+    uint32_t byteBufferSize;
+    buffer_->getBuffer(&byteBuffer, &byteBufferSize);
+    *serializedBuffer = byteBuffer;
+    *serializedLen = byteBufferSize; 
+  }
+
+  // Serialize the passed type into the byte buffer
+  template <typename T> void Serialize(const T& fields, grpc_byte_buffer** bp) {
+
+    const uint8_t* byteBuffer;
+    size_t byteBufferSize;
+
+    Serialize(fields, &byteBuffer, &byteBufferSize);
+
+    gpr_slice slice = gpr_slice_from_copied_buffer((char*)byteBuffer,byteBufferSize);
+
+    *bp = grpc_raw_byte_buffer_create(&slice, 1);
 
-  /**
-   * Set the container size limit to deserialize
-   * This function should be called after buffer_ is initialized
-   */
-  void setContainerSizeLimit(int32_t container_limit) {
+    gpr_slice_unref(slice);
+  }
+
+  // Deserialize the passed char array into  the passed type, returns the number
+  // of bytes that have been consumed from the passed string.
+  template <typename T> uint32_t Deserialize(const uint8_t* serializedBuffer, size_t length,
+      T* fields) {
+    // prepare buffer if necessary
+    if (!prepared_) {
+      prepare();
+    }
+    last_deserialized_ = true;
+
+    //reset buffer transport 
+    buffer_->resetBuffer((uint8_t*)serializedBuffer, length);
+
+    // read the protocol version if necessary
+    if (serialize_version_) {
+      std::string name = "";
+      TMessageType mt = (TMessageType) 0;
+      int32_t seq_id = 0;
+      protocol_->readMessageBegin(name, mt, seq_id);
+    }
+
+    // deserialize buffer into fields
+    uint32_t len = fields->read(protocol_.get());
+
+    // read the end of message
+    if (serialize_version_) {
+      protocol_->readMessageEnd();
+    }
+
+    return len;
+  }
+
+
+  // Deserialize the passed byte buffer to passed type, returns the number
+  // of bytes consumed from byte buffer
+  template <typename T> uint32_t Deserialize(grpc_byte_buffer* buffer, T* msg) {
+
+    grpc_byte_buffer_reader reader;
+    grpc_byte_buffer_reader_init(&reader, buffer);
+
+    gpr_slice slice = grpc_byte_buffer_reader_readall(&reader);
+
+    uint32_t len = Deserialize(GPR_SLICE_START_PTR(slice), GPR_SLICE_LENGTH(slice), msg);
+
+    gpr_slice_unref(slice);
+
+    grpc_byte_buffer_reader_destroy(&reader);
+
+    return len;
+  }
+
+  // set serialization version flag
+  void SetSerializeVersion(bool value) {
+    serialize_version_ = value;
+  }
+
+  // Set the container size limit to deserialize
+  // This function should be called after buffer_ is initialized
+  void SetContainerSizeLimit(int32_t container_limit) {
     if (!prepared_) {
       prepare();
     }
     protocol_->setContainerSizeLimit(container_limit);
   }
 
-  /**
-   * Set the string size limit to deserialize
-   * This function should be called after buffer_ is initialized
-   */
-  void setStringSizeLimit(int32_t string_limit) {
+  // Set the string size limit to deserialize
+  // This function should be called after buffer_ is initialized
+  void SetStringSizeLimit(int32_t string_limit) {
     if (!prepared_) {
       prepare();
     }
     protocol_->setStringSizeLimit(string_limit);
   }
 
+private:
+  bool prepared_;
+  bool last_deserialized_;
+  boost::shared_ptr<TMemoryBuffer> buffer_;
+  std::shared_ptr<Protocol> protocol_;
+  bool serialize_version_;
 
-  private:
-    void prepare();
-
-  private:
-    typedef P Protocol;
-    bool prepared_;
-    bool lastDeserialized_;
-    boost::shared_ptr<TMemoryBuffer> buffer_;
-    shared_ptr<Protocol> protocol_;
-    bool serializeVersion_;
-}; // ThriftSerializer
+  void prepare() {
+    buffer_.reset(new TMemoryBuffer());
 
-template <typename Dummy = void>
-struct ThriftSerializerBinary : public ThriftSerializer<Dummy, TBinaryProtocolT<TBufferBase, TNetworkBigEndian> > {};
+    // create a protocol for the memory buffer transport
+    protocol_.reset(new Protocol(buffer_));
 
+    prepared_ = true;
+  }
 
-template <typename Dummy = void>
-struct ThriftSerializerCompact : public ThriftSerializer<Dummy, TCompactProtocolT<TBufferBase> >{ };
+}; // ThriftSerializer
 
-}}} // namespace apache::thrift::util
+typedef ThriftSerializer<void, TBinaryProtocolT<TBufferBase, TNetworkBigEndian>> ThriftSerializerBinary;
+typedef ThriftSerializer<void, TCompactProtocolT<TBufferBase>> ThriftSerializerCompact;
 
-#include <grpc++/impl/codegen/thrift_serializer_inl.h>
+} // namespace util
+} // namespace thrift
+} // namespace apache
 
-#endif
+#endif

include/grpc++/impl/codegen/thrift_serializer_inl.h

@@ -1,169 +0,0 @@
-/*
- *
- * Copyright 2016, Google Inc.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- *
- *     * Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above
- * copyright notice, this list of conditions and the following disclaimer
- * in the documentation and/or other materials provided with the
- * distribution.
- *     * Neither the name of Google Inc. nor the names of its
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- */
-
- #ifndef GRPCXX_IMPL_CODEGEN_THRIFT_SERIALIZER_INL_H
- #define GRPCXX_IMPL_CODEGEN_THRIFT_SERIALIZER_INL_H
-
-#include <stdexcept>
-#include <string>
-#include <grpc++/impl/codegen/thrift_serializer.h>
-#include <grpc/impl/codegen/byte_buffer_reader.h>
-#include <grpc/impl/codegen/slice.h>
-#include <grpc/impl/codegen/slice_buffer.h>
-#include <thrift/protocol/TProtocolException.h>
-
-namespace apache {
-namespace thrift {
-namespace util {
-
-using apache::thrift::protocol::TMessageType;
-
-template <typename Dummy, typename P>
-template <typename T>
-void ThriftSerializer<Dummy, P>::serialize(const T& fields,
-    const uint8_t** serializedBuffer, size_t* serializedLen) {
-
-  // prepare or reset buffer
-  if (!prepared_ || lastDeserialized_) {
-    prepare();
-  } else {
-    buffer_->resetBuffer();
-  }
-  lastDeserialized_ = false;
-
-  // if required serialize protocol version
-  if (serializeVersion_) {
-    protocol_->writeMessageBegin("", TMessageType(0), 0);
-  }
-
-  // serilaize fields into buffer
-  fields.write(protocol_.get());
-
-  // write the end of message
-  if (serializeVersion_) {
-    protocol_->writeMessageEnd();
-  }
-
-  // assign buffer to string
-  uint8_t* byteBuffer;
-  uint32_t byteBufferSize;
-  buffer_->getBuffer(&byteBuffer, &byteBufferSize);
-  *serializedBuffer = byteBuffer;
-  *serializedLen = byteBufferSize; 
-}
-
-template <typename Dummy, typename P>
-template <typename T>
-void ThriftSerializer<Dummy, P>::serialize(const T& fields, grpc_byte_buffer** bp) {
-
-  const uint8_t* byteBuffer;
-  size_t byteBufferSize;
-  serialize(fields, &byteBuffer, &byteBufferSize);
-
-  gpr_slice slice = gpr_slice_from_copied_buffer((char*)byteBuffer,byteBufferSize);
-
-  *bp = grpc_raw_byte_buffer_create(&slice, 1);
-
-  gpr_slice_unref(slice);
-}
-
-template <typename Dummy, typename P>
-template <typename T>
-uint32_t ThriftSerializer<Dummy, P>::deserialize(const uint8_t* serializedBuffer,
-    size_t length, T* fields) {
-  // prepare buffer if necessary
-  if (!prepared_) {
-    prepare();
-  }
-  lastDeserialized_ = true;
-
-  //reset buffer transport 
-  buffer_->resetBuffer((uint8_t*)serializedBuffer, length);
-
-  // read the protocol version if necessary
-  if (serializeVersion_) {
-    std::string name = "";
-    TMessageType mt = (TMessageType) 0;
-    int32_t seq_id = 0;
-    protocol_->readMessageBegin(name, mt, seq_id);
-  }
-
-  // deserialize buffer into fields
-  uint32_t len = fields->read(protocol_.get());
-
-  // read the end of message
-  if (serializeVersion_) {
-    protocol_->readMessageEnd();
-  }
-
-  return len;
-}
-
-template <typename Dummy, typename P>
-template <typename T>
-uint32_t ThriftSerializer<Dummy, P>::deserialize(grpc_byte_buffer* bp, T* fields) {
-  grpc_byte_buffer_reader reader;
-  grpc_byte_buffer_reader_init(&reader, bp);
-
-  gpr_slice slice = grpc_byte_buffer_reader_readall(&reader);
-
-  uint32_t len = deserialize(GPR_SLICE_START_PTR(slice), GPR_SLICE_LENGTH(slice), fields);
-
-  gpr_slice_unref(slice);
-
-  grpc_byte_buffer_reader_destroy(&reader);
-
-  return len;
-}
-
-template <typename Dummy, typename P>
-void ThriftSerializer<Dummy, P>::setSerializeVersion(bool value) {
-  serializeVersion_ = value;
-}
-
-template <typename Dummy, typename P>
-void
-ThriftSerializer<Dummy, P>::prepare()
-{
-  
-  buffer_.reset(new TMemoryBuffer());
-
-  // create a protocol for the memory buffer transport
-  protocol_.reset(new Protocol(buffer_));
-
-  prepared_ = true;
-}
-
-}}} // namespace apache::thrift::util
-
-#endif

include/grpc++/impl/codegen/thrift_utils.h

@@ -44,9 +44,7 @@
 #include <grpc++/impl/codegen/status.h>
 #include <grpc++/impl/codegen/status_code_enum.h>
 #include <grpc++/impl/codegen/thrift_serializer.h>
-#include <cstdbool>
 #include <cstdint>
-#include <string>
 #include <cstdlib>
 
 namespace grpc {
@@ -62,9 +60,9 @@ class SerializationTraits<T,typename std::enable_if<std::is_base_of<apache::thri
 
     *own_buffer = true;
 
-    ThriftSerializerCompact<T> serializer;
+    ThriftSerializerCompact serializer;
 
-    serializer.serialize(msg, bp);
+    serializer.Serialize(msg, bp);
 
     return Status(StatusCode::OK, "ok");
   }
@@ -76,8 +74,8 @@ class SerializationTraits<T,typename std::enable_if<std::is_base_of<apache::thri
       return Status(StatusCode::INTERNAL, "No payload");
     }
 
-    ThriftSerializerCompact<T> deserializer;
-    deserializer.deserialize(buffer, msg);
+    ThriftSerializerCompact deserializer;
+    deserializer.Deserialize(buffer, msg);
 
     grpc_byte_buffer_destroy(buffer);
 

tools/grift/README.md

@@ -0,0 +1,15 @@
+Copyright 2016 Google Inc.
+
+#Documentation
+
+grift is integration of [Apache Thrift](https://github.com/apache/thrift.git) Serializer with GRPC.
+
+This integration allows you to use grpc to send thrift messages in C++ and java.
+
+By default grift uses Compact Protocol to serialize thrift messages.
+
+#Installation
+
+Before Installing thrift make sure to apply this [patch](grpc_plugins_generate.patch) to third_party/thrift.
+Go to third_party/thrift and follow the [INSTALLATION](https://github.com/apache/thrift.git) instructions to
+install thrift.

tools/grift/grpc_plugins_generator.patch

@@ -1,7 +1,7 @@
 From 0894590b5020c38106d4ebb2291994668c64f9dd Mon Sep 17 00:00:00 2001
 From: chedeti <chedeti@google.com>
 Date: Sun, 31 Jul 2016 15:47:47 -0700
-Subject: [PATCH 1/3] don't build tests
+Subject: [PATCH 1/5] don't build tests
 
 ---
  Makefile.am         | 7 ++-----
@@ -62,7 +62,7 @@ index 6fd15d2..7de1fad 100755
 From 04244fa7805740761db757e4c44251f723d85839 Mon Sep 17 00:00:00 2001
 From: chedeti <chedeti@google.com>
 Date: Sun, 31 Jul 2016 16:16:40 -0700
-Subject: [PATCH 2/3] grpc cpp plugins generator with example
+Subject: [PATCH 2/5] grpc cpp plugins generator with example
 
 ---
  compiler/cpp/src/generate/t_cpp_generator.cc | 476 +++++++++++++++++++++++----
@@ -1401,7 +1401,7 @@ index 0000000..de3c9a4
 From 1d47ed062e62d136c3db9f6fc1dde9e2f794cf22 Mon Sep 17 00:00:00 2001
 From: chedeti <chedeti@google.com>
 Date: Sun, 31 Jul 2016 16:23:53 -0700
-Subject: [PATCH 3/3] grpc java plugins generator
+Subject: [PATCH 3/5] grpc java plugins generator
 
 for examples refer to https://github.com/grpc/grpc-java/tree/master/examples/thrift
 ---
@@ -2415,3 +2415,184 @@ index 5865c54..1cffbe6 100755
 -- 
 2.8.0.rc3.226.g39d4020
 
+
+From a9769a0fa08f553da76215ca59a8fd797b92a853 Mon Sep 17 00:00:00 2001
+From: chedeti <chedeti@google.com>
+Date: Mon, 1 Aug 2016 16:56:36 -0700
+Subject: [PATCH 4/5] maintain consistency with grpc
+
+---
+ compiler/cpp/src/generate/t_cpp_generator.cc   | 20 ++++++++++----------
+ tutorial/cpp/{CppClient.cpp => GrpcClient.cpp} |  0
+ tutorial/cpp/{CppServer.cpp => GrpcServer.cpp} |  0
+ tutorial/cpp/Makefile.am                       |  8 ++++----
+ 4 files changed, 14 insertions(+), 14 deletions(-)
+ rename tutorial/cpp/{CppClient.cpp => GrpcClient.cpp} (100%)
+ rename tutorial/cpp/{CppServer.cpp => GrpcServer.cpp} (100%)
+
+diff --git a/compiler/cpp/src/generate/t_cpp_generator.cc b/compiler/cpp/src/generate/t_cpp_generator.cc
+index 9c3399b..4e00129 100644
+--- a/compiler/cpp/src/generate/t_cpp_generator.cc
++++ b/compiler/cpp/src/generate/t_cpp_generator.cc
+@@ -1641,7 +1641,7 @@ void t_cpp_generator::generate_service(t_service* tservice) {
+             << endl;
+ 
+   t_service* extends_service = tservice->get_extends();
+-  if (extends_service != nullptr) {
++  if (extends_service) {
+     f_header_ << "#include \"" << get_include_prefix(*(extends_service->get_program()))
+               << extends_service->get_name() << ".grpc.thrift.h\"" << endl;
+   }
+@@ -1733,7 +1733,7 @@ void t_cpp_generator::generate_service(t_service* tservice) {
+       indent() << "\"/" << ns << "." << service_name_ << "/" << (*f_iter)->get_name() << "\"," << endl;
+   }
+ 
+-  if (extends_service != nullptr) {
++  if (extends_service) {
+     vector<t_function*> functions = extends_service->get_functions();
+     vector<t_function*>::iterator f_iter;
+ 
+@@ -1749,9 +1749,9 @@ void t_cpp_generator::generate_service(t_service* tservice) {
+   "};" << endl;
+ 
+   // Generate service class
+-  if ( extends_service != nullptr ) {
++  if ( extends_service) {
+     f_header_ << "class " << service_name_ << " : public " <<
+-      extends_service->get_name() << " {" << endl <<
++      type_name(extends_service) << " {" << endl <<
+       "public:" << endl;
+   }
+   else {
+@@ -1841,7 +1841,7 @@ void t_cpp_generator::generate_service_helpers(t_service* tservice) {
+ void t_cpp_generator::generate_service_stub_interface(t_service* tservice) {
+ 
+     string extends = "";
+-    if (tservice->get_extends() != nullptr) {
++    if (tservice->get_extends()) {
+       extends = " : virtual public " + type_name(tservice->get_extends()) + "::StubInterface";
+     }
+ 
+@@ -1890,7 +1890,7 @@ void t_cpp_generator::generate_service_stub(t_service* tservice) {
+     }
+ 
+     t_service* extends_service = tservice->get_extends();
+-    if (extends_service != nullptr) {
++    if (extends_service) {
+       // generate inherited methods
+       vector<t_function*> functions = extends_service->get_functions();
+       vector<t_function*>::iterator f_iter;
+@@ -1914,7 +1914,7 @@ void t_cpp_generator::generate_service_stub(t_service* tservice) {
+         indent() << "const ::grpc::RpcMethod rpcmethod_" << (*f_iter)->get_name() << "_;" << endl;
+     }
+ 
+-    if (extends_service != nullptr) {
++    if (extends_service) {
+       // generate inherited methods
+       vector<t_function*> functions = extends_service->get_functions();
+       vector<t_function*>::iterator f_iter;
+@@ -1944,7 +1944,7 @@ void t_cpp_generator::generate_service_stub(t_service* tservice) {
+         service_name_ << "_method_names[" << i << "], ::grpc::RpcMethod::NORMAL_RPC, channel)" << endl;
+     }
+ 
+-    if (extends_service != nullptr) {
++    if (extends_service) {
+       // generate inherited methods
+       vector<t_function*> functions = extends_service->get_functions();
+       vector<t_function*>::iterator f_iter;
+@@ -2002,7 +2002,7 @@ void t_cpp_generator::generate_service_stub(t_service* tservice) {
+ 
+     }
+ 
+-    if (extends_service != nullptr) {
++    if (extends_service) {
+       vector<t_function*> functions = extends_service->get_functions();
+       vector<t_function*>::iterator f_iter;
+       for (f_iter = functions.begin(); f_iter != functions.end(); ++f_iter) {
+@@ -2049,7 +2049,7 @@ void t_cpp_generator::generate_service_interface(t_service* tservice, string sty
+   }
+ 
+   string extends = "";
+-  if (tservice->get_extends() != NULL) {
++  if (tservice->get_extends()) {
+     extends = " : virtual public " + type_name(tservice->get_extends()) + style + "::Service";
+     if (style == "CobCl" && gen_templates_) {
+       // TODO(simpkins): If gen_templates_ is enabled, we currently assume all
+diff --git a/tutorial/cpp/CppClient.cpp b/tutorial/cpp/GrpcClient.cpp
+similarity index 100%
+rename from tutorial/cpp/CppClient.cpp
+rename to tutorial/cpp/GrpcClient.cpp
+diff --git a/tutorial/cpp/CppServer.cpp b/tutorial/cpp/GrpcServer.cpp
+similarity index 100%
+rename from tutorial/cpp/CppServer.cpp
+rename to tutorial/cpp/GrpcServer.cpp
+diff --git a/tutorial/cpp/Makefile.am b/tutorial/cpp/Makefile.am
+index 581f75e..39d85e1 100755
+--- a/tutorial/cpp/Makefile.am
++++ b/tutorial/cpp/Makefile.am
+@@ -39,14 +39,14 @@ noinst_PROGRAMS = \
+ 	TestClient
+ 
+ TestServer_SOURCES = \
+-	CppServer.cpp
++	GrpcServer.cpp
+ 
+ TestServer_LDADD = \
+ 	libtestgencpp.la \
+ 	$(top_builddir)/lib/cpp/libthrift.la
+ 
+ TestClient_SOURCES = \
+-	CppClient.cpp
++	GrpcClient.cpp
+ 
+ TestClient_LDADD = \
+ 	libtestgencpp.la \
+@@ -78,5 +78,5 @@ style-local:
+ 
+ EXTRA_DIST = \
+ 	CMakeLists.txt \
+-	CppClient.cpp \
+-	CppServer.cpp
++	GrpcClient.cpp \
++	GrpcServer.cpp
+-- 
+2.8.0.rc3.226.g39d4020
+
+
+From b4bc0c810f00a1b86516774306ff4017e3d2d252 Mon Sep 17 00:00:00 2001
+From: chedeti <chedeti@google.com>
+Date: Mon, 1 Aug 2016 17:00:17 -0700
+Subject: [PATCH 5/5] fix typo
+
+---
+ tutorial/cpp/GrpcClient.cpp | 2 +-
+ tutorial/cpp/GrpcServer.cpp | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/tutorial/cpp/GrpcClient.cpp b/tutorial/cpp/GrpcClient.cpp
+index c41604e..41a7acf 100644
+--- a/tutorial/cpp/GrpcClient.cpp
++++ b/tutorial/cpp/GrpcClient.cpp
+@@ -1,6 +1,6 @@
+ /*
+  *
+- * Copyright 2015, Google Inc.
++ * Copyright 2016, Google Inc.
+  * All rights reserved.
+  *
+  * Redistribution and use in source and binary forms, with or without
+diff --git a/tutorial/cpp/GrpcServer.cpp b/tutorial/cpp/GrpcServer.cpp
+index c838b61..f63db57 100644
+--- a/tutorial/cpp/GrpcServer.cpp
++++ b/tutorial/cpp/GrpcServer.cpp
+@@ -1,6 +1,6 @@
+ /*
+  *
+- * Copyright 2015, Google Inc.
++ * Copyright 2016, Google Inc.
+  * All rights reserved.
+  *
+  * Redistribution and use in source and binary forms, with or without
+-- 
+2.8.0.rc3.226.g39d4020
+

tools/run_tests/sources_and_headers.json

@@ -6792,14 +6792,12 @@
     ], 
     "headers": [
       "include/grpc++/impl/codegen/thrift_serializer.h", 
-      "include/grpc++/impl/codegen/thrift_serializer_inl.h", 
       "include/grpc++/impl/codegen/thrift_utils.h"
     ], 
     "language": "c++", 
     "name": "thrift_util", 
     "src": [
       "include/grpc++/impl/codegen/thrift_serializer.h", 
-      "include/grpc++/impl/codegen/thrift_serializer_inl.h", 
       "include/grpc++/impl/codegen/thrift_utils.h"
     ], 
     "third_party": false, 

vsprojects/vcxproj/grpc++_test_util/grpc++_test_util.vcxproj

@@ -201,7 +201,6 @@
     <ClInclude Include="$(SolutionDir)\..\include\grpc++\impl\codegen\proto_utils.h" />
     <ClInclude Include="$(SolutionDir)\..\include\grpc++\impl\codegen\config_protobuf.h" />
     <ClInclude Include="$(SolutionDir)\..\include\grpc++\impl\codegen\thrift_serializer.h" />
-    <ClInclude Include="$(SolutionDir)\..\include\grpc++\impl\codegen\thrift_serializer_inl.h" />
     <ClInclude Include="$(SolutionDir)\..\include\grpc++\impl\codegen\thrift_utils.h" />
   </ItemGroup>
   <ItemGroup>

vsprojects/vcxproj/grpc++_test_util/grpc++_test_util.vcxproj.filters

@@ -195,9 +195,6 @@
     <ClInclude Include="$(SolutionDir)\..\include\grpc++\impl\codegen\thrift_serializer.h">
       <Filter>include\grpc++\impl\codegen</Filter>
     </ClInclude>
-    <ClInclude Include="$(SolutionDir)\..\include\grpc++\impl\codegen\thrift_serializer_inl.h">
-      <Filter>include\grpc++\impl\codegen</Filter>
-    </ClInclude>
     <ClInclude Include="$(SolutionDir)\..\include\grpc++\impl\codegen\thrift_utils.h">
       <Filter>include\grpc++\impl\codegen</Filter>
     </ClInclude>