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
@@ -217,14 +217,15 @@ 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 java.lang.String get$capitalized_name$() {\n"
|
||||
"$deprecation$public java.lang.String ${$get$capitalized_name$$}$() {\n"
|
||||
" java.lang.Object ref = $name$_;\n"
|
||||
" if (ref instanceof java.lang.String) {\n"
|
||||
" return (java.lang.String) ref;\n"
|
||||
@@ -232,6 +233,7 @@ GenerateMembers(io::Printer* printer) const {
|
||||
" com.google.protobuf.ByteString bs = \n"
|
||||
" (com.google.protobuf.ByteString) ref;\n"
|
||||
" java.lang.String s = bs.toStringUtf8();\n");
|
||||
printer->Annotate("{", "}", descriptor_);
|
||||
if (CheckUtf8(descriptor_)) {
|
||||
printer->Print(variables_,
|
||||
" $name$_ = s;\n");
|
||||
@@ -248,7 +250,7 @@ GenerateMembers(io::Printer* printer) const {
|
||||
WriteFieldDocComment(printer, descriptor_);
|
||||
printer->Print(variables_,
|
||||
"$deprecation$public com.google.protobuf.ByteString\n"
|
||||
" get$capitalized_name$Bytes() {\n"
|
||||
" ${$get$capitalized_name$Bytes$}$() {\n"
|
||||
" java.lang.Object ref = $name$_;\n"
|
||||
" if (ref instanceof java.lang.String) {\n"
|
||||
" com.google.protobuf.ByteString b = \n"
|
||||
@@ -260,6 +262,7 @@ GenerateMembers(io::Printer* printer) const {
|
||||
" return (com.google.protobuf.ByteString) ref;\n"
|
||||
" }\n"
|
||||
"}\n");
|
||||
printer->Annotate("{", "}", descriptor_);
|
||||
}
|
||||
|
||||
void ImmutableStringFieldGenerator::
|
||||
@@ -269,19 +272,21 @@ 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 java.lang.String get$capitalized_name$() {\n"
|
||||
"$deprecation$public java.lang.String ${$get$capitalized_name$$}$() {\n"
|
||||
" java.lang.Object ref = $name$_;\n"
|
||||
" if (!(ref instanceof java.lang.String)) {\n"
|
||||
" com.google.protobuf.ByteString bs =\n"
|
||||
" (com.google.protobuf.ByteString) ref;\n"
|
||||
" java.lang.String s = bs.toStringUtf8();\n");
|
||||
printer->Annotate("{", "}", descriptor_);
|
||||
if (CheckUtf8(descriptor_)) {
|
||||
printer->Print(variables_,
|
||||
" $name$_ = s;\n");
|
||||
@@ -301,7 +306,7 @@ GenerateBuilderMembers(io::Printer* printer) const {
|
||||
WriteFieldDocComment(printer, descriptor_);
|
||||
printer->Print(variables_,
|
||||
"$deprecation$public com.google.protobuf.ByteString\n"
|
||||
" get$capitalized_name$Bytes() {\n"
|
||||
" ${$get$capitalized_name$Bytes$}$() {\n"
|
||||
" java.lang.Object ref = $name$_;\n"
|
||||
" if (ref instanceof String) {\n"
|
||||
" com.google.protobuf.ByteString b = \n"
|
||||
@@ -313,10 +318,11 @@ GenerateBuilderMembers(io::Printer* printer) const {
|
||||
" return (com.google.protobuf.ByteString) ref;\n"
|
||||
" }\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"
|
||||
" java.lang.String value) {\n"
|
||||
"$null_check$"
|
||||
" $set_has_field_bit_builder$\n"
|
||||
@@ -324,10 +330,12 @@ 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");
|
||||
printer->Annotate("{", "}", descriptor_);
|
||||
// The default value is not a simple literal so we want to avoid executing
|
||||
// it multiple times. Instead, get the default out of the default instance.
|
||||
printer->Print(variables_,
|
||||
@@ -339,9 +347,10 @@ GenerateBuilderMembers(io::Printer* printer) const {
|
||||
|
||||
WriteFieldDocComment(printer, descriptor_);
|
||||
printer->Print(variables_,
|
||||
"$deprecation$public Builder set$capitalized_name$Bytes(\n"
|
||||
"$deprecation$public Builder ${$set$capitalized_name$Bytes$}$(\n"
|
||||
" com.google.protobuf.ByteString value) {\n"
|
||||
"$null_check$");
|
||||
printer->Annotate("{", "}", descriptor_);
|
||||
if (CheckUtf8(descriptor_)) {
|
||||
printer->Print(variables_,
|
||||
" checkByteStringIsUtf8(value);\n");
|
||||
@@ -482,14 +491,15 @@ 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 java.lang.String get$capitalized_name$() {\n"
|
||||
"$deprecation$public java.lang.String ${$get$capitalized_name$$}$() {\n"
|
||||
" java.lang.Object ref $default_init$;\n"
|
||||
" if ($has_oneof_case_message$) {\n"
|
||||
" ref = $oneof_name$_;\n"
|
||||
@@ -500,6 +510,7 @@ GenerateMembers(io::Printer* printer) const {
|
||||
" com.google.protobuf.ByteString bs = \n"
|
||||
" (com.google.protobuf.ByteString) ref;\n"
|
||||
" java.lang.String s = bs.toStringUtf8();\n");
|
||||
printer->Annotate("{", "}", descriptor_);
|
||||
if (CheckUtf8(descriptor_)) {
|
||||
printer->Print(variables_,
|
||||
" if ($has_oneof_case_message$) {\n"
|
||||
@@ -519,7 +530,7 @@ GenerateMembers(io::Printer* printer) const {
|
||||
|
||||
printer->Print(variables_,
|
||||
"$deprecation$public com.google.protobuf.ByteString\n"
|
||||
" get$capitalized_name$Bytes() {\n"
|
||||
" ${$get$capitalized_name$Bytes$}$() {\n"
|
||||
" java.lang.Object ref $default_init$;\n"
|
||||
" if ($has_oneof_case_message$) {\n"
|
||||
" ref = $oneof_name$_;\n"
|
||||
@@ -536,6 +547,7 @@ GenerateMembers(io::Printer* printer) const {
|
||||
" return (com.google.protobuf.ByteString) ref;\n"
|
||||
" }\n"
|
||||
"}\n");
|
||||
printer->Annotate("{", "}", descriptor_);
|
||||
}
|
||||
|
||||
void ImmutableStringOneofFieldGenerator::
|
||||
@@ -543,14 +555,15 @@ 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 java.lang.String get$capitalized_name$() {\n"
|
||||
"$deprecation$public java.lang.String ${$get$capitalized_name$$}$() {\n"
|
||||
" java.lang.Object ref $default_init$;\n"
|
||||
" if ($has_oneof_case_message$) {\n"
|
||||
" ref = $oneof_name$_;\n"
|
||||
@@ -560,6 +573,7 @@ GenerateBuilderMembers(io::Printer* printer) const {
|
||||
" (com.google.protobuf.ByteString) ref;\n"
|
||||
" java.lang.String s = bs.toStringUtf8();\n"
|
||||
" if ($has_oneof_case_message$) {\n");
|
||||
printer->Annotate("{", "}", descriptor_);
|
||||
if (CheckUtf8(descriptor_)) {
|
||||
printer->Print(variables_,
|
||||
" $oneof_name$_ = s;\n");
|
||||
@@ -580,7 +594,7 @@ GenerateBuilderMembers(io::Printer* printer) const {
|
||||
WriteFieldDocComment(printer, descriptor_);
|
||||
printer->Print(variables_,
|
||||
"$deprecation$public com.google.protobuf.ByteString\n"
|
||||
" get$capitalized_name$Bytes() {\n"
|
||||
" ${$get$capitalized_name$Bytes$}$() {\n"
|
||||
" java.lang.Object ref $default_init$;\n"
|
||||
" if ($has_oneof_case_message$) {\n"
|
||||
" ref = $oneof_name$_;\n"
|
||||
@@ -597,10 +611,11 @@ GenerateBuilderMembers(io::Printer* printer) const {
|
||||
" return (com.google.protobuf.ByteString) ref;\n"
|
||||
" }\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"
|
||||
" java.lang.String value) {\n"
|
||||
"$null_check$"
|
||||
" $set_oneof_case_message$;\n"
|
||||
@@ -608,9 +623,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"
|
||||
@@ -618,12 +634,14 @@ GenerateBuilderMembers(io::Printer* printer) const {
|
||||
" }\n"
|
||||
" return this;\n"
|
||||
"}\n");
|
||||
printer->Annotate("{", "}", descriptor_);
|
||||
|
||||
WriteFieldDocComment(printer, descriptor_);
|
||||
printer->Print(variables_,
|
||||
"$deprecation$public Builder set$capitalized_name$Bytes(\n"
|
||||
"$deprecation$public Builder ${$set$capitalized_name$Bytes$}$(\n"
|
||||
" com.google.protobuf.ByteString value) {\n"
|
||||
"$null_check$");
|
||||
printer->Annotate("{", "}", descriptor_);
|
||||
if (CheckUtf8(descriptor_)) {
|
||||
printer->Print(variables_,
|
||||
" checkByteStringIsUtf8(value);\n");
|
||||
@@ -744,25 +762,30 @@ GenerateMembers(io::Printer* printer) const {
|
||||
WriteFieldDocComment(printer, descriptor_);
|
||||
printer->Print(variables_,
|
||||
"$deprecation$public com.google.protobuf.ProtocolStringList\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 java.lang.String get$capitalized_name$(int index) {\n"
|
||||
"$deprecation$public java.lang.String "
|
||||
"${$get$capitalized_name$$}$(int index) {\n"
|
||||
" return $name$_.get(index);\n"
|
||||
"}\n");
|
||||
printer->Annotate("{", "}", descriptor_);
|
||||
WriteFieldDocComment(printer, descriptor_);
|
||||
printer->Print(variables_,
|
||||
"$deprecation$public com.google.protobuf.ByteString\n"
|
||||
" get$capitalized_name$Bytes(int index) {\n"
|
||||
" ${$get$capitalized_name$Bytes$}$(int index) {\n"
|
||||
" return $name$_.getByteString(index);\n"
|
||||
"}\n");
|
||||
printer->Annotate("{", "}", descriptor_);
|
||||
}
|
||||
|
||||
void RepeatedImmutableStringFieldGenerator::
|
||||
@@ -794,28 +817,33 @@ GenerateBuilderMembers(io::Printer* printer) const {
|
||||
WriteFieldDocComment(printer, descriptor_);
|
||||
printer->Print(variables_,
|
||||
"$deprecation$public com.google.protobuf.ProtocolStringList\n"
|
||||
" get$capitalized_name$List() {\n"
|
||||
" ${$get$capitalized_name$List$}$() {\n"
|
||||
" return $name$_.getUnmodifiableView();\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 java.lang.String get$capitalized_name$(int index) {\n"
|
||||
"$deprecation$public java.lang.String "
|
||||
"${$get$capitalized_name$$}$(int index) {\n"
|
||||
" return $name$_.get(index);\n"
|
||||
"}\n");
|
||||
printer->Annotate("{", "}", descriptor_);
|
||||
WriteFieldDocComment(printer, descriptor_);
|
||||
printer->Print(variables_,
|
||||
"$deprecation$public com.google.protobuf.ByteString\n"
|
||||
" get$capitalized_name$Bytes(int index) {\n"
|
||||
" ${$get$capitalized_name$Bytes$}$(int index) {\n"
|
||||
" return $name$_.getByteString(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, java.lang.String value) {\n"
|
||||
"$null_check$"
|
||||
" ensure$capitalized_name$IsMutable();\n"
|
||||
@@ -823,9 +851,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$(\n"
|
||||
"$deprecation$public Builder ${$add$capitalized_name$$}$(\n"
|
||||
" java.lang.String value) {\n"
|
||||
"$null_check$"
|
||||
" ensure$capitalized_name$IsMutable();\n"
|
||||
@@ -833,9 +862,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<java.lang.String> values) {\n"
|
||||
" ensure$capitalized_name$IsMutable();\n"
|
||||
" com.google.protobuf.AbstractMessageLite.Builder.addAll(\n"
|
||||
@@ -843,20 +873,23 @@ 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_);
|
||||
|
||||
WriteFieldDocComment(printer, descriptor_);
|
||||
printer->Print(variables_,
|
||||
"$deprecation$public Builder add$capitalized_name$Bytes(\n"
|
||||
"$deprecation$public Builder ${$add$capitalized_name$Bytes$}$(\n"
|
||||
" com.google.protobuf.ByteString value) {\n"
|
||||
"$null_check$");
|
||||
printer->Annotate("{", "}", descriptor_);
|
||||
if (CheckUtf8(descriptor_)) {
|
||||
printer->Print(variables_,
|
||||
" checkByteStringIsUtf8(value);\n");
|
||||
|
||||
Reference in new issue
Block a user