Reverts third_party/protobuf: Update to HEAD (f52e188fe4)

third_party/protobuf/src/google/protobuf/compiler/java/java_message_field.cc

 // Protocol Buffers - Google's data interchange format
 // Copyright 2008 Google Inc.  All rights reserved.
 // https://developers.google.com/protocol-buffers/
 //
 // 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.
@@ skipping 38 matching lines @@
 namespace compiler {
 namespace java {
 
 namespace {
 
 void SetMessageVariables(const FieldDescriptor* descriptor,
                          int messageBitIndex,
                          int builderBitIndex,
                          const FieldGeneratorInfo* info,
                          ClassNameResolver* name_resolver,
-                         std::map<string, string>* variables) {
+                         map<string, string>* variables) {
   SetCommonFieldVariables(descriptor, info, variables);
 
   (*variables)["type"] =
       name_resolver->GetImmutableClassName(descriptor->message_type());
   (*variables)["mutable_type"] =
       name_resolver->GetMutableClassName(descriptor->message_type());
   (*variables)["group_or_message"] =
     (GetType(descriptor) == FieldDescriptor::TYPE_GROUP) ?
     "Group" : "Message";
   // TODO(birdo): Add @deprecated javadoc when generating javadoc is supported
   // by the proto compiler
   (*variables)["deprecation"] = descriptor->options().deprecated()
       ? "@java.lang.Deprecated " : "";
   (*variables)["on_changed"] = "onChanged();";
-  (*variables)["ver"] = GeneratedCodeVersionSuffix();
-  (*variables)["get_parser"] =
-      ExposePublicParser(descriptor->message_type()->file())
-          ? "PARSER" : "parser()";
 
   if (SupportFieldPresence(descriptor->file())) {
     // For singular messages and builders, one bit is used for the hasField bit.
     (*variables)["get_has_field_bit_message"] = GenerateGetBit(messageBitIndex);
     (*variables)["get_has_field_bit_builder"] = GenerateGetBit(builderBitIndex);
 
     // Note that these have a trailing ";".
     (*variables)["set_has_field_bit_message"] =
         GenerateSetBit(messageBitIndex) + ";";
     (*variables)["set_has_field_bit_builder"] =
@@ skipping 161 matching lines @@
   // demand and then forever delegates to it after creation.
 
   bool support_field_presence = SupportFieldPresence(descriptor_->file());
 
   printer->Print(variables_,
     "private $type$ $name$_ = null;\n");
 
   printer->Print(variables_,
       // If this builder is non-null, it is used and the other fields are
       // ignored.
-      "private com.google.protobuf.SingleFieldBuilder$ver$<\n"
+      "private com.google.protobuf.SingleFieldBuilder<\n"
       "    $type$, $type$.Builder, $type$OrBuilder> $name$Builder_;"
       "\n");
 
   // The comments above the methods below are based on a hypothetical
   // field of type "Field" called "Field".
 
   // boolean hasField()
   WriteFieldDocComment(printer, descriptor_);
   if (support_field_presence) {
     printer->Print(variables_,
@@ skipping 101 matching lines @@
     "$deprecation$public $type$OrBuilder get$capitalized_name$OrBuilder() {\n"
     "  if ($name$Builder_ != null) {\n"
     "    return $name$Builder_.getMessageOrBuilder();\n"
     "  } else {\n"
     "    return $name$_ == null ?\n"
     "        $type$.getDefaultInstance() : $name$_;\n"
     "  }\n"
     "}\n");
   WriteFieldDocComment(printer, descriptor_);
   printer->Print(variables_,
-    "private com.google.protobuf.SingleFieldBuilder$ver$<\n"
+    "private com.google.protobuf.SingleFieldBuilder<\n"
     "    $type$, $type$.Builder, $type$OrBuilder> \n"
     "    get$capitalized_name$FieldBuilder() {\n"
     "  if ($name$Builder_ == null) {\n"
-    "    $name$Builder_ = new com.google.protobuf.SingleFieldBuilder$ver$<\n"
+    "    $name$Builder_ = new com.google.protobuf.SingleFieldBuilder<\n"
     "        $type$, $type$.Builder, $type$OrBuilder>(\n"
     "            get$capitalized_name$(),\n"
     "            getParentForChildren(),\n"
     "            isClean());\n"
     "    $name$_ = null;\n"
     "  }\n"
     "  return $name$Builder_;\n"
     "}\n");
 }
 
@@ skipping 52 matching lines @@
 void ImmutableMessageFieldGenerator::
 GenerateParsingCode(io::Printer* printer) const {
   printer->Print(variables_,
     "$type$.Builder subBuilder = null;\n"
     "if ($is_field_present_message$) {\n"
     "  subBuilder = $name$_.toBuilder();\n"
     "}\n");
 
   if (GetType(descriptor_) == FieldDescriptor::TYPE_GROUP) {
     printer->Print(variables_,
-      "$name$_ = input.readGroup($number$, $type$.$get_parser$,\n"
+      "$name$_ = input.readGroup($number$, $type$.parser(),\n"
       "    extensionRegistry);\n");
   } else {
     printer->Print(variables_,
-      "$name$_ = input.readMessage($type$.$get_parser$, extensionRegistry);\n");
+      "$name$_ = input.readMessage($type$.parser(), extensionRegistry);\n");
   }
 
   printer->Print(variables_,
     "if (subBuilder != null) {\n"
     "  subBuilder.mergeFrom($name$_);\n"
     "  $name$_ = subBuilder.buildPartial();\n"
     "}\n"
     "$set_has_field_bit_message$\n");
 }
 
@@ skipping 84 matching lines @@
 }
 
 void ImmutableMessageOneofFieldGenerator::
 GenerateBuilderMembers(io::Printer* printer) const {
   // When using nested-builders, the code initially works just like the
   // non-nested builder case. It only creates a nested builder lazily on
   // demand and then forever delegates to it after creation.
   printer->Print(variables_,
     // If this builder is non-null, it is used and the other fields are
     // ignored.
-    "private com.google.protobuf.SingleFieldBuilder$ver$<\n"
+    "private com.google.protobuf.SingleFieldBuilder<\n"
     "    $type$, $type$.Builder, $type$OrBuilder> $name$Builder_;"
     "\n");
 
   // The comments above the methods below are based on a hypothetical
   // field of type "Field" called "Field".
 
   if (SupportFieldPresence(descriptor_->file())) {
     // boolean hasField()
     WriteFieldDocComment(printer, descriptor_);
     printer->Print(variables_,
@@ skipping 102 matching lines @@
     "    return $name$Builder_.getMessageOrBuilder();\n"
     "  } else {\n"
     "    if ($has_oneof_case_message$) {\n"
     "      return ($type$) $oneof_name$_;\n"
     "    }\n"
     "    return $type$.getDefaultInstance();\n"
     "  }\n"
     "}\n");
   WriteFieldDocComment(printer, descriptor_);
   printer->Print(variables_,
-    "private com.google.protobuf.SingleFieldBuilder$ver$<\n"
+    "private com.google.protobuf.SingleFieldBuilder<\n"
     "    $type$, $type$.Builder, $type$OrBuilder> \n"
     "    get$capitalized_name$FieldBuilder() {\n"
     "  if ($name$Builder_ == null) {\n"
     "    if (!($has_oneof_case_message$)) {\n"
     "      $oneof_name$_ = $type$.getDefaultInstance();\n"
     "    }\n"
-    "    $name$Builder_ = new com.google.protobuf.SingleFieldBuilder$ver$<\n"
+    "    $name$Builder_ = new com.google.protobuf.SingleFieldBuilder<\n"
     "        $type$, $type$.Builder, $type$OrBuilder>(\n"
     "            ($type$) $oneof_name$_,\n"
     "            getParentForChildren(),\n"
     "            isClean());\n"
     "    $oneof_name$_ = null;\n"
     "  }\n"
     "  $set_oneof_case_message$;\n"
     "  $on_changed$;\n"
     "  return $name$Builder_;\n"
     "}\n");
@@ skipping 24 matching lines @@
 void ImmutableMessageOneofFieldGenerator::
 GenerateParsingCode(io::Printer* printer) const {
   printer->Print(variables_,
     "$type$.Builder subBuilder = null;\n"
     "if ($has_oneof_case_message$) {\n"
     "  subBuilder = (($type$) $oneof_name$_).toBuilder();\n"
     "}\n");
 
   if (GetType(descriptor_) == FieldDescriptor::TYPE_GROUP) {
     printer->Print(variables_,
-      "$oneof_name$_ = input.readGroup($number$, $type$.$get_parser$,\n"
+      "$oneof_name$_ = input.readGroup($number$, $type$.parser(),\n"
       "    extensionRegistry);\n");
   } else {
     printer->Print(variables_,
       "$oneof_name$_ =\n"
-      "    input.readMessage($type$.$get_parser$, extensionRegistry);\n");
+      "    input.readMessage($type$.parser(), extensionRegistry);\n");
   }
 
   printer->Print(variables_,
     "if (subBuilder != null) {\n"
     "  subBuilder.mergeFrom(($type$) $oneof_name$_);\n"
     "  $oneof_name$_ = subBuilder.buildPartial();\n"
     "}\n");
   printer->Print(variables_,
     "$set_oneof_case_message$;\n");
 }
@@ skipping 159 matching lines @@
     "  if (!$get_mutable_bit_builder$) {\n"
     "    $name$_ = new java.util.ArrayList<$type$>($name$_);\n"
     "    $set_mutable_bit_builder$;\n"
     "   }\n"
     "}\n"
     "\n");
 
   printer->Print(variables_,
     // If this builder is non-null, it is used and the other fields are
     // ignored.
-    "private com.google.protobuf.RepeatedFieldBuilder$ver$<\n"
+    "private com.google.protobuf.RepeatedFieldBuilder<\n"
     "    $type$, $type$.Builder, $type$OrBuilder> $name$Builder_;\n"
     "\n");
 
   // The comments above the methods below are based on a hypothetical
   // repeated field of type "Field" called "RepeatedField".
 
   // List<Field> getRepeatedFieldList()
   WriteFieldDocComment(printer, descriptor_);
   PrintNestedBuilderFunction(printer,
     "$deprecation$public java.util.List<$type$> get$capitalized_name$List()",
@@ skipping 196 matching lines @@
     "    int index) {\n"
     "  return get$capitalized_name$FieldBuilder().addBuilder(\n"
     "      index, $type$.getDefaultInstance());\n"
     "}\n");
   WriteFieldDocComment(printer, descriptor_);
       printer->Print(variables_,
     "$deprecation$public java.util.List<$type$.Builder> \n"
     "     get$capitalized_name$BuilderList() {\n"
     "  return get$capitalized_name$FieldBuilder().getBuilderList();\n"
     "}\n"
-    "private com.google.protobuf.RepeatedFieldBuilder$ver$<\n"
+    "private com.google.protobuf.RepeatedFieldBuilder<\n"
     "    $type$, $type$.Builder, $type$OrBuilder> \n"
     "    get$capitalized_name$FieldBuilder() {\n"
     "  if ($name$Builder_ == null) {\n"
-    "    $name$Builder_ = new com.google.protobuf.RepeatedFieldBuilder$ver$<\n"
+    "    $name$Builder_ = new com.google.protobuf.RepeatedFieldBuilder<\n"
     "        $type$, $type$.Builder, $type$OrBuilder>(\n"
     "            $name$_,\n"
     "            $get_mutable_bit_builder$,\n"
     "            getParentForChildren(),\n"
     "            isClean());\n"
     "    $name$_ = null;\n"
     "  }\n"
     "  return $name$Builder_;\n"
     "}\n");
 }
@@ skipping 37 matching lines @@
     "  $on_changed$\n"
     "}\n",
 
     "if (!other.$name$_.isEmpty()) {\n"
     "  if ($name$Builder_.isEmpty()) {\n"
     "    $name$Builder_.dispose();\n"
     "    $name$Builder_ = null;\n"
     "    $name$_ = other.$name$_;\n"
     "    $clear_mutable_bit_builder$;\n"
     "    $name$Builder_ = \n"
-    "      com.google.protobuf.GeneratedMessage$ver$.alwaysUseFieldBuilders ?\n"
+    "      com.google.protobuf.GeneratedMessage.alwaysUseFieldBuilders ?\n"
     "         get$capitalized_name$FieldBuilder() : null;\n"
     "  } else {\n"
     "    $name$Builder_.addAllMessages(other.$name$_);\n"
     "  }\n"
     "}\n");
 }
 
 void RepeatedImmutableMessageFieldGenerator::
 GenerateBuildingCode(io::Printer* printer) const {
   // The code below (non-nested builder case) ensures that the result has an
@@ skipping 12 matching lines @@
 void RepeatedImmutableMessageFieldGenerator::
 GenerateParsingCode(io::Printer* printer) const {
   printer->Print(variables_,
     "if (!$get_mutable_bit_parser$) {\n"
     "  $name$_ = new java.util.ArrayList<$type$>();\n"
     "  $set_mutable_bit_parser$;\n"
     "}\n");
 
   if (GetType(descriptor_) == FieldDescriptor::TYPE_GROUP) {
     printer->Print(variables_,
-      "$name$_.add(input.readGroup($number$, $type$.$get_parser$,\n"
+      "$name$_.add(input.readGroup($number$, $type$.parser(),\n"
       "    extensionRegistry));\n");
   } else {
     printer->Print(variables_,
-      "$name$_.add(\n"
-      "    input.readMessage($type$.$get_parser$, extensionRegistry));\n");
+      "$name$_.add(input.readMessage($type$.parser(), extensionRegistry));\n");
   }
 }
 
 void RepeatedImmutableMessageFieldGenerator::
 GenerateParsingDoneCode(io::Printer* printer) const {
   printer->Print(variables_,
     "if ($get_mutable_bit_parser$) {\n"
     "  $name$_ = java.util.Collections.unmodifiableList($name$_);\n"
     "}\n");
 }
@@ skipping 32 matching lines @@
 }
 
 string RepeatedImmutableMessageFieldGenerator::GetBoxedType() const {
   return name_resolver_->GetImmutableClassName(descriptor_->message_type());
 }
 
 }  // namespace java
 }  // namespace compiler
 }  // namespace protobuf
 }  // namespace google