Index: third_party/protobuf/src/google/protobuf/compiler/java/java_enum_field.cc |
diff --git a/third_party/protobuf/src/google/protobuf/compiler/java/java_enum_field.cc b/third_party/protobuf/src/google/protobuf/compiler/java/java_enum_field.cc |
index 558da968ee2a8590fd935550996e94ddbb3cb0f1..3e54be3d5a495bfef1bbd1dfdea165d48c992ed9 100644 |
--- a/third_party/protobuf/src/google/protobuf/compiler/java/java_enum_field.cc |
+++ b/third_party/protobuf/src/google/protobuf/compiler/java/java_enum_field.cc |
@@ -68,21 +68,14 @@ void SetEnumVariables(const FieldDescriptor* descriptor, |
(*variables)["default"] = ImmutableDefaultValue(descriptor, name_resolver); |
(*variables)["default_number"] = SimpleItoa( |
descriptor->default_value_enum()->number()); |
- if (descriptor->is_packed()) { |
- (*variables)["tag"] = SimpleItoa(internal::WireFormatLite::MakeTag( |
- descriptor->number(), |
- internal::WireFormatLite::WIRETYPE_LENGTH_DELIMITED)); |
- } else { |
- (*variables)["tag"] = SimpleItoa(internal::WireFormat::MakeTag(descriptor)); |
- } |
+ (*variables)["tag"] = SimpleItoa(internal::WireFormat::MakeTag(descriptor)); |
(*variables)["tag_size"] = SimpleItoa( |
internal::WireFormat::TagSize(descriptor->number(), GetType(descriptor))); |
// 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"] = |
- HasDescriptorMethods(descriptor->containing_type()) ? "onChanged();" : ""; |
+ (*variables)["on_changed"] = "onChanged();"; |
if (SupportFieldPresence(descriptor->file())) { |
// For singular messages and builders, one bit is used for the hasField bit. |
@@ -198,7 +191,7 @@ GenerateMembers(io::Printer* printer) const { |
WriteFieldDocComment(printer, descriptor_); |
printer->Print(variables_, |
"$deprecation$public $type$ get$capitalized_name$() {\n" |
- " $type$ result = $type$.valueOf($name$_);\n" |
+ " $type$ result = $type$.forNumber($name$_);\n" |
" return result == null ? $unknown$ : result;\n" |
"}\n"); |
} |
@@ -231,7 +224,7 @@ GenerateBuilderMembers(io::Printer* printer) const { |
WriteFieldDocComment(printer, descriptor_); |
printer->Print(variables_, |
"$deprecation$public $type$ get$capitalized_name$() {\n" |
- " $type$ result = $type$.valueOf($name$_);\n" |
+ " $type$ result = $type$.forNumber($name$_);\n" |
" return result == null ? $unknown$ : result;\n" |
"}\n"); |
WriteFieldDocComment(printer, descriptor_); |
@@ -311,7 +304,7 @@ GenerateParsingCode(io::Printer* printer) const { |
} else { |
printer->Print(variables_, |
"int rawValue = input.readEnum();\n" |
- "$type$ value = $type$.valueOf(rawValue);\n" |
+ "$type$ value = $type$.forNumber(rawValue);\n" |
"if (value == null) {\n"); |
if (PreserveUnknownFields(descriptor_->containing_type())) { |
printer->Print(variables_, |
@@ -405,7 +398,7 @@ GenerateMembers(io::Printer* printer) const { |
printer->Print(variables_, |
"$deprecation$public $type$ get$capitalized_name$() {\n" |
" if ($has_oneof_case_message$) {\n" |
- " $type$ result = $type$.valueOf((java.lang.Integer) $oneof_name$_);\n" |
+ " $type$ result = $type$.forNumber((java.lang.Integer) $oneof_name$_);\n" |
" return result == null ? $unknown$ : result;\n" |
" }\n" |
" return $default$;\n" |
@@ -443,7 +436,7 @@ GenerateBuilderMembers(io::Printer* printer) const { |
printer->Print(variables_, |
"$deprecation$public $type$ get$capitalized_name$() {\n" |
" if ($has_oneof_case_message$) {\n" |
- " $type$ result = $type$.valueOf((java.lang.Integer) $oneof_name$_);\n" |
+ " $type$ result = $type$.forNumber((java.lang.Integer) $oneof_name$_);\n" |
" return result == null ? $unknown$ : result;\n" |
" }\n" |
" return $default$;\n" |
@@ -500,7 +493,7 @@ GenerateParsingCode(io::Printer* printer) const { |
} else { |
printer->Print(variables_, |
"int rawValue = input.readEnum();\n" |
- "$type$ value = $type$.valueOf(rawValue);\n" |
+ "$type$ value = $type$.forNumber(rawValue);\n" |
"if (value == null) {\n"); |
if (PreserveUnknownFields(descriptor_->containing_type())) { |
printer->Print(variables_, |
@@ -613,7 +606,7 @@ GenerateMembers(io::Printer* printer) const { |
" new com.google.protobuf.Internal.ListAdapter.Converter<\n" |
" java.lang.Integer, $type$>() {\n" |
" public $type$ convert(java.lang.Integer from) {\n" |
- " $type$ result = $type$.valueOf(from);\n" |
+ " $type$ result = $type$.forNumber(from);\n" |
" return result == null ? $unknown$ : result;\n" |
" }\n" |
" };\n"); |
@@ -649,7 +642,7 @@ GenerateMembers(io::Printer* printer) const { |
} |
if (descriptor_->is_packed() && |
- HasGeneratedMethods(descriptor_->containing_type())) { |
+ context_->HasGeneratedMethods(descriptor_->containing_type())) { |
printer->Print(variables_, |
"private int $name$MemoizedSerializedSize;\n"); |
} |
@@ -846,7 +839,7 @@ GenerateParsingCode(io::Printer* printer) const { |
} else { |
printer->Print(variables_, |
"int rawValue = input.readEnum();\n" |
- "$type$ value = $type$.valueOf(rawValue);\n" |
+ "$type$ value = $type$.forNumber(rawValue);\n" |
"if (value == null) {\n"); |
if (PreserveUnknownFields(descriptor_->containing_type())) { |
printer->Print(variables_, |