Merge pull request #14 from lizan/fix_format

fix format with clang-format 3.8

Author: rkpagadala

src/include/grpc_transcoding/response_to_json_translator.h

@@ -72,8 +72,8 @@ class ResponseToJsonTranslator : public MessageStream {
   ResponseToJsonTranslator(
       ::google::protobuf::util::TypeResolver* type_resolver,
       std::string type_url, bool streaming, TranscoderInputStream* in,
-      const ::google::protobuf::util::JsonPrintOptions&
-          json_print_options = ::google::protobuf::util::JsonPrintOptions());
+      const ::google::protobuf::util::JsonPrintOptions& json_print_options =
+          ::google::protobuf::util::JsonPrintOptions());
 
   // MessageStream implementation
   bool NextMessage(std::string* message);

test/proto_stream_tester.h

@@ -20,8 +20,8 @@
 #include "google/protobuf/stubs/status.h"
 #include "google/protobuf/text_format.h"
 #include "google/protobuf/util/message_differencer.h"
-#include "gtest/gtest.h"
 #include "grpc_transcoding/message_stream.h"
+#include "gtest/gtest.h"
 
 namespace google {
 namespace grpc {

test/request_translator_test_base.cc

@@ -27,8 +27,8 @@
 #include "google/protobuf/text_format.h"
 #include "google/protobuf/type.pb.h"
 #include "google/protobuf/util/internal/type_info.h"
-#include "gtest/gtest.h"
 #include "grpc_transcoding/message_stream.h"
+#include "gtest/gtest.h"
 #include "test_common.h"
 
 namespace google {

test/request_translator_test_base.h

@@ -22,11 +22,11 @@
 #include "google/api/service.pb.h"
 #include "google/protobuf/type.pb.h"
 #include "google/protobuf/util/type_resolver.h"
-#include "gtest/gtest.h"
-#include "proto_stream_tester.h"
 #include "grpc_transcoding/message_stream.h"
 #include "grpc_transcoding/request_message_translator.h"
 #include "grpc_transcoding/type_helper.h"
+#include "gtest/gtest.h"
+#include "proto_stream_tester.h"
 
 namespace google {
 namespace grpc {

test/response_to_json_translator_test.cc

@@ -24,8 +24,8 @@
 #include "bookstore.pb.h"
 #include "google/protobuf/io/zero_copy_stream.h"
 #include "google/protobuf/text_format.h"
-#include "gtest/gtest.h"
 #include "grpc_transcoding/type_helper.h"
+#include "gtest/gtest.h"
 #include "test_common.h"
 
 namespace google {
@@ -56,11 +56,11 @@ class ResponseToJsonTranslatorTestRun {
   // type_url - type url of messages being translated,
   // input - the input to be passed to the MessageReader,
   // expected - the expected translated json chunks as the input is processed,
-  ResponseToJsonTranslatorTestRun(pbutil::TypeResolver* type_resolver,
-                            bool streaming, const std::string& type_url,
-                            const pbutil::JsonPrintOptions& json_print_options,
-                            const std::string& input,
-                            const std::vector<ExpectedAt>& expected)
+  ResponseToJsonTranslatorTestRun(
+      pbutil::TypeResolver* type_resolver, bool streaming,
+      const std::string& type_url,
+      const pbutil::JsonPrintOptions& json_print_options,
+      const std::string& input, const std::vector<ExpectedAt>& expected)
       : input_(input),
         expected_(expected),
         streaming_(streaming),
@@ -187,10 +187,11 @@ class ResponseToJsonTranslatorTestCase {
   // type_url - type url of messages being translated,
   // input - the input to be passed to the MessageReader,
   // expected - the expected translated json chunks as the input is processed,
-  ResponseToJsonTranslatorTestCase(pbutil::TypeResolver* type_resolver,
-                           bool streaming, const std::string& type_url,
-                           const pbutil::JsonPrintOptions& json_print_options,
-                           std::string input, std::vector<ExpectedAt> expected)
+  ResponseToJsonTranslatorTestCase(
+      pbutil::TypeResolver* type_resolver, bool streaming,
+      const std::string& type_url,
+      const pbutil::JsonPrintOptions& json_print_options, std::string input,
+      std::vector<ExpectedAt> expected)
       : type_resolver_(type_resolver),
         streaming_(streaming),
         type_url_(type_url),
@@ -277,7 +278,7 @@ class ResponseToJsonTranslatorTest : public ::testing::Test {
   void SetJsonAlwaysPrintPrimitiveFields(bool always_print_primitive_fields) {
     pbutil::JsonPrintOptions json_print_options;
     json_print_options.always_print_primitive_fields =
-                                                always_print_primitive_fields;
+        always_print_primitive_fields;
     SetJsonPrintOptions(json_print_options);
   }
 
@@ -305,8 +306,8 @@ class ResponseToJsonTranslatorTest : public ::testing::Test {
 
     return std::unique_ptr<ResponseToJsonTranslatorTestCase>(
         new ResponseToJsonTranslatorTestCase(
-            type_helper_->Resolver(), streaming_, type_url_, json_print_options_,
-            std::move(input), std::move(expected)));
+            type_helper_->Resolver(), streaming_, type_url_,
+            json_print_options_, std::move(input), std::move(expected)));
   }
 
  private:

test/test_common.h

@@ -23,8 +23,8 @@
 #include "google/api/service.pb.h"
 #include "google/protobuf/io/zero_copy_stream.h"
 #include "google/protobuf/text_format.h"
-#include "gtest/gtest.h"
 #include "grpc_transcoding/transcoder_input_stream.h"
+#include "gtest/gtest.h"
 
 namespace google {
 namespace grpc {