attempting to upgrade to proto 3.5
This commit is contained in:
1 parent
eb1b42a5e8
commit
cc3510c6c2
368 files changed
+35764
-24867
No files matched your search
@@ -183,23 +183,26 @@ GenerateMembers(io::Printer* printer) const {
|
||||
if (SupportFieldPresence(descriptor_->file())) {
|
||||
WriteFieldDocComment(printer, descriptor_);
|
||||
printer->Print(variables_,
|
||||
"$deprecation$public boolean has$capitalized_name$() {\n"
|
||||
"$deprecation$public boolean ${$has$capitalized_name$$}$() {\n"
|
||||
" return $get_has_field_bit_message$;\n"
|
||||
"}\n");
|
||||
printer->Annotate("{", "}", descriptor_);
|
||||
}
|
||||
if (SupportUnknownEnumValue(descriptor_->file())) {
|
||||
WriteFieldDocComment(printer, descriptor_);
|
||||
printer->Print(variables_,
|
||||
"$deprecation$public int get$capitalized_name$Value() {\n"
|
||||
"$deprecation$public int ${$get$capitalized_name$Value$}$() {\n"
|
||||
" return $name$_;\n"
|
||||
"}\n");
|
||||
printer->Annotate("{", "}", descriptor_);
|
||||
}
|
||||
WriteFieldDocComment(printer, descriptor_);
|
||||
printer->Print(variables_,
|
||||
"$deprecation$public $type$ get$capitalized_name$() {\n"
|
||||
"$deprecation$public $type$ ${$get$capitalized_name$$}$() {\n"
|
||||
" $type$ result = $type$.$for_number$($name$_);\n"
|
||||
" return result == null ? $unknown$ : result;\n"
|
||||
"}\n");
|
||||
printer->Annotate("{", "}", descriptor_);
|
||||
}
|
||||
|
||||
void ImmutableEnumFieldGenerator::
|
||||
@@ -209,33 +212,38 @@ GenerateBuilderMembers(io::Printer* printer) const {
|
||||
if (SupportFieldPresence(descriptor_->file())) {
|
||||
WriteFieldDocComment(printer, descriptor_);
|
||||
printer->Print(variables_,
|
||||
"$deprecation$public boolean has$capitalized_name$() {\n"
|
||||
"$deprecation$public boolean ${$has$capitalized_name$$}$() {\n"
|
||||
" return $get_has_field_bit_builder$;\n"
|
||||
"}\n");
|
||||
printer->Annotate("{", "}", descriptor_);
|
||||
}
|
||||
if (SupportUnknownEnumValue(descriptor_->file())) {
|
||||
WriteFieldDocComment(printer, descriptor_);
|
||||
printer->Print(variables_,
|
||||
"$deprecation$public int get$capitalized_name$Value() {\n"
|
||||
"$deprecation$public int ${$get$capitalized_name$Value$}$() {\n"
|
||||
" return $name$_;\n"
|
||||
"}\n");
|
||||
printer->Annotate("{", "}", descriptor_);
|
||||
WriteFieldDocComment(printer, descriptor_);
|
||||
printer->Print(variables_,
|
||||
"$deprecation$public Builder set$capitalized_name$Value(int value) {\n"
|
||||
"$deprecation$public Builder "
|
||||
"${$set$capitalized_name$Value$}$(int value) {\n"
|
||||
" $name$_ = value;\n"
|
||||
" $on_changed$\n"
|
||||
" return this;\n"
|
||||
"}\n");
|
||||
printer->Annotate("{", "}", descriptor_);
|
||||
}
|
||||
WriteFieldDocComment(printer, descriptor_);
|
||||
printer->Print(variables_,
|
||||
"$deprecation$public $type$ get$capitalized_name$() {\n"
|
||||
"$deprecation$public $type$ ${$get$capitalized_name$$}$() {\n"
|
||||
" $type$ result = $type$.$for_number$($name$_);\n"
|
||||
" return result == null ? $unknown$ : result;\n"
|
||||
"}\n");
|
||||
printer->Annotate("{", "}", descriptor_);
|
||||
WriteFieldDocComment(printer, descriptor_);
|
||||
printer->Print(variables_,
|
||||
"$deprecation$public Builder set$capitalized_name$($type$ value) {\n"
|
||||
"$deprecation$public Builder ${$set$capitalized_name$$}$($type$ value) {\n"
|
||||
" if (value == null) {\n"
|
||||
" throw new NullPointerException();\n"
|
||||
" }\n"
|
||||
@@ -244,14 +252,16 @@ GenerateBuilderMembers(io::Printer* printer) const {
|
||||
" $on_changed$\n"
|
||||
" return this;\n"
|
||||
"}\n");
|
||||
printer->Annotate("{", "}", descriptor_);
|
||||
WriteFieldDocComment(printer, descriptor_);
|
||||
printer->Print(variables_,
|
||||
"$deprecation$public Builder clear$capitalized_name$() {\n"
|
||||
"$deprecation$public Builder ${$clear$capitalized_name$$}$() {\n"
|
||||
" $clear_has_field_bit_builder$\n"
|
||||
" $name$_ = $default_number$;\n"
|
||||
" $on_changed$\n"
|
||||
" return this;\n"
|
||||
"}\n");
|
||||
printer->Annotate("{", "}", descriptor_);
|
||||
}
|
||||
|
||||
void ImmutableEnumFieldGenerator::
|
||||
@@ -311,12 +321,8 @@ GenerateParsingCode(io::Printer* printer) const {
|
||||
printer->Print(variables_,
|
||||
"int rawValue = input.readEnum();\n"
|
||||
"$type$ value = $type$.$for_number$(rawValue);\n"
|
||||
"if (value == null) {\n");
|
||||
if (PreserveUnknownFields(descriptor_->containing_type())) {
|
||||
printer->Print(variables_,
|
||||
" unknownFields.mergeVarintField($number$, rawValue);\n");
|
||||
}
|
||||
printer->Print(variables_,
|
||||
"if (value == null) {\n"
|
||||
" unknownFields.mergeVarintField($number$, rawValue);\n"
|
||||
"} else {\n"
|
||||
" $set_has_field_bit_message$\n"
|
||||
" $name$_ = rawValue;\n"
|
||||
@@ -386,23 +392,25 @@ GenerateMembers(io::Printer* printer) const {
|
||||
if (SupportFieldPresence(descriptor_->file())) {
|
||||
WriteFieldDocComment(printer, descriptor_);
|
||||
printer->Print(variables_,
|
||||
"$deprecation$public boolean has$capitalized_name$() {\n"
|
||||
"$deprecation$public boolean ${$has$capitalized_name$$}$() {\n"
|
||||
" return $has_oneof_case_message$;\n"
|
||||
"}\n");
|
||||
printer->Annotate("{", "}", descriptor_);
|
||||
}
|
||||
if (SupportUnknownEnumValue(descriptor_->file())) {
|
||||
WriteFieldDocComment(printer, descriptor_);
|
||||
printer->Print(variables_,
|
||||
"$deprecation$public int get$capitalized_name$Value() {\n"
|
||||
"$deprecation$public int ${$get$capitalized_name$Value$}$() {\n"
|
||||
" if ($has_oneof_case_message$) {\n"
|
||||
" return (java.lang.Integer) $oneof_name$_;\n"
|
||||
" }\n"
|
||||
" return $default_number$;\n"
|
||||
"}\n");
|
||||
printer->Annotate("{", "}", descriptor_);
|
||||
}
|
||||
WriteFieldDocComment(printer, descriptor_);
|
||||
printer->Print(variables_,
|
||||
"$deprecation$public $type$ get$capitalized_name$() {\n"
|
||||
"$deprecation$public $type$ ${$get$capitalized_name$$}$() {\n"
|
||||
" if ($has_oneof_case_message$) {\n"
|
||||
" $type$ result = $type$.$for_number$(\n"
|
||||
" (java.lang.Integer) $oneof_name$_);\n"
|
||||
@@ -410,6 +418,7 @@ GenerateMembers(io::Printer* printer) const {
|
||||
" }\n"
|
||||
" return $default$;\n"
|
||||
"}\n");
|
||||
printer->Annotate("{", "}", descriptor_);
|
||||
}
|
||||
|
||||
void ImmutableEnumOneofFieldGenerator::
|
||||
@@ -417,31 +426,35 @@ GenerateBuilderMembers(io::Printer* printer) const {
|
||||
if (SupportFieldPresence(descriptor_->file())) {
|
||||
WriteFieldDocComment(printer, descriptor_);
|
||||
printer->Print(variables_,
|
||||
"$deprecation$public boolean has$capitalized_name$() {\n"
|
||||
"$deprecation$public boolean ${$has$capitalized_name$$}$() {\n"
|
||||
" return $has_oneof_case_message$;\n"
|
||||
"}\n");
|
||||
printer->Annotate("{", "}", descriptor_);
|
||||
}
|
||||
if (SupportUnknownEnumValue(descriptor_->file())) {
|
||||
WriteFieldDocComment(printer, descriptor_);
|
||||
printer->Print(variables_,
|
||||
"$deprecation$public int get$capitalized_name$Value() {\n"
|
||||
"$deprecation$public int ${$get$capitalized_name$Value$}$() {\n"
|
||||
" if ($has_oneof_case_message$) {\n"
|
||||
" return ((java.lang.Integer) $oneof_name$_).intValue();\n"
|
||||
" }\n"
|
||||
" return $default_number$;\n"
|
||||
"}\n");
|
||||
printer->Annotate("{", "}", descriptor_);
|
||||
WriteFieldDocComment(printer, descriptor_);
|
||||
printer->Print(variables_,
|
||||
"$deprecation$public Builder set$capitalized_name$Value(int value) {\n"
|
||||
"$deprecation$public Builder "
|
||||
"${$set$capitalized_name$Value$}$(int value) {\n"
|
||||
" $set_oneof_case_message$;\n"
|
||||
" $oneof_name$_ = value;\n"
|
||||
" $on_changed$\n"
|
||||
" return this;\n"
|
||||
"}\n");
|
||||
printer->Annotate("{", "}", descriptor_);
|
||||
}
|
||||
WriteFieldDocComment(printer, descriptor_);
|
||||
printer->Print(variables_,
|
||||
"$deprecation$public $type$ get$capitalized_name$() {\n"
|
||||
"$deprecation$public $type$ ${$get$capitalized_name$$}$() {\n"
|
||||
" if ($has_oneof_case_message$) {\n"
|
||||
" $type$ result = $type$.$for_number$(\n"
|
||||
" (java.lang.Integer) $oneof_name$_);\n"
|
||||
@@ -449,9 +462,10 @@ GenerateBuilderMembers(io::Printer* printer) const {
|
||||
" }\n"
|
||||
" return $default$;\n"
|
||||
"}\n");
|
||||
printer->Annotate("{", "}", descriptor_);
|
||||
WriteFieldDocComment(printer, descriptor_);
|
||||
printer->Print(variables_,
|
||||
"$deprecation$public Builder set$capitalized_name$($type$ value) {\n"
|
||||
"$deprecation$public Builder ${$set$capitalized_name$$}$($type$ value) {\n"
|
||||
" if (value == null) {\n"
|
||||
" throw new NullPointerException();\n"
|
||||
" }\n"
|
||||
@@ -460,9 +474,10 @@ GenerateBuilderMembers(io::Printer* printer) const {
|
||||
" $on_changed$\n"
|
||||
" return this;\n"
|
||||
"}\n");
|
||||
printer->Annotate("{", "}", descriptor_);
|
||||
WriteFieldDocComment(printer, descriptor_);
|
||||
printer->Print(variables_,
|
||||
"$deprecation$public Builder clear$capitalized_name$() {\n"
|
||||
"$deprecation$public Builder ${$clear$capitalized_name$$}$() {\n"
|
||||
" if ($has_oneof_case_message$) {\n"
|
||||
" $clear_oneof_case_message$;\n"
|
||||
" $oneof_name$_ = null;\n"
|
||||
@@ -470,6 +485,7 @@ GenerateBuilderMembers(io::Printer* printer) const {
|
||||
" }\n"
|
||||
" return this;\n"
|
||||
"}\n");
|
||||
printer->Annotate("{", "}", descriptor_);
|
||||
}
|
||||
|
||||
void ImmutableEnumOneofFieldGenerator::
|
||||
@@ -502,12 +518,8 @@ GenerateParsingCode(io::Printer* printer) const {
|
||||
printer->Print(variables_,
|
||||
"int rawValue = input.readEnum();\n"
|
||||
"$type$ value = $type$.$for_number$(rawValue);\n"
|
||||
"if (value == null) {\n");
|
||||
if (PreserveUnknownFields(descriptor_->containing_type())) {
|
||||
printer->Print(variables_,
|
||||
" unknownFields.mergeVarintField($number$, rawValue);\n");
|
||||
}
|
||||
printer->Print(variables_,
|
||||
"if (value == null) {\n"
|
||||
" unknownFields.mergeVarintField($number$, rawValue);\n"
|
||||
"} else {\n"
|
||||
" $set_oneof_case_message$;\n"
|
||||
" $oneof_name$_ = rawValue;\n"
|
||||
@@ -621,32 +633,38 @@ GenerateMembers(io::Printer* printer) const {
|
||||
PrintExtraFieldInfo(variables_, printer);
|
||||
WriteFieldDocComment(printer, descriptor_);
|
||||
printer->Print(variables_,
|
||||
"$deprecation$public java.util.List<$type$> get$capitalized_name$List() {\n"
|
||||
"$deprecation$public java.util.List<$type$> "
|
||||
"${$get$capitalized_name$List$}$() {\n"
|
||||
" return new com.google.protobuf.Internal.ListAdapter<\n"
|
||||
" java.lang.Integer, $type$>($name$_, $name$_converter_);\n"
|
||||
"}\n");
|
||||
printer->Annotate("{", "}", descriptor_);
|
||||
WriteFieldDocComment(printer, descriptor_);
|
||||
printer->Print(variables_,
|
||||
"$deprecation$public int get$capitalized_name$Count() {\n"
|
||||
"$deprecation$public int ${$get$capitalized_name$Count$}$() {\n"
|
||||
" return $name$_.size();\n"
|
||||
"}\n");
|
||||
printer->Annotate("{", "}", descriptor_);
|
||||
WriteFieldDocComment(printer, descriptor_);
|
||||
printer->Print(variables_,
|
||||
"$deprecation$public $type$ get$capitalized_name$(int index) {\n"
|
||||
"$deprecation$public $type$ ${$get$capitalized_name$$}$(int index) {\n"
|
||||
" return $name$_converter_.convert($name$_.get(index));\n"
|
||||
"}\n");
|
||||
printer->Annotate("{", "}", descriptor_);
|
||||
if (SupportUnknownEnumValue(descriptor_->file())) {
|
||||
WriteFieldDocComment(printer, descriptor_);
|
||||
printer->Print(variables_,
|
||||
"$deprecation$public java.util.List<java.lang.Integer>\n"
|
||||
"get$capitalized_name$ValueList() {\n"
|
||||
"${$get$capitalized_name$ValueList$}$() {\n"
|
||||
" return $name$_;\n"
|
||||
"}\n");
|
||||
printer->Annotate("{", "}", descriptor_);
|
||||
WriteFieldDocComment(printer, descriptor_);
|
||||
printer->Print(variables_,
|
||||
"$deprecation$public int get$capitalized_name$Value(int index) {\n"
|
||||
"$deprecation$public int ${$get$capitalized_name$Value$}$(int index) {\n"
|
||||
" return $name$_.get(index);\n"
|
||||
"}\n");
|
||||
printer->Annotate("{", "}", descriptor_);
|
||||
}
|
||||
|
||||
if (descriptor_->is_packed() &&
|
||||
@@ -684,23 +702,27 @@ GenerateBuilderMembers(io::Printer* printer) const {
|
||||
// could hold on to the returned list and modify it after the message
|
||||
// has been built, thus mutating the message which is supposed to be
|
||||
// immutable.
|
||||
"$deprecation$public java.util.List<$type$> get$capitalized_name$List() {\n"
|
||||
"$deprecation$public java.util.List<$type$> "
|
||||
"${$get$capitalized_name$List$}$() {\n"
|
||||
" return new com.google.protobuf.Internal.ListAdapter<\n"
|
||||
" java.lang.Integer, $type$>($name$_, $name$_converter_);\n"
|
||||
"}\n");
|
||||
printer->Annotate("{", "}", descriptor_);
|
||||
WriteFieldDocComment(printer, descriptor_);
|
||||
printer->Print(variables_,
|
||||
"$deprecation$public int get$capitalized_name$Count() {\n"
|
||||
"$deprecation$public int ${$get$capitalized_name$Count$}$() {\n"
|
||||
" return $name$_.size();\n"
|
||||
"}\n");
|
||||
printer->Annotate("{", "}", descriptor_);
|
||||
WriteFieldDocComment(printer, descriptor_);
|
||||
printer->Print(variables_,
|
||||
"$deprecation$public $type$ get$capitalized_name$(int index) {\n"
|
||||
"$deprecation$public $type$ ${$get$capitalized_name$$}$(int index) {\n"
|
||||
" return $name$_converter_.convert($name$_.get(index));\n"
|
||||
"}\n");
|
||||
printer->Annotate("{", "}", descriptor_);
|
||||
WriteFieldDocComment(printer, descriptor_);
|
||||
printer->Print(variables_,
|
||||
"$deprecation$public Builder set$capitalized_name$(\n"
|
||||
"$deprecation$public Builder ${$set$capitalized_name$$}$(\n"
|
||||
" int index, $type$ value) {\n"
|
||||
" if (value == null) {\n"
|
||||
" throw new NullPointerException();\n"
|
||||
@@ -710,9 +732,10 @@ GenerateBuilderMembers(io::Printer* printer) const {
|
||||
" $on_changed$\n"
|
||||
" return this;\n"
|
||||
"}\n");
|
||||
printer->Annotate("{", "}", descriptor_);
|
||||
WriteFieldDocComment(printer, descriptor_);
|
||||
printer->Print(variables_,
|
||||
"$deprecation$public Builder add$capitalized_name$($type$ value) {\n"
|
||||
"$deprecation$public Builder ${$add$capitalized_name$$}$($type$ value) {\n"
|
||||
" if (value == null) {\n"
|
||||
" throw new NullPointerException();\n"
|
||||
" }\n"
|
||||
@@ -721,9 +744,10 @@ GenerateBuilderMembers(io::Printer* printer) const {
|
||||
" $on_changed$\n"
|
||||
" return this;\n"
|
||||
"}\n");
|
||||
printer->Annotate("{", "}", descriptor_);
|
||||
WriteFieldDocComment(printer, descriptor_);
|
||||
printer->Print(variables_,
|
||||
"$deprecation$public Builder addAll$capitalized_name$(\n"
|
||||
"$deprecation$public Builder ${$addAll$capitalized_name$$}$(\n"
|
||||
" java.lang.Iterable<? extends $type$> values) {\n"
|
||||
" ensure$capitalized_name$IsMutable();\n"
|
||||
" for ($type$ value : values) {\n"
|
||||
@@ -732,47 +756,54 @@ GenerateBuilderMembers(io::Printer* printer) const {
|
||||
" $on_changed$\n"
|
||||
" return this;\n"
|
||||
"}\n");
|
||||
printer->Annotate("{", "}", descriptor_);
|
||||
WriteFieldDocComment(printer, descriptor_);
|
||||
printer->Print(variables_,
|
||||
"$deprecation$public Builder clear$capitalized_name$() {\n"
|
||||
"$deprecation$public Builder ${$clear$capitalized_name$$}$() {\n"
|
||||
" $name$_ = java.util.Collections.emptyList();\n"
|
||||
" $clear_mutable_bit_builder$;\n"
|
||||
" $on_changed$\n"
|
||||
" return this;\n"
|
||||
"}\n");
|
||||
printer->Annotate("{", "}", descriptor_);
|
||||
|
||||
if (SupportUnknownEnumValue(descriptor_->file())) {
|
||||
WriteFieldDocComment(printer, descriptor_);
|
||||
printer->Print(variables_,
|
||||
"$deprecation$public java.util.List<java.lang.Integer>\n"
|
||||
"get$capitalized_name$ValueList() {\n"
|
||||
"${$get$capitalized_name$ValueList$}$() {\n"
|
||||
" return java.util.Collections.unmodifiableList($name$_);\n"
|
||||
"}\n");
|
||||
printer->Annotate("{", "}", descriptor_);
|
||||
WriteFieldDocComment(printer, descriptor_);
|
||||
printer->Print(variables_,
|
||||
"$deprecation$public int get$capitalized_name$Value(int index) {\n"
|
||||
"$deprecation$public int ${$get$capitalized_name$Value$}$(int index) {\n"
|
||||
" return $name$_.get(index);\n"
|
||||
"}\n");
|
||||
printer->Annotate("{", "}", descriptor_);
|
||||
WriteFieldDocComment(printer, descriptor_);
|
||||
printer->Print(variables_,
|
||||
"$deprecation$public Builder set$capitalized_name$Value(\n"
|
||||
"$deprecation$public Builder ${$set$capitalized_name$Value$}$(\n"
|
||||
" int index, int value) {\n"
|
||||
" ensure$capitalized_name$IsMutable();\n"
|
||||
" $name$_.set(index, value);\n"
|
||||
" $on_changed$\n"
|
||||
" return this;\n"
|
||||
"}\n");
|
||||
printer->Annotate("{", "}", descriptor_);
|
||||
WriteFieldDocComment(printer, descriptor_);
|
||||
printer->Print(variables_,
|
||||
"$deprecation$public Builder add$capitalized_name$Value(int value) {\n"
|
||||
"$deprecation$public Builder "
|
||||
"${$add$capitalized_name$Value$}$(int value) {\n"
|
||||
" ensure$capitalized_name$IsMutable();\n"
|
||||
" $name$_.add(value);\n"
|
||||
" $on_changed$\n"
|
||||
" return this;\n"
|
||||
"}\n");
|
||||
printer->Annotate("{", "}", descriptor_);
|
||||
WriteFieldDocComment(printer, descriptor_);
|
||||
printer->Print(variables_,
|
||||
"$deprecation$public Builder addAll$capitalized_name$Value(\n"
|
||||
"$deprecation$public Builder ${$addAll$capitalized_name$Value$}$(\n"
|
||||
" java.lang.Iterable<java.lang.Integer> values) {\n"
|
||||
" ensure$capitalized_name$IsMutable();\n"
|
||||
" for (int value : values) {\n"
|
||||
@@ -781,6 +812,7 @@ GenerateBuilderMembers(io::Printer* printer) const {
|
||||
" $on_changed$\n"
|
||||
" return this;\n"
|
||||
"}\n");
|
||||
printer->Annotate("{", "}", descriptor_);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -848,12 +880,8 @@ GenerateParsingCode(io::Printer* printer) const {
|
||||
printer->Print(variables_,
|
||||
"int rawValue = input.readEnum();\n"
|
||||
"$type$ value = $type$.$for_number$(rawValue);\n"
|
||||
"if (value == null) {\n");
|
||||
if (PreserveUnknownFields(descriptor_->containing_type())) {
|
||||
printer->Print(variables_,
|
||||
" unknownFields.mergeVarintField($number$, rawValue);\n");
|
||||
}
|
||||
printer->Print(variables_,
|
||||
"if (value == null) {\n"
|
||||
" unknownFields.mergeVarintField($number$, rawValue);\n"
|
||||
"} else {\n"
|
||||
" if (!$get_mutable_bit_parser$) {\n"
|
||||
" $name$_ = new java.util.ArrayList<java.lang.Integer>();\n"
|
||||
|
||||
Reference in new issue
Block a user