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
@@ -190,16 +190,18 @@ 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_);
|
||||
}
|
||||
|
||||
WriteFieldDocComment(printer, descriptor_);
|
||||
printer->Print(variables_,
|
||||
"$deprecation$public $type$ get$capitalized_name$() {\n"
|
||||
"$deprecation$public $type$ ${$get$capitalized_name$$}$() {\n"
|
||||
" return $name$_;\n"
|
||||
"}\n");
|
||||
printer->Annotate("{", "}", descriptor_);
|
||||
}
|
||||
|
||||
void ImmutablePrimitiveFieldGenerator::
|
||||
@@ -210,31 +212,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 $get_has_field_bit_builder$;\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"
|
||||
" return $name$_;\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"
|
||||
"$null_check$"
|
||||
" $set_has_field_bit_builder$\n"
|
||||
" $name$_ = value;\n"
|
||||
" $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");
|
||||
printer->Annotate("{", "}", descriptor_);
|
||||
JavaType type = GetJavaType(descriptor_);
|
||||
if (type == JAVATYPE_STRING || type == JAVATYPE_BYTES) {
|
||||
// The default value is not a simple literal so we want to avoid executing
|
||||
@@ -441,19 +447,21 @@ 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_);
|
||||
}
|
||||
|
||||
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"
|
||||
" return ($boxed_type$) $oneof_name$_;\n"
|
||||
" }\n"
|
||||
" return $default$;\n"
|
||||
"}\n");
|
||||
printer->Annotate("{", "}", descriptor_);
|
||||
}
|
||||
|
||||
|
||||
@@ -462,33 +470,36 @@ 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_);
|
||||
}
|
||||
|
||||
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"
|
||||
" return ($boxed_type$) $oneof_name$_;\n"
|
||||
" }\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"
|
||||
"$null_check$"
|
||||
" $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 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"
|
||||
@@ -496,6 +507,7 @@ GenerateBuilderMembers(io::Printer* printer) const {
|
||||
" }\n"
|
||||
" return this;\n"
|
||||
"}\n");
|
||||
printer->Annotate("{", "}", descriptor_);
|
||||
}
|
||||
|
||||
void ImmutablePrimitiveOneofFieldGenerator::
|
||||
@@ -604,19 +616,22 @@ GenerateMembers(io::Printer* printer) const {
|
||||
WriteFieldDocComment(printer, descriptor_);
|
||||
printer->Print(variables_,
|
||||
"$deprecation$public java.util.List<$boxed_type$>\n"
|
||||
" get$capitalized_name$List() {\n"
|
||||
" ${$get$capitalized_name$List$}$() {\n"
|
||||
" return $name$_;\n" // note: unmodifiable list
|
||||
"}\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$_.get(index);\n"
|
||||
"}\n");
|
||||
printer->Annotate("{", "}", descriptor_);
|
||||
|
||||
if (descriptor_->is_packed() &&
|
||||
context_->HasGeneratedMethods(descriptor_->containing_type())) {
|
||||
@@ -654,22 +669,25 @@ GenerateBuilderMembers(io::Printer* printer) const {
|
||||
WriteFieldDocComment(printer, descriptor_);
|
||||
printer->Print(variables_,
|
||||
"$deprecation$public java.util.List<$boxed_type$>\n"
|
||||
" get$capitalized_name$List() {\n"
|
||||
" ${$get$capitalized_name$List$}$() {\n"
|
||||
" return java.util.Collections.unmodifiableList($name$_);\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$_.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"
|
||||
"$null_check$"
|
||||
" ensure$capitalized_name$IsMutable();\n"
|
||||
@@ -677,18 +695,20 @@ 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"
|
||||
"$null_check$"
|
||||
" 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$(\n"
|
||||
"$deprecation$public Builder ${$addAll$capitalized_name$$}$(\n"
|
||||
" java.lang.Iterable<? extends $boxed_type$> values) {\n"
|
||||
" ensure$capitalized_name$IsMutable();\n"
|
||||
" com.google.protobuf.AbstractMessageLite.Builder.addAll(\n"
|
||||
@@ -696,14 +716,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"
|
||||
" $name$_ = $empty_list$;\n"
|
||||
" $clear_mutable_bit_builder$;\n"
|
||||
" $on_changed$\n"
|
||||
" return this;\n"
|
||||
"}\n");
|
||||
printer->Annotate("{", "}", descriptor_);
|
||||
}
|
||||
|
||||
void RepeatedImmutablePrimitiveFieldGenerator::
|
||||
|
||||
Reference in new issue
Block a user