Upgrade linux protobuf from 3.19.1 -> 21.12
This commit is contained in:
1 parent
4a3e40193e
commit
01a4bb004a
554 files changed
+34981
-37969
No files matched your search
+4
-4
@@ -28,13 +28,13 @@
|
||||
// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
|
||||
// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||
|
||||
#include <google/protobuf/compiler/java/java_context.h>
|
||||
#include <google/protobuf/compiler/java/context.h>
|
||||
|
||||
#include <google/protobuf/compiler/java/java_field.h>
|
||||
#include <google/protobuf/compiler/java/java_helpers.h>
|
||||
#include <google/protobuf/compiler/java/java_name_resolver.h>
|
||||
#include <google/protobuf/descriptor.h>
|
||||
#include <google/protobuf/stubs/strutil.h>
|
||||
#include <google/protobuf/compiler/java/field.h>
|
||||
#include <google/protobuf/compiler/java/helpers.h>
|
||||
#include <google/protobuf/compiler/java/name_resolver.h>
|
||||
#include <google/protobuf/stubs/map_util.h>
|
||||
|
||||
namespace google {
|
||||
+1
-1
@@ -36,7 +36,7 @@
|
||||
#include <vector>
|
||||
|
||||
#include <google/protobuf/stubs/common.h>
|
||||
#include <google/protobuf/compiler/java/java_options.h>
|
||||
#include <google/protobuf/compiler/java/options.h>
|
||||
|
||||
namespace google {
|
||||
namespace protobuf {
|
||||
+12
-3
@@ -32,13 +32,13 @@
|
||||
// Based on original Protocol Buffers design by
|
||||
// Sanjay Ghemawat, Jeff Dean, and others.
|
||||
|
||||
#include <google/protobuf/compiler/java/java_doc_comment.h>
|
||||
#include <google/protobuf/compiler/java/doc_comment.h>
|
||||
|
||||
#include <vector>
|
||||
|
||||
#include <google/protobuf/descriptor.pb.h>
|
||||
#include <google/protobuf/io/printer.h>
|
||||
#include <google/protobuf/stubs/strutil.h>
|
||||
#include <google/protobuf/descriptor.pb.h>
|
||||
|
||||
namespace google {
|
||||
namespace protobuf {
|
||||
@@ -199,7 +199,16 @@ void WriteDeprecatedJavadoc(io::Printer* printer, const FieldDescriptor* field,
|
||||
return;
|
||||
}
|
||||
|
||||
printer->Print(" * @deprecated\n");
|
||||
std::string startLine = "0";
|
||||
SourceLocation location;
|
||||
if (field->GetSourceLocation(&location)) {
|
||||
startLine = std::to_string(location.start_line);
|
||||
}
|
||||
|
||||
printer->Print(" * @deprecated $name$ is deprecated.\n", "name",
|
||||
field->full_name());
|
||||
printer->Print(" * See $file$;l=$line$\n", "file", field->file()->name(),
|
||||
"line", startLine);
|
||||
}
|
||||
|
||||
void WriteFieldAccessorDocComment(io::Printer* printer,
|
||||
+1
@@ -37,6 +37,7 @@
|
||||
|
||||
#include <google/protobuf/descriptor.h>
|
||||
|
||||
// Must be included last.
|
||||
#include <google/protobuf/port_def.inc>
|
||||
|
||||
namespace google {
|
||||
+1
-12
@@ -30,7 +30,7 @@
|
||||
|
||||
// Author: kenton@google.com (Kenton Varda)
|
||||
|
||||
#include <google/protobuf/compiler/java/java_doc_comment.h>
|
||||
#include <google/protobuf/compiler/java/doc_comment.h>
|
||||
|
||||
#include <gtest/gtest.h>
|
||||
|
||||
@@ -49,17 +49,6 @@ TEST(JavaDocCommentTest, Escaping) {
|
||||
EXPECT_EQ("@deprecated", EscapeJavadoc("@deprecated"));
|
||||
}
|
||||
|
||||
// TODO(kenton): It's hard to write a robust test of the doc comments -- we
|
||||
// can only really compare the output against a golden value, which is a
|
||||
// fairly tedious and fragile testing strategy. If we want to go that route,
|
||||
// it probably makes sense to bite the bullet and write a test that compares
|
||||
// the whole generated output for unittest.proto against a golden value, with
|
||||
// a very simple script that can be run to regenerate it with the latest code.
|
||||
// This would mean that updates to the golden file would have to be included
|
||||
// in any change to the code generator, which would actually be fairly useful
|
||||
// as it allows the reviewer to see clearly how the generated code is
|
||||
// changing.
|
||||
|
||||
} // namespace
|
||||
} // namespace java
|
||||
} // namespace compiler
|
||||
+12
-6
@@ -32,17 +32,21 @@
|
||||
// Based on original Protocol Buffers design by
|
||||
// Sanjay Ghemawat, Jeff Dean, and others.
|
||||
|
||||
#include <google/protobuf/compiler/java/enum.h>
|
||||
|
||||
#include <map>
|
||||
#include <string>
|
||||
|
||||
#include <google/protobuf/compiler/java/java_context.h>
|
||||
#include <google/protobuf/compiler/java/java_doc_comment.h>
|
||||
#include <google/protobuf/compiler/java/java_enum.h>
|
||||
#include <google/protobuf/compiler/java/java_helpers.h>
|
||||
#include <google/protobuf/compiler/java/java_name_resolver.h>
|
||||
#include <google/protobuf/descriptor.pb.h>
|
||||
#include <google/protobuf/io/printer.h>
|
||||
#include <google/protobuf/stubs/strutil.h>
|
||||
#include <google/protobuf/compiler/java/context.h>
|
||||
#include <google/protobuf/compiler/java/doc_comment.h>
|
||||
#include <google/protobuf/compiler/java/helpers.h>
|
||||
#include <google/protobuf/compiler/java/name_resolver.h>
|
||||
#include <google/protobuf/descriptor.pb.h>
|
||||
|
||||
// Must be last.
|
||||
#include <google/protobuf/port_def.inc>
|
||||
|
||||
namespace google {
|
||||
namespace protobuf {
|
||||
@@ -389,3 +393,5 @@ bool EnumGenerator::CanUseEnumValues() {
|
||||
} // namespace compiler
|
||||
} // namespace protobuf
|
||||
} // namespace google
|
||||
|
||||
#include <google/protobuf/port_undef.inc>
|
||||
File renamed without changes.
+126
-152
@@ -32,21 +32,24 @@
|
||||
// Based on original Protocol Buffers design by
|
||||
// Sanjay Ghemawat, Jeff Dean, and others.
|
||||
|
||||
#include <google/protobuf/compiler/java/java_enum_field.h>
|
||||
#include "google/protobuf/compiler/java/enum_field.h"
|
||||
|
||||
#include <cstdint>
|
||||
#include <map>
|
||||
#include <string>
|
||||
|
||||
#include <google/protobuf/stubs/logging.h>
|
||||
#include <google/protobuf/stubs/common.h>
|
||||
#include <google/protobuf/compiler/java/java_context.h>
|
||||
#include <google/protobuf/compiler/java/java_doc_comment.h>
|
||||
#include <google/protobuf/compiler/java/java_helpers.h>
|
||||
#include <google/protobuf/compiler/java/java_name_resolver.h>
|
||||
#include <google/protobuf/io/printer.h>
|
||||
#include <google/protobuf/wire_format.h>
|
||||
#include <google/protobuf/stubs/strutil.h>
|
||||
#include "google/protobuf/stubs/logging.h"
|
||||
#include "google/protobuf/stubs/common.h"
|
||||
#include "google/protobuf/io/printer.h"
|
||||
#include "google/protobuf/wire_format.h"
|
||||
#include "google/protobuf/stubs/strutil.h"
|
||||
#include "google/protobuf/compiler/java/context.h"
|
||||
#include "google/protobuf/compiler/java/doc_comment.h"
|
||||
#include "google/protobuf/compiler/java/helpers.h"
|
||||
#include "google/protobuf/compiler/java/name_resolver.h"
|
||||
|
||||
// Must be last.
|
||||
#include "google/protobuf/port_def.inc"
|
||||
|
||||
namespace google {
|
||||
namespace protobuf {
|
||||
@@ -55,10 +58,11 @@ namespace java {
|
||||
|
||||
namespace {
|
||||
|
||||
void SetEnumVariables(const FieldDescriptor* descriptor, int messageBitIndex,
|
||||
int builderBitIndex, const FieldGeneratorInfo* info,
|
||||
ClassNameResolver* name_resolver,
|
||||
std::map<std::string, std::string>* variables) {
|
||||
void SetEnumVariables(
|
||||
const FieldDescriptor* descriptor, int messageBitIndex, int builderBitIndex,
|
||||
const FieldGeneratorInfo* info, ClassNameResolver* name_resolver,
|
||||
std::map<std::string, std::string>* variables,
|
||||
Context* context) {
|
||||
SetCommonFieldVariables(descriptor, info, variables);
|
||||
|
||||
(*variables)["type"] =
|
||||
@@ -77,40 +81,27 @@ void SetEnumVariables(const FieldDescriptor* descriptor, int messageBitIndex,
|
||||
// by the proto compiler
|
||||
(*variables)["deprecation"] =
|
||||
descriptor->options().deprecated() ? "@java.lang.Deprecated " : "";
|
||||
(*variables)["kt_deprecation"] =
|
||||
descriptor->options().deprecated()
|
||||
? "@kotlin.Deprecated(message = \"Field " + (*variables)["name"] +
|
||||
" is deprecated\") "
|
||||
: "";
|
||||
(*variables)["on_changed"] = "onChanged();";
|
||||
// Use deprecated valueOf() method to be compatible with old generated code
|
||||
// for v2.5.0/v2.6.1.
|
||||
// TODO(xiaofeng): Use "forNumber" when we no longer support compatibility
|
||||
// with v2.5.0/v2.6.1, and remove the @SuppressWarnings annotations.
|
||||
(*variables)["for_number"] = "valueOf";
|
||||
|
||||
variables->insert(
|
||||
{"kt_deprecation",
|
||||
descriptor->options().deprecated()
|
||||
? StrCat("@kotlin.Deprecated(message = \"Field ",
|
||||
(*variables)["name"], " is deprecated\") ")
|
||||
: ""});
|
||||
if (HasHasbit(descriptor)) {
|
||||
// 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"] =
|
||||
GenerateSetBit(builderBitIndex) + ";";
|
||||
(*variables)["clear_has_field_bit_builder"] =
|
||||
GenerateClearBit(builderBitIndex) + ";";
|
||||
|
||||
(*variables)["set_has_field_bit_to_local"] =
|
||||
GenerateSetBitToLocal(messageBitIndex);
|
||||
(*variables)["is_field_present_message"] = GenerateGetBit(messageBitIndex);
|
||||
} else {
|
||||
(*variables)["set_has_field_bit_message"] = "";
|
||||
(*variables)["set_has_field_bit_builder"] = "";
|
||||
(*variables)["clear_has_field_bit_builder"] = "";
|
||||
|
||||
(*variables)["is_field_present_message"] =
|
||||
(*variables)["name"] + "_ != " + (*variables)["default"] +
|
||||
".getNumber()";
|
||||
(*variables)["set_has_field_bit_to_local"] = "";
|
||||
variables->insert({"is_field_present_message",
|
||||
StrCat((*variables)["name"], "_ != ",
|
||||
(*variables)["default"], ".getNumber()")});
|
||||
}
|
||||
|
||||
// For repeated builders, one bit is used for whether the array is immutable.
|
||||
@@ -118,22 +109,21 @@ void SetEnumVariables(const FieldDescriptor* descriptor, int messageBitIndex,
|
||||
(*variables)["set_mutable_bit_builder"] = GenerateSetBit(builderBitIndex);
|
||||
(*variables)["clear_mutable_bit_builder"] = GenerateClearBit(builderBitIndex);
|
||||
|
||||
// For repeated fields, one bit is used for whether the array is immutable
|
||||
// in the parsing constructor.
|
||||
(*variables)["get_mutable_bit_parser"] =
|
||||
GenerateGetBitMutableLocal(builderBitIndex);
|
||||
(*variables)["set_mutable_bit_parser"] =
|
||||
GenerateSetBitMutableLocal(builderBitIndex);
|
||||
(*variables)["get_has_field_bit_builder"] = GenerateGetBit(builderBitIndex);
|
||||
|
||||
// Note that these have a trailing ";".
|
||||
(*variables)["set_has_field_bit_builder"] =
|
||||
GenerateSetBit(builderBitIndex) + ";";
|
||||
(*variables)["clear_has_field_bit_builder"] =
|
||||
GenerateClearBit(builderBitIndex) + ";";
|
||||
(*variables)["get_has_field_bit_from_local"] =
|
||||
GenerateGetBitFromLocal(builderBitIndex);
|
||||
(*variables)["set_has_field_bit_to_local"] =
|
||||
GenerateSetBitToLocal(messageBitIndex);
|
||||
|
||||
if (SupportUnknownEnumValue(descriptor->file())) {
|
||||
(*variables)["unknown"] = (*variables)["type"] + ".UNRECOGNIZED";
|
||||
variables->insert(
|
||||
{"unknown", StrCat((*variables)["type"], ".UNRECOGNIZED")});
|
||||
} else {
|
||||
(*variables)["unknown"] = (*variables)["default"];
|
||||
variables->insert({"unknown", (*variables)["default"]});
|
||||
}
|
||||
}
|
||||
|
||||
@@ -144,21 +134,30 @@ void SetEnumVariables(const FieldDescriptor* descriptor, int messageBitIndex,
|
||||
ImmutableEnumFieldGenerator::ImmutableEnumFieldGenerator(
|
||||
const FieldDescriptor* descriptor, int messageBitIndex, int builderBitIndex,
|
||||
Context* context)
|
||||
: descriptor_(descriptor), name_resolver_(context->GetNameResolver()) {
|
||||
: descriptor_(descriptor),
|
||||
message_bit_index_(messageBitIndex),
|
||||
builder_bit_index_(builderBitIndex),
|
||||
name_resolver_(context->GetNameResolver()) {
|
||||
SetEnumVariables(descriptor, messageBitIndex, builderBitIndex,
|
||||
context->GetFieldGeneratorInfo(descriptor), name_resolver_,
|
||||
&variables_);
|
||||
&variables_, context);
|
||||
}
|
||||
|
||||
ImmutableEnumFieldGenerator::~ImmutableEnumFieldGenerator() {}
|
||||
|
||||
int ImmutableEnumFieldGenerator::GetMessageBitIndex() const {
|
||||
return message_bit_index_;
|
||||
}
|
||||
|
||||
int ImmutableEnumFieldGenerator::GetBuilderBitIndex() const {
|
||||
return builder_bit_index_;
|
||||
}
|
||||
|
||||
int ImmutableEnumFieldGenerator::GetNumBitsForMessage() const {
|
||||
return HasHasbit(descriptor_) ? 1 : 0;
|
||||
}
|
||||
|
||||
int ImmutableEnumFieldGenerator::GetNumBitsForBuilder() const {
|
||||
return GetNumBitsForMessage();
|
||||
}
|
||||
int ImmutableEnumFieldGenerator::GetNumBitsForBuilder() const { return 1; }
|
||||
|
||||
void ImmutableEnumFieldGenerator::GenerateInterfaceMembers(
|
||||
io::Printer* printer) const {
|
||||
@@ -177,7 +176,7 @@ void ImmutableEnumFieldGenerator::GenerateInterfaceMembers(
|
||||
}
|
||||
|
||||
void ImmutableEnumFieldGenerator::GenerateMembers(io::Printer* printer) const {
|
||||
printer->Print(variables_, "private int $name$_;\n");
|
||||
printer->Print(variables_, "private int $name$_ = $default_number$;\n");
|
||||
PrintExtraFieldInfo(variables_, printer);
|
||||
if (HasHazzer(descriptor_)) {
|
||||
WriteFieldAccessorDocComment(printer, descriptor_, HAZZER);
|
||||
@@ -201,8 +200,7 @@ void ImmutableEnumFieldGenerator::GenerateMembers(io::Printer* printer) const {
|
||||
printer->Print(variables_,
|
||||
"@java.lang.Override $deprecation$public $type$ "
|
||||
"${$get$capitalized_name$$}$() {\n"
|
||||
" @SuppressWarnings(\"deprecation\")\n"
|
||||
" $type$ result = $type$.$for_number$($name$_);\n"
|
||||
" $type$ result = $type$.forNumber($name$_);\n"
|
||||
" return result == null ? $unknown$ : result;\n"
|
||||
"}\n");
|
||||
printer->Annotate("{", "}", descriptor_);
|
||||
@@ -233,9 +231,9 @@ void ImmutableEnumFieldGenerator::GenerateBuilderMembers(
|
||||
printer->Print(variables_,
|
||||
"$deprecation$public Builder "
|
||||
"${$set$capitalized_name$Value$}$(int value) {\n"
|
||||
" $set_has_field_bit_builder$\n"
|
||||
" $name$_ = value;\n"
|
||||
" $on_changed$\n"
|
||||
" $set_has_field_bit_builder$\n"
|
||||
" onChanged();\n"
|
||||
" return this;\n"
|
||||
"}\n");
|
||||
printer->Annotate("{", "}", descriptor_);
|
||||
@@ -244,8 +242,7 @@ void ImmutableEnumFieldGenerator::GenerateBuilderMembers(
|
||||
printer->Print(variables_,
|
||||
"@java.lang.Override\n"
|
||||
"$deprecation$public $type$ ${$get$capitalized_name$$}$() {\n"
|
||||
" @SuppressWarnings(\"deprecation\")\n"
|
||||
" $type$ result = $type$.$for_number$($name$_);\n"
|
||||
" $type$ result = $type$.forNumber($name$_);\n"
|
||||
" return result == null ? $unknown$ : result;\n"
|
||||
"}\n");
|
||||
printer->Annotate("{", "}", descriptor_);
|
||||
@@ -259,7 +256,7 @@ void ImmutableEnumFieldGenerator::GenerateBuilderMembers(
|
||||
" }\n"
|
||||
" $set_has_field_bit_builder$\n"
|
||||
" $name$_ = value.getNumber();\n"
|
||||
" $on_changed$\n"
|
||||
" onChanged();\n"
|
||||
" return this;\n"
|
||||
"}\n");
|
||||
printer->Annotate("{", "}", descriptor_);
|
||||
@@ -270,7 +267,7 @@ void ImmutableEnumFieldGenerator::GenerateBuilderMembers(
|
||||
"$deprecation$public Builder ${$clear$capitalized_name$$}$() {\n"
|
||||
" $clear_has_field_bit_builder$\n"
|
||||
" $name$_ = $default_number$;\n"
|
||||
" $on_changed$\n"
|
||||
" onChanged();\n"
|
||||
" return this;\n"
|
||||
"}\n");
|
||||
printer->Annotate("{", "}", descriptor_);
|
||||
@@ -317,9 +314,7 @@ void ImmutableEnumFieldGenerator::GenerateInitializationCode(
|
||||
|
||||
void ImmutableEnumFieldGenerator::GenerateBuilderClearCode(
|
||||
io::Printer* printer) const {
|
||||
printer->Print(variables_,
|
||||
"$name$_ = $default_number$;\n"
|
||||
"$clear_has_field_bit_builder$\n");
|
||||
printer->Print(variables_, "$name$_ = $default_number$;\n");
|
||||
}
|
||||
|
||||
void ImmutableEnumFieldGenerator::GenerateMergingCode(
|
||||
@@ -342,41 +337,35 @@ void ImmutableEnumFieldGenerator::GenerateMergingCode(
|
||||
|
||||
void ImmutableEnumFieldGenerator::GenerateBuildingCode(
|
||||
io::Printer* printer) const {
|
||||
if (HasHazzer(descriptor_)) {
|
||||
printer->Print(variables_,
|
||||
"if ($get_has_field_bit_from_local$) {\n"
|
||||
" $set_has_field_bit_to_local$;\n"
|
||||
"}\n");
|
||||
printer->Print(variables_,
|
||||
"if ($get_has_field_bit_from_local$) {\n"
|
||||
" result.$name$_ = $name$_;\n");
|
||||
if (GetNumBitsForMessage() > 0) {
|
||||
printer->Print(variables_, " $set_has_field_bit_to_local$;\n");
|
||||
}
|
||||
printer->Print(variables_, "result.$name$_ = $name$_;\n");
|
||||
printer->Print("}\n");
|
||||
}
|
||||
|
||||
void ImmutableEnumFieldGenerator::GenerateParsingCode(
|
||||
void ImmutableEnumFieldGenerator::GenerateBuilderParsingCode(
|
||||
io::Printer* printer) const {
|
||||
if (SupportUnknownEnumValue(descriptor_->file())) {
|
||||
printer->Print(variables_,
|
||||
"int rawValue = input.readEnum();\n"
|
||||
"$set_has_field_bit_message$\n"
|
||||
"$name$_ = rawValue;\n");
|
||||
"$name$_ = input.readEnum();\n"
|
||||
"$set_has_field_bit_builder$\n");
|
||||
} else {
|
||||
printer->Print(variables_,
|
||||
"int rawValue = input.readEnum();\n"
|
||||
" @SuppressWarnings(\"deprecation\")\n"
|
||||
"$type$ value = $type$.$for_number$(rawValue);\n"
|
||||
"if (value == null) {\n"
|
||||
" unknownFields.mergeVarintField($number$, rawValue);\n"
|
||||
"int tmpRaw = input.readEnum();\n"
|
||||
"$type$ tmpValue =\n"
|
||||
" $type$.forNumber(tmpRaw);\n"
|
||||
"if (tmpValue == null) {\n"
|
||||
" mergeUnknownVarintField($number$, tmpRaw);\n"
|
||||
"} else {\n"
|
||||
" $set_has_field_bit_message$\n"
|
||||
" $name$_ = rawValue;\n"
|
||||
" $name$_ = tmpRaw;\n"
|
||||
" $set_has_field_bit_builder$\n"
|
||||
"}\n");
|
||||
}
|
||||
}
|
||||
|
||||
void ImmutableEnumFieldGenerator::GenerateParsingDoneCode(
|
||||
io::Printer* printer) const {
|
||||
// noop for enums
|
||||
}
|
||||
|
||||
void ImmutableEnumFieldGenerator::GenerateSerializationCode(
|
||||
io::Printer* printer) const {
|
||||
printer->Print(variables_,
|
||||
@@ -450,8 +439,7 @@ void ImmutableEnumOneofFieldGenerator::GenerateMembers(
|
||||
printer->Print(variables_,
|
||||
"$deprecation$public $type$ ${$get$capitalized_name$$}$() {\n"
|
||||
" if ($has_oneof_case_message$) {\n"
|
||||
" @SuppressWarnings(\"deprecation\")\n"
|
||||
" $type$ result = $type$.$for_number$(\n"
|
||||
" $type$ result = $type$.forNumber(\n"
|
||||
" (java.lang.Integer) $oneof_name$_);\n"
|
||||
" return result == null ? $unknown$ : result;\n"
|
||||
" }\n"
|
||||
@@ -490,7 +478,7 @@ void ImmutableEnumOneofFieldGenerator::GenerateBuilderMembers(
|
||||
"${$set$capitalized_name$Value$}$(int value) {\n"
|
||||
" $set_oneof_case_message$;\n"
|
||||
" $oneof_name$_ = value;\n"
|
||||
" $on_changed$\n"
|
||||
" onChanged();\n"
|
||||
" return this;\n"
|
||||
"}\n");
|
||||
printer->Annotate("{", "}", descriptor_);
|
||||
@@ -500,14 +488,14 @@ void ImmutableEnumOneofFieldGenerator::GenerateBuilderMembers(
|
||||
"@java.lang.Override\n"
|
||||
"$deprecation$public $type$ ${$get$capitalized_name$$}$() {\n"
|
||||
" if ($has_oneof_case_message$) {\n"
|
||||
" @SuppressWarnings(\"deprecation\")\n"
|
||||
" $type$ result = $type$.$for_number$(\n"
|
||||
" $type$ result = $type$.forNumber(\n"
|
||||
" (java.lang.Integer) $oneof_name$_);\n"
|
||||
" return result == null ? $unknown$ : result;\n"
|
||||
" }\n"
|
||||
" return $default$;\n"
|
||||
"}\n");
|
||||
printer->Annotate("{", "}", descriptor_);
|
||||
|
||||
WriteFieldAccessorDocComment(printer, descriptor_, SETTER,
|
||||
/* builder */ true);
|
||||
printer->Print(variables_,
|
||||
@@ -518,10 +506,11 @@ void ImmutableEnumOneofFieldGenerator::GenerateBuilderMembers(
|
||||
" }\n"
|
||||
" $set_oneof_case_message$;\n"
|
||||
" $oneof_name$_ = value.getNumber();\n"
|
||||
" $on_changed$\n"
|
||||
" onChanged();\n"
|
||||
" return this;\n"
|
||||
"}\n");
|
||||
printer->Annotate("{", "}", descriptor_);
|
||||
|
||||
WriteFieldAccessorDocComment(printer, descriptor_, CLEARER,
|
||||
/* builder */ true);
|
||||
printer->Print(
|
||||
@@ -530,19 +519,21 @@ void ImmutableEnumOneofFieldGenerator::GenerateBuilderMembers(
|
||||
" if ($has_oneof_case_message$) {\n"
|
||||
" $clear_oneof_case_message$;\n"
|
||||
" $oneof_name$_ = null;\n"
|
||||
" $on_changed$\n"
|
||||
" onChanged();\n"
|
||||
" }\n"
|
||||
" return this;\n"
|
||||
"}\n");
|
||||
printer->Annotate("{", "}", descriptor_);
|
||||
}
|
||||
|
||||
void ImmutableEnumOneofFieldGenerator::GenerateBuilderClearCode(
|
||||
io::Printer* printer) const {
|
||||
// No-op: Enum fields in oneofs are correctly cleared by clearing the oneof
|
||||
}
|
||||
|
||||
void ImmutableEnumOneofFieldGenerator::GenerateBuildingCode(
|
||||
io::Printer* printer) const {
|
||||
printer->Print(variables_,
|
||||
"if ($has_oneof_case_message$) {\n"
|
||||
" result.$oneof_name$_ = $oneof_name$_;\n"
|
||||
"}\n");
|
||||
// No-Op: Handled by single statement for the oneof
|
||||
}
|
||||
|
||||
void ImmutableEnumOneofFieldGenerator::GenerateMergingCode(
|
||||
@@ -557,7 +548,7 @@ void ImmutableEnumOneofFieldGenerator::GenerateMergingCode(
|
||||
}
|
||||
}
|
||||
|
||||
void ImmutableEnumOneofFieldGenerator::GenerateParsingCode(
|
||||
void ImmutableEnumOneofFieldGenerator::GenerateBuilderParsingCode(
|
||||
io::Printer* printer) const {
|
||||
if (SupportUnknownEnumValue(descriptor_->file())) {
|
||||
printer->Print(variables_,
|
||||
@@ -567,10 +558,10 @@ void ImmutableEnumOneofFieldGenerator::GenerateParsingCode(
|
||||
} else {
|
||||
printer->Print(variables_,
|
||||
"int rawValue = input.readEnum();\n"
|
||||
"@SuppressWarnings(\"deprecation\")\n"
|
||||
"$type$ value = $type$.$for_number$(rawValue);\n"
|
||||
"$type$ value =\n"
|
||||
" $type$.forNumber(rawValue);\n"
|
||||
"if (value == null) {\n"
|
||||
" unknownFields.mergeVarintField($number$, rawValue);\n"
|
||||
" mergeUnknownVarintField($number$, rawValue);\n"
|
||||
"} else {\n"
|
||||
" $set_oneof_case_message$;\n"
|
||||
" $oneof_name$_ = rawValue;\n"
|
||||
@@ -631,11 +622,8 @@ void ImmutableEnumOneofFieldGenerator::GenerateHashCode(
|
||||
RepeatedImmutableEnumFieldGenerator::RepeatedImmutableEnumFieldGenerator(
|
||||
const FieldDescriptor* descriptor, int messageBitIndex, int builderBitIndex,
|
||||
Context* context)
|
||||
: descriptor_(descriptor), name_resolver_(context->GetNameResolver()) {
|
||||
SetEnumVariables(descriptor, messageBitIndex, builderBitIndex,
|
||||
context->GetFieldGeneratorInfo(descriptor), name_resolver_,
|
||||
&variables_);
|
||||
}
|
||||
: ImmutableEnumFieldGenerator(descriptor, messageBitIndex, builderBitIndex,
|
||||
context) {}
|
||||
|
||||
RepeatedImmutableEnumFieldGenerator::~RepeatedImmutableEnumFieldGenerator() {}
|
||||
|
||||
@@ -675,6 +663,7 @@ void RepeatedImmutableEnumFieldGenerator::GenerateMembers(
|
||||
io::Printer* printer) const {
|
||||
printer->Print(
|
||||
variables_,
|
||||
"@SuppressWarnings(\"serial\")\n"
|
||||
"private java.util.List<java.lang.Integer> $name$_;\n"
|
||||
"private static final "
|
||||
"com.google.protobuf.Internal.ListAdapter.Converter<\n"
|
||||
@@ -682,8 +671,7 @@ void RepeatedImmutableEnumFieldGenerator::GenerateMembers(
|
||||
" new com.google.protobuf.Internal.ListAdapter.Converter<\n"
|
||||
" java.lang.Integer, $type$>() {\n"
|
||||
" public $type$ convert(java.lang.Integer from) {\n"
|
||||
" @SuppressWarnings(\"deprecation\")\n"
|
||||
" $type$ result = $type$.$for_number$(from);\n"
|
||||
" $type$ result = $type$.forNumber(from);\n"
|
||||
" return result == null ? $unknown$ : result;\n"
|
||||
" }\n"
|
||||
" };\n");
|
||||
@@ -799,7 +787,7 @@ void RepeatedImmutableEnumFieldGenerator::GenerateBuilderMembers(
|
||||
" }\n"
|
||||
" ensure$capitalized_name$IsMutable();\n"
|
||||
" $name$_.set(index, value.getNumber());\n"
|
||||
" $on_changed$\n"
|
||||
" onChanged();\n"
|
||||
" return this;\n"
|
||||
"}\n");
|
||||
printer->Annotate("{", "}", descriptor_);
|
||||
@@ -813,7 +801,7 @@ void RepeatedImmutableEnumFieldGenerator::GenerateBuilderMembers(
|
||||
" }\n"
|
||||
" ensure$capitalized_name$IsMutable();\n"
|
||||
" $name$_.add(value.getNumber());\n"
|
||||
" $on_changed$\n"
|
||||
" onChanged();\n"
|
||||
" return this;\n"
|
||||
"}\n");
|
||||
printer->Annotate("{", "}", descriptor_);
|
||||
@@ -826,7 +814,7 @@ void RepeatedImmutableEnumFieldGenerator::GenerateBuilderMembers(
|
||||
" for ($type$ value : values) {\n"
|
||||
" $name$_.add(value.getNumber());\n"
|
||||
" }\n"
|
||||
" $on_changed$\n"
|
||||
" onChanged();\n"
|
||||
" return this;\n"
|
||||
"}\n");
|
||||
printer->Annotate("{", "}", descriptor_);
|
||||
@@ -837,7 +825,7 @@ void RepeatedImmutableEnumFieldGenerator::GenerateBuilderMembers(
|
||||
"$deprecation$public Builder ${$clear$capitalized_name$$}$() {\n"
|
||||
" $name$_ = java.util.Collections.emptyList();\n"
|
||||
" $clear_mutable_bit_builder$;\n"
|
||||
" $on_changed$\n"
|
||||
" onChanged();\n"
|
||||
" return this;\n"
|
||||
"}\n");
|
||||
printer->Annotate("{", "}", descriptor_);
|
||||
@@ -859,7 +847,7 @@ void RepeatedImmutableEnumFieldGenerator::GenerateBuilderMembers(
|
||||
"}\n");
|
||||
printer->Annotate("{", "}", descriptor_);
|
||||
WriteFieldEnumValueAccessorDocComment(printer, descriptor_,
|
||||
LIST_INDEXED_GETTER,
|
||||
LIST_INDEXED_SETTER,
|
||||
/* builder */ true);
|
||||
printer->Print(
|
||||
variables_,
|
||||
@@ -867,7 +855,7 @@ void RepeatedImmutableEnumFieldGenerator::GenerateBuilderMembers(
|
||||
" int index, int value) {\n"
|
||||
" ensure$capitalized_name$IsMutable();\n"
|
||||
" $name$_.set(index, value);\n"
|
||||
" $on_changed$\n"
|
||||
" onChanged();\n"
|
||||
" return this;\n"
|
||||
"}\n");
|
||||
printer->Annotate("{", "}", descriptor_);
|
||||
@@ -878,7 +866,7 @@ void RepeatedImmutableEnumFieldGenerator::GenerateBuilderMembers(
|
||||
"${$add$capitalized_name$Value$}$(int value) {\n"
|
||||
" ensure$capitalized_name$IsMutable();\n"
|
||||
" $name$_.add(value);\n"
|
||||
" $on_changed$\n"
|
||||
" onChanged();\n"
|
||||
" return this;\n"
|
||||
"}\n");
|
||||
printer->Annotate("{", "}", descriptor_);
|
||||
@@ -892,7 +880,7 @@ void RepeatedImmutableEnumFieldGenerator::GenerateBuilderMembers(
|
||||
" for (int value : values) {\n"
|
||||
" $name$_.add(value);\n"
|
||||
" }\n"
|
||||
" $on_changed$\n"
|
||||
" onChanged();\n"
|
||||
" return this;\n"
|
||||
"}\n");
|
||||
printer->Annotate("{", "}", descriptor_);
|
||||
@@ -932,7 +920,7 @@ void RepeatedImmutableEnumFieldGenerator::GenerateMergingCode(
|
||||
" ensure$capitalized_name$IsMutable();\n"
|
||||
" $name$_.addAll(other.$name$_);\n"
|
||||
" }\n"
|
||||
" $on_changed$\n"
|
||||
" onChanged();\n"
|
||||
"}\n");
|
||||
}
|
||||
|
||||
@@ -949,36 +937,29 @@ void RepeatedImmutableEnumFieldGenerator::GenerateBuildingCode(
|
||||
"result.$name$_ = $name$_;\n");
|
||||
}
|
||||
|
||||
void RepeatedImmutableEnumFieldGenerator::GenerateParsingCode(
|
||||
void RepeatedImmutableEnumFieldGenerator::GenerateBuilderParsingCode(
|
||||
io::Printer* printer) const {
|
||||
// Read and store the enum
|
||||
if (SupportUnknownEnumValue(descriptor_->file())) {
|
||||
printer->Print(variables_,
|
||||
"int rawValue = input.readEnum();\n"
|
||||
"if (!$get_mutable_bit_parser$) {\n"
|
||||
" $name$_ = new java.util.ArrayList<java.lang.Integer>();\n"
|
||||
" $set_mutable_bit_parser$;\n"
|
||||
"}\n"
|
||||
"$name$_.add(rawValue);\n");
|
||||
"int tmpRaw = input.readEnum();\n"
|
||||
"ensure$capitalized_name$IsMutable();\n"
|
||||
"$name$_.add(tmpRaw);\n");
|
||||
} else {
|
||||
printer->Print(
|
||||
variables_,
|
||||
"int rawValue = input.readEnum();\n"
|
||||
"@SuppressWarnings(\"deprecation\")\n"
|
||||
"$type$ value = $type$.$for_number$(rawValue);\n"
|
||||
"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"
|
||||
" $set_mutable_bit_parser$;\n"
|
||||
" }\n"
|
||||
" $name$_.add(rawValue);\n"
|
||||
"}\n");
|
||||
printer->Print(variables_,
|
||||
"int tmpRaw = input.readEnum();\n"
|
||||
"$type$ tmpValue =\n"
|
||||
" $type$.forNumber(tmpRaw);\n"
|
||||
"if (tmpValue == null) {\n"
|
||||
" mergeUnknownVarintField($number$, tmpRaw);\n"
|
||||
"} else {\n"
|
||||
" ensure$capitalized_name$IsMutable();\n"
|
||||
" $name$_.add(tmpRaw);\n"
|
||||
"}\n");
|
||||
}
|
||||
}
|
||||
|
||||
void RepeatedImmutableEnumFieldGenerator::GenerateParsingCodeFromPacked(
|
||||
void RepeatedImmutableEnumFieldGenerator::GenerateBuilderParsingCodeFromPacked(
|
||||
io::Printer* printer) const {
|
||||
// Wrap GenerateParsingCode's contents with a while loop.
|
||||
|
||||
@@ -988,7 +969,7 @@ void RepeatedImmutableEnumFieldGenerator::GenerateParsingCodeFromPacked(
|
||||
"while(input.getBytesUntilLimit() > 0) {\n");
|
||||
printer->Indent();
|
||||
|
||||
GenerateParsingCode(printer);
|
||||
GenerateBuilderParsingCode(printer);
|
||||
|
||||
printer->Outdent();
|
||||
printer->Print(variables_,
|
||||
@@ -996,15 +977,6 @@ void RepeatedImmutableEnumFieldGenerator::GenerateParsingCodeFromPacked(
|
||||
"input.popLimit(oldLimit);\n");
|
||||
}
|
||||
|
||||
void RepeatedImmutableEnumFieldGenerator::GenerateParsingDoneCode(
|
||||
io::Printer* printer) const {
|
||||
printer->Print(
|
||||
variables_,
|
||||
"if ($get_mutable_bit_parser$) {\n"
|
||||
" $name$_ = java.util.Collections.unmodifiableList($name$_);\n"
|
||||
"}\n");
|
||||
}
|
||||
|
||||
void RepeatedImmutableEnumFieldGenerator::GenerateSerializationCode(
|
||||
io::Printer* printer) const {
|
||||
if (descriptor_->is_packed()) {
|
||||
@@ -1087,7 +1059,7 @@ void RepeatedImmutableEnumFieldGenerator::GenerateKotlinDslMembers(
|
||||
|
||||
WriteFieldDocComment(printer, descriptor_);
|
||||
printer->Print(variables_,
|
||||
"$kt_deprecation$ public val $kt_name$: "
|
||||
"$kt_deprecation$public val $kt_name$: "
|
||||
"com.google.protobuf.kotlin.DslList"
|
||||
"<$kt_type$, ${$$kt_capitalized_name$Proxy$}$>\n"
|
||||
" @kotlin.jvm.JvmSynthetic\n"
|
||||
@@ -1174,3 +1146,5 @@ std::string RepeatedImmutableEnumFieldGenerator::GetBoxedType() const {
|
||||
} // namespace compiler
|
||||
} // namespace protobuf
|
||||
} // namespace google
|
||||
|
||||
#include "google/protobuf/port_undef.inc"
|
||||
+25
-22
@@ -37,7 +37,8 @@
|
||||
|
||||
#include <map>
|
||||
#include <string>
|
||||
#include <google/protobuf/compiler/java/java_field.h>
|
||||
|
||||
#include "google/protobuf/compiler/java/field.h"
|
||||
|
||||
namespace google {
|
||||
namespace protobuf {
|
||||
@@ -60,10 +61,15 @@ class ImmutableEnumFieldGenerator : public ImmutableFieldGenerator {
|
||||
explicit ImmutableEnumFieldGenerator(const FieldDescriptor* descriptor,
|
||||
int messageBitIndex, int builderBitIndex,
|
||||
Context* context);
|
||||
ImmutableEnumFieldGenerator(const ImmutableEnumFieldGenerator&) = delete;
|
||||
ImmutableEnumFieldGenerator& operator=(const ImmutableEnumFieldGenerator&) =
|
||||
delete;
|
||||
~ImmutableEnumFieldGenerator() override;
|
||||
|
||||
// implements ImmutableFieldGenerator
|
||||
// ---------------------------------------
|
||||
int GetMessageBitIndex() const override;
|
||||
int GetBuilderBitIndex() const override;
|
||||
int GetNumBitsForMessage() const override;
|
||||
int GetNumBitsForBuilder() const override;
|
||||
void GenerateInterfaceMembers(io::Printer* printer) const override;
|
||||
@@ -71,10 +77,9 @@ class ImmutableEnumFieldGenerator : public ImmutableFieldGenerator {
|
||||
void GenerateBuilderMembers(io::Printer* printer) const override;
|
||||
void GenerateInitializationCode(io::Printer* printer) const override;
|
||||
void GenerateBuilderClearCode(io::Printer* printer) const override;
|
||||
void GenerateBuilderParsingCode(io::Printer* printer) const override;
|
||||
void GenerateMergingCode(io::Printer* printer) const override;
|
||||
void GenerateBuildingCode(io::Printer* printer) const override;
|
||||
void GenerateParsingCode(io::Printer* printer) const override;
|
||||
void GenerateParsingDoneCode(io::Printer* printer) const override;
|
||||
void GenerateSerializationCode(io::Printer* printer) const override;
|
||||
void GenerateSerializedSizeCode(io::Printer* printer) const override;
|
||||
void GenerateFieldBuilderInitializationCode(
|
||||
@@ -87,11 +92,10 @@ class ImmutableEnumFieldGenerator : public ImmutableFieldGenerator {
|
||||
|
||||
protected:
|
||||
const FieldDescriptor* descriptor_;
|
||||
int message_bit_index_;
|
||||
int builder_bit_index_;
|
||||
std::map<std::string, std::string> variables_;
|
||||
ClassNameResolver* name_resolver_;
|
||||
|
||||
private:
|
||||
GOOGLE_DISALLOW_EVIL_CONSTRUCTORS(ImmutableEnumFieldGenerator);
|
||||
};
|
||||
|
||||
class ImmutableEnumOneofFieldGenerator : public ImmutableEnumFieldGenerator {
|
||||
@@ -99,27 +103,33 @@ class ImmutableEnumOneofFieldGenerator : public ImmutableEnumFieldGenerator {
|
||||
ImmutableEnumOneofFieldGenerator(const FieldDescriptor* descriptor,
|
||||
int messageBitIndex, int builderBitIndex,
|
||||
Context* context);
|
||||
~ImmutableEnumOneofFieldGenerator();
|
||||
ImmutableEnumOneofFieldGenerator(const ImmutableEnumOneofFieldGenerator&) =
|
||||
delete;
|
||||
ImmutableEnumOneofFieldGenerator& operator=(
|
||||
const ImmutableEnumOneofFieldGenerator&) = delete;
|
||||
~ImmutableEnumOneofFieldGenerator() override;
|
||||
|
||||
void GenerateMembers(io::Printer* printer) const override;
|
||||
void GenerateBuilderMembers(io::Printer* printer) const override;
|
||||
void GenerateBuilderClearCode(io::Printer* printer) const override;
|
||||
void GenerateMergingCode(io::Printer* printer) const override;
|
||||
void GenerateBuildingCode(io::Printer* printer) const override;
|
||||
void GenerateParsingCode(io::Printer* printer) const override;
|
||||
void GenerateBuilderParsingCode(io::Printer* printer) const override;
|
||||
void GenerateSerializationCode(io::Printer* printer) const override;
|
||||
void GenerateSerializedSizeCode(io::Printer* printer) const override;
|
||||
void GenerateEqualsCode(io::Printer* printer) const override;
|
||||
void GenerateHashCode(io::Printer* printer) const override;
|
||||
|
||||
private:
|
||||
GOOGLE_DISALLOW_EVIL_CONSTRUCTORS(ImmutableEnumOneofFieldGenerator);
|
||||
};
|
||||
|
||||
class RepeatedImmutableEnumFieldGenerator : public ImmutableFieldGenerator {
|
||||
class RepeatedImmutableEnumFieldGenerator : public ImmutableEnumFieldGenerator {
|
||||
public:
|
||||
explicit RepeatedImmutableEnumFieldGenerator(
|
||||
const FieldDescriptor* descriptor, int messageBitIndex,
|
||||
int builderBitIndex, Context* context);
|
||||
RepeatedImmutableEnumFieldGenerator(
|
||||
const RepeatedImmutableEnumFieldGenerator&) = delete;
|
||||
RepeatedImmutableEnumFieldGenerator& operator=(
|
||||
const RepeatedImmutableEnumFieldGenerator&) = delete;
|
||||
~RepeatedImmutableEnumFieldGenerator() override;
|
||||
|
||||
// implements ImmutableFieldGenerator ---------------------------------------
|
||||
@@ -132,9 +142,9 @@ class RepeatedImmutableEnumFieldGenerator : public ImmutableFieldGenerator {
|
||||
void GenerateBuilderClearCode(io::Printer* printer) const override;
|
||||
void GenerateMergingCode(io::Printer* printer) const override;
|
||||
void GenerateBuildingCode(io::Printer* printer) const override;
|
||||
void GenerateParsingCode(io::Printer* printer) const override;
|
||||
void GenerateParsingCodeFromPacked(io::Printer* printer) const override;
|
||||
void GenerateParsingDoneCode(io::Printer* printer) const override;
|
||||
void GenerateBuilderParsingCode(io::Printer* printer) const override;
|
||||
void GenerateBuilderParsingCodeFromPacked(
|
||||
io::Printer* printer) const override;
|
||||
void GenerateSerializationCode(io::Printer* printer) const override;
|
||||
void GenerateSerializedSizeCode(io::Printer* printer) const override;
|
||||
void GenerateFieldBuilderInitializationCode(
|
||||
@@ -144,13 +154,6 @@ class RepeatedImmutableEnumFieldGenerator : public ImmutableFieldGenerator {
|
||||
void GenerateKotlinDslMembers(io::Printer* printer) const override;
|
||||
|
||||
std::string GetBoxedType() const override;
|
||||
|
||||
private:
|
||||
const FieldDescriptor* descriptor_;
|
||||
std::map<std::string, std::string> variables_;
|
||||
ClassNameResolver* name_resolver_;
|
||||
|
||||
GOOGLE_DISALLOW_EVIL_CONSTRUCTORS(RepeatedImmutableEnumFieldGenerator);
|
||||
};
|
||||
|
||||
} // namespace java
|
||||
+10
-5
@@ -32,7 +32,7 @@
|
||||
// Based on original Protocol Buffers design by
|
||||
// Sanjay Ghemawat, Jeff Dean, and others.
|
||||
|
||||
#include <google/protobuf/compiler/java/java_enum_field_lite.h>
|
||||
#include <google/protobuf/compiler/java/enum_field_lite.h>
|
||||
|
||||
#include <cstdint>
|
||||
#include <map>
|
||||
@@ -40,13 +40,16 @@
|
||||
|
||||
#include <google/protobuf/stubs/logging.h>
|
||||
#include <google/protobuf/stubs/common.h>
|
||||
#include <google/protobuf/compiler/java/java_context.h>
|
||||
#include <google/protobuf/compiler/java/java_doc_comment.h>
|
||||
#include <google/protobuf/compiler/java/java_helpers.h>
|
||||
#include <google/protobuf/compiler/java/java_name_resolver.h>
|
||||
#include <google/protobuf/io/printer.h>
|
||||
#include <google/protobuf/wire_format.h>
|
||||
#include <google/protobuf/stubs/strutil.h>
|
||||
#include <google/protobuf/compiler/java/context.h>
|
||||
#include <google/protobuf/compiler/java/doc_comment.h>
|
||||
#include <google/protobuf/compiler/java/helpers.h>
|
||||
#include <google/protobuf/compiler/java/name_resolver.h>
|
||||
|
||||
// Must be last.
|
||||
#include <google/protobuf/port_def.inc>
|
||||
|
||||
namespace google {
|
||||
namespace protobuf {
|
||||
@@ -916,3 +919,5 @@ std::string RepeatedImmutableEnumFieldLiteGenerator::GetBoxedType() const {
|
||||
} // namespace compiler
|
||||
} // namespace protobuf
|
||||
} // namespace google
|
||||
|
||||
#include <google/protobuf/port_undef.inc>
|
||||
+1
-1
@@ -39,7 +39,7 @@
|
||||
#include <map>
|
||||
#include <string>
|
||||
|
||||
#include <google/protobuf/compiler/java/java_field.h>
|
||||
#include <google/protobuf/compiler/java/field.h>
|
||||
|
||||
namespace google {
|
||||
namespace protobuf {
|
||||
+7
-6
@@ -32,17 +32,18 @@
|
||||
// Based on original Protocol Buffers design by
|
||||
// Sanjay Ghemawat, Jeff Dean, and others.
|
||||
|
||||
#include <google/protobuf/compiler/java/enum_lite.h>
|
||||
|
||||
#include <map>
|
||||
#include <string>
|
||||
|
||||
#include <google/protobuf/compiler/java/java_context.h>
|
||||
#include <google/protobuf/compiler/java/java_doc_comment.h>
|
||||
#include <google/protobuf/compiler/java/java_enum_lite.h>
|
||||
#include <google/protobuf/compiler/java/java_helpers.h>
|
||||
#include <google/protobuf/compiler/java/java_name_resolver.h>
|
||||
#include <google/protobuf/descriptor.pb.h>
|
||||
#include <google/protobuf/io/printer.h>
|
||||
#include <google/protobuf/stubs/strutil.h>
|
||||
#include <google/protobuf/compiler/java/context.h>
|
||||
#include <google/protobuf/compiler/java/doc_comment.h>
|
||||
#include <google/protobuf/compiler/java/helpers.h>
|
||||
#include <google/protobuf/compiler/java/name_resolver.h>
|
||||
#include <google/protobuf/descriptor.pb.h>
|
||||
#include <google/protobuf/stubs/map_util.h>
|
||||
|
||||
namespace google {
|
||||
File renamed without changes.
+10
-5
@@ -32,14 +32,17 @@
|
||||
// Based on original Protocol Buffers design by
|
||||
// Sanjay Ghemawat, Jeff Dean, and others.
|
||||
|
||||
#include <google/protobuf/compiler/java/java_extension.h>
|
||||
#include <google/protobuf/compiler/java/extension.h>
|
||||
|
||||
#include <google/protobuf/compiler/java/java_context.h>
|
||||
#include <google/protobuf/compiler/java/java_doc_comment.h>
|
||||
#include <google/protobuf/compiler/java/java_helpers.h>
|
||||
#include <google/protobuf/compiler/java/java_name_resolver.h>
|
||||
#include <google/protobuf/io/printer.h>
|
||||
#include <google/protobuf/stubs/strutil.h>
|
||||
#include <google/protobuf/compiler/java/context.h>
|
||||
#include <google/protobuf/compiler/java/doc_comment.h>
|
||||
#include <google/protobuf/compiler/java/helpers.h>
|
||||
#include <google/protobuf/compiler/java/name_resolver.h>
|
||||
|
||||
// Must be last.
|
||||
#include <google/protobuf/port_def.inc>
|
||||
|
||||
namespace google {
|
||||
namespace protobuf {
|
||||
@@ -170,3 +173,5 @@ int ImmutableExtensionGenerator::GenerateRegistrationCode(
|
||||
} // namespace compiler
|
||||
} // namespace protobuf
|
||||
} // namespace google
|
||||
|
||||
#include <google/protobuf/port_undef.inc>
|
||||
+1
-1
@@ -92,7 +92,7 @@ class ImmutableExtensionGenerator : public ExtensionGenerator {
|
||||
public:
|
||||
explicit ImmutableExtensionGenerator(const FieldDescriptor* descriptor,
|
||||
Context* context);
|
||||
virtual ~ImmutableExtensionGenerator();
|
||||
~ImmutableExtensionGenerator() override;
|
||||
|
||||
void Generate(io::Printer* printer) override;
|
||||
int GenerateNonNestedInitializationCode(io::Printer* printer) override;
|
||||
+10
-5
@@ -28,14 +28,17 @@
|
||||
// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
|
||||
// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||
|
||||
#include <google/protobuf/compiler/java/java_extension_lite.h>
|
||||
#include <google/protobuf/compiler/java/extension_lite.h>
|
||||
|
||||
#include <google/protobuf/compiler/java/java_context.h>
|
||||
#include <google/protobuf/compiler/java/java_doc_comment.h>
|
||||
#include <google/protobuf/compiler/java/java_helpers.h>
|
||||
#include <google/protobuf/compiler/java/java_name_resolver.h>
|
||||
#include <google/protobuf/io/printer.h>
|
||||
#include <google/protobuf/stubs/strutil.h>
|
||||
#include <google/protobuf/compiler/java/context.h>
|
||||
#include <google/protobuf/compiler/java/doc_comment.h>
|
||||
#include <google/protobuf/compiler/java/helpers.h>
|
||||
#include <google/protobuf/compiler/java/name_resolver.h>
|
||||
|
||||
// Must be last.
|
||||
#include <google/protobuf/port_def.inc>
|
||||
|
||||
namespace google {
|
||||
namespace protobuf {
|
||||
@@ -113,3 +116,5 @@ int ImmutableExtensionLiteGenerator::GenerateRegistrationCode(
|
||||
} // namespace compiler
|
||||
} // namespace protobuf
|
||||
} // namespace google
|
||||
|
||||
#include <google/protobuf/port_undef.inc>
|
||||
+2
-2
@@ -35,7 +35,7 @@
|
||||
#include <string>
|
||||
|
||||
#include <google/protobuf/stubs/common.h>
|
||||
#include <google/protobuf/compiler/java/java_extension.h>
|
||||
#include <google/protobuf/compiler/java/extension.h>
|
||||
|
||||
namespace google {
|
||||
namespace protobuf {
|
||||
@@ -49,7 +49,7 @@ class ImmutableExtensionLiteGenerator : public ExtensionGenerator {
|
||||
public:
|
||||
explicit ImmutableExtensionLiteGenerator(const FieldDescriptor* descriptor,
|
||||
Context* context);
|
||||
virtual ~ImmutableExtensionLiteGenerator();
|
||||
~ImmutableExtensionLiteGenerator() override;
|
||||
|
||||
void Generate(io::Printer* printer) override;
|
||||
|
||||
+15
-15
@@ -32,27 +32,27 @@
|
||||
// Based on original Protocol Buffers design by
|
||||
// Sanjay Ghemawat, Jeff Dean, and others.
|
||||
|
||||
#include <google/protobuf/compiler/java/java_field.h>
|
||||
#include <google/protobuf/compiler/java/field.h>
|
||||
|
||||
#include <memory>
|
||||
|
||||
#include <google/protobuf/stubs/logging.h>
|
||||
#include <google/protobuf/stubs/common.h>
|
||||
#include <google/protobuf/compiler/java/java_context.h>
|
||||
#include <google/protobuf/compiler/java/java_enum_field.h>
|
||||
#include <google/protobuf/compiler/java/java_enum_field_lite.h>
|
||||
#include <google/protobuf/compiler/java/java_helpers.h>
|
||||
#include <google/protobuf/compiler/java/java_map_field.h>
|
||||
#include <google/protobuf/compiler/java/java_map_field_lite.h>
|
||||
#include <google/protobuf/compiler/java/java_message_field.h>
|
||||
#include <google/protobuf/compiler/java/java_message_field_lite.h>
|
||||
#include <google/protobuf/compiler/java/java_primitive_field.h>
|
||||
#include <google/protobuf/compiler/java/java_primitive_field_lite.h>
|
||||
#include <google/protobuf/compiler/java/java_string_field.h>
|
||||
#include <google/protobuf/compiler/java/java_string_field_lite.h>
|
||||
#include <google/protobuf/io/printer.h>
|
||||
#include <google/protobuf/stubs/strutil.h>
|
||||
#include <google/protobuf/stubs/substitute.h>
|
||||
#include <google/protobuf/compiler/java/context.h>
|
||||
#include <google/protobuf/compiler/java/enum_field.h>
|
||||
#include <google/protobuf/compiler/java/enum_field_lite.h>
|
||||
#include <google/protobuf/compiler/java/helpers.h>
|
||||
#include <google/protobuf/compiler/java/map_field.h>
|
||||
#include <google/protobuf/compiler/java/map_field_lite.h>
|
||||
#include <google/protobuf/compiler/java/message_field.h>
|
||||
#include <google/protobuf/compiler/java/message_field_lite.h>
|
||||
#include <google/protobuf/compiler/java/primitive_field.h>
|
||||
#include <google/protobuf/compiler/java/primitive_field_lite.h>
|
||||
#include <google/protobuf/compiler/java/string_field.h>
|
||||
#include <google/protobuf/compiler/java/string_field_lite.h>
|
||||
|
||||
|
||||
namespace google {
|
||||
@@ -185,7 +185,7 @@ static inline void ReportUnexpectedPackedFieldsCall(io::Printer* printer) {
|
||||
// but this method should be overridden.
|
||||
// - This FieldGenerator doesn't support packing, and this method
|
||||
// should never have been called.
|
||||
GOOGLE_LOG(FATAL) << "GenerateParsingCodeFromPacked() "
|
||||
GOOGLE_LOG(FATAL) << "GenerateBuilderParsingCodeFromPacked() "
|
||||
<< "called on field generator that does not support packing.";
|
||||
}
|
||||
|
||||
@@ -193,7 +193,7 @@ static inline void ReportUnexpectedPackedFieldsCall(io::Printer* printer) {
|
||||
|
||||
ImmutableFieldGenerator::~ImmutableFieldGenerator() {}
|
||||
|
||||
void ImmutableFieldGenerator::GenerateParsingCodeFromPacked(
|
||||
void ImmutableFieldGenerator::GenerateBuilderParsingCodeFromPacked(
|
||||
io::Printer* printer) const {
|
||||
ReportUnexpectedPackedFieldsCall(printer);
|
||||
}
|
||||
+5
-4
@@ -68,6 +68,8 @@ class ImmutableFieldGenerator {
|
||||
ImmutableFieldGenerator() {}
|
||||
virtual ~ImmutableFieldGenerator();
|
||||
|
||||
virtual int GetMessageBitIndex() const = 0;
|
||||
virtual int GetBuilderBitIndex() const = 0;
|
||||
virtual int GetNumBitsForMessage() const = 0;
|
||||
virtual int GetNumBitsForBuilder() const = 0;
|
||||
virtual void GenerateInterfaceMembers(io::Printer* printer) const = 0;
|
||||
@@ -77,9 +79,8 @@ class ImmutableFieldGenerator {
|
||||
virtual void GenerateBuilderClearCode(io::Printer* printer) const = 0;
|
||||
virtual void GenerateMergingCode(io::Printer* printer) const = 0;
|
||||
virtual void GenerateBuildingCode(io::Printer* printer) const = 0;
|
||||
virtual void GenerateParsingCode(io::Printer* printer) const = 0;
|
||||
virtual void GenerateParsingCodeFromPacked(io::Printer* printer) const;
|
||||
virtual void GenerateParsingDoneCode(io::Printer* printer) const = 0;
|
||||
virtual void GenerateBuilderParsingCode(io::Printer* printer) const = 0;
|
||||
virtual void GenerateBuilderParsingCodeFromPacked(io::Printer* printer) const;
|
||||
virtual void GenerateSerializationCode(io::Printer* printer) const = 0;
|
||||
virtual void GenerateSerializedSizeCode(io::Printer* printer) const = 0;
|
||||
virtual void GenerateFieldBuilderInitializationCode(
|
||||
@@ -156,7 +157,7 @@ template <>
|
||||
FieldGeneratorMap<ImmutableFieldLiteGenerator>::~FieldGeneratorMap();
|
||||
|
||||
|
||||
// Field information used in FieldGeneartors.
|
||||
// Field information used in FieldGenerators.
|
||||
struct FieldGeneratorInfo {
|
||||
std::string name;
|
||||
std::string capitalized_name;
|
||||
+18
-13
@@ -32,27 +32,30 @@
|
||||
// Based on original Protocol Buffers design by
|
||||
// Sanjay Ghemawat, Jeff Dean, and others.
|
||||
|
||||
#include <google/protobuf/compiler/java/java_file.h>
|
||||
#include <google/protobuf/compiler/java/file.h>
|
||||
|
||||
#include <memory>
|
||||
#include <set>
|
||||
|
||||
#include <google/protobuf/compiler/java/java_context.h>
|
||||
#include <google/protobuf/compiler/java/java_enum.h>
|
||||
#include <google/protobuf/compiler/java/java_enum_lite.h>
|
||||
#include <google/protobuf/compiler/java/java_extension.h>
|
||||
#include <google/protobuf/compiler/java/java_generator_factory.h>
|
||||
#include <google/protobuf/compiler/java/java_helpers.h>
|
||||
#include <google/protobuf/compiler/java/java_message.h>
|
||||
#include <google/protobuf/compiler/java/java_name_resolver.h>
|
||||
#include <google/protobuf/compiler/java/java_service.h>
|
||||
#include <google/protobuf/compiler/java/java_shared_code_generator.h>
|
||||
#include <google/protobuf/compiler/code_generator.h>
|
||||
#include <google/protobuf/descriptor.pb.h>
|
||||
#include <google/protobuf/io/printer.h>
|
||||
#include <google/protobuf/io/zero_copy_stream.h>
|
||||
#include <google/protobuf/dynamic_message.h>
|
||||
#include <google/protobuf/stubs/strutil.h>
|
||||
#include <google/protobuf/compiler/java/context.h>
|
||||
#include <google/protobuf/compiler/java/enum.h>
|
||||
#include <google/protobuf/compiler/java/enum_lite.h>
|
||||
#include <google/protobuf/compiler/java/extension.h>
|
||||
#include <google/protobuf/compiler/java/generator_factory.h>
|
||||
#include <google/protobuf/compiler/java/helpers.h>
|
||||
#include <google/protobuf/compiler/java/message.h>
|
||||
#include <google/protobuf/compiler/java/name_resolver.h>
|
||||
#include <google/protobuf/compiler/java/service.h>
|
||||
#include <google/protobuf/compiler/java/shared_code_generator.h>
|
||||
#include <google/protobuf/descriptor.pb.h>
|
||||
|
||||
// Must be last.
|
||||
#include <google/protobuf/port_def.inc>
|
||||
|
||||
namespace google {
|
||||
namespace protobuf {
|
||||
@@ -247,7 +250,7 @@ bool FileGenerator::Validate(std::string* error) {
|
||||
<< "generate full runtime code for Java. To use Java Lite runtime, "
|
||||
<< "users should use the Java Lite plugin instead. See:\n"
|
||||
<< " "
|
||||
"https://github.com/protocolbuffers/protobuf/blob/master/java/"
|
||||
"https://github.com/protocolbuffers/protobuf/blob/main/java/"
|
||||
"lite.md";
|
||||
}
|
||||
return true;
|
||||
@@ -732,3 +735,5 @@ bool FileGenerator::ShouldIncludeDependency(const FileDescriptor* descriptor,
|
||||
} // namespace compiler
|
||||
} // namespace protobuf
|
||||
} // namespace google
|
||||
|
||||
#include <google/protobuf/port_undef.inc>
|
||||
+2
-1
@@ -38,8 +38,9 @@
|
||||
#include <memory>
|
||||
#include <string>
|
||||
#include <vector>
|
||||
|
||||
#include <google/protobuf/stubs/common.h>
|
||||
#include <google/protobuf/compiler/java/java_options.h>
|
||||
#include <google/protobuf/compiler/java/options.h>
|
||||
|
||||
namespace google {
|
||||
namespace protobuf {
|
||||
+9
-8
@@ -32,20 +32,21 @@
|
||||
// Based on original Protocol Buffers design by
|
||||
// Sanjay Ghemawat, Jeff Dean, and others.
|
||||
|
||||
#include <google/protobuf/compiler/java/java_generator.h>
|
||||
#include <google/protobuf/compiler/java/generator.h>
|
||||
|
||||
|
||||
#include <memory>
|
||||
|
||||
#include <google/protobuf/compiler/java/java_file.h>
|
||||
#include <google/protobuf/compiler/java/java_generator_factory.h>
|
||||
#include <google/protobuf/compiler/java/java_helpers.h>
|
||||
#include <google/protobuf/compiler/java/java_name_resolver.h>
|
||||
#include <google/protobuf/compiler/java/java_options.h>
|
||||
#include <google/protobuf/compiler/java/java_shared_code_generator.h>
|
||||
#include <google/protobuf/descriptor.pb.h>
|
||||
#include <google/protobuf/io/printer.h>
|
||||
#include <google/protobuf/io/zero_copy_stream.h>
|
||||
#include <google/protobuf/stubs/stringprintf.h>
|
||||
#include <google/protobuf/compiler/java/file.h>
|
||||
#include <google/protobuf/compiler/java/generator_factory.h>
|
||||
#include <google/protobuf/compiler/java/helpers.h>
|
||||
#include <google/protobuf/compiler/java/name_resolver.h>
|
||||
#include <google/protobuf/compiler/java/options.h>
|
||||
#include <google/protobuf/compiler/java/shared_code_generator.h>
|
||||
#include <google/protobuf/descriptor.pb.h>
|
||||
|
||||
#include <google/protobuf/stubs/strutil.h>
|
||||
|
||||
@@ -0,0 +1,77 @@
|
||||
// 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.
|
||||
// * Redistributions in binary form must reproduce the above
|
||||
// copyright notice, this list of conditions and the following disclaimer
|
||||
// in the documentation and/or other materials provided with the
|
||||
// distribution.
|
||||
// * Neither the name of Google Inc. nor the names of its
|
||||
// contributors may be used to endorse or promote products derived from
|
||||
// this software without specific prior written permission.
|
||||
//
|
||||
// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
|
||||
// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
|
||||
// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
|
||||
// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
|
||||
// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
|
||||
// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
|
||||
// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
|
||||
// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
|
||||
// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
|
||||
// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
|
||||
// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||
|
||||
// Author: kenton@google.com (Kenton Varda)
|
||||
// Based on original Protocol Buffers design by
|
||||
// Sanjay Ghemawat, Jeff Dean, and others.
|
||||
//
|
||||
// Generates Java code for a given .proto file.
|
||||
|
||||
#ifndef GOOGLE_PROTOBUF_COMPILER_JAVA_GENERATOR_H__
|
||||
#define GOOGLE_PROTOBUF_COMPILER_JAVA_GENERATOR_H__
|
||||
|
||||
#include <string>
|
||||
#include <google/protobuf/compiler/code_generator.h>
|
||||
|
||||
// Must be included last.
|
||||
#include <google/protobuf/port_def.inc>
|
||||
|
||||
namespace google {
|
||||
namespace protobuf {
|
||||
namespace compiler {
|
||||
namespace java {
|
||||
|
||||
// CodeGenerator implementation which generates Java code. If you create your
|
||||
// own protocol compiler binary and you want it to support Java output, you
|
||||
// can do so by registering an instance of this CodeGenerator with the
|
||||
// CommandLineInterface in your main() function.
|
||||
class PROTOC_EXPORT JavaGenerator : public CodeGenerator {
|
||||
public:
|
||||
JavaGenerator();
|
||||
~JavaGenerator() override;
|
||||
|
||||
// implements CodeGenerator ----------------------------------------
|
||||
bool Generate(const FileDescriptor* file, const std::string& parameter,
|
||||
GeneratorContext* context, std::string* error) const override;
|
||||
|
||||
uint64_t GetSupportedFeatures() const override;
|
||||
|
||||
private:
|
||||
GOOGLE_DISALLOW_EVIL_CONSTRUCTORS(JavaGenerator);
|
||||
};
|
||||
|
||||
} // namespace java
|
||||
} // namespace compiler
|
||||
} // namespace protobuf
|
||||
} // namespace google
|
||||
|
||||
#include <google/protobuf/port_undef.inc>
|
||||
|
||||
#endif // GOOGLE_PROTOBUF_COMPILER_JAVA_GENERATOR_H__
|
||||
+10
-10
@@ -30,17 +30,17 @@
|
||||
|
||||
// Author: liujisi@google.com (Pherl Liu)
|
||||
|
||||
#include <google/protobuf/compiler/java/java_generator_factory.h>
|
||||
#include <google/protobuf/compiler/java/generator_factory.h>
|
||||
|
||||
#include <google/protobuf/compiler/java/java_context.h>
|
||||
#include <google/protobuf/compiler/java/java_enum_field.h>
|
||||
#include <google/protobuf/compiler/java/java_extension.h>
|
||||
#include <google/protobuf/compiler/java/java_extension_lite.h>
|
||||
#include <google/protobuf/compiler/java/java_field.h>
|
||||
#include <google/protobuf/compiler/java/java_helpers.h>
|
||||
#include <google/protobuf/compiler/java/java_message.h>
|
||||
#include <google/protobuf/compiler/java/java_message_lite.h>
|
||||
#include <google/protobuf/compiler/java/java_service.h>
|
||||
#include <google/protobuf/compiler/java/context.h>
|
||||
#include <google/protobuf/compiler/java/enum_field.h>
|
||||
#include <google/protobuf/compiler/java/extension.h>
|
||||
#include <google/protobuf/compiler/java/extension_lite.h>
|
||||
#include <google/protobuf/compiler/java/field.h>
|
||||
#include <google/protobuf/compiler/java/helpers.h>
|
||||
#include <google/protobuf/compiler/java/message.h>
|
||||
#include <google/protobuf/compiler/java/message_lite.h>
|
||||
#include <google/protobuf/compiler/java/service.h>
|
||||
|
||||
namespace google {
|
||||
namespace protobuf {
|
||||
+1
-1
@@ -78,7 +78,7 @@ class GeneratorFactory {
|
||||
class ImmutableGeneratorFactory : public GeneratorFactory {
|
||||
public:
|
||||
ImmutableGeneratorFactory(Context* context);
|
||||
virtual ~ImmutableGeneratorFactory();
|
||||
~ImmutableGeneratorFactory() override;
|
||||
|
||||
MessageGenerator* NewMessageGenerator(
|
||||
const Descriptor* descriptor) const override;
|
||||
+41
-26
@@ -32,7 +32,7 @@
|
||||
// Based on original Protocol Buffers design by
|
||||
// Sanjay Ghemawat, Jeff Dean, and others.
|
||||
|
||||
#include <google/protobuf/compiler/java/java_helpers.h>
|
||||
#include <google/protobuf/compiler/java/helpers.h>
|
||||
|
||||
#include <algorithm>
|
||||
#include <cstdint>
|
||||
@@ -40,15 +40,18 @@
|
||||
#include <unordered_set>
|
||||
#include <vector>
|
||||
|
||||
#include <google/protobuf/stubs/stringprintf.h>
|
||||
#include <google/protobuf/compiler/java/java_name_resolver.h>
|
||||
#include <google/protobuf/compiler/java/java_names.h>
|
||||
#include <google/protobuf/descriptor.pb.h>
|
||||
#include <google/protobuf/wire_format.h>
|
||||
#include <google/protobuf/stubs/strutil.h>
|
||||
#include <google/protobuf/stubs/stringprintf.h>
|
||||
#include <google/protobuf/stubs/substitute.h>
|
||||
#include <google/protobuf/compiler/java/name_resolver.h>
|
||||
#include <google/protobuf/compiler/java/names.h>
|
||||
#include <google/protobuf/descriptor.pb.h>
|
||||
#include <google/protobuf/stubs/hash.h> // for hash<T *>
|
||||
|
||||
// Must be last.
|
||||
#include <google/protobuf/port_def.inc>
|
||||
|
||||
namespace google {
|
||||
namespace protobuf {
|
||||
namespace compiler {
|
||||
@@ -66,15 +69,26 @@ namespace {
|
||||
|
||||
const char* kDefaultPackage = "";
|
||||
|
||||
// Names that should be avoided as field names.
|
||||
// Using them will cause the compiler to generate accessors whose names are
|
||||
// colliding with methods defined in base classes.
|
||||
// Names that should be avoided (in UpperCamelCase format).
|
||||
// Using them will cause the compiler to generate accessors whose names
|
||||
// collide with methods defined in base classes.
|
||||
// Keep this list in sync with specialFieldNames in
|
||||
// java/core/src/main/java/com/google/protobuf/DescriptorMessageInfoFactory.java
|
||||
const char* kForbiddenWordList[] = {
|
||||
// message base class:
|
||||
"cached_size",
|
||||
"serialized_size",
|
||||
// java.lang.Object:
|
||||
"class",
|
||||
"Class",
|
||||
// com.google.protobuf.MessageLiteOrBuilder:
|
||||
"DefaultInstanceForType",
|
||||
// com.google.protobuf.MessageLite:
|
||||
"ParserForType",
|
||||
"SerializedSize",
|
||||
// com.google.protobuf.MessageOrBuilder:
|
||||
"AllFields",
|
||||
"DescriptorForType",
|
||||
"InitializationErrorString",
|
||||
"UnknownFields",
|
||||
// obsolete. kept for backwards compatibility of generated code
|
||||
"CachedSize",
|
||||
};
|
||||
|
||||
const std::unordered_set<std::string>* kReservedNames =
|
||||
@@ -93,7 +107,7 @@ const std::unordered_set<std::string>* kReservedNames =
|
||||
|
||||
bool IsForbidden(const std::string& field_name) {
|
||||
for (int i = 0; i < GOOGLE_ARRAYSIZE(kForbiddenWordList); ++i) {
|
||||
if (field_name == kForbiddenWordList[i]) {
|
||||
if (UnderscoresToCamelCase(field_name, true) == kForbiddenWordList[i]) {
|
||||
return true;
|
||||
}
|
||||
}
|
||||
@@ -249,18 +263,18 @@ std::string UnderscoresToCamelCaseCheckReserved(const FieldDescriptor* field) {
|
||||
return name;
|
||||
}
|
||||
|
||||
// Names that should be avoided as field names in Kotlin.
|
||||
// All Kotlin hard keywords are in this list.
|
||||
const std::unordered_set<std::string>* kKotlinForbiddenNames =
|
||||
new std::unordered_set<std::string>({
|
||||
"as", "as?", "break", "class", "continue", "do", "else",
|
||||
"false", "for", "fun", "if", "in", "!in", "interface",
|
||||
"is", "!is", "null", "object", "package", "return", "super",
|
||||
"this", "throw", "true", "try", "typealias", "typeof", "val",
|
||||
"var", "when", "while",
|
||||
});
|
||||
|
||||
bool IsForbiddenKotlin(const std::string& field_name) {
|
||||
// Names that should be avoided as field names in Kotlin.
|
||||
// All Kotlin hard keywords are in this list.
|
||||
const std::unordered_set<std::string>* kKotlinForbiddenNames =
|
||||
new std::unordered_set<std::string>({
|
||||
"as", "as?", "break", "class", "continue", "do",
|
||||
"else", "false", "for", "fun", "if", "in",
|
||||
"!in", "interface", "is", "!is", "null", "object",
|
||||
"package", "return", "super", "this", "throw", "true",
|
||||
"try", "typealias", "typeof", "val", "var", "when",
|
||||
"while",
|
||||
});
|
||||
return kKotlinForbiddenNames->find(field_name) !=
|
||||
kKotlinForbiddenNames->end();
|
||||
}
|
||||
@@ -1049,8 +1063,7 @@ int GetExperimentalJavaFieldType(const FieldDescriptor* field) {
|
||||
|
||||
if (field->is_map()) {
|
||||
if (!SupportUnknownEnumValue(field)) {
|
||||
const FieldDescriptor* value =
|
||||
field->message_type()->FindFieldByName("value");
|
||||
const FieldDescriptor* value = field->message_type()->map_value();
|
||||
if (GetJavaType(value) == JAVATYPE_ENUM) {
|
||||
extra_bits |= kMapWithProto2EnumValue;
|
||||
}
|
||||
@@ -1098,3 +1111,5 @@ void EscapeUtf16ToString(uint16_t code, std::string* output) {
|
||||
} // namespace compiler
|
||||
} // namespace protobuf
|
||||
} // namespace google
|
||||
|
||||
#include <google/protobuf/port_undef.inc>
|
||||
+17
-2
@@ -38,10 +38,10 @@
|
||||
#include <cstdint>
|
||||
#include <string>
|
||||
|
||||
#include <google/protobuf/compiler/java/java_context.h>
|
||||
#include <google/protobuf/descriptor.pb.h>
|
||||
#include <google/protobuf/io/printer.h>
|
||||
#include <google/protobuf/descriptor.h>
|
||||
#include <google/protobuf/compiler/java/context.h>
|
||||
#include <google/protobuf/descriptor.pb.h>
|
||||
|
||||
namespace google {
|
||||
namespace protobuf {
|
||||
@@ -151,6 +151,21 @@ inline bool IsDescriptorProto(const Descriptor* descriptor) {
|
||||
// fields.
|
||||
std::string GetOneofStoredType(const FieldDescriptor* field);
|
||||
|
||||
// We use either the proto1 enums if the enum is generated, otherwise fall back
|
||||
// to use integers.
|
||||
enum class Proto1EnumRepresentation {
|
||||
kEnum,
|
||||
kInteger,
|
||||
};
|
||||
|
||||
// Returns which representation we should use.
|
||||
inline Proto1EnumRepresentation GetProto1EnumRepresentation(
|
||||
const EnumDescriptor* descriptor) {
|
||||
if (descriptor->containing_type() != nullptr) {
|
||||
return Proto1EnumRepresentation::kEnum;
|
||||
}
|
||||
return Proto1EnumRepresentation::kInteger;
|
||||
}
|
||||
|
||||
// Whether we should generate multiple java files for messages.
|
||||
inline bool MultipleJavaFiles(const FileDescriptor* descriptor,
|
||||
@@ -1,76 +1,6 @@
|
||||
// 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.
|
||||
// * Redistributions in binary form must reproduce the above
|
||||
// copyright notice, this list of conditions and the following disclaimer
|
||||
// in the documentation and/or other materials provided with the
|
||||
// distribution.
|
||||
// * Neither the name of Google Inc. nor the names of its
|
||||
// contributors may be used to endorse or promote products derived from
|
||||
// this software without specific prior written permission.
|
||||
//
|
||||
// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
|
||||
// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
|
||||
// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
|
||||
// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
|
||||
// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
|
||||
// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
|
||||
// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
|
||||
// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
|
||||
// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
|
||||
// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
|
||||
// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||
#ifndef GOOGLE_PROTOBUF_COMPILER_JAVA_JAVA_GENERATOR_H_
|
||||
#define GOOGLE_PROTOBUF_COMPILER_JAVA_JAVA_GENERATOR_H_
|
||||
|
||||
// Author: kenton@google.com (Kenton Varda)
|
||||
// Based on original Protocol Buffers design by
|
||||
// Sanjay Ghemawat, Jeff Dean, and others.
|
||||
//
|
||||
// Generates Java code for a given .proto file.
|
||||
#include <google/protobuf/compiler/java/generator.h>
|
||||
|
||||
#ifndef GOOGLE_PROTOBUF_COMPILER_JAVA_GENERATOR_H__
|
||||
#define GOOGLE_PROTOBUF_COMPILER_JAVA_GENERATOR_H__
|
||||
|
||||
#include <string>
|
||||
#include <google/protobuf/compiler/code_generator.h>
|
||||
|
||||
#include <google/protobuf/port_def.inc>
|
||||
|
||||
namespace google {
|
||||
namespace protobuf {
|
||||
namespace compiler {
|
||||
namespace java {
|
||||
|
||||
// CodeGenerator implementation which generates Java code. If you create your
|
||||
// own protocol compiler binary and you want it to support Java output, you
|
||||
// can do so by registering an instance of this CodeGenerator with the
|
||||
// CommandLineInterface in your main() function.
|
||||
class PROTOC_EXPORT JavaGenerator : public CodeGenerator {
|
||||
public:
|
||||
JavaGenerator();
|
||||
~JavaGenerator();
|
||||
|
||||
// implements CodeGenerator ----------------------------------------
|
||||
bool Generate(const FileDescriptor* file, const std::string& parameter,
|
||||
GeneratorContext* context, std::string* error) const override;
|
||||
|
||||
uint64_t GetSupportedFeatures() const override;
|
||||
|
||||
private:
|
||||
GOOGLE_DISALLOW_EVIL_CONSTRUCTORS(JavaGenerator);
|
||||
};
|
||||
|
||||
} // namespace java
|
||||
} // namespace compiler
|
||||
} // namespace protobuf
|
||||
} // namespace google
|
||||
|
||||
#include <google/protobuf/port_undef.inc>
|
||||
|
||||
#endif // GOOGLE_PROTOBUF_COMPILER_JAVA_GENERATOR_H__
|
||||
#endif // GOOGLE_PROTOBUF_COMPILER_JAVA_JAVA_GENERATOR_H_
|
||||
+12
-16
@@ -28,13 +28,13 @@
|
||||
// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
|
||||
// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||
|
||||
#include <google/protobuf/compiler/java/java_kotlin_generator.h>
|
||||
#include <google/protobuf/compiler/java/kotlin_generator.h>
|
||||
|
||||
#include <google/protobuf/compiler/java/java_file.h>
|
||||
#include <google/protobuf/compiler/java/java_helpers.h>
|
||||
#include <google/protobuf/compiler/java/java_options.h>
|
||||
#include <google/protobuf/compiler/java/java_generator.h>
|
||||
#include <google/protobuf/compiler/code_generator.h>
|
||||
#include <google/protobuf/compiler/java/file.h>
|
||||
#include <google/protobuf/compiler/java/generator.h>
|
||||
#include <google/protobuf/compiler/java/helpers.h>
|
||||
#include <google/protobuf/compiler/java/options.h>
|
||||
|
||||
namespace google {
|
||||
namespace protobuf {
|
||||
@@ -63,11 +63,13 @@ bool KotlinGenerator::Generate(const FileDescriptor* file,
|
||||
if (option.first == "output_list_file") {
|
||||
file_options.output_list_file = option.second;
|
||||
} else if (option.first == "immutable") {
|
||||
// Note: the option is considered always set regardless of the input.
|
||||
file_options.generate_immutable_code = true;
|
||||
} else if (option.first == "mutable") {
|
||||
*error = "Mutable not supported by Kotlin generator";
|
||||
return false;
|
||||
} else if (option.first == "shared") {
|
||||
// Note: the option is considered always set regardless of the input.
|
||||
file_options.generate_shared_code = true;
|
||||
} else if (option.first == "lite") {
|
||||
file_options.enforce_lite = true;
|
||||
@@ -81,23 +83,17 @@ bool KotlinGenerator::Generate(const FileDescriptor* file,
|
||||
}
|
||||
}
|
||||
|
||||
// By default we generate immutable code and shared code for immutable API.
|
||||
if (!file_options.generate_immutable_code &&
|
||||
!file_options.generate_shared_code) {
|
||||
file_options.generate_immutable_code = true;
|
||||
file_options.generate_shared_code = true;
|
||||
}
|
||||
// We only support generation of immutable code so we do it.
|
||||
file_options.generate_immutable_code = true;
|
||||
file_options.generate_shared_code = true;
|
||||
|
||||
std::vector<std::string> all_files;
|
||||
std::vector<std::string> all_annotations;
|
||||
|
||||
std::unique_ptr<FileGenerator> file_generator;
|
||||
if (file_options.generate_immutable_code) {
|
||||
file_generator.reset(
|
||||
std::unique_ptr<FileGenerator> file_generator(
|
||||
new FileGenerator(file, file_options, /* immutable_api = */ true));
|
||||
}
|
||||
|
||||
if (!file_generator->Validate(error)) {
|
||||
if (!file_generator || !file_generator->Validate(error)) {
|
||||
return false;
|
||||
}
|
||||
|
||||
+2
@@ -36,6 +36,8 @@
|
||||
#include <string>
|
||||
|
||||
#include <google/protobuf/compiler/code_generator.h>
|
||||
|
||||
// Must be included last.
|
||||
#include <google/protobuf/port_def.inc>
|
||||
|
||||
namespace google {
|
||||
+213
-166
@@ -28,13 +28,16 @@
|
||||
// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
|
||||
// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||
|
||||
#include <google/protobuf/compiler/java/java_map_field.h>
|
||||
#include "google/protobuf/compiler/java/map_field.h"
|
||||
|
||||
#include <google/protobuf/compiler/java/java_context.h>
|
||||
#include <google/protobuf/compiler/java/java_doc_comment.h>
|
||||
#include <google/protobuf/compiler/java/java_helpers.h>
|
||||
#include <google/protobuf/compiler/java/java_name_resolver.h>
|
||||
#include <google/protobuf/io/printer.h>
|
||||
#include "google/protobuf/io/printer.h"
|
||||
#include "google/protobuf/compiler/java/context.h"
|
||||
#include "google/protobuf/compiler/java/doc_comment.h"
|
||||
#include "google/protobuf/compiler/java/helpers.h"
|
||||
#include "google/protobuf/compiler/java/name_resolver.h"
|
||||
|
||||
// Must be last.
|
||||
#include "google/protobuf/port_def.inc"
|
||||
|
||||
namespace google {
|
||||
namespace protobuf {
|
||||
@@ -47,14 +50,14 @@ const FieldDescriptor* KeyField(const FieldDescriptor* descriptor) {
|
||||
GOOGLE_CHECK_EQ(FieldDescriptor::TYPE_MESSAGE, descriptor->type());
|
||||
const Descriptor* message = descriptor->message_type();
|
||||
GOOGLE_CHECK(message->options().map_entry());
|
||||
return message->FindFieldByName("key");
|
||||
return message->map_key();
|
||||
}
|
||||
|
||||
const FieldDescriptor* ValueField(const FieldDescriptor* descriptor) {
|
||||
GOOGLE_CHECK_EQ(FieldDescriptor::TYPE_MESSAGE, descriptor->type());
|
||||
const Descriptor* message = descriptor->message_type();
|
||||
GOOGLE_CHECK(message->options().map_entry());
|
||||
return message->FindFieldByName("value");
|
||||
return message->map_value();
|
||||
}
|
||||
|
||||
std::string TypeName(const FieldDescriptor* field,
|
||||
@@ -85,10 +88,10 @@ std::string WireType(const FieldDescriptor* field) {
|
||||
std::string(FieldTypeName(field->type()));
|
||||
}
|
||||
|
||||
void SetMessageVariables(const FieldDescriptor* descriptor, int messageBitIndex,
|
||||
int builderBitIndex, const FieldGeneratorInfo* info,
|
||||
Context* context,
|
||||
std::map<std::string, std::string>* variables) {
|
||||
void SetMessageVariables(
|
||||
const FieldDescriptor* descriptor, int messageBitIndex, int builderBitIndex,
|
||||
const FieldGeneratorInfo* info, Context* context,
|
||||
std::map<std::string, std::string>* variables) {
|
||||
SetCommonFieldVariables(descriptor, info, variables);
|
||||
ClassNameResolver* name_resolver = context->GetNameResolver();
|
||||
|
||||
@@ -99,6 +102,8 @@ void SetMessageVariables(const FieldDescriptor* descriptor, int messageBitIndex,
|
||||
const JavaType keyJavaType = GetJavaType(key);
|
||||
const JavaType valueJavaType = GetJavaType(value);
|
||||
|
||||
std::string pass_through_nullness = "/* nullable */\n";
|
||||
|
||||
(*variables)["key_type"] = TypeName(key, name_resolver, false);
|
||||
std::string boxed_key_type = TypeName(key, name_resolver, true);
|
||||
(*variables)["boxed_key_type"] = boxed_key_type;
|
||||
@@ -115,13 +120,14 @@ void SetMessageVariables(const FieldDescriptor* descriptor, int messageBitIndex,
|
||||
: "";
|
||||
(*variables)["value_null_check"] =
|
||||
valueJavaType != JAVATYPE_ENUM && IsReferenceType(valueJavaType)
|
||||
? "if (value == null) {\n"
|
||||
" throw new NullPointerException(\"map value\");\n"
|
||||
"}\n"
|
||||
? "if (value == null) { "
|
||||
"throw new NullPointerException(\"map value\"); }"
|
||||
: "";
|
||||
if (valueJavaType == JAVATYPE_ENUM) {
|
||||
// We store enums as Integers internally.
|
||||
(*variables)["value_type"] = "int";
|
||||
variables->insert(
|
||||
{"value_type_pass_through_nullness", (*variables)["value_type"]});
|
||||
(*variables)["boxed_value_type"] = "java.lang.Integer";
|
||||
(*variables)["value_wire_type"] = WireType(value);
|
||||
(*variables)["value_default_value"] =
|
||||
@@ -129,10 +135,15 @@ void SetMessageVariables(const FieldDescriptor* descriptor, int messageBitIndex,
|
||||
|
||||
(*variables)["value_enum_type"] = TypeName(value, name_resolver, false);
|
||||
|
||||
variables->insert(
|
||||
{"value_enum_type_pass_through_nullness",
|
||||
StrCat(pass_through_nullness, (*variables)["value_enum_type"])});
|
||||
|
||||
if (SupportUnknownEnumValue(descriptor->file())) {
|
||||
// Map unknown values to a special UNRECOGNIZED value if supported.
|
||||
(*variables)["unrecognized_value"] =
|
||||
(*variables)["value_enum_type"] + ".UNRECOGNIZED";
|
||||
variables->insert(
|
||||
{"unrecognized_value",
|
||||
StrCat((*variables)["value_enum_type"], ".UNRECOGNIZED")});
|
||||
} else {
|
||||
// Map unknown values to the default value if we don't have UNRECOGNIZED.
|
||||
(*variables)["unrecognized_value"] =
|
||||
@@ -140,38 +151,49 @@ void SetMessageVariables(const FieldDescriptor* descriptor, int messageBitIndex,
|
||||
}
|
||||
} else {
|
||||
(*variables)["value_type"] = TypeName(value, name_resolver, false);
|
||||
|
||||
variables->insert(
|
||||
{"value_type_pass_through_nullness",
|
||||
StrCat(
|
||||
(IsReferenceType(valueJavaType) ? pass_through_nullness : ""),
|
||||
(*variables)["value_type"])});
|
||||
|
||||
(*variables)["boxed_value_type"] = TypeName(value, name_resolver, true);
|
||||
(*variables)["value_wire_type"] = WireType(value);
|
||||
(*variables)["value_default_value"] =
|
||||
DefaultValue(value, true, name_resolver);
|
||||
}
|
||||
(*variables)["type_parameters"] =
|
||||
(*variables)["boxed_key_type"] + ", " + (*variables)["boxed_value_type"];
|
||||
variables->insert(
|
||||
{"type_parameters", StrCat((*variables)["boxed_key_type"], ", ",
|
||||
(*variables)["boxed_value_type"])});
|
||||
// TODO(birdo): Add @deprecated javadoc when generating javadoc is supported
|
||||
// by the proto compiler
|
||||
(*variables)["deprecation"] =
|
||||
descriptor->options().deprecated() ? "@java.lang.Deprecated " : "";
|
||||
(*variables)["kt_deprecation"] =
|
||||
descriptor->options().deprecated()
|
||||
? "@kotlin.Deprecated(message = \"Field " + (*variables)["name"] +
|
||||
" is deprecated\") "
|
||||
: "";
|
||||
variables->insert(
|
||||
{"kt_deprecation",
|
||||
descriptor->options().deprecated()
|
||||
? StrCat("@kotlin.Deprecated(message = \"Field ",
|
||||
(*variables)["name"], " is deprecated\") ")
|
||||
: ""});
|
||||
(*variables)["on_changed"] = "onChanged();";
|
||||
|
||||
// For repeated fields, one bit is used for whether the array is immutable
|
||||
// in the parsing constructor.
|
||||
(*variables)["get_mutable_bit_parser"] =
|
||||
GenerateGetBitMutableLocal(builderBitIndex);
|
||||
(*variables)["set_mutable_bit_parser"] =
|
||||
GenerateSetBitMutableLocal(builderBitIndex);
|
||||
|
||||
(*variables)["default_entry"] =
|
||||
(*variables)["capitalized_name"] + "DefaultEntryHolder.defaultEntry";
|
||||
(*variables)["map_field_parameter"] = (*variables)["default_entry"];
|
||||
variables->insert(
|
||||
{"default_entry", StrCat((*variables)["capitalized_name"],
|
||||
"DefaultEntryHolder.defaultEntry")});
|
||||
variables->insert({"map_field_parameter", (*variables)["default_entry"]});
|
||||
(*variables)["descriptor"] =
|
||||
name_resolver->GetImmutableClassName(descriptor->file()) + ".internal_" +
|
||||
UniqueFileScopeIdentifier(descriptor->message_type()) + "_descriptor, ";
|
||||
(*variables)["ver"] = GeneratedCodeVersionSuffix();
|
||||
|
||||
(*variables)["get_has_field_bit_builder"] = GenerateGetBit(builderBitIndex);
|
||||
(*variables)["get_has_field_bit_from_local"] =
|
||||
GenerateGetBitFromLocal(builderBitIndex);
|
||||
(*variables)["set_has_field_bit_builder"] =
|
||||
GenerateSetBit(builderBitIndex) + ";";
|
||||
(*variables)["clear_has_field_bit_builder"] =
|
||||
GenerateClearBit(builderBitIndex) + ";";
|
||||
}
|
||||
|
||||
} // namespace
|
||||
@@ -179,7 +201,11 @@ void SetMessageVariables(const FieldDescriptor* descriptor, int messageBitIndex,
|
||||
ImmutableMapFieldGenerator::ImmutableMapFieldGenerator(
|
||||
const FieldDescriptor* descriptor, int messageBitIndex, int builderBitIndex,
|
||||
Context* context)
|
||||
: descriptor_(descriptor), name_resolver_(context->GetNameResolver()) {
|
||||
: descriptor_(descriptor),
|
||||
message_bit_index_(messageBitIndex),
|
||||
builder_bit_index_(builderBitIndex),
|
||||
name_resolver_(context->GetNameResolver()),
|
||||
context_(context) {
|
||||
SetMessageVariables(descriptor, messageBitIndex, builderBitIndex,
|
||||
context->GetFieldGeneratorInfo(descriptor), context,
|
||||
&variables_);
|
||||
@@ -187,6 +213,14 @@ ImmutableMapFieldGenerator::ImmutableMapFieldGenerator(
|
||||
|
||||
ImmutableMapFieldGenerator::~ImmutableMapFieldGenerator() {}
|
||||
|
||||
int ImmutableMapFieldGenerator::GetMessageBitIndex() const {
|
||||
return message_bit_index_;
|
||||
}
|
||||
|
||||
int ImmutableMapFieldGenerator::GetBuilderBitIndex() const {
|
||||
return builder_bit_index_;
|
||||
}
|
||||
|
||||
int ImmutableMapFieldGenerator::GetNumBitsForMessage() const { return 0; }
|
||||
|
||||
int ImmutableMapFieldGenerator::GetNumBitsForBuilder() const { return 1; }
|
||||
@@ -218,11 +252,12 @@ void ImmutableMapFieldGenerator::GenerateInterfaceMembers(
|
||||
"${$get$capitalized_name$Map$}$();\n");
|
||||
printer->Annotate("{", "}", descriptor_);
|
||||
WriteFieldDocComment(printer, descriptor_);
|
||||
printer->Print(
|
||||
variables_,
|
||||
"$deprecation$$value_enum_type$ ${$get$capitalized_name$OrDefault$}$(\n"
|
||||
" $key_type$ key,\n"
|
||||
" $value_enum_type$ defaultValue);\n");
|
||||
printer->Print(variables_,
|
||||
"$deprecation$$value_enum_type_pass_through_nullness$ "
|
||||
"${$get$capitalized_name$OrDefault$}$(\n"
|
||||
" $key_type$ key,\n"
|
||||
" $value_enum_type_pass_through_nullness$ "
|
||||
" defaultValue);\n");
|
||||
printer->Annotate("{", "}", descriptor_);
|
||||
WriteFieldDocComment(printer, descriptor_);
|
||||
printer->Print(
|
||||
@@ -247,16 +282,16 @@ void ImmutableMapFieldGenerator::GenerateInterfaceMembers(
|
||||
printer->Annotate("{", "}", descriptor_);
|
||||
WriteFieldDocComment(printer, descriptor_);
|
||||
printer->Print(variables_,
|
||||
"$deprecation$\n"
|
||||
"$value_type$ ${$get$capitalized_name$ValueOrDefault$}$(\n"
|
||||
"$deprecation$$value_type_pass_through_nullness$ "
|
||||
"${$get$capitalized_name$ValueOrDefault$}$(\n"
|
||||
" $key_type$ key,\n"
|
||||
" $value_type$ defaultValue);\n");
|
||||
" $value_type_pass_through_nullness$ defaultValue);\n");
|
||||
printer->Annotate("{", "}", descriptor_);
|
||||
WriteFieldDocComment(printer, descriptor_);
|
||||
printer->Print(variables_,
|
||||
"$deprecation$\n"
|
||||
"$value_type$ ${$get$capitalized_name$ValueOrThrow$}$(\n"
|
||||
" $key_type$ key);\n");
|
||||
printer->Print(
|
||||
variables_,
|
||||
"$deprecation$$value_type$ ${$get$capitalized_name$ValueOrThrow$}$(\n"
|
||||
" $key_type$ key);\n");
|
||||
printer->Annotate("{", "}", descriptor_);
|
||||
}
|
||||
} else {
|
||||
@@ -275,16 +310,16 @@ void ImmutableMapFieldGenerator::GenerateInterfaceMembers(
|
||||
printer->Annotate("{", "}", descriptor_);
|
||||
WriteFieldDocComment(printer, descriptor_);
|
||||
printer->Print(variables_,
|
||||
"$deprecation$\n"
|
||||
"$value_type$ ${$get$capitalized_name$OrDefault$}$(\n"
|
||||
"$deprecation$$value_type_pass_through_nullness$ "
|
||||
"${$get$capitalized_name$OrDefault$}$(\n"
|
||||
" $key_type$ key,\n"
|
||||
" $value_type$ defaultValue);\n");
|
||||
" $value_type_pass_through_nullness$ defaultValue);\n");
|
||||
printer->Annotate("{", "}", descriptor_);
|
||||
WriteFieldDocComment(printer, descriptor_);
|
||||
printer->Print(variables_,
|
||||
"$deprecation$\n"
|
||||
"$value_type$ ${$get$capitalized_name$OrThrow$}$(\n"
|
||||
" $key_type$ key);\n");
|
||||
printer->Print(
|
||||
variables_,
|
||||
"$deprecation$$value_type$ ${$get$capitalized_name$OrThrow$}$(\n"
|
||||
" $key_type$ key);\n");
|
||||
printer->Annotate("{", "}", descriptor_);
|
||||
}
|
||||
}
|
||||
@@ -304,6 +339,7 @@ void ImmutableMapFieldGenerator::GenerateMembers(io::Printer* printer) const {
|
||||
" $value_default_value$);\n"
|
||||
"}\n");
|
||||
printer->Print(variables_,
|
||||
"@SuppressWarnings(\"serial\")\n"
|
||||
"private com.google.protobuf.MapField<\n"
|
||||
" $type_parameters$> $name$_;\n"
|
||||
"private com.google.protobuf.MapField<$type_parameters$>\n"
|
||||
@@ -339,42 +375,45 @@ void ImmutableMapFieldGenerator::GenerateMembers(io::Printer* printer) const {
|
||||
|
||||
void ImmutableMapFieldGenerator::GenerateBuilderMembers(
|
||||
io::Printer* printer) const {
|
||||
printer->Print(variables_,
|
||||
"private com.google.protobuf.MapField<\n"
|
||||
" $type_parameters$> $name$_;\n"
|
||||
"private com.google.protobuf.MapField<$type_parameters$>\n"
|
||||
"internalGet$capitalized_name$() {\n"
|
||||
" if ($name$_ == null) {\n"
|
||||
" return com.google.protobuf.MapField.emptyMapField(\n"
|
||||
" $map_field_parameter$);\n"
|
||||
" }\n"
|
||||
" return $name$_;\n"
|
||||
"}\n"
|
||||
"private com.google.protobuf.MapField<$type_parameters$>\n"
|
||||
"internalGetMutable$capitalized_name$() {\n"
|
||||
" $on_changed$;\n"
|
||||
" if ($name$_ == null) {\n"
|
||||
" $name$_ = com.google.protobuf.MapField.newMapField(\n"
|
||||
" $map_field_parameter$);\n"
|
||||
" }\n"
|
||||
" if (!$name$_.isMutable()) {\n"
|
||||
" $name$_ = $name$_.copy();\n"
|
||||
" }\n"
|
||||
" return $name$_;\n"
|
||||
"}\n");
|
||||
printer->Print(
|
||||
variables_,
|
||||
"private com.google.protobuf.MapField<\n"
|
||||
" $type_parameters$> $name$_;\n"
|
||||
"$deprecation$private com.google.protobuf.MapField<$type_parameters$>\n"
|
||||
" internalGet$capitalized_name$() {\n"
|
||||
" if ($name$_ == null) {\n"
|
||||
" return com.google.protobuf.MapField.emptyMapField(\n"
|
||||
" $map_field_parameter$);\n"
|
||||
" }\n"
|
||||
" return $name$_;\n"
|
||||
"}\n"
|
||||
"$deprecation$private com.google.protobuf.MapField<$type_parameters$>\n"
|
||||
" internalGetMutable$capitalized_name$() {\n"
|
||||
" if ($name$_ == null) {\n"
|
||||
" $name$_ = com.google.protobuf.MapField.newMapField(\n"
|
||||
" $map_field_parameter$);\n"
|
||||
" }\n"
|
||||
" if (!$name$_.isMutable()) {\n"
|
||||
" $name$_ = $name$_.copy();\n"
|
||||
" }\n"
|
||||
" $set_has_field_bit_builder$\n"
|
||||
" $on_changed$\n"
|
||||
" return $name$_;\n"
|
||||
"}\n");
|
||||
GenerateMapGetters(printer);
|
||||
printer->Print(variables_,
|
||||
"$deprecation$\n"
|
||||
"public Builder ${$clear$capitalized_name$$}$() {\n"
|
||||
" internalGetMutable$capitalized_name$().getMutableMap()\n"
|
||||
" .clear();\n"
|
||||
" return this;\n"
|
||||
"}\n");
|
||||
printer->Print(
|
||||
variables_,
|
||||
"$deprecation$public Builder ${$clear$capitalized_name$$}$() {\n"
|
||||
" $clear_has_field_bit_builder$\n"
|
||||
" internalGetMutable$capitalized_name$().getMutableMap()\n"
|
||||
" .clear();\n"
|
||||
" return this;\n"
|
||||
"}\n");
|
||||
printer->Annotate("{", "}", descriptor_);
|
||||
|
||||
WriteFieldDocComment(printer, descriptor_);
|
||||
printer->Print(variables_,
|
||||
"$deprecation$\n"
|
||||
"public Builder ${$remove$capitalized_name$$}$(\n"
|
||||
"$deprecation$public Builder ${$remove$capitalized_name$$}$(\n"
|
||||
" $key_type$ key) {\n"
|
||||
" $key_null_check$\n"
|
||||
" internalGetMutable$capitalized_name$().getMutableMap()\n"
|
||||
@@ -382,6 +421,7 @@ void ImmutableMapFieldGenerator::GenerateBuilderMembers(
|
||||
" return this;\n"
|
||||
"}\n");
|
||||
printer->Annotate("{", "}", descriptor_);
|
||||
|
||||
if (GetJavaType(ValueField(descriptor_)) == JAVATYPE_ENUM) {
|
||||
printer->Print(
|
||||
variables_,
|
||||
@@ -390,7 +430,8 @@ void ImmutableMapFieldGenerator::GenerateBuilderMembers(
|
||||
" */\n"
|
||||
"@java.lang.Deprecated\n"
|
||||
"public java.util.Map<$boxed_key_type$, $value_enum_type$>\n"
|
||||
"${$getMutable$capitalized_name$$}$() {\n"
|
||||
" ${$getMutable$capitalized_name$$}$() {\n"
|
||||
" $set_has_field_bit_builder$\n"
|
||||
" return internalGetAdapted$capitalized_name$Map(\n"
|
||||
" internalGetMutable$capitalized_name$().getMutableMap());\n"
|
||||
"}\n");
|
||||
@@ -404,9 +445,11 @@ void ImmutableMapFieldGenerator::GenerateBuilderMembers(
|
||||
" $value_null_check$\n"
|
||||
" internalGetMutable$capitalized_name$().getMutableMap()\n"
|
||||
" .put(key, $name$ValueConverter.doBackward(value));\n"
|
||||
" $set_has_field_bit_builder$\n"
|
||||
" return this;\n"
|
||||
"}\n");
|
||||
printer->Annotate("{", "}", descriptor_);
|
||||
|
||||
WriteFieldDocComment(printer, descriptor_);
|
||||
printer->Print(
|
||||
variables_,
|
||||
@@ -415,9 +458,11 @@ void ImmutableMapFieldGenerator::GenerateBuilderMembers(
|
||||
" internalGetAdapted$capitalized_name$Map(\n"
|
||||
" internalGetMutable$capitalized_name$().getMutableMap())\n"
|
||||
" .putAll(values);\n"
|
||||
" $set_has_field_bit_builder$\n"
|
||||
" return this;\n"
|
||||
"}\n");
|
||||
printer->Annotate("{", "}", descriptor_);
|
||||
|
||||
if (SupportUnknownEnumValue(descriptor_->file())) {
|
||||
printer->Print(
|
||||
variables_,
|
||||
@@ -427,6 +472,7 @@ void ImmutableMapFieldGenerator::GenerateBuilderMembers(
|
||||
"@java.lang.Deprecated\n"
|
||||
"public java.util.Map<$boxed_key_type$, $boxed_value_type$>\n"
|
||||
"${$getMutable$capitalized_name$Value$}$() {\n"
|
||||
" $set_has_field_bit_builder$\n"
|
||||
" return internalGetMutable$capitalized_name$().getMutableMap();\n"
|
||||
"}\n");
|
||||
printer->Annotate("{", "}", descriptor_);
|
||||
@@ -440,9 +486,11 @@ void ImmutableMapFieldGenerator::GenerateBuilderMembers(
|
||||
" $value_null_check$\n"
|
||||
" internalGetMutable$capitalized_name$().getMutableMap()\n"
|
||||
" .put(key, value);\n"
|
||||
" $set_has_field_bit_builder$\n"
|
||||
" return this;\n"
|
||||
"}\n");
|
||||
printer->Annotate("{", "}", descriptor_);
|
||||
|
||||
WriteFieldDocComment(printer, descriptor_);
|
||||
printer->Print(
|
||||
variables_,
|
||||
@@ -450,6 +498,7 @@ void ImmutableMapFieldGenerator::GenerateBuilderMembers(
|
||||
" java.util.Map<$boxed_key_type$, $boxed_value_type$> values) {\n"
|
||||
" internalGetMutable$capitalized_name$().getMutableMap()\n"
|
||||
" .putAll(values);\n"
|
||||
" $set_has_field_bit_builder$\n"
|
||||
" return this;\n"
|
||||
"}\n");
|
||||
printer->Annotate("{", "}", descriptor_);
|
||||
@@ -462,55 +511,59 @@ void ImmutableMapFieldGenerator::GenerateBuilderMembers(
|
||||
" */\n"
|
||||
"@java.lang.Deprecated\n"
|
||||
"public java.util.Map<$type_parameters$>\n"
|
||||
"${$getMutable$capitalized_name$$}$() {\n"
|
||||
" ${$getMutable$capitalized_name$$}$() {\n"
|
||||
" $set_has_field_bit_builder$\n"
|
||||
" return internalGetMutable$capitalized_name$().getMutableMap();\n"
|
||||
"}\n");
|
||||
printer->Annotate("{", "}", descriptor_);
|
||||
WriteFieldDocComment(printer, descriptor_);
|
||||
printer->Print(variables_,
|
||||
"$deprecation$"
|
||||
"public Builder ${$put$capitalized_name$$}$(\n"
|
||||
"$deprecation$public Builder ${$put$capitalized_name$$}$(\n"
|
||||
" $key_type$ key,\n"
|
||||
" $value_type$ value) {\n"
|
||||
" $key_null_check$\n"
|
||||
" $value_null_check$\n"
|
||||
" internalGetMutable$capitalized_name$().getMutableMap()\n"
|
||||
" .put(key, value);\n"
|
||||
" $set_has_field_bit_builder$\n"
|
||||
" return this;\n"
|
||||
"}\n");
|
||||
printer->Annotate("{", "}", descriptor_);
|
||||
|
||||
WriteFieldDocComment(printer, descriptor_);
|
||||
printer->Print(variables_,
|
||||
"$deprecation$\n"
|
||||
"public Builder ${$putAll$capitalized_name$$}$(\n"
|
||||
" java.util.Map<$type_parameters$> values) {\n"
|
||||
" internalGetMutable$capitalized_name$().getMutableMap()\n"
|
||||
" .putAll(values);\n"
|
||||
" return this;\n"
|
||||
"}\n");
|
||||
printer->Print(
|
||||
variables_,
|
||||
"$deprecation$public Builder ${$putAll$capitalized_name$$}$(\n"
|
||||
" java.util.Map<$type_parameters$> values) {\n"
|
||||
" internalGetMutable$capitalized_name$().getMutableMap()\n"
|
||||
" .putAll(values);\n"
|
||||
" $set_has_field_bit_builder$\n"
|
||||
" return this;\n"
|
||||
"}\n");
|
||||
printer->Annotate("{", "}", descriptor_);
|
||||
}
|
||||
}
|
||||
|
||||
void ImmutableMapFieldGenerator::GenerateMapGetters(
|
||||
io::Printer* printer) const {
|
||||
printer->Print(variables_,
|
||||
"$deprecation$\n"
|
||||
"public int ${$get$capitalized_name$Count$}$() {\n"
|
||||
" return internalGet$capitalized_name$().getMap().size();\n"
|
||||
"}\n");
|
||||
printer->Print(
|
||||
variables_,
|
||||
"$deprecation$public int ${$get$capitalized_name$Count$}$() {\n"
|
||||
" return internalGet$capitalized_name$().getMap().size();\n"
|
||||
"}\n");
|
||||
printer->Annotate("{", "}", descriptor_);
|
||||
|
||||
WriteFieldDocComment(printer, descriptor_);
|
||||
printer->Print(
|
||||
variables_,
|
||||
"$deprecation$\n"
|
||||
"@java.lang.Override\n"
|
||||
"public boolean ${$contains$capitalized_name$$}$(\n"
|
||||
"$deprecation$public boolean ${$contains$capitalized_name$$}$(\n"
|
||||
" $key_type$ key) {\n"
|
||||
" $key_null_check$\n"
|
||||
" return internalGet$capitalized_name$().getMap().containsKey(key);\n"
|
||||
"}\n");
|
||||
printer->Annotate("{", "}", descriptor_);
|
||||
|
||||
if (GetJavaType(ValueField(descriptor_)) == JAVATYPE_ENUM) {
|
||||
printer->Print(variables_,
|
||||
"/**\n"
|
||||
@@ -526,21 +579,22 @@ void ImmutableMapFieldGenerator::GenerateMapGetters(
|
||||
WriteFieldDocComment(printer, descriptor_);
|
||||
printer->Print(variables_,
|
||||
"@java.lang.Override\n"
|
||||
"$deprecation$\n"
|
||||
"public java.util.Map<$boxed_key_type$, $value_enum_type$>\n"
|
||||
"$deprecation$public java.util.Map<$boxed_key_type$, "
|
||||
"$value_enum_type$>\n"
|
||||
"${$get$capitalized_name$Map$}$() {\n"
|
||||
" return internalGetAdapted$capitalized_name$Map(\n"
|
||||
" internalGet$capitalized_name$().getMap());"
|
||||
"}\n");
|
||||
printer->Annotate("{", "}", descriptor_);
|
||||
|
||||
WriteFieldDocComment(printer, descriptor_);
|
||||
printer->Print(
|
||||
variables_,
|
||||
"@java.lang.Override\n"
|
||||
"$deprecation$\n"
|
||||
"public $value_enum_type$ ${$get$capitalized_name$OrDefault$}$(\n"
|
||||
"$deprecation$public $value_enum_type_pass_through_nullness$ "
|
||||
"${$get$capitalized_name$OrDefault$}$(\n"
|
||||
" $key_type$ key,\n"
|
||||
" $value_enum_type$ defaultValue) {\n"
|
||||
" $value_enum_type_pass_through_nullness$ defaultValue) {\n"
|
||||
" $key_null_check$\n"
|
||||
" java.util.Map<$boxed_key_type$, $boxed_value_type$> map =\n"
|
||||
" internalGet$capitalized_name$().getMap();\n"
|
||||
@@ -549,12 +603,12 @@ void ImmutableMapFieldGenerator::GenerateMapGetters(
|
||||
" : defaultValue;\n"
|
||||
"}\n");
|
||||
printer->Annotate("{", "}", descriptor_);
|
||||
|
||||
WriteFieldDocComment(printer, descriptor_);
|
||||
printer->Print(
|
||||
variables_,
|
||||
"@java.lang.Override\n"
|
||||
"$deprecation$\n"
|
||||
"public $value_enum_type$ ${$get$capitalized_name$OrThrow$}$(\n"
|
||||
"$deprecation$public $value_enum_type$ get$capitalized_name$OrThrow(\n"
|
||||
" $key_type$ key) {\n"
|
||||
" $key_null_check$\n"
|
||||
" java.util.Map<$boxed_key_type$, $boxed_value_type$> map =\n"
|
||||
@@ -565,6 +619,7 @@ void ImmutableMapFieldGenerator::GenerateMapGetters(
|
||||
" return $name$ValueConverter.doForward(map.get(key));\n"
|
||||
"}\n");
|
||||
printer->Annotate("{", "}", descriptor_);
|
||||
|
||||
if (SupportUnknownEnumValue(descriptor_->file())) {
|
||||
printer->Print(
|
||||
variables_,
|
||||
@@ -579,23 +634,22 @@ void ImmutableMapFieldGenerator::GenerateMapGetters(
|
||||
"}\n");
|
||||
printer->Annotate("{", "}", descriptor_);
|
||||
WriteFieldDocComment(printer, descriptor_);
|
||||
printer->Print(
|
||||
variables_,
|
||||
"@java.lang.Override\n"
|
||||
"$deprecation$\n"
|
||||
"public java.util.Map<$boxed_key_type$, $boxed_value_type$>\n"
|
||||
"${$get$capitalized_name$ValueMap$}$() {\n"
|
||||
" return internalGet$capitalized_name$().getMap();\n"
|
||||
"}\n");
|
||||
printer->Print(variables_,
|
||||
"@java.lang.Override\n"
|
||||
"$deprecation$public java.util.Map<$boxed_key_type$, "
|
||||
"$boxed_value_type$>\n"
|
||||
"${$get$capitalized_name$ValueMap$}$() {\n"
|
||||
" return internalGet$capitalized_name$().getMap();\n"
|
||||
"}\n");
|
||||
printer->Annotate("{", "}", descriptor_);
|
||||
WriteFieldDocComment(printer, descriptor_);
|
||||
printer->Print(
|
||||
variables_,
|
||||
"@java.lang.Override\n"
|
||||
"$deprecation$\n"
|
||||
"public $value_type$ ${$get$capitalized_name$ValueOrDefault$}$(\n"
|
||||
"$deprecation$public $value_type_pass_through_nullness$ "
|
||||
"${$get$capitalized_name$ValueOrDefault$}$(\n"
|
||||
" $key_type$ key,\n"
|
||||
" $value_type$ defaultValue) {\n"
|
||||
" $value_type_pass_through_nullness$ defaultValue) {\n"
|
||||
" $key_null_check$\n"
|
||||
" java.util.Map<$boxed_key_type$, $boxed_value_type$> map =\n"
|
||||
" internalGet$capitalized_name$().getMap();\n"
|
||||
@@ -606,8 +660,8 @@ void ImmutableMapFieldGenerator::GenerateMapGetters(
|
||||
printer->Print(
|
||||
variables_,
|
||||
"@java.lang.Override\n"
|
||||
"$deprecation$\n"
|
||||
"public $value_type$ ${$get$capitalized_name$ValueOrThrow$}$(\n"
|
||||
"$deprecation$public $value_type$ "
|
||||
"${$get$capitalized_name$ValueOrThrow$}$(\n"
|
||||
" $key_type$ key) {\n"
|
||||
" $key_null_check$\n"
|
||||
" java.util.Map<$boxed_key_type$, $boxed_value_type$> map =\n"
|
||||
@@ -634,8 +688,7 @@ void ImmutableMapFieldGenerator::GenerateMapGetters(
|
||||
WriteFieldDocComment(printer, descriptor_);
|
||||
printer->Print(variables_,
|
||||
"@java.lang.Override\n"
|
||||
"$deprecation$\n"
|
||||
"public java.util.Map<$type_parameters$> "
|
||||
"$deprecation$public java.util.Map<$type_parameters$> "
|
||||
"${$get$capitalized_name$Map$}$() {\n"
|
||||
" return internalGet$capitalized_name$().getMap();\n"
|
||||
"}\n");
|
||||
@@ -644,10 +697,10 @@ void ImmutableMapFieldGenerator::GenerateMapGetters(
|
||||
printer->Print(
|
||||
variables_,
|
||||
"@java.lang.Override\n"
|
||||
"$deprecation$\n"
|
||||
"public $value_type$ ${$get$capitalized_name$OrDefault$}$(\n"
|
||||
"$deprecation$public $value_type_pass_through_nullness$ "
|
||||
"${$get$capitalized_name$OrDefault$}$(\n"
|
||||
" $key_type$ key,\n"
|
||||
" $value_type$ defaultValue) {\n"
|
||||
" $value_type_pass_through_nullness$ defaultValue) {\n"
|
||||
" $key_null_check$\n"
|
||||
" java.util.Map<$type_parameters$> map =\n"
|
||||
" internalGet$capitalized_name$().getMap();\n"
|
||||
@@ -655,19 +708,19 @@ void ImmutableMapFieldGenerator::GenerateMapGetters(
|
||||
"}\n");
|
||||
printer->Annotate("{", "}", descriptor_);
|
||||
WriteFieldDocComment(printer, descriptor_);
|
||||
printer->Print(variables_,
|
||||
"@java.lang.Override\n"
|
||||
"$deprecation$\n"
|
||||
"public $value_type$ ${$get$capitalized_name$OrThrow$}$(\n"
|
||||
" $key_type$ key) {\n"
|
||||
" $key_null_check$\n"
|
||||
" java.util.Map<$type_parameters$> map =\n"
|
||||
" internalGet$capitalized_name$().getMap();\n"
|
||||
" if (!map.containsKey(key)) {\n"
|
||||
" throw new java.lang.IllegalArgumentException();\n"
|
||||
" }\n"
|
||||
" return map.get(key);\n"
|
||||
"}\n");
|
||||
printer->Print(
|
||||
variables_,
|
||||
"@java.lang.Override\n"
|
||||
"$deprecation$public $value_type$ ${$get$capitalized_name$OrThrow$}$(\n"
|
||||
" $key_type$ key) {\n"
|
||||
" $key_null_check$\n"
|
||||
" java.util.Map<$type_parameters$> map =\n"
|
||||
" internalGet$capitalized_name$().getMap();\n"
|
||||
" if (!map.containsKey(key)) {\n"
|
||||
" throw new java.lang.IllegalArgumentException();\n"
|
||||
" }\n"
|
||||
" return map.get(key);\n"
|
||||
"}\n");
|
||||
printer->Annotate("{", "}", descriptor_);
|
||||
}
|
||||
}
|
||||
@@ -766,6 +819,7 @@ void ImmutableMapFieldGenerator::GenerateInitializationCode(
|
||||
|
||||
void ImmutableMapFieldGenerator::GenerateBuilderClearCode(
|
||||
io::Printer* printer) const {
|
||||
// No need to clear the has-bit since we clear the bitField ints all at once.
|
||||
printer->Print(variables_,
|
||||
"internalGetMutable$capitalized_name$().clear();\n");
|
||||
}
|
||||
@@ -774,38 +828,34 @@ void ImmutableMapFieldGenerator::GenerateMergingCode(
|
||||
io::Printer* printer) const {
|
||||
printer->Print(variables_,
|
||||
"internalGetMutable$capitalized_name$().mergeFrom(\n"
|
||||
" other.internalGet$capitalized_name$());\n");
|
||||
" other.internalGet$capitalized_name$());\n"
|
||||
"$set_has_field_bit_builder$\n");
|
||||
}
|
||||
|
||||
void ImmutableMapFieldGenerator::GenerateBuildingCode(
|
||||
io::Printer* printer) const {
|
||||
printer->Print(variables_,
|
||||
"result.$name$_ = internalGet$capitalized_name$();\n"
|
||||
"result.$name$_.makeImmutable();\n");
|
||||
"if ($get_has_field_bit_from_local$) {\n"
|
||||
" result.$name$_ = internalGet$capitalized_name$();\n"
|
||||
" result.$name$_.makeImmutable();\n"
|
||||
"}\n");
|
||||
}
|
||||
|
||||
void ImmutableMapFieldGenerator::GenerateParsingCode(
|
||||
void ImmutableMapFieldGenerator::GenerateBuilderParsingCode(
|
||||
io::Printer* printer) const {
|
||||
printer->Print(variables_,
|
||||
"if (!$get_mutable_bit_parser$) {\n"
|
||||
" $name$_ = com.google.protobuf.MapField.newMapField(\n"
|
||||
" $map_field_parameter$);\n"
|
||||
" $set_mutable_bit_parser$;\n"
|
||||
"}\n");
|
||||
if (!SupportUnknownEnumValue(descriptor_->file()) &&
|
||||
GetJavaType(ValueField(descriptor_)) == JAVATYPE_ENUM) {
|
||||
printer->Print(
|
||||
variables_,
|
||||
"com.google.protobuf.ByteString bytes = input.readBytes();\n"
|
||||
"com.google.protobuf.MapEntry<$type_parameters$>\n"
|
||||
"$name$__ = $default_entry$.getParserForType().parseFrom(bytes);\n");
|
||||
printer->Print(
|
||||
variables_,
|
||||
"$name$__ = $default_entry$.getParserForType().parseFrom(bytes);\n"
|
||||
"if ($value_enum_type$.forNumber($name$__.getValue()) == null) {\n"
|
||||
" unknownFields.mergeLengthDelimitedField($number$, bytes);\n"
|
||||
" mergeUnknownLengthDelimitedField($number$, bytes);\n"
|
||||
"} else {\n"
|
||||
" $name$_.getMutableMap().put(\n"
|
||||
" internalGetMutable$capitalized_name$().getMutableMap().put(\n"
|
||||
" $name$__.getKey(), $name$__.getValue());\n"
|
||||
" $set_has_field_bit_builder$\n"
|
||||
"}\n");
|
||||
} else {
|
||||
printer->Print(
|
||||
@@ -813,16 +863,11 @@ void ImmutableMapFieldGenerator::GenerateParsingCode(
|
||||
"com.google.protobuf.MapEntry<$type_parameters$>\n"
|
||||
"$name$__ = input.readMessage(\n"
|
||||
" $default_entry$.getParserForType(), extensionRegistry);\n"
|
||||
"$name$_.getMutableMap().put(\n"
|
||||
" $name$__.getKey(), $name$__.getValue());\n");
|
||||
"internalGetMutable$capitalized_name$().getMutableMap().put(\n"
|
||||
" $name$__.getKey(), $name$__.getValue());\n"
|
||||
"$set_has_field_bit_builder$\n");
|
||||
}
|
||||
}
|
||||
|
||||
void ImmutableMapFieldGenerator::GenerateParsingDoneCode(
|
||||
io::Printer* printer) const {
|
||||
// Nothing to do here.
|
||||
}
|
||||
|
||||
void ImmutableMapFieldGenerator::GenerateSerializationCode(
|
||||
io::Printer* printer) const {
|
||||
printer->Print(variables_,
|
||||
@@ -874,3 +919,5 @@ std::string ImmutableMapFieldGenerator::GetBoxedType() const {
|
||||
} // namespace compiler
|
||||
} // namespace protobuf
|
||||
} // namespace google
|
||||
|
||||
#include "google/protobuf/port_undef.inc"
|
||||
+7
-3
@@ -31,7 +31,7 @@
|
||||
#ifndef GOOGLE_PROTOBUF_COMPILER_JAVA_MAP_FIELD_H__
|
||||
#define GOOGLE_PROTOBUF_COMPILER_JAVA_MAP_FIELD_H__
|
||||
|
||||
#include <google/protobuf/compiler/java/java_field.h>
|
||||
#include "google/protobuf/compiler/java/field.h"
|
||||
|
||||
namespace google {
|
||||
namespace protobuf {
|
||||
@@ -46,6 +46,8 @@ class ImmutableMapFieldGenerator : public ImmutableFieldGenerator {
|
||||
~ImmutableMapFieldGenerator() override;
|
||||
|
||||
// implements ImmutableFieldGenerator ---------------------------------------
|
||||
int GetMessageBitIndex() const override;
|
||||
int GetBuilderBitIndex() const override;
|
||||
int GetNumBitsForMessage() const override;
|
||||
int GetNumBitsForBuilder() const override;
|
||||
void GenerateInterfaceMembers(io::Printer* printer) const override;
|
||||
@@ -55,8 +57,7 @@ class ImmutableMapFieldGenerator : public ImmutableFieldGenerator {
|
||||
void GenerateBuilderClearCode(io::Printer* printer) const override;
|
||||
void GenerateMergingCode(io::Printer* printer) const override;
|
||||
void GenerateBuildingCode(io::Printer* printer) const override;
|
||||
void GenerateParsingCode(io::Printer* printer) const override;
|
||||
void GenerateParsingDoneCode(io::Printer* printer) const override;
|
||||
void GenerateBuilderParsingCode(io::Printer* printer) const override;
|
||||
void GenerateSerializationCode(io::Printer* printer) const override;
|
||||
void GenerateSerializedSizeCode(io::Printer* printer) const override;
|
||||
void GenerateFieldBuilderInitializationCode(
|
||||
@@ -69,8 +70,11 @@ class ImmutableMapFieldGenerator : public ImmutableFieldGenerator {
|
||||
|
||||
private:
|
||||
const FieldDescriptor* descriptor_;
|
||||
int message_bit_index_;
|
||||
int builder_bit_index_;
|
||||
std::map<std::string, std::string> variables_;
|
||||
ClassNameResolver* name_resolver_;
|
||||
Context* context_;
|
||||
void GenerateMapGetters(io::Printer* printer) const;
|
||||
};
|
||||
|
||||
+34
-16
@@ -28,15 +28,18 @@
|
||||
// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
|
||||
// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||
|
||||
#include <google/protobuf/compiler/java/java_map_field_lite.h>
|
||||
#include <google/protobuf/compiler/java/map_field_lite.h>
|
||||
|
||||
#include <cstdint>
|
||||
|
||||
#include <google/protobuf/compiler/java/java_context.h>
|
||||
#include <google/protobuf/compiler/java/java_doc_comment.h>
|
||||
#include <google/protobuf/compiler/java/java_helpers.h>
|
||||
#include <google/protobuf/compiler/java/java_name_resolver.h>
|
||||
#include <google/protobuf/io/printer.h>
|
||||
#include <google/protobuf/compiler/java/context.h>
|
||||
#include <google/protobuf/compiler/java/doc_comment.h>
|
||||
#include <google/protobuf/compiler/java/helpers.h>
|
||||
#include <google/protobuf/compiler/java/name_resolver.h>
|
||||
|
||||
// Must be last.
|
||||
#include <google/protobuf/port_def.inc>
|
||||
|
||||
namespace google {
|
||||
namespace protobuf {
|
||||
@@ -49,14 +52,14 @@ const FieldDescriptor* KeyField(const FieldDescriptor* descriptor) {
|
||||
GOOGLE_CHECK_EQ(FieldDescriptor::TYPE_MESSAGE, descriptor->type());
|
||||
const Descriptor* message = descriptor->message_type();
|
||||
GOOGLE_CHECK(message->options().map_entry());
|
||||
return message->FindFieldByName("key");
|
||||
return message->map_key();
|
||||
}
|
||||
|
||||
const FieldDescriptor* ValueField(const FieldDescriptor* descriptor) {
|
||||
GOOGLE_CHECK_EQ(FieldDescriptor::TYPE_MESSAGE, descriptor->type());
|
||||
const Descriptor* message = descriptor->message_type();
|
||||
GOOGLE_CHECK(message->options().map_entry());
|
||||
return message->FindFieldByName("value");
|
||||
return message->map_value();
|
||||
}
|
||||
|
||||
std::string TypeName(const FieldDescriptor* field,
|
||||
@@ -101,6 +104,8 @@ void SetMessageVariables(const FieldDescriptor* descriptor, int messageBitIndex,
|
||||
const JavaType keyJavaType = GetJavaType(key);
|
||||
const JavaType valueJavaType = GetJavaType(value);
|
||||
|
||||
std::string pass_through_nullness = "/* nullable */\n";
|
||||
|
||||
(*variables)["key_type"] = TypeName(key, name_resolver, false);
|
||||
(*variables)["boxed_key_type"] = TypeName(key, name_resolver, true);
|
||||
(*variables)["kt_key_type"] = KotlinTypeName(key, name_resolver);
|
||||
@@ -128,6 +133,9 @@ void SetMessageVariables(const FieldDescriptor* descriptor, int messageBitIndex,
|
||||
|
||||
(*variables)["value_enum_type"] = TypeName(value, name_resolver, false);
|
||||
|
||||
(*variables)["value_enum_type_pass_through_nullness"] =
|
||||
pass_through_nullness + (*variables)["value_enum_type"];
|
||||
|
||||
if (SupportUnknownEnumValue(descriptor->file())) {
|
||||
// Map unknown values to a special UNRECOGNIZED value if supported.
|
||||
(*variables)["unrecognized_value"] =
|
||||
@@ -139,6 +147,11 @@ void SetMessageVariables(const FieldDescriptor* descriptor, int messageBitIndex,
|
||||
}
|
||||
} else {
|
||||
(*variables)["value_type"] = TypeName(value, name_resolver, false);
|
||||
|
||||
(*variables)["value_type_pass_through_nullness"] =
|
||||
(IsReferenceType(valueJavaType) ? pass_through_nullness : "") +
|
||||
(*variables)["value_type"];
|
||||
|
||||
(*variables)["boxed_value_type"] = TypeName(value, name_resolver, true);
|
||||
(*variables)["value_wire_type"] = WireType(value);
|
||||
(*variables)["value_default_value"] =
|
||||
@@ -203,11 +216,12 @@ void ImmutableMapFieldLiteGenerator::GenerateInterfaceMembers(
|
||||
"${$get$capitalized_name$Map$}$();\n");
|
||||
printer->Annotate("{", "}", descriptor_);
|
||||
WriteFieldDocComment(printer, descriptor_);
|
||||
printer->Print(
|
||||
variables_,
|
||||
"$deprecation$$value_enum_type$ ${$get$capitalized_name$OrDefault$}$(\n"
|
||||
" $key_type$ key,\n"
|
||||
" $value_enum_type$ defaultValue);\n");
|
||||
printer->Print(variables_,
|
||||
"$deprecation$$value_enum_type_pass_through_nullness$ "
|
||||
"${$get$capitalized_name$OrDefault$}$(\n"
|
||||
" $key_type$ key,\n"
|
||||
" $value_enum_type_pass_through_nullness$ "
|
||||
" defaultValue);\n");
|
||||
printer->Annotate("{", "}", descriptor_);
|
||||
WriteFieldDocComment(printer, descriptor_);
|
||||
printer->Print(
|
||||
@@ -261,9 +275,10 @@ void ImmutableMapFieldLiteGenerator::GenerateInterfaceMembers(
|
||||
WriteFieldDocComment(printer, descriptor_);
|
||||
printer->Print(variables_,
|
||||
"$deprecation$\n"
|
||||
"$value_type$ ${$get$capitalized_name$OrDefault$}$(\n"
|
||||
"$value_type_pass_through_nullness$ "
|
||||
"${$get$capitalized_name$OrDefault$}$(\n"
|
||||
" $key_type$ key,\n"
|
||||
" $value_type$ defaultValue);\n");
|
||||
" $value_type_pass_through_nullness$ defaultValue);\n");
|
||||
printer->Annotate("{", "}", descriptor_);
|
||||
WriteFieldDocComment(printer, descriptor_);
|
||||
printer->Print(variables_,
|
||||
@@ -606,9 +621,10 @@ void ImmutableMapFieldLiteGenerator::GenerateBuilderMembers(
|
||||
variables_,
|
||||
"@java.lang.Override\n"
|
||||
"$deprecation$\n"
|
||||
"public $value_enum_type$ ${$get$capitalized_name$OrDefault$}$(\n"
|
||||
"public $value_enum_type_pass_through_nullness$ "
|
||||
"${$get$capitalized_name$OrDefault$}$(\n"
|
||||
" $key_type$ key,\n"
|
||||
" $value_enum_type$ defaultValue) {\n"
|
||||
" $value_enum_type_pass_through_nullness$ defaultValue) {\n"
|
||||
" $key_null_check$\n"
|
||||
" java.util.Map<$boxed_key_type$, $value_enum_type$> map =\n"
|
||||
" instance.get$capitalized_name$Map();\n"
|
||||
@@ -907,3 +923,5 @@ std::string ImmutableMapFieldLiteGenerator::GetBoxedType() const {
|
||||
} // namespace compiler
|
||||
} // namespace protobuf
|
||||
} // namespace google
|
||||
|
||||
#include <google/protobuf/port_undef.inc>
|
||||
+1
-1
@@ -33,7 +33,7 @@
|
||||
|
||||
#include <cstdint>
|
||||
|
||||
#include <google/protobuf/compiler/java/java_field.h>
|
||||
#include <google/protobuf/compiler/java/field.h>
|
||||
|
||||
namespace google {
|
||||
namespace protobuf {
|
||||
+82
-208
@@ -32,7 +32,7 @@
|
||||
// Based on original Protocol Buffers design by
|
||||
// Sanjay Ghemawat, Jeff Dean, and others.
|
||||
|
||||
#include <google/protobuf/compiler/java/java_message.h>
|
||||
#include <google/protobuf/compiler/java/message.h>
|
||||
|
||||
#include <algorithm>
|
||||
#include <cstdint>
|
||||
@@ -40,21 +40,25 @@
|
||||
#include <memory>
|
||||
#include <vector>
|
||||
|
||||
#include <google/protobuf/compiler/java/java_context.h>
|
||||
#include <google/protobuf/compiler/java/java_doc_comment.h>
|
||||
#include <google/protobuf/compiler/java/java_enum.h>
|
||||
#include <google/protobuf/compiler/java/java_extension.h>
|
||||
#include <google/protobuf/compiler/java/java_generator_factory.h>
|
||||
#include <google/protobuf/compiler/java/java_helpers.h>
|
||||
#include <google/protobuf/compiler/java/java_message_builder.h>
|
||||
#include <google/protobuf/compiler/java/java_message_builder_lite.h>
|
||||
#include <google/protobuf/compiler/java/java_name_resolver.h>
|
||||
#include <google/protobuf/descriptor.pb.h>
|
||||
#include <google/protobuf/io/coded_stream.h>
|
||||
#include <google/protobuf/io/printer.h>
|
||||
#include <google/protobuf/descriptor.h>
|
||||
#include <google/protobuf/wire_format.h>
|
||||
#include <google/protobuf/stubs/strutil.h>
|
||||
#include <google/protobuf/stubs/substitute.h>
|
||||
#include <google/protobuf/compiler/java/context.h>
|
||||
#include <google/protobuf/compiler/java/doc_comment.h>
|
||||
#include <google/protobuf/compiler/java/enum.h>
|
||||
#include <google/protobuf/compiler/java/extension.h>
|
||||
#include <google/protobuf/compiler/java/generator_factory.h>
|
||||
#include <google/protobuf/compiler/java/helpers.h>
|
||||
#include <google/protobuf/compiler/java/message_builder.h>
|
||||
#include <google/protobuf/compiler/java/message_builder_lite.h>
|
||||
#include <google/protobuf/compiler/java/name_resolver.h>
|
||||
#include <google/protobuf/descriptor.pb.h>
|
||||
|
||||
// Must be last.
|
||||
#include <google/protobuf/port_def.inc>
|
||||
|
||||
namespace google {
|
||||
namespace protobuf {
|
||||
@@ -67,7 +71,7 @@ using internal::WireFormatLite;
|
||||
namespace {
|
||||
std::string MapValueImmutableClassdName(const Descriptor* descriptor,
|
||||
ClassNameResolver* name_resolver) {
|
||||
const FieldDescriptor* value_field = descriptor->FindFieldByName("value");
|
||||
const FieldDescriptor* value_field = descriptor->map_value();
|
||||
GOOGLE_CHECK_EQ(FieldDescriptor::TYPE_MESSAGE, value_field->type());
|
||||
return name_resolver->GetImmutableClassName(value_field->message_type());
|
||||
}
|
||||
@@ -376,6 +380,7 @@ void ImmutableMessageGenerator::Generate(io::Printer* printer) {
|
||||
"}\n"
|
||||
"\n");
|
||||
|
||||
// TODO(b/248149118): Remove this superfluous override.
|
||||
printer->Print(
|
||||
"@java.lang.Override\n"
|
||||
"public final com.google.protobuf.UnknownFieldSet\n"
|
||||
@@ -383,10 +388,6 @@ void ImmutableMessageGenerator::Generate(io::Printer* printer) {
|
||||
" return this.unknownFields;\n"
|
||||
"}\n");
|
||||
|
||||
if (context_->HasGeneratedMethods(descriptor_)) {
|
||||
GenerateParsingConstructor(printer);
|
||||
}
|
||||
|
||||
GenerateDescriptorMethods(printer);
|
||||
|
||||
// Nested types
|
||||
@@ -635,9 +636,9 @@ void ImmutableMessageGenerator::GenerateMessageSerializationMethods(
|
||||
}
|
||||
|
||||
if (descriptor_->options().message_set_wire_format()) {
|
||||
printer->Print("unknownFields.writeAsMessageSetTo(output);\n");
|
||||
printer->Print("getUnknownFields().writeAsMessageSetTo(output);\n");
|
||||
} else {
|
||||
printer->Print("unknownFields.writeTo(output);\n");
|
||||
printer->Print("getUnknownFields().writeTo(output);\n");
|
||||
}
|
||||
|
||||
printer->Outdent();
|
||||
@@ -666,9 +667,10 @@ void ImmutableMessageGenerator::GenerateMessageSerializationMethods(
|
||||
}
|
||||
|
||||
if (descriptor_->options().message_set_wire_format()) {
|
||||
printer->Print("size += unknownFields.getSerializedSizeAsMessageSet();\n");
|
||||
printer->Print(
|
||||
"size += getUnknownFields().getSerializedSizeAsMessageSet();\n");
|
||||
} else {
|
||||
printer->Print("size += unknownFields.getSerializedSize();\n");
|
||||
printer->Print("size += getUnknownFields().getSerializedSize();\n");
|
||||
}
|
||||
|
||||
printer->Print(
|
||||
@@ -1065,7 +1067,8 @@ void ImmutableMessageGenerator::GenerateEqualsAndHashCode(
|
||||
// false for non-canonical ordering when running in LITE_RUNTIME but it's
|
||||
// the best we can do.
|
||||
printer->Print(
|
||||
"if (!unknownFields.equals(other.unknownFields)) return false;\n");
|
||||
"if (!getUnknownFields().equals(other.getUnknownFields())) return "
|
||||
"false;\n");
|
||||
if (descriptor_->extension_range_count() > 0) {
|
||||
printer->Print(
|
||||
"if (!getExtensionFields().equals(other.getExtensionFields()))\n"
|
||||
@@ -1139,7 +1142,7 @@ void ImmutableMessageGenerator::GenerateEqualsAndHashCode(
|
||||
printer->Print("hash = hashFields(hash, getExtensionFields());\n");
|
||||
}
|
||||
|
||||
printer->Print("hash = (29 * hash) + unknownFields.hashCode();\n");
|
||||
printer->Print("hash = (29 * hash) + getUnknownFields().hashCode();\n");
|
||||
printer->Print(
|
||||
"memoizedHashCode = hash;\n"
|
||||
"return hash;\n");
|
||||
@@ -1164,186 +1167,33 @@ void ImmutableMessageGenerator::GenerateExtensionRegistrationCode(
|
||||
}
|
||||
}
|
||||
|
||||
// ===================================================================
|
||||
void ImmutableMessageGenerator::GenerateParsingConstructor(
|
||||
io::Printer* printer) {
|
||||
std::unique_ptr<const FieldDescriptor*[]> sorted_fields(
|
||||
SortFieldsByNumber(descriptor_));
|
||||
|
||||
printer->Print(
|
||||
"private $classname$(\n"
|
||||
" com.google.protobuf.CodedInputStream input,\n"
|
||||
" com.google.protobuf.ExtensionRegistryLite extensionRegistry)\n"
|
||||
" throws com.google.protobuf.InvalidProtocolBufferException {\n",
|
||||
"classname", descriptor_->name());
|
||||
printer->Indent();
|
||||
|
||||
// Initialize all fields to default.
|
||||
printer->Print(
|
||||
"this();\n"
|
||||
"if (extensionRegistry == null) {\n"
|
||||
" throw new java.lang.NullPointerException();\n"
|
||||
"}\n");
|
||||
|
||||
// Use builder bits to track mutable repeated fields.
|
||||
int totalBuilderBits = 0;
|
||||
for (int i = 0; i < descriptor_->field_count(); i++) {
|
||||
const ImmutableFieldGenerator& field =
|
||||
field_generators_.get(descriptor_->field(i));
|
||||
totalBuilderBits += field.GetNumBitsForBuilder();
|
||||
}
|
||||
int totalBuilderInts = (totalBuilderBits + 31) / 32;
|
||||
for (int i = 0; i < totalBuilderInts; i++) {
|
||||
printer->Print("int mutable_$bit_field_name$ = 0;\n", "bit_field_name",
|
||||
GetBitFieldName(i));
|
||||
}
|
||||
|
||||
printer->Print(
|
||||
"com.google.protobuf.UnknownFieldSet.Builder unknownFields =\n"
|
||||
" com.google.protobuf.UnknownFieldSet.newBuilder();\n");
|
||||
|
||||
printer->Print("try {\n");
|
||||
printer->Indent();
|
||||
|
||||
printer->Print(
|
||||
"boolean done = false;\n"
|
||||
"while (!done) {\n");
|
||||
printer->Indent();
|
||||
|
||||
printer->Print(
|
||||
"int tag = input.readTag();\n"
|
||||
"switch (tag) {\n");
|
||||
printer->Indent();
|
||||
|
||||
printer->Print(
|
||||
"case 0:\n" // zero signals EOF / limit reached
|
||||
" done = true;\n"
|
||||
" break;\n");
|
||||
|
||||
for (int i = 0; i < descriptor_->field_count(); i++) {
|
||||
const FieldDescriptor* field = sorted_fields[i];
|
||||
uint32_t tag = WireFormatLite::MakeTag(
|
||||
field->number(), WireFormat::WireTypeForFieldType(field->type()));
|
||||
|
||||
printer->Print("case $tag$: {\n", "tag",
|
||||
StrCat(static_cast<int32_t>(tag)));
|
||||
printer->Indent();
|
||||
|
||||
field_generators_.get(field).GenerateParsingCode(printer);
|
||||
|
||||
printer->Outdent();
|
||||
printer->Print(
|
||||
" break;\n"
|
||||
"}\n");
|
||||
|
||||
if (field->is_packable()) {
|
||||
// To make packed = true wire compatible, we generate parsing code from a
|
||||
// packed version of this field regardless of field->options().packed().
|
||||
uint32_t packed_tag = WireFormatLite::MakeTag(
|
||||
field->number(), WireFormatLite::WIRETYPE_LENGTH_DELIMITED);
|
||||
printer->Print("case $tag$: {\n", "tag",
|
||||
StrCat(static_cast<int32_t>(packed_tag)));
|
||||
printer->Indent();
|
||||
|
||||
field_generators_.get(field).GenerateParsingCodeFromPacked(printer);
|
||||
|
||||
printer->Outdent();
|
||||
printer->Print(
|
||||
" break;\n"
|
||||
"}\n");
|
||||
}
|
||||
}
|
||||
|
||||
printer->Print(
|
||||
"default: {\n"
|
||||
" if (!parseUnknownField(\n"
|
||||
" input, unknownFields, extensionRegistry, tag)) {\n"
|
||||
" done = true;\n" // it's an endgroup tag
|
||||
" }\n"
|
||||
" break;\n"
|
||||
"}\n");
|
||||
|
||||
printer->Outdent();
|
||||
printer->Outdent();
|
||||
printer->Print(
|
||||
" }\n" // switch (tag)
|
||||
"}\n"); // while (!done)
|
||||
|
||||
printer->Outdent();
|
||||
printer->Print(
|
||||
"} catch (com.google.protobuf.InvalidProtocolBufferException e) {\n"
|
||||
" throw e.setUnfinishedMessage(this);\n"
|
||||
"} catch (java.io.IOException e) {\n"
|
||||
" throw new com.google.protobuf.InvalidProtocolBufferException(\n"
|
||||
" e).setUnfinishedMessage(this);\n"
|
||||
"} finally {\n");
|
||||
printer->Indent();
|
||||
|
||||
// Make repeated field list immutable.
|
||||
for (int i = 0; i < descriptor_->field_count(); i++) {
|
||||
const FieldDescriptor* field = sorted_fields[i];
|
||||
field_generators_.get(field).GenerateParsingDoneCode(printer);
|
||||
}
|
||||
|
||||
// Make unknown fields immutable.
|
||||
printer->Print("this.unknownFields = unknownFields.build();\n");
|
||||
|
||||
// Make extensions immutable.
|
||||
printer->Print("makeExtensionsImmutable();\n");
|
||||
|
||||
printer->Outdent();
|
||||
printer->Outdent();
|
||||
printer->Print(
|
||||
" }\n" // finally
|
||||
"}\n");
|
||||
}
|
||||
|
||||
// ===================================================================
|
||||
void ImmutableMessageGenerator::GenerateParser(io::Printer* printer) {
|
||||
printer->Print(
|
||||
"$visibility$ static final com.google.protobuf.Parser<$classname$>\n"
|
||||
" PARSER = new com.google.protobuf.AbstractParser<$classname$>() {\n",
|
||||
"visibility",
|
||||
ExposePublicParser(descriptor_->file()) ? "@java.lang.Deprecated public"
|
||||
: "private",
|
||||
"classname", descriptor_->name());
|
||||
printer->Indent();
|
||||
printer->Print(
|
||||
"@java.lang.Override\n"
|
||||
"public $classname$ parsePartialFrom(\n"
|
||||
" com.google.protobuf.CodedInputStream input,\n"
|
||||
" com.google.protobuf.ExtensionRegistryLite extensionRegistry)\n"
|
||||
" throws com.google.protobuf.InvalidProtocolBufferException {\n",
|
||||
"classname", descriptor_->name());
|
||||
if (context_->HasGeneratedMethods(descriptor_)) {
|
||||
printer->Print(" return new $classname$(input, extensionRegistry);\n",
|
||||
"classname", descriptor_->name());
|
||||
} else {
|
||||
// When parsing constructor isn't generated, use builder to parse
|
||||
// messages. Note, will fallback to use reflection based mergeFieldFrom()
|
||||
// in AbstractMessage.Builder.
|
||||
printer->Indent();
|
||||
printer->Print(
|
||||
"Builder builder = newBuilder();\n"
|
||||
"try {\n"
|
||||
" builder.mergeFrom(input, extensionRegistry);\n"
|
||||
"} catch (com.google.protobuf.InvalidProtocolBufferException e) {\n"
|
||||
" throw e.setUnfinishedMessage(builder.buildPartial());\n"
|
||||
"} catch (java.io.IOException e) {\n"
|
||||
" throw new com.google.protobuf.InvalidProtocolBufferException(\n"
|
||||
" e.getMessage()).setUnfinishedMessage(\n"
|
||||
" builder.buildPartial());\n"
|
||||
"}\n"
|
||||
"return builder.buildPartial();\n");
|
||||
printer->Outdent();
|
||||
}
|
||||
printer->Print("}\n");
|
||||
printer->Outdent();
|
||||
printer->Print(
|
||||
" PARSER = new com.google.protobuf.AbstractParser<$classname$>() {\n"
|
||||
" @java.lang.Override\n"
|
||||
" public $classname$ parsePartialFrom(\n"
|
||||
" com.google.protobuf.CodedInputStream input,\n"
|
||||
" com.google.protobuf.ExtensionRegistryLite extensionRegistry)\n"
|
||||
" throws com.google.protobuf.InvalidProtocolBufferException {\n"
|
||||
" Builder builder = newBuilder();\n"
|
||||
" try {\n"
|
||||
" builder.mergeFrom(input, extensionRegistry);\n"
|
||||
" } catch (com.google.protobuf.InvalidProtocolBufferException e) {\n"
|
||||
" throw e.setUnfinishedMessage(builder.buildPartial());\n"
|
||||
" } catch (com.google.protobuf.UninitializedMessageException e) {\n"
|
||||
" throw "
|
||||
"e.asInvalidProtocolBufferException().setUnfinishedMessage(builder."
|
||||
"buildPartial());\n"
|
||||
" } catch (java.io.IOException e) {\n"
|
||||
" throw new com.google.protobuf.InvalidProtocolBufferException(e)\n"
|
||||
" .setUnfinishedMessage(builder.buildPartial());\n"
|
||||
" }\n"
|
||||
" return builder.buildPartial();\n"
|
||||
" }\n"
|
||||
"};\n"
|
||||
"\n");
|
||||
|
||||
printer->Print(
|
||||
"\n"
|
||||
"public static com.google.protobuf.Parser<$classname$> parser() {\n"
|
||||
" return PARSER;\n"
|
||||
"}\n"
|
||||
@@ -1353,6 +1203,9 @@ void ImmutableMessageGenerator::GenerateParser(io::Printer* printer) {
|
||||
" return PARSER;\n"
|
||||
"}\n"
|
||||
"\n",
|
||||
"visibility",
|
||||
ExposePublicParser(descriptor_->file()) ? "@java.lang.Deprecated public"
|
||||
: "private",
|
||||
"classname", descriptor_->name());
|
||||
}
|
||||
|
||||
@@ -1455,7 +1308,7 @@ void ImmutableMessageGenerator::GenerateKotlinDsl(io::Printer* printer) const {
|
||||
void ImmutableMessageGenerator::GenerateKotlinMembers(
|
||||
io::Printer* printer) const {
|
||||
printer->Print(
|
||||
"@kotlin.jvm.JvmSynthetic\n"
|
||||
"@kotlin.jvm.JvmName(\"-initialize$camelcase_name$\")\n"
|
||||
"public inline fun $camelcase_name$(block: $message_kt$.Dsl.() -> "
|
||||
"kotlin.Unit): "
|
||||
"$message$ "
|
||||
@@ -1486,7 +1339,7 @@ void ImmutableMessageGenerator::GenerateTopLevelKotlinMembers(
|
||||
"kotlin.Unit): "
|
||||
"$message$ =\n"
|
||||
" $message_kt$.Dsl._create(this.toBuilder()).apply { block() "
|
||||
"}._build()\n",
|
||||
"}._build()\n\n",
|
||||
"message", name_resolver_->GetClassName(descriptor_, true), "message_kt",
|
||||
name_resolver_->GetKotlinExtensionsClassName(descriptor_));
|
||||
|
||||
@@ -1495,6 +1348,24 @@ void ImmutableMessageGenerator::GenerateTopLevelKotlinMembers(
|
||||
ImmutableMessageGenerator(descriptor_->nested_type(i), context_)
|
||||
.GenerateTopLevelKotlinMembers(printer);
|
||||
}
|
||||
|
||||
GenerateKotlinOrNull(printer);
|
||||
}
|
||||
|
||||
void ImmutableMessageGenerator::GenerateKotlinOrNull(io::Printer* printer) const {
|
||||
for (int i = 0; i < descriptor_->field_count(); i++) {
|
||||
const FieldDescriptor* field = descriptor_->field(i);
|
||||
if (field->has_presence() && GetJavaType(field) == JAVATYPE_MESSAGE) {
|
||||
printer->Print(
|
||||
"public val $full_classname$OrBuilder.$camelcase_name$OrNull: $full_name$?\n"
|
||||
" get() = if (has$name$()) get$name$() else null\n\n",
|
||||
"full_classname", name_resolver_->GetClassName(descriptor_, true),
|
||||
"camelcase_name", context_->GetFieldGeneratorInfo(field)->name,
|
||||
"full_name",
|
||||
name_resolver_->GetImmutableClassName(field->message_type()), "name",
|
||||
context_->GetFieldGeneratorInfo(field)->capitalized_name);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
void ImmutableMessageGenerator::GenerateKotlinExtensions(
|
||||
@@ -1504,7 +1375,7 @@ void ImmutableMessageGenerator::GenerateKotlinExtensions(
|
||||
printer->Print(
|
||||
"@Suppress(\"UNCHECKED_CAST\")\n"
|
||||
"@kotlin.jvm.JvmSynthetic\n"
|
||||
"public operator fun <T> get(extension: "
|
||||
"public operator fun <T : kotlin.Any> get(extension: "
|
||||
"com.google.protobuf.ExtensionLite<$message$, T>): T {\n"
|
||||
" return if (extension.isRepeated) {\n"
|
||||
" get(extension as com.google.protobuf.ExtensionLite<$message$, "
|
||||
@@ -1520,7 +1391,7 @@ void ImmutableMessageGenerator::GenerateKotlinExtensions(
|
||||
"@kotlin.OptIn"
|
||||
"(com.google.protobuf.kotlin.OnlyForUseByGeneratedProtoCode::class)\n"
|
||||
"@kotlin.jvm.JvmName(\"-getRepeatedExtension\")\n"
|
||||
"public operator fun <E> get(\n"
|
||||
"public operator fun <E : kotlin.Any> get(\n"
|
||||
" extension: com.google.protobuf.ExtensionLite<$message$, List<E>>\n"
|
||||
"): com.google.protobuf.kotlin.ExtensionList<E, $message$> {\n"
|
||||
" return com.google.protobuf.kotlin.ExtensionList(extension, "
|
||||
@@ -1549,7 +1420,7 @@ void ImmutableMessageGenerator::GenerateKotlinExtensions(
|
||||
printer->Print(
|
||||
"@kotlin.jvm.JvmSynthetic\n"
|
||||
"@kotlin.PublishedApi\n"
|
||||
"internal fun <T> setExtension(extension: "
|
||||
"internal fun <T : kotlin.Any> setExtension(extension: "
|
||||
"com.google.protobuf.ExtensionLite<$message$, T>, "
|
||||
"value: T) {\n"
|
||||
" _builder.setExtension(extension, value)\n"
|
||||
@@ -1582,7 +1453,7 @@ void ImmutableMessageGenerator::GenerateKotlinExtensions(
|
||||
printer->Print(
|
||||
"@kotlin.jvm.JvmSynthetic\n"
|
||||
"@Suppress(\"NOTHING_TO_INLINE\")\n"
|
||||
"public inline operator fun <T : com.google.protobuf.MessageLite> set(\n"
|
||||
"inline operator fun <T : com.google.protobuf.MessageLite> set(\n"
|
||||
" extension: com.google.protobuf.ExtensionLite<$message$, T>,\n"
|
||||
" value: T\n"
|
||||
") {\n"
|
||||
@@ -1592,7 +1463,7 @@ void ImmutableMessageGenerator::GenerateKotlinExtensions(
|
||||
|
||||
printer->Print(
|
||||
"@kotlin.jvm.JvmSynthetic\n"
|
||||
"public fun <E> com.google.protobuf.kotlin.ExtensionList<E, "
|
||||
"public fun <E : kotlin.Any> com.google.protobuf.kotlin.ExtensionList<E, "
|
||||
"$message$>.add(value: E) {\n"
|
||||
" _builder.addExtension(this.extension, value)\n"
|
||||
"}\n\n",
|
||||
@@ -1601,7 +1472,7 @@ void ImmutableMessageGenerator::GenerateKotlinExtensions(
|
||||
printer->Print(
|
||||
"@kotlin.jvm.JvmSynthetic\n"
|
||||
"@Suppress(\"NOTHING_TO_INLINE\")\n"
|
||||
"public inline operator fun <E> "
|
||||
"public inline operator fun <E : kotlin.Any> "
|
||||
"com.google.protobuf.kotlin.ExtensionList<E, "
|
||||
"$message$>.plusAssign"
|
||||
"(value: E) {\n"
|
||||
@@ -1611,7 +1482,7 @@ void ImmutableMessageGenerator::GenerateKotlinExtensions(
|
||||
|
||||
printer->Print(
|
||||
"@kotlin.jvm.JvmSynthetic\n"
|
||||
"public fun <E> com.google.protobuf.kotlin.ExtensionList<E, "
|
||||
"public fun <E : kotlin.Any> com.google.protobuf.kotlin.ExtensionList<E, "
|
||||
"$message$>.addAll(values: Iterable<E>) {\n"
|
||||
" for (value in values) {\n"
|
||||
" add(value)\n"
|
||||
@@ -1622,7 +1493,7 @@ void ImmutableMessageGenerator::GenerateKotlinExtensions(
|
||||
printer->Print(
|
||||
"@kotlin.jvm.JvmSynthetic\n"
|
||||
"@Suppress(\"NOTHING_TO_INLINE\")\n"
|
||||
"public inline operator fun <E> "
|
||||
"public inline operator fun <E : kotlin.Any> "
|
||||
"com.google.protobuf.kotlin.ExtensionList<E, "
|
||||
"$message$>.plusAssign(values: "
|
||||
"Iterable<E>) {\n"
|
||||
@@ -1632,7 +1503,8 @@ void ImmutableMessageGenerator::GenerateKotlinExtensions(
|
||||
|
||||
printer->Print(
|
||||
"@kotlin.jvm.JvmSynthetic\n"
|
||||
"public operator fun <E> com.google.protobuf.kotlin.ExtensionList<E, "
|
||||
"public operator fun <E : kotlin.Any> "
|
||||
"com.google.protobuf.kotlin.ExtensionList<E, "
|
||||
"$message$>.set(index: Int, value: "
|
||||
"E) {\n"
|
||||
" _builder.setExtension(this.extension, index, value)\n"
|
||||
@@ -1727,3 +1599,5 @@ void ImmutableMessageGenerator::GenerateAnyMethods(io::Printer* printer) {
|
||||
} // namespace compiler
|
||||
} // namespace protobuf
|
||||
} // namespace google
|
||||
|
||||
#include <google/protobuf/port_undef.inc>
|
||||
+4
-2
@@ -37,7 +37,8 @@
|
||||
|
||||
#include <map>
|
||||
#include <string>
|
||||
#include <google/protobuf/compiler/java/java_field.h>
|
||||
|
||||
#include <google/protobuf/compiler/java/field.h>
|
||||
|
||||
namespace google {
|
||||
namespace protobuf {
|
||||
@@ -100,7 +101,7 @@ class MessageGenerator {
|
||||
class ImmutableMessageGenerator : public MessageGenerator {
|
||||
public:
|
||||
ImmutableMessageGenerator(const Descriptor* descriptor, Context* context);
|
||||
virtual ~ImmutableMessageGenerator();
|
||||
~ImmutableMessageGenerator() override;
|
||||
|
||||
void Generate(io::Printer* printer) override;
|
||||
void GenerateInterface(io::Printer* printer) override;
|
||||
@@ -136,6 +137,7 @@ class ImmutableMessageGenerator : public MessageGenerator {
|
||||
void GenerateParsingConstructor(io::Printer* printer);
|
||||
void GenerateMutableCopy(io::Printer* printer);
|
||||
void GenerateKotlinExtensions(io::Printer* printer) const;
|
||||
void GenerateKotlinOrNull(io::Printer* printer) const;
|
||||
void GenerateAnyMethods(io::Printer* printer);
|
||||
|
||||
Context* context_;
|
||||
+310
-113
@@ -32,36 +32,43 @@
|
||||
// Based on original Protocol Buffers design by
|
||||
// Sanjay Ghemawat, Jeff Dean, and others.
|
||||
|
||||
#include <google/protobuf/compiler/java/java_message_builder.h>
|
||||
#include "google/protobuf/compiler/java/message_builder.h"
|
||||
|
||||
#include <algorithm>
|
||||
#include <map>
|
||||
#include <memory>
|
||||
#include <set>
|
||||
#include <vector>
|
||||
|
||||
#include <google/protobuf/compiler/java/java_context.h>
|
||||
#include <google/protobuf/compiler/java/java_doc_comment.h>
|
||||
#include <google/protobuf/compiler/java/java_enum.h>
|
||||
#include <google/protobuf/compiler/java/java_extension.h>
|
||||
#include <google/protobuf/compiler/java/java_generator_factory.h>
|
||||
#include <google/protobuf/compiler/java/java_helpers.h>
|
||||
#include <google/protobuf/compiler/java/java_name_resolver.h>
|
||||
#include <google/protobuf/descriptor.pb.h>
|
||||
#include <google/protobuf/io/coded_stream.h>
|
||||
#include <google/protobuf/io/printer.h>
|
||||
#include <google/protobuf/wire_format.h>
|
||||
#include <google/protobuf/stubs/strutil.h>
|
||||
#include <google/protobuf/stubs/substitute.h>
|
||||
#include "google/protobuf/io/coded_stream.h"
|
||||
#include "google/protobuf/io/printer.h"
|
||||
#include "google/protobuf/wire_format.h"
|
||||
#include "google/protobuf/stubs/strutil.h"
|
||||
#include "google/protobuf/stubs/substitute.h"
|
||||
#include "google/protobuf/compiler/java/context.h"
|
||||
#include "google/protobuf/compiler/java/doc_comment.h"
|
||||
#include "google/protobuf/compiler/java/enum.h"
|
||||
#include "google/protobuf/compiler/java/extension.h"
|
||||
#include "google/protobuf/compiler/java/generator_factory.h"
|
||||
#include "google/protobuf/compiler/java/helpers.h"
|
||||
#include "google/protobuf/compiler/java/name_resolver.h"
|
||||
#include "google/protobuf/descriptor.pb.h"
|
||||
|
||||
// Must be last.
|
||||
#include "google/protobuf/port_def.inc"
|
||||
|
||||
namespace google {
|
||||
namespace protobuf {
|
||||
namespace compiler {
|
||||
namespace java {
|
||||
|
||||
using internal::WireFormat;
|
||||
using internal::WireFormatLite;
|
||||
|
||||
namespace {
|
||||
std::string MapValueImmutableClassdName(const Descriptor* descriptor,
|
||||
ClassNameResolver* name_resolver) {
|
||||
const FieldDescriptor* value_field = descriptor->FindFieldByName("value");
|
||||
const FieldDescriptor* value_field = descriptor->map_value();
|
||||
GOOGLE_CHECK_EQ(FieldDescriptor::TYPE_MESSAGE, value_field->type());
|
||||
return name_resolver->GetImmutableClassName(value_field->message_type());
|
||||
}
|
||||
@@ -139,12 +146,11 @@ void MessageBuilderGenerator::Generate(io::Printer* printer) {
|
||||
"\n"
|
||||
"public Builder clear$oneof_capitalized_name$() {\n"
|
||||
" $oneof_name$Case_ = 0;\n"
|
||||
" $oneof_name$_ = null;\n");
|
||||
printer->Print(" onChanged();\n");
|
||||
printer->Print(
|
||||
" return this;\n"
|
||||
"}\n"
|
||||
"\n");
|
||||
" $oneof_name$_ = null;\n"
|
||||
" onChanged();\n"
|
||||
" return this;\n"
|
||||
"}\n"
|
||||
"\n");
|
||||
}
|
||||
|
||||
// Integers for bit fields.
|
||||
@@ -285,43 +291,63 @@ void MessageBuilderGenerator::GenerateDescriptorMethods(io::Printer* printer) {
|
||||
|
||||
void MessageBuilderGenerator::GenerateCommonBuilderMethods(
|
||||
io::Printer* printer) {
|
||||
// Decide if we really need to have the "maybeForceBuilderInitialization()"
|
||||
// method.
|
||||
// TODO(b/249158148): Remove the need for this entirely
|
||||
bool need_maybe_force_builder_init = false;
|
||||
for (int i = 0; i < descriptor_->field_count(); i++) {
|
||||
if (descriptor_->field(i)->message_type() != nullptr &&
|
||||
!IsRealOneof(descriptor_->field(i)) &&
|
||||
HasHasbit(descriptor_->field(i))) {
|
||||
need_maybe_force_builder_init = true;
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
const char* force_builder_init = need_maybe_force_builder_init
|
||||
? " maybeForceBuilderInitialization();"
|
||||
: "";
|
||||
|
||||
printer->Print(
|
||||
"// Construct using $classname$.newBuilder()\n"
|
||||
"private Builder() {\n"
|
||||
" maybeForceBuilderInitialization();\n"
|
||||
"$force_builder_init$\n"
|
||||
"}\n"
|
||||
"\n",
|
||||
"classname", name_resolver_->GetImmutableClassName(descriptor_));
|
||||
"classname", name_resolver_->GetImmutableClassName(descriptor_),
|
||||
"force_builder_init", force_builder_init);
|
||||
|
||||
printer->Print(
|
||||
"private Builder(\n"
|
||||
" com.google.protobuf.GeneratedMessage$ver$.BuilderParent parent) {\n"
|
||||
" super(parent);\n"
|
||||
" maybeForceBuilderInitialization();\n"
|
||||
"$force_builder_init$\n"
|
||||
"}\n",
|
||||
"classname", name_resolver_->GetImmutableClassName(descriptor_), "ver",
|
||||
GeneratedCodeVersionSuffix());
|
||||
GeneratedCodeVersionSuffix(), "force_builder_init", force_builder_init);
|
||||
|
||||
printer->Print(
|
||||
"private void maybeForceBuilderInitialization() {\n"
|
||||
" if (com.google.protobuf.GeneratedMessage$ver$\n"
|
||||
" .alwaysUseFieldBuilders) {\n",
|
||||
"ver", GeneratedCodeVersionSuffix());
|
||||
if (need_maybe_force_builder_init) {
|
||||
printer->Print(
|
||||
"private void maybeForceBuilderInitialization() {\n"
|
||||
" if (com.google.protobuf.GeneratedMessage$ver$\n"
|
||||
" .alwaysUseFieldBuilders) {\n",
|
||||
"ver", GeneratedCodeVersionSuffix());
|
||||
|
||||
printer->Indent();
|
||||
printer->Indent();
|
||||
for (int i = 0; i < descriptor_->field_count(); i++) {
|
||||
if (!IsRealOneof(descriptor_->field(i))) {
|
||||
field_generators_.get(descriptor_->field(i))
|
||||
.GenerateFieldBuilderInitializationCode(printer);
|
||||
printer->Indent();
|
||||
printer->Indent();
|
||||
for (int i = 0; i < descriptor_->field_count(); i++) {
|
||||
if (!IsRealOneof(descriptor_->field(i))) {
|
||||
field_generators_.get(descriptor_->field(i))
|
||||
.GenerateFieldBuilderInitializationCode(printer);
|
||||
}
|
||||
}
|
||||
}
|
||||
printer->Outdent();
|
||||
printer->Outdent();
|
||||
printer->Outdent();
|
||||
printer->Outdent();
|
||||
|
||||
printer->Print(
|
||||
" }\n"
|
||||
"}\n");
|
||||
printer->Print(
|
||||
" }\n"
|
||||
"}\n");
|
||||
}
|
||||
|
||||
printer->Print(
|
||||
"@java.lang.Override\n"
|
||||
@@ -329,12 +355,15 @@ void MessageBuilderGenerator::GenerateCommonBuilderMethods(
|
||||
" super.clear();\n");
|
||||
|
||||
printer->Indent();
|
||||
int totalBuilderInts = (descriptor_->field_count() + 31) / 32;
|
||||
for (int i = 0; i < totalBuilderInts; i++) {
|
||||
printer->Print("$bit_field_name$ = 0;\n", "bit_field_name",
|
||||
GetBitFieldName(i));
|
||||
}
|
||||
|
||||
for (int i = 0; i < descriptor_->field_count(); i++) {
|
||||
if (!IsRealOneof(descriptor_->field(i))) {
|
||||
field_generators_.get(descriptor_->field(i))
|
||||
.GenerateBuilderClearCode(printer);
|
||||
}
|
||||
field_generators_.get(descriptor_->field(i))
|
||||
.GenerateBuilderClearCode(printer);
|
||||
}
|
||||
|
||||
for (auto oneof : oneofs_) {
|
||||
@@ -382,63 +411,7 @@ void MessageBuilderGenerator::GenerateCommonBuilderMethods(
|
||||
"\n",
|
||||
"classname", name_resolver_->GetImmutableClassName(descriptor_));
|
||||
|
||||
printer->Print(
|
||||
"@java.lang.Override\n"
|
||||
"public $classname$ buildPartial() {\n"
|
||||
" $classname$ result = new $classname$(this);\n",
|
||||
"classname", name_resolver_->GetImmutableClassName(descriptor_));
|
||||
|
||||
printer->Indent();
|
||||
|
||||
int totalBuilderBits = 0;
|
||||
int totalMessageBits = 0;
|
||||
for (int i = 0; i < descriptor_->field_count(); i++) {
|
||||
const ImmutableFieldGenerator& field =
|
||||
field_generators_.get(descriptor_->field(i));
|
||||
totalBuilderBits += field.GetNumBitsForBuilder();
|
||||
totalMessageBits += field.GetNumBitsForMessage();
|
||||
}
|
||||
int totalBuilderInts = (totalBuilderBits + 31) / 32;
|
||||
int totalMessageInts = (totalMessageBits + 31) / 32;
|
||||
|
||||
// Local vars for from and to bit fields to avoid accessing the builder and
|
||||
// message over and over for these fields. Seems to provide a slight
|
||||
// perforamance improvement in micro benchmark and this is also what proto1
|
||||
// code does.
|
||||
for (int i = 0; i < totalBuilderInts; i++) {
|
||||
printer->Print("int from_$bit_field_name$ = $bit_field_name$;\n",
|
||||
"bit_field_name", GetBitFieldName(i));
|
||||
}
|
||||
for (int i = 0; i < totalMessageInts; i++) {
|
||||
printer->Print("int to_$bit_field_name$ = 0;\n", "bit_field_name",
|
||||
GetBitFieldName(i));
|
||||
}
|
||||
|
||||
// Output generation code for each field.
|
||||
for (int i = 0; i < descriptor_->field_count(); i++) {
|
||||
field_generators_.get(descriptor_->field(i)).GenerateBuildingCode(printer);
|
||||
}
|
||||
|
||||
// Copy the bit field results to the generated message
|
||||
for (int i = 0; i < totalMessageInts; i++) {
|
||||
printer->Print("result.$bit_field_name$ = to_$bit_field_name$;\n",
|
||||
"bit_field_name", GetBitFieldName(i));
|
||||
}
|
||||
|
||||
for (auto oneof : oneofs_) {
|
||||
printer->Print("result.$oneof_name$Case_ = $oneof_name$Case_;\n",
|
||||
"oneof_name", context_->GetOneofGeneratorInfo(oneof)->name);
|
||||
}
|
||||
|
||||
printer->Outdent();
|
||||
|
||||
printer->Print(" onBuilt();\n");
|
||||
|
||||
printer->Print(
|
||||
" return result;\n"
|
||||
"}\n"
|
||||
"\n",
|
||||
"classname", name_resolver_->GetImmutableClassName(descriptor_));
|
||||
GenerateBuildPartial(printer);
|
||||
|
||||
// Override methods declared in GeneratedMessage to return the concrete
|
||||
// generated type so callsites won't depend on GeneratedMessage. This
|
||||
@@ -575,7 +548,7 @@ void MessageBuilderGenerator::GenerateCommonBuilderMethods(
|
||||
printer->Print(" this.mergeExtensionFields(other);\n");
|
||||
}
|
||||
|
||||
printer->Print(" this.mergeUnknownFields(other.unknownFields);\n");
|
||||
printer->Print(" this.mergeUnknownFields(other.getUnknownFields());\n");
|
||||
|
||||
printer->Print(" onChanged();\n");
|
||||
|
||||
@@ -586,6 +559,156 @@ void MessageBuilderGenerator::GenerateCommonBuilderMethods(
|
||||
}
|
||||
}
|
||||
|
||||
void MessageBuilderGenerator::GenerateBuildPartial(io::Printer* printer) {
|
||||
printer->Print(
|
||||
"@java.lang.Override\n"
|
||||
"public $classname$ buildPartial() {\n"
|
||||
" $classname$ result = new $classname$(this);\n",
|
||||
"classname", name_resolver_->GetImmutableClassName(descriptor_));
|
||||
|
||||
printer->Indent();
|
||||
|
||||
// Handle the repeated fields first so that the "mutable bits" are cleared.
|
||||
bool has_repeated_fields = false;
|
||||
for (int i = 0; i < descriptor_->field_count(); ++i) {
|
||||
if (descriptor_->field(i)->is_repeated() &&
|
||||
!IsMapField(descriptor_->field(i))) {
|
||||
has_repeated_fields = true;
|
||||
printer->Print("buildPartialRepeatedFields(result);\n");
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
// One buildPartial#() per from_bit_field
|
||||
int totalBuilderInts = (descriptor_->field_count() + 31) / 32;
|
||||
if (totalBuilderInts > 0) {
|
||||
for (int i = 0; i < totalBuilderInts; ++i) {
|
||||
printer->Print(
|
||||
"if ($bit_field_name$ != 0) { buildPartial$piece$(result); }\n",
|
||||
"bit_field_name", GetBitFieldName(i), "piece", StrCat(i));
|
||||
}
|
||||
}
|
||||
|
||||
if (!oneofs_.empty()) {
|
||||
printer->Print("buildPartialOneofs(result);\n");
|
||||
}
|
||||
|
||||
printer->Outdent();
|
||||
printer->Print(
|
||||
" onBuilt();\n"
|
||||
" return result;\n"
|
||||
"}\n"
|
||||
"\n",
|
||||
"classname", name_resolver_->GetImmutableClassName(descriptor_));
|
||||
|
||||
// Build Repeated Fields
|
||||
if (has_repeated_fields) {
|
||||
printer->Print(
|
||||
"private void buildPartialRepeatedFields($classname$ result) {\n",
|
||||
"classname", name_resolver_->GetImmutableClassName(descriptor_));
|
||||
printer->Indent();
|
||||
for (int i = 0; i < descriptor_->field_count(); ++i) {
|
||||
if (descriptor_->field(i)->is_repeated() &&
|
||||
!IsMapField(descriptor_->field(i))) {
|
||||
const ImmutableFieldGenerator& field =
|
||||
field_generators_.get(descriptor_->field(i));
|
||||
field.GenerateBuildingCode(printer);
|
||||
}
|
||||
}
|
||||
printer->Outdent();
|
||||
printer->Print("}\n\n");
|
||||
}
|
||||
|
||||
// Build non-oneof fields
|
||||
int start_field = 0;
|
||||
for (int i = 0; i < totalBuilderInts; i++) {
|
||||
start_field = GenerateBuildPartialPiece(printer, i, start_field);
|
||||
}
|
||||
|
||||
// Build Oneofs
|
||||
if (!oneofs_.empty()) {
|
||||
printer->Print("private void buildPartialOneofs($classname$ result) {\n",
|
||||
"classname",
|
||||
name_resolver_->GetImmutableClassName(descriptor_));
|
||||
printer->Indent();
|
||||
for (auto oneof : oneofs_) {
|
||||
printer->Print(
|
||||
"result.$oneof_name$Case_ = $oneof_name$Case_;\n"
|
||||
"result.$oneof_name$_ = this.$oneof_name$_;\n",
|
||||
"oneof_name", context_->GetOneofGeneratorInfo(oneof)->name);
|
||||
for (int i = 0; i < oneof->field_count(); ++i) {
|
||||
if (oneof->field(i)->message_type() != nullptr) {
|
||||
const ImmutableFieldGenerator& field =
|
||||
field_generators_.get(oneof->field(i));
|
||||
field.GenerateBuildingCode(printer);
|
||||
}
|
||||
}
|
||||
}
|
||||
printer->Outdent();
|
||||
printer->Print("}\n\n");
|
||||
}
|
||||
}
|
||||
|
||||
int MessageBuilderGenerator::GenerateBuildPartialPiece(io::Printer* printer,
|
||||
int piece,
|
||||
int first_field) {
|
||||
printer->Print(
|
||||
"private void buildPartial$piece$($classname$ result) {\n"
|
||||
" int from_$bit_field_name$ = $bit_field_name$;\n",
|
||||
"classname", name_resolver_->GetImmutableClassName(descriptor_), "piece",
|
||||
StrCat(piece), "bit_field_name", GetBitFieldName(piece));
|
||||
printer->Indent();
|
||||
std::set<int> declared_to_bitfields;
|
||||
|
||||
int bit = 0;
|
||||
int next = first_field;
|
||||
for (; bit < 32 && next < descriptor_->field_count(); ++next) {
|
||||
const ImmutableFieldGenerator& field =
|
||||
field_generators_.get(descriptor_->field(next));
|
||||
bit += field.GetNumBitsForBuilder();
|
||||
|
||||
// Skip oneof fields that are handled separately
|
||||
if (IsRealOneof(descriptor_->field(next))) {
|
||||
continue;
|
||||
}
|
||||
|
||||
// Skip repeated fields because they are currently handled
|
||||
// in separate buildPartial sub-methods.
|
||||
if (descriptor_->field(next)->is_repeated() &&
|
||||
!IsMapField(descriptor_->field(next))) {
|
||||
continue;
|
||||
}
|
||||
// Skip fields without presence bits in the builder
|
||||
if (field.GetNumBitsForBuilder() == 0) {
|
||||
continue;
|
||||
}
|
||||
|
||||
// Track message bits if necessary
|
||||
if (field.GetNumBitsForMessage() > 0) {
|
||||
int to_bitfield = field.GetMessageBitIndex() / 32;
|
||||
if (declared_to_bitfields.count(to_bitfield) == 0) {
|
||||
printer->Print("int to_$bit_field_name$ = 0;\n", "bit_field_name",
|
||||
GetBitFieldName(to_bitfield));
|
||||
declared_to_bitfields.insert(to_bitfield);
|
||||
}
|
||||
}
|
||||
|
||||
// Copy the field from the builder to the message
|
||||
field.GenerateBuildingCode(printer);
|
||||
}
|
||||
|
||||
// Copy the bit field results to the generated message
|
||||
for (int to_bitfield : declared_to_bitfields) {
|
||||
printer->Print("result.$bit_field_name$ |= to_$bit_field_name$;\n",
|
||||
"bit_field_name", GetBitFieldName(to_bitfield));
|
||||
}
|
||||
|
||||
printer->Outdent();
|
||||
printer->Print("}\n\n");
|
||||
|
||||
return next;
|
||||
}
|
||||
|
||||
// ===================================================================
|
||||
|
||||
void MessageBuilderGenerator::GenerateBuilderParsingMethods(
|
||||
@@ -596,20 +719,92 @@ void MessageBuilderGenerator::GenerateBuilderParsingMethods(
|
||||
" com.google.protobuf.CodedInputStream input,\n"
|
||||
" com.google.protobuf.ExtensionRegistryLite extensionRegistry)\n"
|
||||
" throws java.io.IOException {\n"
|
||||
" $classname$ parsedMessage = null;\n"
|
||||
" if (extensionRegistry == null) {\n"
|
||||
" throw new java.lang.NullPointerException();\n"
|
||||
" }\n"
|
||||
" try {\n"
|
||||
" parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);\n"
|
||||
" boolean done = false;\n"
|
||||
" while (!done) {\n"
|
||||
" int tag = input.readTag();\n"
|
||||
" switch (tag) {\n"
|
||||
" case 0:\n" // zero signals EOF / limit reached
|
||||
" done = true;\n"
|
||||
" break;\n");
|
||||
printer->Indent(); // method
|
||||
printer->Indent(); // try
|
||||
printer->Indent(); // while
|
||||
printer->Indent(); // switch
|
||||
GenerateBuilderFieldParsingCases(printer);
|
||||
printer->Outdent(); // switch
|
||||
printer->Outdent(); // while
|
||||
printer->Outdent(); // try
|
||||
printer->Outdent(); // method
|
||||
printer->Print(
|
||||
" default: {\n"
|
||||
" if (!super.parseUnknownField(input, extensionRegistry, tag)) "
|
||||
"{\n"
|
||||
" done = true; // was an endgroup tag\n"
|
||||
" }\n"
|
||||
" break;\n"
|
||||
" } // default:\n"
|
||||
" } // switch (tag)\n"
|
||||
" } // while (!done)\n"
|
||||
" } catch (com.google.protobuf.InvalidProtocolBufferException e) {\n"
|
||||
" parsedMessage = ($classname$) e.getUnfinishedMessage();\n"
|
||||
" throw e.unwrapIOException();\n"
|
||||
" } finally {\n"
|
||||
" if (parsedMessage != null) {\n"
|
||||
" mergeFrom(parsedMessage);\n"
|
||||
" }\n"
|
||||
" }\n"
|
||||
" onChanged();\n"
|
||||
" } // finally\n"
|
||||
" return this;\n"
|
||||
"}\n",
|
||||
"classname", name_resolver_->GetImmutableClassName(descriptor_));
|
||||
"}\n");
|
||||
}
|
||||
|
||||
void MessageBuilderGenerator::GenerateBuilderFieldParsingCases(
|
||||
io::Printer* printer) {
|
||||
std::unique_ptr<const FieldDescriptor*[]> sorted_fields(
|
||||
SortFieldsByNumber(descriptor_));
|
||||
for (int i = 0; i < descriptor_->field_count(); i++) {
|
||||
const FieldDescriptor* field = sorted_fields[i];
|
||||
GenerateBuilderFieldParsingCase(printer, field);
|
||||
if (field->is_packable()) {
|
||||
GenerateBuilderPackedFieldParsingCase(printer, field);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
void MessageBuilderGenerator::GenerateBuilderFieldParsingCase(
|
||||
io::Printer* printer, const FieldDescriptor* field) {
|
||||
uint32_t tag = WireFormatLite::MakeTag(
|
||||
field->number(), WireFormat::WireTypeForFieldType(field->type()));
|
||||
std::string tagString = StrCat(static_cast<int32_t>(tag));
|
||||
printer->Print("case $tag$: {\n", "tag", tagString);
|
||||
printer->Indent();
|
||||
|
||||
field_generators_.get(field).GenerateBuilderParsingCode(printer);
|
||||
|
||||
printer->Outdent();
|
||||
printer->Print(
|
||||
" break;\n"
|
||||
"} // case $tag$\n",
|
||||
"tag", tagString);
|
||||
}
|
||||
|
||||
void MessageBuilderGenerator::GenerateBuilderPackedFieldParsingCase(
|
||||
io::Printer* printer, const FieldDescriptor* field) {
|
||||
// To make packed = true wire compatible, we generate parsing code from a
|
||||
// packed version of this field regardless of field->options().packed().
|
||||
uint32_t tag = WireFormatLite::MakeTag(
|
||||
field->number(), WireFormatLite::WIRETYPE_LENGTH_DELIMITED);
|
||||
std::string tagString = StrCat(static_cast<int32_t>(tag));
|
||||
printer->Print("case $tag$: {\n", "tag", tagString);
|
||||
printer->Indent();
|
||||
|
||||
field_generators_.get(field).GenerateBuilderParsingCodeFromPacked(printer);
|
||||
|
||||
printer->Outdent();
|
||||
printer->Print(
|
||||
" break;\n"
|
||||
"} // case $tag$\n",
|
||||
"tag", tagString);
|
||||
}
|
||||
|
||||
// ===================================================================
|
||||
@@ -710,3 +905,5 @@ void MessageBuilderGenerator::GenerateIsInitialized(io::Printer* printer) {
|
||||
} // namespace compiler
|
||||
} // namespace protobuf
|
||||
} // namespace google
|
||||
|
||||
#include "google/protobuf/port_undef.inc"
|
||||
+12
-1
@@ -37,7 +37,8 @@
|
||||
|
||||
#include <map>
|
||||
#include <string>
|
||||
#include <google/protobuf/compiler/java/java_field.h>
|
||||
|
||||
#include <google/protobuf/compiler/java/field.h>
|
||||
|
||||
namespace google {
|
||||
namespace protobuf {
|
||||
@@ -68,8 +69,18 @@ class MessageBuilderGenerator {
|
||||
|
||||
private:
|
||||
void GenerateCommonBuilderMethods(io::Printer* printer);
|
||||
void GenerateBuildPartial(io::Printer* printer);
|
||||
int GenerateBuildPartialPiece(io::Printer* printer, int piece,
|
||||
int first_field);
|
||||
int GenerateBuildPartialPieceWithoutPresence(io::Printer* printer, int piece,
|
||||
int first_field);
|
||||
void GenerateDescriptorMethods(io::Printer* printer);
|
||||
void GenerateBuilderParsingMethods(io::Printer* printer);
|
||||
void GenerateBuilderFieldParsingCases(io::Printer* printer);
|
||||
void GenerateBuilderFieldParsingCase(io::Printer* printer,
|
||||
const FieldDescriptor* field);
|
||||
void GenerateBuilderPackedFieldParsingCase(io::Printer* printer,
|
||||
const FieldDescriptor* field);
|
||||
void GenerateIsInitialized(io::Printer* printer);
|
||||
|
||||
const Descriptor* descriptor_;
|
||||
+14
-9
@@ -32,26 +32,29 @@
|
||||
// Based on original Protocol Buffers design by
|
||||
// Sanjay Ghemawat, Jeff Dean, and others.
|
||||
|
||||
#include <google/protobuf/compiler/java/java_message_builder_lite.h>
|
||||
#include <google/protobuf/compiler/java/message_builder_lite.h>
|
||||
|
||||
#include <algorithm>
|
||||
#include <map>
|
||||
#include <memory>
|
||||
#include <vector>
|
||||
|
||||
#include <google/protobuf/compiler/java/java_context.h>
|
||||
#include <google/protobuf/compiler/java/java_doc_comment.h>
|
||||
#include <google/protobuf/compiler/java/java_enum.h>
|
||||
#include <google/protobuf/compiler/java/java_extension.h>
|
||||
#include <google/protobuf/compiler/java/java_generator_factory.h>
|
||||
#include <google/protobuf/compiler/java/java_helpers.h>
|
||||
#include <google/protobuf/compiler/java/java_name_resolver.h>
|
||||
#include <google/protobuf/descriptor.pb.h>
|
||||
#include <google/protobuf/io/coded_stream.h>
|
||||
#include <google/protobuf/io/printer.h>
|
||||
#include <google/protobuf/wire_format.h>
|
||||
#include <google/protobuf/stubs/strutil.h>
|
||||
#include <google/protobuf/stubs/substitute.h>
|
||||
#include <google/protobuf/compiler/java/context.h>
|
||||
#include <google/protobuf/compiler/java/doc_comment.h>
|
||||
#include <google/protobuf/compiler/java/enum.h>
|
||||
#include <google/protobuf/compiler/java/extension.h>
|
||||
#include <google/protobuf/compiler/java/generator_factory.h>
|
||||
#include <google/protobuf/compiler/java/helpers.h>
|
||||
#include <google/protobuf/compiler/java/name_resolver.h>
|
||||
#include <google/protobuf/descriptor.pb.h>
|
||||
|
||||
// Must be last.
|
||||
#include <google/protobuf/port_def.inc>
|
||||
|
||||
namespace google {
|
||||
namespace protobuf {
|
||||
@@ -149,3 +152,5 @@ void MessageBuilderLiteGenerator::GenerateCommonBuilderMethods(
|
||||
} // namespace compiler
|
||||
} // namespace protobuf
|
||||
} // namespace google
|
||||
|
||||
#include <google/protobuf/port_undef.inc>
|
||||
+2
-1
@@ -37,7 +37,8 @@
|
||||
|
||||
#include <map>
|
||||
#include <string>
|
||||
#include <google/protobuf/compiler/java/java_field.h>
|
||||
|
||||
#include <google/protobuf/compiler/java/field.h>
|
||||
|
||||
namespace google {
|
||||
namespace protobuf {
|
||||
+214
-256
@@ -32,17 +32,21 @@
|
||||
// Based on original Protocol Buffers design by
|
||||
// Sanjay Ghemawat, Jeff Dean, and others.
|
||||
|
||||
#include "google/protobuf/compiler/java/message_field.h"
|
||||
|
||||
#include <map>
|
||||
#include <string>
|
||||
|
||||
#include <google/protobuf/compiler/java/java_context.h>
|
||||
#include <google/protobuf/compiler/java/java_doc_comment.h>
|
||||
#include <google/protobuf/compiler/java/java_helpers.h>
|
||||
#include <google/protobuf/compiler/java/java_message_field.h>
|
||||
#include <google/protobuf/compiler/java/java_name_resolver.h>
|
||||
#include <google/protobuf/io/printer.h>
|
||||
#include <google/protobuf/wire_format.h>
|
||||
#include <google/protobuf/stubs/strutil.h>
|
||||
#include "google/protobuf/io/printer.h"
|
||||
#include "google/protobuf/wire_format.h"
|
||||
#include "google/protobuf/stubs/strutil.h"
|
||||
#include "google/protobuf/compiler/java/context.h"
|
||||
#include "google/protobuf/compiler/java/doc_comment.h"
|
||||
#include "google/protobuf/compiler/java/helpers.h"
|
||||
#include "google/protobuf/compiler/java/name_resolver.h"
|
||||
|
||||
// Must be last.
|
||||
#include "google/protobuf/port_def.inc"
|
||||
|
||||
namespace google {
|
||||
namespace protobuf {
|
||||
@@ -52,10 +56,11 @@ namespace java {
|
||||
|
||||
namespace {
|
||||
|
||||
void SetMessageVariables(const FieldDescriptor* descriptor, int messageBitIndex,
|
||||
int builderBitIndex, const FieldGeneratorInfo* info,
|
||||
ClassNameResolver* name_resolver,
|
||||
std::map<std::string, std::string>* variables) {
|
||||
void SetMessageVariables(
|
||||
const FieldDescriptor* descriptor, int messageBitIndex, int builderBitIndex,
|
||||
const FieldGeneratorInfo* info, ClassNameResolver* name_resolver,
|
||||
std::map<std::string, std::string>* variables,
|
||||
Context* context) {
|
||||
SetCommonFieldVariables(descriptor, info, variables);
|
||||
|
||||
(*variables)["type"] =
|
||||
@@ -70,11 +75,12 @@ void SetMessageVariables(const FieldDescriptor* descriptor, int messageBitIndex,
|
||||
// by the proto compiler
|
||||
(*variables)["deprecation"] =
|
||||
descriptor->options().deprecated() ? "@java.lang.Deprecated " : "";
|
||||
(*variables)["kt_deprecation"] =
|
||||
descriptor->options().deprecated()
|
||||
? "@kotlin.Deprecated(message = \"Field " + (*variables)["name"] +
|
||||
" is deprecated\") "
|
||||
: "";
|
||||
variables->insert(
|
||||
{"kt_deprecation",
|
||||
descriptor->options().deprecated()
|
||||
? StrCat("@kotlin.Deprecated(message = \"Field ",
|
||||
(*variables)["name"], " is deprecated\") ")
|
||||
: ""});
|
||||
(*variables)["on_changed"] = "onChanged();";
|
||||
(*variables)["ver"] = GeneratedCodeVersionSuffix();
|
||||
(*variables)["get_parser"] =
|
||||
@@ -84,24 +90,16 @@ void SetMessageVariables(const FieldDescriptor* descriptor, int messageBitIndex,
|
||||
if (HasHasbit(descriptor)) {
|
||||
// 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"] =
|
||||
GenerateSetBit(builderBitIndex) + ";";
|
||||
(*variables)["clear_has_field_bit_builder"] =
|
||||
GenerateClearBit(builderBitIndex) + ";";
|
||||
(*variables)["set_has_field_bit_to_local"] =
|
||||
GenerateSetBitToLocal(messageBitIndex);
|
||||
|
||||
(*variables)["is_field_present_message"] = GenerateGetBit(messageBitIndex);
|
||||
} else {
|
||||
(*variables)["set_has_field_bit_message"] = "";
|
||||
(*variables)["set_has_field_bit_builder"] = "";
|
||||
(*variables)["clear_has_field_bit_builder"] = "";
|
||||
|
||||
(*variables)["is_field_present_message"] =
|
||||
(*variables)["name"] + "_ != null";
|
||||
(*variables)["set_has_field_bit_to_local"] = "";
|
||||
variables->insert({"is_field_present_message",
|
||||
StrCat((*variables)["name"], "_ != null")});
|
||||
}
|
||||
|
||||
// For repeated builders, one bit is used for whether the array is immutable.
|
||||
@@ -109,17 +107,13 @@ void SetMessageVariables(const FieldDescriptor* descriptor, int messageBitIndex,
|
||||
(*variables)["set_mutable_bit_builder"] = GenerateSetBit(builderBitIndex);
|
||||
(*variables)["clear_mutable_bit_builder"] = GenerateClearBit(builderBitIndex);
|
||||
|
||||
// For repeated fields, one bit is used for whether the array is immutable
|
||||
// in the parsing constructor.
|
||||
(*variables)["get_mutable_bit_parser"] =
|
||||
GenerateGetBitMutableLocal(builderBitIndex);
|
||||
(*variables)["set_mutable_bit_parser"] =
|
||||
GenerateSetBitMutableLocal(builderBitIndex);
|
||||
|
||||
(*variables)["get_has_field_bit_builder"] = GenerateGetBit(builderBitIndex);
|
||||
(*variables)["set_has_field_bit_builder"] =
|
||||
GenerateSetBit(builderBitIndex) + ";";
|
||||
(*variables)["clear_has_field_bit_builder"] =
|
||||
GenerateClearBit(builderBitIndex) + ";";
|
||||
(*variables)["get_has_field_bit_from_local"] =
|
||||
GenerateGetBitFromLocal(builderBitIndex);
|
||||
(*variables)["set_has_field_bit_to_local"] =
|
||||
GenerateSetBitToLocal(messageBitIndex);
|
||||
}
|
||||
|
||||
} // namespace
|
||||
@@ -129,21 +123,31 @@ void SetMessageVariables(const FieldDescriptor* descriptor, int messageBitIndex,
|
||||
ImmutableMessageFieldGenerator::ImmutableMessageFieldGenerator(
|
||||
const FieldDescriptor* descriptor, int messageBitIndex, int builderBitIndex,
|
||||
Context* context)
|
||||
: descriptor_(descriptor), name_resolver_(context->GetNameResolver()) {
|
||||
: descriptor_(descriptor),
|
||||
message_bit_index_(messageBitIndex),
|
||||
builder_bit_index_(builderBitIndex),
|
||||
name_resolver_(context->GetNameResolver()),
|
||||
context_(context) {
|
||||
SetMessageVariables(descriptor, messageBitIndex, builderBitIndex,
|
||||
context->GetFieldGeneratorInfo(descriptor),
|
||||
name_resolver_, &variables_);
|
||||
name_resolver_, &variables_, context);
|
||||
}
|
||||
|
||||
ImmutableMessageFieldGenerator::~ImmutableMessageFieldGenerator() {}
|
||||
|
||||
int ImmutableMessageFieldGenerator::GetMessageBitIndex() const {
|
||||
return message_bit_index_;
|
||||
}
|
||||
|
||||
int ImmutableMessageFieldGenerator::GetBuilderBitIndex() const {
|
||||
return builder_bit_index_;
|
||||
}
|
||||
|
||||
int ImmutableMessageFieldGenerator::GetNumBitsForMessage() const {
|
||||
return HasHasbit(descriptor_) ? 1 : 0;
|
||||
}
|
||||
|
||||
int ImmutableMessageFieldGenerator::GetNumBitsForBuilder() const {
|
||||
return GetNumBitsForMessage();
|
||||
}
|
||||
int ImmutableMessageFieldGenerator::GetNumBitsForBuilder() const { return 1; }
|
||||
|
||||
void ImmutableMessageFieldGenerator::GenerateInterfaceMembers(
|
||||
io::Printer* printer) const {
|
||||
@@ -176,24 +180,6 @@ void ImmutableMessageFieldGenerator::GenerateMembers(
|
||||
" return $get_has_field_bit_message$;\n"
|
||||
"}\n");
|
||||
printer->Annotate("{", "}", descriptor_);
|
||||
WriteFieldAccessorDocComment(printer, descriptor_, GETTER);
|
||||
printer->Print(
|
||||
variables_,
|
||||
"@java.lang.Override\n"
|
||||
"$deprecation$public $type$ ${$get$capitalized_name$$}$() {\n"
|
||||
" return $name$_ == null ? $type$.getDefaultInstance() : $name$_;\n"
|
||||
"}\n");
|
||||
printer->Annotate("{", "}", descriptor_);
|
||||
|
||||
WriteFieldDocComment(printer, descriptor_);
|
||||
printer->Print(
|
||||
variables_,
|
||||
"@java.lang.Override\n"
|
||||
"$deprecation$public $type$OrBuilder "
|
||||
"${$get$capitalized_name$OrBuilder$}$() {\n"
|
||||
" return $name$_ == null ? $type$.getDefaultInstance() : $name$_;\n"
|
||||
"}\n");
|
||||
printer->Annotate("{", "}", descriptor_);
|
||||
} else {
|
||||
WriteFieldAccessorDocComment(printer, descriptor_, HAZZER);
|
||||
printer->Print(
|
||||
@@ -203,24 +189,25 @@ void ImmutableMessageFieldGenerator::GenerateMembers(
|
||||
" return $name$_ != null;\n"
|
||||
"}\n");
|
||||
printer->Annotate("{", "}", descriptor_);
|
||||
WriteFieldAccessorDocComment(printer, descriptor_, GETTER);
|
||||
printer->Print(
|
||||
variables_,
|
||||
"@java.lang.Override\n"
|
||||
"$deprecation$public $type$ ${$get$capitalized_name$$}$() {\n"
|
||||
" return $name$_ == null ? $type$.getDefaultInstance() : $name$_;\n"
|
||||
"}\n");
|
||||
printer->Annotate("{", "}", descriptor_);
|
||||
|
||||
WriteFieldDocComment(printer, descriptor_);
|
||||
printer->Print(variables_,
|
||||
"@java.lang.Override\n"
|
||||
"$deprecation$public $type$OrBuilder "
|
||||
"${$get$capitalized_name$OrBuilder$}$() {\n"
|
||||
" return get$capitalized_name$();\n"
|
||||
"}\n");
|
||||
printer->Annotate("{", "}", descriptor_);
|
||||
}
|
||||
WriteFieldAccessorDocComment(printer, descriptor_, GETTER);
|
||||
printer->Print(
|
||||
variables_,
|
||||
"@java.lang.Override\n"
|
||||
"$deprecation$public $type$ ${$get$capitalized_name$$}$() {\n"
|
||||
" return $name$_ == null ? $type$.getDefaultInstance() : $name$_;\n"
|
||||
"}\n");
|
||||
printer->Annotate("{", "}", descriptor_);
|
||||
|
||||
WriteFieldDocComment(printer, descriptor_);
|
||||
printer->Print(
|
||||
variables_,
|
||||
"@java.lang.Override\n"
|
||||
"$deprecation$public $type$OrBuilder "
|
||||
"${$get$capitalized_name$OrBuilder$}$() {\n"
|
||||
" return $name$_ == null ? $type$.getDefaultInstance() : $name$_;\n"
|
||||
"}\n");
|
||||
printer->Annotate("{", "}", descriptor_);
|
||||
}
|
||||
|
||||
void ImmutableMessageFieldGenerator::PrintNestedBuilderCondition(
|
||||
@@ -258,9 +245,6 @@ void ImmutableMessageFieldGenerator::GenerateBuilderMembers(
|
||||
// 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.
|
||||
|
||||
bool has_hasbit = HasHasbit(descriptor_);
|
||||
|
||||
printer->Print(variables_, "private $type$ $name$_;\n");
|
||||
|
||||
printer->Print(variables_,
|
||||
@@ -275,21 +259,11 @@ void ImmutableMessageFieldGenerator::GenerateBuilderMembers(
|
||||
|
||||
// boolean hasField()
|
||||
WriteFieldAccessorDocComment(printer, descriptor_, HAZZER);
|
||||
if (has_hasbit) {
|
||||
printer->Print(
|
||||
variables_,
|
||||
"$deprecation$public boolean ${$has$capitalized_name$$}$() {\n"
|
||||
" return $get_has_field_bit_builder$;\n"
|
||||
"}\n");
|
||||
printer->Annotate("{", "}", descriptor_);
|
||||
} else {
|
||||
printer->Print(
|
||||
variables_,
|
||||
"$deprecation$public boolean ${$has$capitalized_name$$}$() {\n"
|
||||
" return $name$Builder_ != null || $name$_ != null;\n"
|
||||
"}\n");
|
||||
printer->Annotate("{", "}", descriptor_);
|
||||
}
|
||||
printer->Print(variables_,
|
||||
"$deprecation$public boolean ${$has$capitalized_name$$}$() {\n"
|
||||
" return $get_has_field_bit_builder$;\n"
|
||||
"}\n");
|
||||
printer->Annotate("{", "}", descriptor_);
|
||||
|
||||
// Field getField()
|
||||
WriteFieldAccessorDocComment(printer, descriptor_, GETTER);
|
||||
@@ -307,12 +281,12 @@ void ImmutableMessageFieldGenerator::GenerateBuilderMembers(
|
||||
"if (value == null) {\n"
|
||||
" throw new NullPointerException();\n"
|
||||
"}\n"
|
||||
"$name$_ = value;\n"
|
||||
"$on_changed$\n",
|
||||
"$name$_ = value;\n",
|
||||
|
||||
"$name$Builder_.setMessage(value);\n",
|
||||
|
||||
"$set_has_field_bit_builder$\n"
|
||||
"$on_changed$\n"
|
||||
"return this;\n");
|
||||
|
||||
// Field.Builder setField(Field.Builder builderForValue)
|
||||
@@ -322,58 +296,48 @@ void ImmutableMessageFieldGenerator::GenerateBuilderMembers(
|
||||
"$deprecation$public Builder ${$set$capitalized_name$$}$(\n"
|
||||
" $type$.Builder builderForValue)",
|
||||
|
||||
"$name$_ = builderForValue.build();\n"
|
||||
"$on_changed$\n",
|
||||
"$name$_ = builderForValue.build();\n",
|
||||
|
||||
"$name$Builder_.setMessage(builderForValue.build());\n",
|
||||
|
||||
"$set_has_field_bit_builder$\n"
|
||||
"$on_changed$\n"
|
||||
"return this;\n");
|
||||
|
||||
// Field.Builder mergeField(Field value)
|
||||
// Message.Builder mergeField(Field value)
|
||||
WriteFieldDocComment(printer, descriptor_);
|
||||
PrintNestedBuilderFunction(
|
||||
printer,
|
||||
"$deprecation$public Builder ${$merge$capitalized_name$$}$($type$ value)",
|
||||
|
||||
has_hasbit
|
||||
? "if ($get_has_field_bit_builder$ &&\n"
|
||||
" $name$_ != null &&\n"
|
||||
" $name$_ != $type$.getDefaultInstance()) {\n"
|
||||
" $name$_ =\n"
|
||||
" $type$.newBuilder($name$_).mergeFrom(value).buildPartial();\n"
|
||||
"} else {\n"
|
||||
" $name$_ = value;\n"
|
||||
"}\n"
|
||||
"$on_changed$\n"
|
||||
: "if ($name$_ != null) {\n"
|
||||
" $name$_ =\n"
|
||||
" $type$.newBuilder($name$_).mergeFrom(value).buildPartial();\n"
|
||||
"} else {\n"
|
||||
" $name$_ = value;\n"
|
||||
"}\n"
|
||||
"$on_changed$\n",
|
||||
"if ($get_has_field_bit_builder$ &&\n"
|
||||
" $name$_ != null &&\n"
|
||||
" $name$_ != $type$.getDefaultInstance()) {\n"
|
||||
" get$capitalized_name$Builder().mergeFrom(value);\n"
|
||||
"} else {\n"
|
||||
" $name$_ = value;\n"
|
||||
"}\n",
|
||||
|
||||
"$name$Builder_.mergeFrom(value);\n",
|
||||
|
||||
"$set_has_field_bit_builder$\n"
|
||||
"$on_changed$\n"
|
||||
"return this;\n");
|
||||
|
||||
// Field.Builder clearField()
|
||||
// Message.Builder clearField()
|
||||
WriteFieldDocComment(printer, descriptor_);
|
||||
PrintNestedBuilderFunction(
|
||||
printer, "$deprecation$public Builder ${$clear$capitalized_name$$}$()",
|
||||
|
||||
"$name$_ = null;\n"
|
||||
"$on_changed$\n",
|
||||
|
||||
has_hasbit ? "$name$Builder_.clear();\n"
|
||||
: "$name$_ = null;\n"
|
||||
"$name$Builder_ = null;\n",
|
||||
|
||||
"$clear_has_field_bit_builder$\n"
|
||||
"return this;\n");
|
||||
printer->Print(variables_,
|
||||
"$deprecation$public Builder clear$capitalized_name$() {\n"
|
||||
" $clear_has_field_bit_builder$\n"
|
||||
" $name$_ = null;\n"
|
||||
" if ($name$Builder_ != null) {\n"
|
||||
" $name$Builder_.dispose();\n"
|
||||
" $name$Builder_ = null;\n"
|
||||
" }\n"
|
||||
" $on_changed$\n"
|
||||
" return this;\n"
|
||||
"}\n");
|
||||
|
||||
// Field.Builder getFieldBuilder()
|
||||
WriteFieldDocComment(printer, descriptor_);
|
||||
printer->Print(variables_,
|
||||
"$deprecation$public $type$.Builder "
|
||||
@@ -383,6 +347,8 @@ void ImmutableMessageFieldGenerator::GenerateBuilderMembers(
|
||||
" return get$capitalized_name$FieldBuilder().getBuilder();\n"
|
||||
"}\n");
|
||||
printer->Annotate("{", "}", descriptor_);
|
||||
|
||||
// FieldOrBuilder getFieldOrBuilder()
|
||||
WriteFieldDocComment(printer, descriptor_);
|
||||
printer->Print(variables_,
|
||||
"$deprecation$public $type$OrBuilder "
|
||||
@@ -395,6 +361,8 @@ void ImmutableMessageFieldGenerator::GenerateBuilderMembers(
|
||||
" }\n"
|
||||
"}\n");
|
||||
printer->Annotate("{", "}", descriptor_);
|
||||
|
||||
// SingleFieldBuilder getFieldFieldBuilder
|
||||
WriteFieldDocComment(printer, descriptor_);
|
||||
printer->Print(
|
||||
variables_,
|
||||
@@ -438,13 +406,21 @@ void ImmutableMessageFieldGenerator::GenerateKotlinDslMembers(
|
||||
"public fun ${$has$kt_capitalized_name$$}$(): kotlin.Boolean {\n"
|
||||
" return $kt_dsl_builder$.${$has$capitalized_name$$}$()\n"
|
||||
"}\n");
|
||||
|
||||
GenerateKotlinOrNull(printer);
|
||||
}
|
||||
|
||||
void ImmutableMessageFieldGenerator::GenerateKotlinOrNull(io::Printer* printer) const {
|
||||
if (descriptor_->has_optional_keyword()) {
|
||||
printer->Print(variables_,
|
||||
"public val $classname$Kt.Dsl.$name$OrNull: $kt_type$?\n"
|
||||
" get() = $kt_dsl_builder$.$name$OrNull\n");
|
||||
}
|
||||
}
|
||||
|
||||
void ImmutableMessageFieldGenerator::GenerateFieldBuilderInitializationCode(
|
||||
io::Printer* printer) const {
|
||||
if (HasHasbit(descriptor_)) {
|
||||
printer->Print(variables_, "get$capitalized_name$FieldBuilder();\n");
|
||||
}
|
||||
printer->Print(variables_, "get$capitalized_name$FieldBuilder();\n");
|
||||
}
|
||||
|
||||
void ImmutableMessageFieldGenerator::GenerateInitializationCode(
|
||||
@@ -452,17 +428,13 @@ void ImmutableMessageFieldGenerator::GenerateInitializationCode(
|
||||
|
||||
void ImmutableMessageFieldGenerator::GenerateBuilderClearCode(
|
||||
io::Printer* printer) const {
|
||||
if (HasHasbit(descriptor_)) {
|
||||
PrintNestedBuilderCondition(printer, "$name$_ = null;\n",
|
||||
|
||||
"$name$Builder_.clear();\n");
|
||||
printer->Print(variables_, "$clear_has_field_bit_builder$\n");
|
||||
} else {
|
||||
PrintNestedBuilderCondition(printer, "$name$_ = null;\n",
|
||||
|
||||
"$name$_ = null;\n"
|
||||
"$name$Builder_ = null;\n");
|
||||
}
|
||||
// No need to clear the has-bit since we clear the bitField ints all at once.
|
||||
printer->Print(variables_,
|
||||
"$name$_ = null;\n"
|
||||
"if ($name$Builder_ != null) {\n"
|
||||
" $name$Builder_.dispose();\n"
|
||||
" $name$Builder_ = null;\n"
|
||||
"}\n");
|
||||
}
|
||||
|
||||
void ImmutableMessageFieldGenerator::GenerateMergingCode(
|
||||
@@ -475,50 +447,32 @@ void ImmutableMessageFieldGenerator::GenerateMergingCode(
|
||||
|
||||
void ImmutableMessageFieldGenerator::GenerateBuildingCode(
|
||||
io::Printer* printer) const {
|
||||
if (HasHasbit(descriptor_)) {
|
||||
printer->Print(variables_, "if ($get_has_field_bit_from_local$) {\n");
|
||||
printer->Indent();
|
||||
PrintNestedBuilderCondition(printer, "result.$name$_ = $name$_;\n",
|
||||
"result.$name$_ = $name$Builder_.build();\n");
|
||||
printer->Outdent();
|
||||
printer->Print(variables_,
|
||||
" $set_has_field_bit_to_local$;\n"
|
||||
"}\n");
|
||||
} else {
|
||||
PrintNestedBuilderCondition(printer, "result.$name$_ = $name$_;\n",
|
||||
"result.$name$_ = $name$Builder_.build();\n");
|
||||
printer->Print(variables_,
|
||||
"if ($get_has_field_bit_from_local$) {\n"
|
||||
" result.$name$_ = $name$Builder_ == null\n"
|
||||
" ? $name$_\n"
|
||||
" : $name$Builder_.build();\n");
|
||||
if (GetNumBitsForMessage() > 0) {
|
||||
printer->Print(variables_, " $set_has_field_bit_to_local$;\n");
|
||||
}
|
||||
printer->Print("}\n");
|
||||
}
|
||||
|
||||
void ImmutableMessageFieldGenerator::GenerateParsingCode(
|
||||
void ImmutableMessageFieldGenerator::GenerateBuilderParsingCode(
|
||||
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"
|
||||
" extensionRegistry);\n");
|
||||
"input.readGroup($number$,\n"
|
||||
" get$capitalized_name$FieldBuilder().getBuilder(),\n"
|
||||
" extensionRegistry);\n"
|
||||
"$set_has_field_bit_builder$\n");
|
||||
} else {
|
||||
printer->Print(variables_,
|
||||
"$name$_ = input.readMessage($type$.$get_parser$, "
|
||||
"extensionRegistry);\n");
|
||||
"input.readMessage(\n"
|
||||
" get$capitalized_name$FieldBuilder().getBuilder(),\n"
|
||||
" extensionRegistry);\n"
|
||||
"$set_has_field_bit_builder$\n");
|
||||
}
|
||||
|
||||
printer->Print(variables_,
|
||||
"if (subBuilder != null) {\n"
|
||||
" subBuilder.mergeFrom($name$_);\n"
|
||||
" $name$_ = subBuilder.buildPartial();\n"
|
||||
"}\n"
|
||||
"$set_has_field_bit_message$\n");
|
||||
}
|
||||
|
||||
void ImmutableMessageFieldGenerator::GenerateParsingDoneCode(
|
||||
io::Printer* printer) const {
|
||||
// noop for messages.
|
||||
}
|
||||
|
||||
void ImmutableMessageFieldGenerator::GenerateSerializationCode(
|
||||
@@ -582,6 +536,7 @@ void ImmutableMessageOneofFieldGenerator::GenerateMembers(
|
||||
" return $has_oneof_case_message$;\n"
|
||||
"}\n");
|
||||
printer->Annotate("{", "}", descriptor_);
|
||||
|
||||
WriteFieldAccessorDocComment(printer, descriptor_, GETTER);
|
||||
printer->Print(variables_,
|
||||
"@java.lang.Override\n"
|
||||
@@ -698,8 +653,9 @@ void ImmutableMessageOneofFieldGenerator::GenerateBuilderMembers(
|
||||
|
||||
"if ($has_oneof_case_message$) {\n"
|
||||
" $name$Builder_.mergeFrom(value);\n"
|
||||
"}\n"
|
||||
"$name$Builder_.setMessage(value);\n",
|
||||
"} else {\n"
|
||||
" $name$Builder_.setMessage(value);\n"
|
||||
"}\n",
|
||||
|
||||
"$set_oneof_case_message$;\n"
|
||||
"return this;\n");
|
||||
@@ -764,24 +720,28 @@ void ImmutableMessageOneofFieldGenerator::GenerateBuilderMembers(
|
||||
" $oneof_name$_ = null;\n"
|
||||
" }\n"
|
||||
" $set_oneof_case_message$;\n"
|
||||
" $on_changed$;\n"
|
||||
" $on_changed$\n"
|
||||
" return $name$Builder_;\n"
|
||||
"}\n");
|
||||
printer->Annotate("{", "}", descriptor_);
|
||||
}
|
||||
|
||||
void ImmutableMessageOneofFieldGenerator::GenerateBuilderClearCode(
|
||||
io::Printer* printer) const {
|
||||
// Make sure the builder gets cleared.
|
||||
printer->Print(variables_,
|
||||
"if ($name$Builder_ != null) {\n"
|
||||
" $name$Builder_.clear();\n"
|
||||
"}\n");
|
||||
}
|
||||
|
||||
void ImmutableMessageOneofFieldGenerator::GenerateBuildingCode(
|
||||
io::Printer* printer) const {
|
||||
printer->Print(variables_, "if ($has_oneof_case_message$) {\n");
|
||||
printer->Indent();
|
||||
|
||||
PrintNestedBuilderCondition(
|
||||
printer, "result.$oneof_name$_ = $oneof_name$_;\n",
|
||||
|
||||
"result.$oneof_name$_ = $name$Builder_.build();\n");
|
||||
|
||||
printer->Outdent();
|
||||
printer->Print("}\n");
|
||||
printer->Print(variables_,
|
||||
"if ($has_oneof_case_message$ &&\n"
|
||||
" $name$Builder_ != null) {\n"
|
||||
" result.$oneof_name$_ = $name$Builder_.build();\n"
|
||||
"}\n");
|
||||
}
|
||||
|
||||
void ImmutableMessageOneofFieldGenerator::GenerateMergingCode(
|
||||
@@ -790,32 +750,21 @@ void ImmutableMessageOneofFieldGenerator::GenerateMergingCode(
|
||||
"merge$capitalized_name$(other.get$capitalized_name$());\n");
|
||||
}
|
||||
|
||||
void ImmutableMessageOneofFieldGenerator::GenerateParsingCode(
|
||||
void ImmutableMessageOneofFieldGenerator::GenerateBuilderParsingCode(
|
||||
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"
|
||||
" extensionRegistry);\n");
|
||||
printer->Print(variables_,
|
||||
"input.readGroup($number$,\n"
|
||||
" get$capitalized_name$FieldBuilder().getBuilder(),\n"
|
||||
" extensionRegistry);\n"
|
||||
"$set_oneof_case_message$;\n");
|
||||
} else {
|
||||
printer->Print(
|
||||
variables_,
|
||||
"$oneof_name$_ =\n"
|
||||
" input.readMessage($type$.$get_parser$, extensionRegistry);\n");
|
||||
printer->Print(variables_,
|
||||
"input.readMessage(\n"
|
||||
" get$capitalized_name$FieldBuilder().getBuilder(),\n"
|
||||
" extensionRegistry);\n"
|
||||
"$set_oneof_case_message$;\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");
|
||||
}
|
||||
|
||||
void ImmutableMessageOneofFieldGenerator::GenerateSerializationCode(
|
||||
@@ -842,11 +791,8 @@ void ImmutableMessageOneofFieldGenerator::GenerateSerializedSizeCode(
|
||||
RepeatedImmutableMessageFieldGenerator::RepeatedImmutableMessageFieldGenerator(
|
||||
const FieldDescriptor* descriptor, int messageBitIndex, int builderBitIndex,
|
||||
Context* context)
|
||||
: descriptor_(descriptor), name_resolver_(context->GetNameResolver()) {
|
||||
SetMessageVariables(descriptor, messageBitIndex, builderBitIndex,
|
||||
context->GetFieldGeneratorInfo(descriptor),
|
||||
name_resolver_, &variables_);
|
||||
}
|
||||
: ImmutableMessageFieldGenerator(descriptor, messageBitIndex,
|
||||
builderBitIndex, context) {}
|
||||
|
||||
RepeatedImmutableMessageFieldGenerator::
|
||||
~RepeatedImmutableMessageFieldGenerator() {}
|
||||
@@ -889,7 +835,8 @@ void RepeatedImmutableMessageFieldGenerator::GenerateInterfaceMembers(
|
||||
|
||||
void RepeatedImmutableMessageFieldGenerator::GenerateMembers(
|
||||
io::Printer* printer) const {
|
||||
printer->Print(variables_, "private java.util.List<$type$> $name$_;\n");
|
||||
printer->Print(variables_, "@SuppressWarnings(\"serial\")\n"
|
||||
"private java.util.List<$type$> $name$_;\n");
|
||||
PrintExtraFieldInfo(variables_, printer);
|
||||
WriteFieldDocComment(printer, descriptor_);
|
||||
printer->Print(variables_,
|
||||
@@ -899,6 +846,8 @@ void RepeatedImmutableMessageFieldGenerator::GenerateMembers(
|
||||
" return $name$_;\n" // note: unmodifiable list
|
||||
"}\n");
|
||||
printer->Annotate("{", "}", descriptor_);
|
||||
|
||||
// List<FieldOrBuilder> getFieldOrBuilderList()
|
||||
WriteFieldDocComment(printer, descriptor_);
|
||||
printer->Print(
|
||||
variables_,
|
||||
@@ -908,6 +857,8 @@ void RepeatedImmutableMessageFieldGenerator::GenerateMembers(
|
||||
" return $name$_;\n"
|
||||
"}\n");
|
||||
printer->Annotate("{", "}", descriptor_);
|
||||
|
||||
// int getFieldCount()
|
||||
WriteFieldDocComment(printer, descriptor_);
|
||||
printer->Print(
|
||||
variables_,
|
||||
@@ -916,6 +867,8 @@ void RepeatedImmutableMessageFieldGenerator::GenerateMembers(
|
||||
" return $name$_.size();\n"
|
||||
"}\n");
|
||||
printer->Annotate("{", "}", descriptor_);
|
||||
|
||||
// Field getField(int index)
|
||||
WriteFieldDocComment(printer, descriptor_);
|
||||
printer->Print(
|
||||
variables_,
|
||||
@@ -924,6 +877,8 @@ void RepeatedImmutableMessageFieldGenerator::GenerateMembers(
|
||||
" return $name$_.get(index);\n"
|
||||
"}\n");
|
||||
printer->Annotate("{", "}", descriptor_);
|
||||
|
||||
// FieldOrBuilder getFieldOrBuilder(int index)
|
||||
WriteFieldDocComment(printer, descriptor_);
|
||||
printer->Print(variables_,
|
||||
"@java.lang.Override\n"
|
||||
@@ -1149,7 +1104,7 @@ void RepeatedImmutableMessageFieldGenerator::GenerateBuilderMembers(
|
||||
|
||||
"return this;\n");
|
||||
|
||||
// Builder clearAllRepeatedField()
|
||||
// Builder clearRepeatedField()
|
||||
WriteFieldDocComment(printer, descriptor_);
|
||||
PrintNestedBuilderFunction(
|
||||
printer, "$deprecation$public Builder ${$clear$capitalized_name$$}$()",
|
||||
@@ -1176,6 +1131,7 @@ void RepeatedImmutableMessageFieldGenerator::GenerateBuilderMembers(
|
||||
|
||||
"return this;\n");
|
||||
|
||||
// Field.Builder getRepeatedFieldBuilder(int index)
|
||||
WriteFieldDocComment(printer, descriptor_);
|
||||
printer->Print(
|
||||
variables_,
|
||||
@@ -1185,6 +1141,7 @@ void RepeatedImmutableMessageFieldGenerator::GenerateBuilderMembers(
|
||||
"}\n");
|
||||
printer->Annotate("{", "}", descriptor_);
|
||||
|
||||
// FieldOrBuilder getRepeatedFieldOrBuilder(int index)
|
||||
WriteFieldDocComment(printer, descriptor_);
|
||||
printer->Print(variables_,
|
||||
"$deprecation$public $type$OrBuilder "
|
||||
@@ -1198,6 +1155,7 @@ void RepeatedImmutableMessageFieldGenerator::GenerateBuilderMembers(
|
||||
"}\n");
|
||||
printer->Annotate("{", "}", descriptor_);
|
||||
|
||||
// List<FieldOrBuilder> getRepeatedFieldOrBuilderList()
|
||||
WriteFieldDocComment(printer, descriptor_);
|
||||
printer->Print(
|
||||
variables_,
|
||||
@@ -1211,6 +1169,7 @@ void RepeatedImmutableMessageFieldGenerator::GenerateBuilderMembers(
|
||||
"}\n");
|
||||
printer->Annotate("{", "}", descriptor_);
|
||||
|
||||
// Field.Builder addRepeatedField()
|
||||
WriteFieldDocComment(printer, descriptor_);
|
||||
printer->Print(variables_,
|
||||
"$deprecation$public $type$.Builder "
|
||||
@@ -1219,6 +1178,8 @@ void RepeatedImmutableMessageFieldGenerator::GenerateBuilderMembers(
|
||||
" $type$.getDefaultInstance());\n"
|
||||
"}\n");
|
||||
printer->Annotate("{", "}", descriptor_);
|
||||
|
||||
// Field.Builder addRepeatedFieldBuilder(int index)
|
||||
WriteFieldDocComment(printer, descriptor_);
|
||||
printer->Print(
|
||||
variables_,
|
||||
@@ -1228,6 +1189,8 @@ void RepeatedImmutableMessageFieldGenerator::GenerateBuilderMembers(
|
||||
" index, $type$.getDefaultInstance());\n"
|
||||
"}\n");
|
||||
printer->Annotate("{", "}", descriptor_);
|
||||
|
||||
// List<Field.Builder> getRepeatedFieldBuilderList()
|
||||
WriteFieldDocComment(printer, descriptor_);
|
||||
printer->Print(
|
||||
variables_,
|
||||
@@ -1266,10 +1229,12 @@ void RepeatedImmutableMessageFieldGenerator::GenerateInitializationCode(
|
||||
void RepeatedImmutableMessageFieldGenerator::GenerateBuilderClearCode(
|
||||
io::Printer* printer) const {
|
||||
PrintNestedBuilderCondition(printer,
|
||||
"$name$_ = java.util.Collections.emptyList();\n"
|
||||
"$clear_mutable_bit_builder$;\n",
|
||||
"$name$_ = java.util.Collections.emptyList();\n",
|
||||
|
||||
"$name$_ = null;\n"
|
||||
"$name$Builder_.clear();\n");
|
||||
|
||||
printer->Print(variables_, "$clear_mutable_bit_builder$;\n");
|
||||
}
|
||||
|
||||
void RepeatedImmutableMessageFieldGenerator::GenerateMergingCode(
|
||||
@@ -1324,34 +1289,25 @@ void RepeatedImmutableMessageFieldGenerator::GenerateBuildingCode(
|
||||
"result.$name$_ = $name$Builder_.build();\n");
|
||||
}
|
||||
|
||||
void RepeatedImmutableMessageFieldGenerator::GenerateParsingCode(
|
||||
void RepeatedImmutableMessageFieldGenerator::GenerateBuilderParsingCode(
|
||||
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"
|
||||
" extensionRegistry));\n");
|
||||
printer->Print(variables_,
|
||||
"$type$ m =\n"
|
||||
" input.readGroup($number$,\n"
|
||||
" $type$.$get_parser$,\n"
|
||||
" extensionRegistry);\n");
|
||||
} else {
|
||||
printer->Print(
|
||||
variables_,
|
||||
"$name$_.add(\n"
|
||||
" input.readMessage($type$.$get_parser$, extensionRegistry));\n");
|
||||
printer->Print(variables_,
|
||||
"$type$ m =\n"
|
||||
" input.readMessage(\n"
|
||||
" $type$.$get_parser$,\n"
|
||||
" 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");
|
||||
PrintNestedBuilderCondition(printer,
|
||||
"ensure$capitalized_name$IsMutable();\n"
|
||||
"$name$_.add(m);\n",
|
||||
"$name$Builder_.addMessage(m);\n");
|
||||
}
|
||||
|
||||
void RepeatedImmutableMessageFieldGenerator::GenerateSerializationCode(
|
||||
@@ -1426,7 +1382,7 @@ void RepeatedImmutableMessageFieldGenerator::GenerateKotlinDslMembers(
|
||||
"<$kt_type$, ${$$kt_capitalized_name$Proxy$}$>."
|
||||
"add(value: $kt_type$) {\n"
|
||||
" $kt_dsl_builder$.${$add$capitalized_name$$}$(value)\n"
|
||||
"}");
|
||||
"}\n");
|
||||
|
||||
WriteFieldAccessorDocComment(printer, descriptor_, LIST_ADDER,
|
||||
/* builder */ false);
|
||||
@@ -1438,7 +1394,7 @@ void RepeatedImmutableMessageFieldGenerator::GenerateKotlinDslMembers(
|
||||
"<$kt_type$, ${$$kt_capitalized_name$Proxy$}$>."
|
||||
"plusAssign(value: $kt_type$) {\n"
|
||||
" add(value)\n"
|
||||
"}");
|
||||
"}\n");
|
||||
|
||||
WriteFieldAccessorDocComment(printer, descriptor_, LIST_MULTI_ADDER,
|
||||
/* builder */ false);
|
||||
@@ -1449,7 +1405,7 @@ void RepeatedImmutableMessageFieldGenerator::GenerateKotlinDslMembers(
|
||||
"<$kt_type$, ${$$kt_capitalized_name$Proxy$}$>."
|
||||
"addAll(values: kotlin.collections.Iterable<$kt_type$>) {\n"
|
||||
" $kt_dsl_builder$.${$addAll$capitalized_name$$}$(values)\n"
|
||||
"}");
|
||||
"}\n");
|
||||
|
||||
WriteFieldAccessorDocComment(printer, descriptor_, LIST_MULTI_ADDER,
|
||||
/* builder */ false);
|
||||
@@ -1462,7 +1418,7 @@ void RepeatedImmutableMessageFieldGenerator::GenerateKotlinDslMembers(
|
||||
"<$kt_type$, ${$$kt_capitalized_name$Proxy$}$>."
|
||||
"plusAssign(values: kotlin.collections.Iterable<$kt_type$>) {\n"
|
||||
" addAll(values)\n"
|
||||
"}");
|
||||
"}\n");
|
||||
|
||||
WriteFieldAccessorDocComment(printer, descriptor_, LIST_INDEXED_SETTER,
|
||||
/* builder */ false);
|
||||
@@ -1474,7 +1430,7 @@ void RepeatedImmutableMessageFieldGenerator::GenerateKotlinDslMembers(
|
||||
"<$kt_type$, ${$$kt_capitalized_name$Proxy$}$>."
|
||||
"set(index: kotlin.Int, value: $kt_type$) {\n"
|
||||
" $kt_dsl_builder$.${$set$capitalized_name$$}$(index, value)\n"
|
||||
"}");
|
||||
"}\n");
|
||||
|
||||
WriteFieldAccessorDocComment(printer, descriptor_, CLEARER,
|
||||
/* builder */ false);
|
||||
@@ -1485,10 +1441,12 @@ void RepeatedImmutableMessageFieldGenerator::GenerateKotlinDslMembers(
|
||||
"<$kt_type$, ${$$kt_capitalized_name$Proxy$}$>."
|
||||
"clear() {\n"
|
||||
" $kt_dsl_builder$.${$clear$capitalized_name$$}$()\n"
|
||||
"}");
|
||||
"}\n\n");
|
||||
}
|
||||
|
||||
} // namespace java
|
||||
} // namespace compiler
|
||||
} // namespace protobuf
|
||||
} // namespace google
|
||||
|
||||
#include "google/protobuf/port_undef.inc"
|
||||
+40
-32
@@ -37,7 +37,8 @@
|
||||
|
||||
#include <map>
|
||||
#include <string>
|
||||
#include <google/protobuf/compiler/java/java_field.h>
|
||||
|
||||
#include "google/protobuf/compiler/java/field.h"
|
||||
|
||||
namespace google {
|
||||
namespace protobuf {
|
||||
@@ -61,10 +62,16 @@ class ImmutableMessageFieldGenerator : public ImmutableFieldGenerator {
|
||||
int messageBitIndex,
|
||||
int builderBitIndex,
|
||||
Context* context);
|
||||
~ImmutableMessageFieldGenerator();
|
||||
ImmutableMessageFieldGenerator(const ImmutableMessageFieldGenerator&) =
|
||||
delete;
|
||||
ImmutableMessageFieldGenerator& operator=(
|
||||
const ImmutableMessageFieldGenerator&) = delete;
|
||||
~ImmutableMessageFieldGenerator() override;
|
||||
|
||||
// implements ImmutableFieldGenerator
|
||||
// ---------------------------------------
|
||||
int GetMessageBitIndex() const override;
|
||||
int GetBuilderBitIndex() const override;
|
||||
int GetNumBitsForMessage() const override;
|
||||
int GetNumBitsForBuilder() const override;
|
||||
void GenerateInterfaceMembers(io::Printer* printer) const override;
|
||||
@@ -74,8 +81,7 @@ class ImmutableMessageFieldGenerator : public ImmutableFieldGenerator {
|
||||
void GenerateBuilderClearCode(io::Printer* printer) const override;
|
||||
void GenerateMergingCode(io::Printer* printer) const override;
|
||||
void GenerateBuildingCode(io::Printer* printer) const override;
|
||||
void GenerateParsingCode(io::Printer* printer) const override;
|
||||
void GenerateParsingDoneCode(io::Printer* printer) const override;
|
||||
void GenerateBuilderParsingCode(io::Printer* printer) const override;
|
||||
void GenerateSerializationCode(io::Printer* printer) const override;
|
||||
void GenerateSerializedSizeCode(io::Printer* printer) const override;
|
||||
void GenerateFieldBuilderInitializationCode(
|
||||
@@ -88,20 +94,23 @@ class ImmutableMessageFieldGenerator : public ImmutableFieldGenerator {
|
||||
|
||||
protected:
|
||||
const FieldDescriptor* descriptor_;
|
||||
int message_bit_index_;
|
||||
int builder_bit_index_;
|
||||
std::map<std::string, std::string> variables_;
|
||||
ClassNameResolver* name_resolver_;
|
||||
Context* context_;
|
||||
|
||||
void PrintNestedBuilderCondition(io::Printer* printer,
|
||||
const char* regular_case,
|
||||
const char* nested_builder_case) const;
|
||||
void PrintNestedBuilderFunction(io::Printer* printer,
|
||||
const char* method_prototype,
|
||||
const char* regular_case,
|
||||
const char* nested_builder_case,
|
||||
const char* trailing_code) const;
|
||||
virtual void PrintNestedBuilderCondition(
|
||||
io::Printer* printer, const char* regular_case,
|
||||
const char* nested_builder_case) const;
|
||||
virtual void PrintNestedBuilderFunction(io::Printer* printer,
|
||||
const char* method_prototype,
|
||||
const char* regular_case,
|
||||
const char* nested_builder_case,
|
||||
const char* trailing_code) const;
|
||||
|
||||
private:
|
||||
GOOGLE_DISALLOW_EVIL_CONSTRUCTORS(ImmutableMessageFieldGenerator);
|
||||
void GenerateKotlinOrNull(io::Printer* printer) const;
|
||||
};
|
||||
|
||||
class ImmutableMessageOneofFieldGenerator
|
||||
@@ -110,25 +119,32 @@ class ImmutableMessageOneofFieldGenerator
|
||||
ImmutableMessageOneofFieldGenerator(const FieldDescriptor* descriptor,
|
||||
int messageBitIndex, int builderBitIndex,
|
||||
Context* context);
|
||||
~ImmutableMessageOneofFieldGenerator();
|
||||
ImmutableMessageOneofFieldGenerator(
|
||||
const ImmutableMessageOneofFieldGenerator&) = delete;
|
||||
ImmutableMessageOneofFieldGenerator& operator=(
|
||||
const ImmutableMessageOneofFieldGenerator&) = delete;
|
||||
~ImmutableMessageOneofFieldGenerator() override;
|
||||
|
||||
void GenerateMembers(io::Printer* printer) const override;
|
||||
void GenerateBuilderMembers(io::Printer* printer) const override;
|
||||
void GenerateBuilderClearCode(io::Printer* printer) const override;
|
||||
void GenerateBuildingCode(io::Printer* printer) const override;
|
||||
void GenerateMergingCode(io::Printer* printer) const override;
|
||||
void GenerateParsingCode(io::Printer* printer) const override;
|
||||
void GenerateBuilderParsingCode(io::Printer* printer) const override;
|
||||
void GenerateSerializationCode(io::Printer* printer) const override;
|
||||
void GenerateSerializedSizeCode(io::Printer* printer) const override;
|
||||
|
||||
private:
|
||||
GOOGLE_DISALLOW_EVIL_CONSTRUCTORS(ImmutableMessageOneofFieldGenerator);
|
||||
};
|
||||
|
||||
class RepeatedImmutableMessageFieldGenerator : public ImmutableFieldGenerator {
|
||||
class RepeatedImmutableMessageFieldGenerator
|
||||
: public ImmutableMessageFieldGenerator {
|
||||
public:
|
||||
explicit RepeatedImmutableMessageFieldGenerator(
|
||||
const FieldDescriptor* descriptor, int messageBitIndex,
|
||||
int builderBitIndex, Context* context);
|
||||
RepeatedImmutableMessageFieldGenerator(
|
||||
const RepeatedImmutableMessageFieldGenerator&) = delete;
|
||||
RepeatedImmutableMessageFieldGenerator& operator=(
|
||||
const RepeatedImmutableMessageFieldGenerator&) = delete;
|
||||
~RepeatedImmutableMessageFieldGenerator() override;
|
||||
|
||||
// implements ImmutableFieldGenerator ---------------------------------------
|
||||
@@ -141,8 +157,7 @@ class RepeatedImmutableMessageFieldGenerator : public ImmutableFieldGenerator {
|
||||
void GenerateBuilderClearCode(io::Printer* printer) const override;
|
||||
void GenerateMergingCode(io::Printer* printer) const override;
|
||||
void GenerateBuildingCode(io::Printer* printer) const override;
|
||||
void GenerateParsingCode(io::Printer* printer) const override;
|
||||
void GenerateParsingDoneCode(io::Printer* printer) const override;
|
||||
void GenerateBuilderParsingCode(io::Printer* printer) const override;
|
||||
void GenerateSerializationCode(io::Printer* printer) const override;
|
||||
void GenerateSerializedSizeCode(io::Printer* printer) const override;
|
||||
void GenerateFieldBuilderInitializationCode(
|
||||
@@ -154,21 +169,14 @@ class RepeatedImmutableMessageFieldGenerator : public ImmutableFieldGenerator {
|
||||
std::string GetBoxedType() const override;
|
||||
|
||||
protected:
|
||||
const FieldDescriptor* descriptor_;
|
||||
std::map<std::string, std::string> variables_;
|
||||
ClassNameResolver* name_resolver_;
|
||||
|
||||
void PrintNestedBuilderCondition(io::Printer* printer,
|
||||
const char* regular_case,
|
||||
const char* nested_builder_case) const;
|
||||
void PrintNestedBuilderCondition(
|
||||
io::Printer* printer, const char* regular_case,
|
||||
const char* nested_builder_case) const override;
|
||||
void PrintNestedBuilderFunction(io::Printer* printer,
|
||||
const char* method_prototype,
|
||||
const char* regular_case,
|
||||
const char* nested_builder_case,
|
||||
const char* trailing_code) const;
|
||||
|
||||
private:
|
||||
GOOGLE_DISALLOW_EVIL_CONSTRUCTORS(RepeatedImmutableMessageFieldGenerator);
|
||||
const char* trailing_code) const override;
|
||||
};
|
||||
|
||||
} // namespace java
|
||||
+25
-11
@@ -32,19 +32,22 @@
|
||||
// Based on original Protocol Buffers design by
|
||||
// Sanjay Ghemawat, Jeff Dean, and others.
|
||||
|
||||
#include <google/protobuf/compiler/java/java_message_field_lite.h>
|
||||
#include <google/protobuf/compiler/java/message_field_lite.h>
|
||||
|
||||
#include <cstdint>
|
||||
#include <map>
|
||||
#include <string>
|
||||
|
||||
#include <google/protobuf/compiler/java/java_context.h>
|
||||
#include <google/protobuf/compiler/java/java_doc_comment.h>
|
||||
#include <google/protobuf/compiler/java/java_helpers.h>
|
||||
#include <google/protobuf/compiler/java/java_name_resolver.h>
|
||||
#include <google/protobuf/io/printer.h>
|
||||
#include <google/protobuf/wire_format.h>
|
||||
#include <google/protobuf/stubs/strutil.h>
|
||||
#include <google/protobuf/compiler/java/context.h>
|
||||
#include <google/protobuf/compiler/java/doc_comment.h>
|
||||
#include <google/protobuf/compiler/java/helpers.h>
|
||||
#include <google/protobuf/compiler/java/name_resolver.h>
|
||||
|
||||
// Must be last.
|
||||
#include <google/protobuf/port_def.inc>
|
||||
|
||||
namespace google {
|
||||
namespace protobuf {
|
||||
@@ -308,6 +311,15 @@ void ImmutableMessageFieldLiteGenerator::GenerateKotlinDslMembers(
|
||||
"public fun ${$has$kt_capitalized_name$$}$(): kotlin.Boolean {\n"
|
||||
" return $kt_dsl_builder$.${$has$capitalized_name$$}$()\n"
|
||||
"}\n");
|
||||
GenerateKotlinOrNull(printer);
|
||||
}
|
||||
|
||||
void ImmutableMessageFieldLiteGenerator::GenerateKotlinOrNull(io::Printer* printer) const {
|
||||
if (descriptor_->has_optional_keyword()) {
|
||||
printer->Print(variables_,
|
||||
"public val $classname$Kt.Dsl.$name$OrNull: $kt_type$?\n"
|
||||
" get() = $kt_dsl_builder$.$name$OrNull\n");
|
||||
}
|
||||
}
|
||||
|
||||
void ImmutableMessageFieldLiteGenerator::GenerateFieldInfo(
|
||||
@@ -816,7 +828,7 @@ void RepeatedImmutableMessageFieldLiteGenerator::GenerateKotlinDslMembers(
|
||||
"<$kt_type$, ${$$kt_capitalized_name$Proxy$}$>."
|
||||
"add(value: $kt_type$) {\n"
|
||||
" $kt_dsl_builder$.${$add$capitalized_name$$}$(value)\n"
|
||||
"}");
|
||||
"}\n");
|
||||
|
||||
WriteFieldAccessorDocComment(printer, descriptor_, LIST_ADDER,
|
||||
/* builder */ false);
|
||||
@@ -828,7 +840,7 @@ void RepeatedImmutableMessageFieldLiteGenerator::GenerateKotlinDslMembers(
|
||||
"<$kt_type$, ${$$kt_capitalized_name$Proxy$}$>."
|
||||
"plusAssign(value: $kt_type$) {\n"
|
||||
" add(value)\n"
|
||||
"}");
|
||||
"}\n");
|
||||
|
||||
WriteFieldAccessorDocComment(printer, descriptor_, LIST_MULTI_ADDER,
|
||||
/* builder */ false);
|
||||
@@ -839,7 +851,7 @@ void RepeatedImmutableMessageFieldLiteGenerator::GenerateKotlinDslMembers(
|
||||
"<$kt_type$, ${$$kt_capitalized_name$Proxy$}$>."
|
||||
"addAll(values: kotlin.collections.Iterable<$kt_type$>) {\n"
|
||||
" $kt_dsl_builder$.${$addAll$capitalized_name$$}$(values)\n"
|
||||
"}");
|
||||
"}\n");
|
||||
|
||||
WriteFieldAccessorDocComment(printer, descriptor_, LIST_MULTI_ADDER,
|
||||
/* builder */ false);
|
||||
@@ -852,7 +864,7 @@ void RepeatedImmutableMessageFieldLiteGenerator::GenerateKotlinDslMembers(
|
||||
"<$kt_type$, ${$$kt_capitalized_name$Proxy$}$>."
|
||||
"plusAssign(values: kotlin.collections.Iterable<$kt_type$>) {\n"
|
||||
" addAll(values)\n"
|
||||
"}");
|
||||
"}\n");
|
||||
|
||||
WriteFieldAccessorDocComment(printer, descriptor_, LIST_INDEXED_SETTER,
|
||||
/* builder */ false);
|
||||
@@ -864,7 +876,7 @@ void RepeatedImmutableMessageFieldLiteGenerator::GenerateKotlinDslMembers(
|
||||
"<$kt_type$, ${$$kt_capitalized_name$Proxy$}$>."
|
||||
"set(index: kotlin.Int, value: $kt_type$) {\n"
|
||||
" $kt_dsl_builder$.${$set$capitalized_name$$}$(index, value)\n"
|
||||
"}");
|
||||
"}\n");
|
||||
|
||||
WriteFieldAccessorDocComment(printer, descriptor_, CLEARER,
|
||||
/* builder */ false);
|
||||
@@ -875,10 +887,12 @@ void RepeatedImmutableMessageFieldLiteGenerator::GenerateKotlinDslMembers(
|
||||
"<$kt_type$, ${$$kt_capitalized_name$Proxy$}$>."
|
||||
"clear() {\n"
|
||||
" $kt_dsl_builder$.${$clear$capitalized_name$$}$()\n"
|
||||
"}");
|
||||
"}\n");
|
||||
}
|
||||
|
||||
} // namespace java
|
||||
} // namespace compiler
|
||||
} // namespace protobuf
|
||||
} // namespace google
|
||||
|
||||
#include <google/protobuf/port_undef.inc>
|
||||
+4
-3
@@ -39,7 +39,7 @@
|
||||
#include <map>
|
||||
#include <string>
|
||||
|
||||
#include <google/protobuf/compiler/java/java_field.h>
|
||||
#include <google/protobuf/compiler/java/field.h>
|
||||
|
||||
namespace google {
|
||||
namespace protobuf {
|
||||
@@ -62,7 +62,7 @@ class ImmutableMessageFieldLiteGenerator : public ImmutableFieldLiteGenerator {
|
||||
explicit ImmutableMessageFieldLiteGenerator(const FieldDescriptor* descriptor,
|
||||
int messageBitIndex,
|
||||
Context* context);
|
||||
~ImmutableMessageFieldLiteGenerator();
|
||||
~ImmutableMessageFieldLiteGenerator() override;
|
||||
|
||||
// implements ImmutableFieldLiteGenerator
|
||||
// ------------------------------------
|
||||
@@ -85,6 +85,7 @@ class ImmutableMessageFieldLiteGenerator : public ImmutableFieldLiteGenerator {
|
||||
|
||||
private:
|
||||
GOOGLE_DISALLOW_EVIL_CONSTRUCTORS(ImmutableMessageFieldLiteGenerator);
|
||||
void GenerateKotlinOrNull(io::Printer* printer) const;
|
||||
};
|
||||
|
||||
class ImmutableMessageOneofFieldLiteGenerator
|
||||
@@ -93,7 +94,7 @@ class ImmutableMessageOneofFieldLiteGenerator
|
||||
ImmutableMessageOneofFieldLiteGenerator(const FieldDescriptor* descriptor,
|
||||
int messageBitIndex,
|
||||
Context* context);
|
||||
~ImmutableMessageOneofFieldLiteGenerator();
|
||||
~ImmutableMessageOneofFieldLiteGenerator() override;
|
||||
|
||||
void GenerateMembers(io::Printer* printer) const override;
|
||||
void GenerateBuilderMembers(io::Printer* printer) const override;
|
||||
+47
-21
@@ -32,7 +32,7 @@
|
||||
// Based on original Protocol Buffers design by
|
||||
// Sanjay Ghemawat, Jeff Dean, and others.
|
||||
|
||||
#include <google/protobuf/compiler/java/java_message_lite.h>
|
||||
#include <google/protobuf/compiler/java/message_lite.h>
|
||||
|
||||
#include <algorithm>
|
||||
#include <cstdint>
|
||||
@@ -40,21 +40,24 @@
|
||||
#include <memory>
|
||||
#include <vector>
|
||||
|
||||
#include <google/protobuf/compiler/java/java_context.h>
|
||||
#include <google/protobuf/compiler/java/java_doc_comment.h>
|
||||
#include <google/protobuf/compiler/java/java_enum_lite.h>
|
||||
#include <google/protobuf/compiler/java/java_extension_lite.h>
|
||||
#include <google/protobuf/compiler/java/java_generator_factory.h>
|
||||
#include <google/protobuf/compiler/java/java_helpers.h>
|
||||
#include <google/protobuf/compiler/java/java_message_builder.h>
|
||||
#include <google/protobuf/compiler/java/java_message_builder_lite.h>
|
||||
#include <google/protobuf/compiler/java/java_name_resolver.h>
|
||||
#include <google/protobuf/descriptor.pb.h>
|
||||
#include <google/protobuf/io/coded_stream.h>
|
||||
#include <google/protobuf/io/printer.h>
|
||||
#include <google/protobuf/wire_format.h>
|
||||
#include <google/protobuf/stubs/strutil.h>
|
||||
#include <google/protobuf/stubs/substitute.h>
|
||||
#include <google/protobuf/compiler/java/context.h>
|
||||
#include <google/protobuf/compiler/java/doc_comment.h>
|
||||
#include <google/protobuf/compiler/java/enum_lite.h>
|
||||
#include <google/protobuf/compiler/java/extension_lite.h>
|
||||
#include <google/protobuf/compiler/java/generator_factory.h>
|
||||
#include <google/protobuf/compiler/java/helpers.h>
|
||||
#include <google/protobuf/compiler/java/message_builder.h>
|
||||
#include <google/protobuf/compiler/java/message_builder_lite.h>
|
||||
#include <google/protobuf/compiler/java/name_resolver.h>
|
||||
#include <google/protobuf/descriptor.pb.h>
|
||||
|
||||
// Must be last.
|
||||
#include <google/protobuf/port_def.inc>
|
||||
|
||||
namespace google {
|
||||
namespace protobuf {
|
||||
@@ -779,7 +782,7 @@ void ImmutableMessageLiteGenerator::GenerateKotlinDsl(
|
||||
void ImmutableMessageLiteGenerator::GenerateKotlinMembers(
|
||||
io::Printer* printer) const {
|
||||
printer->Print(
|
||||
"@kotlin.jvm.JvmSynthetic\n"
|
||||
"@kotlin.jvm.JvmName(\"-initialize$camelcase_name$\")\n"
|
||||
"public inline fun $camelcase_name$(block: $message_kt$.Dsl.() -> "
|
||||
"kotlin.Unit): "
|
||||
"$message$ =\n"
|
||||
@@ -808,7 +811,7 @@ void ImmutableMessageLiteGenerator::GenerateTopLevelKotlinMembers(
|
||||
"kotlin.Unit): "
|
||||
"$message$ =\n"
|
||||
" $message_kt$.Dsl._create(this.toBuilder()).apply { block() "
|
||||
"}._build()\n",
|
||||
"}._build()\n\n",
|
||||
"message", name_resolver_->GetClassName(descriptor_, true), "message_kt",
|
||||
name_resolver_->GetKotlinExtensionsClassName(descriptor_));
|
||||
|
||||
@@ -817,6 +820,26 @@ void ImmutableMessageLiteGenerator::GenerateTopLevelKotlinMembers(
|
||||
ImmutableMessageLiteGenerator(descriptor_->nested_type(i), context_)
|
||||
.GenerateTopLevelKotlinMembers(printer);
|
||||
}
|
||||
|
||||
GenerateKotlinOrNull(printer);
|
||||
}
|
||||
|
||||
void ImmutableMessageLiteGenerator::GenerateKotlinOrNull(io::Printer* printer) const {
|
||||
// Generate getFieldOrNull getters for all optional message fields.
|
||||
for (int i = 0; i < descriptor_->field_count(); i++) {
|
||||
const FieldDescriptor* field = descriptor_->field(i);
|
||||
if (field->has_presence() && GetJavaType(field) == JAVATYPE_MESSAGE) {
|
||||
printer->Print(
|
||||
"public val $full_classname$OrBuilder.$camelcase_name$OrNull: "
|
||||
"$full_name$?\n"
|
||||
" get() = if (has$name$()) get$name$() else null\n\n",
|
||||
"full_classname", name_resolver_->GetClassName(descriptor_, true),
|
||||
"camelcase_name", context_->GetFieldGeneratorInfo(field)->name,
|
||||
"full_name",
|
||||
name_resolver_->GetImmutableClassName(field->message_type()), "name",
|
||||
context_->GetFieldGeneratorInfo(field)->capitalized_name);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
void ImmutableMessageLiteGenerator::GenerateKotlinExtensions(
|
||||
@@ -826,7 +849,7 @@ void ImmutableMessageLiteGenerator::GenerateKotlinExtensions(
|
||||
printer->Print(
|
||||
"@Suppress(\"UNCHECKED_CAST\")\n"
|
||||
"@kotlin.jvm.JvmSynthetic\n"
|
||||
"public operator fun <T> get(extension: "
|
||||
"public operator fun <T : kotlin.Any> get(extension: "
|
||||
"com.google.protobuf.ExtensionLite<$message$, T>): T {\n"
|
||||
" return if (extension.isRepeated) {\n"
|
||||
" get(extension as com.google.protobuf.ExtensionLite<$message$, "
|
||||
@@ -842,7 +865,7 @@ void ImmutableMessageLiteGenerator::GenerateKotlinExtensions(
|
||||
"@kotlin.OptIn"
|
||||
"(com.google.protobuf.kotlin.OnlyForUseByGeneratedProtoCode::class)\n"
|
||||
"@kotlin.jvm.JvmName(\"-getRepeatedExtension\")\n"
|
||||
"public operator fun <E> get(\n"
|
||||
"public operator fun <E : kotlin.Any> get(\n"
|
||||
" extension: com.google.protobuf.ExtensionLite<$message$, List<E>>\n"
|
||||
"): com.google.protobuf.kotlin.ExtensionList<E, $message$> {\n"
|
||||
" return com.google.protobuf.kotlin.ExtensionList(extension, "
|
||||
@@ -871,7 +894,7 @@ void ImmutableMessageLiteGenerator::GenerateKotlinExtensions(
|
||||
printer->Print(
|
||||
"@kotlin.jvm.JvmSynthetic\n"
|
||||
"@kotlin.PublishedApi\n"
|
||||
"internal fun <T> setExtension(extension: "
|
||||
"internal fun <T : kotlin.Any> setExtension(extension: "
|
||||
"com.google.protobuf.ExtensionLite<$message$, T>, "
|
||||
"value: T) {\n"
|
||||
" _builder.setExtension(extension, value)\n"
|
||||
@@ -914,7 +937,7 @@ void ImmutableMessageLiteGenerator::GenerateKotlinExtensions(
|
||||
|
||||
printer->Print(
|
||||
"@kotlin.jvm.JvmSynthetic\n"
|
||||
"public fun<E> com.google.protobuf.kotlin.ExtensionList<E, "
|
||||
"public fun<E : kotlin.Any> com.google.protobuf.kotlin.ExtensionList<E, "
|
||||
"$message$>.add(value: E) {\n"
|
||||
" _builder.addExtension(this.extension, value)\n"
|
||||
"}\n\n",
|
||||
@@ -923,7 +946,7 @@ void ImmutableMessageLiteGenerator::GenerateKotlinExtensions(
|
||||
printer->Print(
|
||||
"@kotlin.jvm.JvmSynthetic\n"
|
||||
"@Suppress(\"NOTHING_TO_INLINE\")\n"
|
||||
"public inline operator fun <E> "
|
||||
"public inline operator fun <E : kotlin.Any> "
|
||||
"com.google.protobuf.kotlin.ExtensionList<E, "
|
||||
"$message$>.plusAssign"
|
||||
"(value: E) {\n"
|
||||
@@ -933,7 +956,7 @@ void ImmutableMessageLiteGenerator::GenerateKotlinExtensions(
|
||||
|
||||
printer->Print(
|
||||
"@kotlin.jvm.JvmSynthetic\n"
|
||||
"public fun<E> com.google.protobuf.kotlin.ExtensionList<E, "
|
||||
"public fun<E : kotlin.Any> com.google.protobuf.kotlin.ExtensionList<E, "
|
||||
"$message$>.addAll(values: Iterable<E>) {\n"
|
||||
" for (value in values) {\n"
|
||||
" add(value)\n"
|
||||
@@ -944,7 +967,7 @@ void ImmutableMessageLiteGenerator::GenerateKotlinExtensions(
|
||||
printer->Print(
|
||||
"@kotlin.jvm.JvmSynthetic\n"
|
||||
"@Suppress(\"NOTHING_TO_INLINE\")\n"
|
||||
"public inline operator fun <E> "
|
||||
"public inline operator fun <E : kotlin.Any> "
|
||||
"com.google.protobuf.kotlin.ExtensionList<E, "
|
||||
"$message$>.plusAssign(values: "
|
||||
"Iterable<E>) {\n"
|
||||
@@ -954,7 +977,8 @@ void ImmutableMessageLiteGenerator::GenerateKotlinExtensions(
|
||||
|
||||
printer->Print(
|
||||
"@kotlin.jvm.JvmSynthetic\n"
|
||||
"public operator fun <E> com.google.protobuf.kotlin.ExtensionList<E, "
|
||||
"public operator fun <E : kotlin.Any> "
|
||||
"com.google.protobuf.kotlin.ExtensionList<E, "
|
||||
"$message$>.set(index: Int, value: "
|
||||
"E) {\n"
|
||||
" _builder.setExtension(this.extension, index, value)\n"
|
||||
@@ -975,3 +999,5 @@ void ImmutableMessageLiteGenerator::GenerateKotlinExtensions(
|
||||
} // namespace compiler
|
||||
} // namespace protobuf
|
||||
} // namespace google
|
||||
|
||||
#include <google/protobuf/port_undef.inc>
|
||||
+4
-5
@@ -35,10 +35,8 @@
|
||||
#ifndef GOOGLE_PROTOBUF_COMPILER_JAVA_MESSAGE_LITE_H__
|
||||
#define GOOGLE_PROTOBUF_COMPILER_JAVA_MESSAGE_LITE_H__
|
||||
|
||||
#include <map>
|
||||
#include <string>
|
||||
#include <google/protobuf/compiler/java/java_field.h>
|
||||
#include <google/protobuf/compiler/java/java_message.h>
|
||||
#include <google/protobuf/compiler/java/field.h>
|
||||
#include <google/protobuf/compiler/java/message.h>
|
||||
|
||||
namespace google {
|
||||
namespace protobuf {
|
||||
@@ -48,7 +46,7 @@ namespace java {
|
||||
class ImmutableMessageLiteGenerator : public MessageGenerator {
|
||||
public:
|
||||
ImmutableMessageLiteGenerator(const Descriptor* descriptor, Context* context);
|
||||
virtual ~ImmutableMessageLiteGenerator();
|
||||
~ImmutableMessageLiteGenerator() override;
|
||||
|
||||
void Generate(io::Printer* printer) override;
|
||||
void GenerateInterface(io::Printer* printer) override;
|
||||
@@ -70,6 +68,7 @@ class ImmutableMessageLiteGenerator : public MessageGenerator {
|
||||
void GenerateConstructor(io::Printer* printer);
|
||||
void GenerateDynamicMethodNewBuildMessageInfo(io::Printer* printer);
|
||||
void GenerateKotlinExtensions(io::Printer* printer) const;
|
||||
void GenerateKotlinOrNull(io::Printer* printer) const;
|
||||
|
||||
Context* context_;
|
||||
ClassNameResolver* name_resolver_;
|
||||
+8
-3
@@ -28,15 +28,18 @@
|
||||
// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
|
||||
// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||
|
||||
#include <google/protobuf/compiler/java/java_name_resolver.h>
|
||||
#include <google/protobuf/compiler/java/name_resolver.h>
|
||||
|
||||
#include <map>
|
||||
#include <string>
|
||||
|
||||
#include <google/protobuf/compiler/java/java_helpers.h>
|
||||
#include <google/protobuf/compiler/java/java_names.h>
|
||||
#include <google/protobuf/compiler/code_generator.h>
|
||||
#include <google/protobuf/stubs/substitute.h>
|
||||
#include <google/protobuf/compiler/java/helpers.h>
|
||||
#include <google/protobuf/compiler/java/names.h>
|
||||
|
||||
// Must be last.
|
||||
#include <google/protobuf/port_def.inc>
|
||||
|
||||
namespace google {
|
||||
namespace protobuf {
|
||||
@@ -378,3 +381,5 @@ std::string ClassNameResolver::GetDowngradedClassName(
|
||||
} // namespace compiler
|
||||
} // namespace protobuf
|
||||
} // namespace google
|
||||
|
||||
#include <google/protobuf/port_undef.inc>
|
||||
+7
-1
@@ -36,6 +36,9 @@
|
||||
|
||||
#include <google/protobuf/stubs/common.h>
|
||||
|
||||
// Must be last.
|
||||
#include <google/protobuf/port_def.inc>
|
||||
|
||||
namespace google {
|
||||
namespace protobuf {
|
||||
class Descriptor;
|
||||
@@ -123,7 +126,6 @@ class ClassNameResolver {
|
||||
std::string GetDowngradedFileClassName(const FileDescriptor* file);
|
||||
std::string GetDowngradedClassName(const Descriptor* descriptor);
|
||||
|
||||
private:
|
||||
// Get the full name of a Java class by prepending the Java package name
|
||||
// or outer class name.
|
||||
std::string GetClassFullName(const std::string& name_without_package,
|
||||
@@ -132,6 +134,8 @@ class ClassNameResolver {
|
||||
std::string GetClassFullName(const std::string& name_without_package,
|
||||
const FileDescriptor* file, bool immutable,
|
||||
bool is_own_file, bool kotlin);
|
||||
|
||||
private:
|
||||
// Get the Java Class style full name of a message.
|
||||
std::string GetJavaClassFullName(const std::string& name_without_package,
|
||||
const FileDescriptor* file, bool immutable);
|
||||
@@ -150,4 +154,6 @@ class ClassNameResolver {
|
||||
} // namespace protobuf
|
||||
} // namespace google
|
||||
|
||||
#include <google/protobuf/port_undef.inc>
|
||||
|
||||
#endif // GOOGLE_PROTOBUF_COMPILER_JAVA_NAME_RESOLVER_H__
|
||||
File renamed without changes.
File renamed without changes.
+26
-9
@@ -29,19 +29,17 @@
|
||||
// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||
|
||||
// Author: kenton@google.com (Kenton Varda)
|
||||
//
|
||||
// TODO(kenton): Share code with the versions of this test in other languages?
|
||||
// It seemed like parameterizing it would add more complexity than it is
|
||||
// worth.
|
||||
|
||||
#include <memory>
|
||||
#include <string>
|
||||
|
||||
#include <google/protobuf/testing/file.h>
|
||||
#include <google/protobuf/testing/file.h>
|
||||
#include <google/protobuf/compiler/java/java_generator.h>
|
||||
#include <google/protobuf/compiler/java/generator.h>
|
||||
#include <google/protobuf/compiler/command_line_interface.h>
|
||||
#include <google/protobuf/io/printer.h>
|
||||
#include <google/protobuf/io/zero_copy_stream.h>
|
||||
#include <google/protobuf/stubs/strutil.h>
|
||||
#include <google/protobuf/testing/googletest.h>
|
||||
#include <gtest/gtest.h>
|
||||
|
||||
@@ -54,11 +52,10 @@ namespace {
|
||||
class TestGenerator : public CodeGenerator {
|
||||
public:
|
||||
TestGenerator() {}
|
||||
~TestGenerator() {}
|
||||
~TestGenerator() override {}
|
||||
|
||||
virtual bool Generate(const FileDescriptor* file,
|
||||
const std::string& parameter, GeneratorContext* context,
|
||||
std::string* error) const {
|
||||
bool Generate(const FileDescriptor* file, const std::string& parameter,
|
||||
GeneratorContext* context, std::string* error) const override {
|
||||
std::string filename = "Test.java";
|
||||
TryInsert(filename, "outer_class_scope", context);
|
||||
TryInsert(filename, "class_scope:foo.Bar", context);
|
||||
@@ -110,6 +107,26 @@ TEST(JavaPluginTest, PluginTest) {
|
||||
test_out.c_str(), "test.proto"};
|
||||
|
||||
EXPECT_EQ(0, cli.Run(5, argv));
|
||||
|
||||
// Loop over the lines of the generated code and verify that we find what we
|
||||
// expect
|
||||
|
||||
std::string output;
|
||||
GOOGLE_CHECK_OK(File::GetContents(TestTempDir() + "/Test.java", &output,
|
||||
true));
|
||||
std::vector<std::string> lines = Split(output, "\n");
|
||||
bool found_generated_annotation = false;
|
||||
bool found_do_not_edit = false;
|
||||
for (const auto& line : lines) {
|
||||
if (line.find(" DO NOT EDIT!") != std::string::npos) {
|
||||
found_do_not_edit = true;
|
||||
}
|
||||
if (line.find("@com.google.protobuf.Generated") != std::string::npos) {
|
||||
found_generated_annotation = true;
|
||||
}
|
||||
}
|
||||
EXPECT_TRUE(found_do_not_edit);
|
||||
(void)found_generated_annotation;
|
||||
}
|
||||
|
||||
} // namespace
|
||||
+124
-159
@@ -32,21 +32,21 @@
|
||||
// Based on original Protocol Buffers design by
|
||||
// Sanjay Ghemawat, Jeff Dean, and others.
|
||||
|
||||
#include <google/protobuf/compiler/java/java_primitive_field.h>
|
||||
#include "google/protobuf/compiler/java/primitive_field.h"
|
||||
|
||||
#include <cstdint>
|
||||
#include <map>
|
||||
#include <string>
|
||||
|
||||
#include <google/protobuf/stubs/logging.h>
|
||||
#include <google/protobuf/stubs/common.h>
|
||||
#include <google/protobuf/compiler/java/java_context.h>
|
||||
#include <google/protobuf/compiler/java/java_doc_comment.h>
|
||||
#include <google/protobuf/compiler/java/java_helpers.h>
|
||||
#include <google/protobuf/compiler/java/java_name_resolver.h>
|
||||
#include <google/protobuf/io/printer.h>
|
||||
#include <google/protobuf/wire_format.h>
|
||||
#include <google/protobuf/stubs/strutil.h>
|
||||
#include "google/protobuf/stubs/logging.h"
|
||||
#include "google/protobuf/stubs/common.h"
|
||||
#include "google/protobuf/io/printer.h"
|
||||
#include "google/protobuf/wire_format.h"
|
||||
#include "google/protobuf/stubs/strutil.h"
|
||||
#include "google/protobuf/compiler/java/context.h"
|
||||
#include "google/protobuf/compiler/java/doc_comment.h"
|
||||
#include "google/protobuf/compiler/java/helpers.h"
|
||||
#include "google/protobuf/compiler/java/name_resolver.h"
|
||||
|
||||
namespace google {
|
||||
namespace protobuf {
|
||||
@@ -57,53 +57,55 @@ using internal::WireFormat;
|
||||
|
||||
namespace {
|
||||
|
||||
void SetPrimitiveVariables(const FieldDescriptor* descriptor,
|
||||
int messageBitIndex, int builderBitIndex,
|
||||
const FieldGeneratorInfo* info,
|
||||
ClassNameResolver* name_resolver,
|
||||
std::map<std::string, std::string>* variables) {
|
||||
void SetPrimitiveVariables(
|
||||
const FieldDescriptor* descriptor, int messageBitIndex, int builderBitIndex,
|
||||
const FieldGeneratorInfo* info, ClassNameResolver* name_resolver,
|
||||
std::map<std::string, std::string>* variables,
|
||||
Context* context) {
|
||||
SetCommonFieldVariables(descriptor, info, variables);
|
||||
JavaType javaType = GetJavaType(descriptor);
|
||||
|
||||
(*variables)["type"] = PrimitiveTypeName(javaType);
|
||||
(*variables)["boxed_type"] = BoxedPrimitiveTypeName(javaType);
|
||||
(*variables)["kt_type"] = KotlinTypeName(javaType);
|
||||
(*variables)["field_type"] = (*variables)["type"];
|
||||
variables->insert({"field_type", (*variables)["type"]});
|
||||
|
||||
std::string name = (*variables)["name"];
|
||||
if (javaType == JAVATYPE_BOOLEAN || javaType == JAVATYPE_DOUBLE ||
|
||||
javaType == JAVATYPE_FLOAT || javaType == JAVATYPE_INT ||
|
||||
javaType == JAVATYPE_LONG) {
|
||||
std::string capitalized_type = UnderscoresToCamelCase(
|
||||
PrimitiveTypeName(javaType), /*cap_first_letter=*/true);
|
||||
(*variables)["field_list_type"] =
|
||||
"com.google.protobuf.Internal." + capitalized_type + "List";
|
||||
(*variables)["empty_list"] = "empty" + capitalized_type + "List()";
|
||||
(*variables)["create_list"] = "new" + capitalized_type + "List()";
|
||||
(*variables)["mutable_copy_list"] =
|
||||
"mutableCopy(" + (*variables)["name"] + "_)";
|
||||
(*variables)["name_make_immutable"] =
|
||||
(*variables)["name"] + "_.makeImmutable()";
|
||||
(*variables)["repeated_get"] =
|
||||
(*variables)["name"] + "_.get" + capitalized_type;
|
||||
(*variables)["repeated_add"] =
|
||||
(*variables)["name"] + "_.add" + capitalized_type;
|
||||
(*variables)["repeated_set"] =
|
||||
(*variables)["name"] + "_.set" + capitalized_type;
|
||||
} else {
|
||||
(*variables)["field_list_type"] =
|
||||
"java.util.List<" + (*variables)["boxed_type"] + ">";
|
||||
StrCat("com.google.protobuf.Internal.", capitalized_type, "List");
|
||||
(*variables)["empty_list"] =
|
||||
StrCat("empty", capitalized_type, "List()");
|
||||
(*variables)["create_list"] =
|
||||
"new java.util.ArrayList<" + (*variables)["boxed_type"] + ">()";
|
||||
(*variables)["mutable_copy_list"] = "new java.util.ArrayList<" +
|
||||
(*variables)["boxed_type"] + ">(" +
|
||||
(*variables)["name"] + "_)";
|
||||
(*variables)["empty_list"] = "java.util.Collections.emptyList()";
|
||||
StrCat("new", capitalized_type, "List()");
|
||||
(*variables)["mutable_copy_list"] =
|
||||
StrCat("mutableCopy(", name, "_)");
|
||||
(*variables)["name_make_immutable"] =
|
||||
(*variables)["name"] + "_ = java.util.Collections.unmodifiableList(" +
|
||||
(*variables)["name"] + "_)";
|
||||
(*variables)["repeated_get"] = (*variables)["name"] + "_.get";
|
||||
(*variables)["repeated_add"] = (*variables)["name"] + "_.add";
|
||||
(*variables)["repeated_set"] = (*variables)["name"] + "_.set";
|
||||
StrCat(name, "_.makeImmutable()");
|
||||
(*variables)["repeated_get"] =
|
||||
StrCat(name, "_.get", capitalized_type);
|
||||
(*variables)["repeated_add"] =
|
||||
StrCat(name, "_.add", capitalized_type);
|
||||
(*variables)["repeated_set"] =
|
||||
StrCat(name, "_.set", capitalized_type);
|
||||
} else {
|
||||
std::string boxed_type = (*variables)["boxed_type"];
|
||||
(*variables)["field_list_type"] =
|
||||
StrCat("java.util.List<", boxed_type, ">");
|
||||
(*variables)["create_list"] =
|
||||
StrCat("new java.util.ArrayList<", boxed_type, ">()");
|
||||
(*variables)["mutable_copy_list"] =
|
||||
StrCat("new java.util.ArrayList<", boxed_type, ">(", name, "_)");
|
||||
(*variables)["empty_list"] = "java.util.Collections.emptyList()";
|
||||
(*variables)["name_make_immutable"] = StrCat(
|
||||
name, "_ = java.util.Collections.unmodifiableList(", name, "_)");
|
||||
(*variables)["repeated_get"] = StrCat(name, "_.get");
|
||||
(*variables)["repeated_add"] = StrCat(name, "_.add");
|
||||
(*variables)["repeated_set"] = StrCat(name, "_.set");
|
||||
}
|
||||
|
||||
(*variables)["default"] = ImmutableDefaultValue(descriptor, name_resolver);
|
||||
@@ -119,9 +121,7 @@ void SetPrimitiveVariables(const FieldDescriptor* descriptor,
|
||||
WireFormat::TagSize(descriptor->number(), GetType(descriptor)));
|
||||
if (IsReferenceType(GetJavaType(descriptor))) {
|
||||
(*variables)["null_check"] =
|
||||
" if (value == null) {\n"
|
||||
" throw new NullPointerException();\n"
|
||||
" }\n";
|
||||
"if (value == null) { throw new NullPointerException(); }";
|
||||
} else {
|
||||
(*variables)["null_check"] = "";
|
||||
}
|
||||
@@ -131,8 +131,8 @@ void SetPrimitiveVariables(const FieldDescriptor* descriptor,
|
||||
descriptor->options().deprecated() ? "@java.lang.Deprecated " : "";
|
||||
(*variables)["kt_deprecation"] =
|
||||
descriptor->options().deprecated()
|
||||
? "@kotlin.Deprecated(message = \"Field " + (*variables)["name"] +
|
||||
" is deprecated\") "
|
||||
? StrCat("@kotlin.Deprecated(message = \"Field ", name,
|
||||
" is deprecated\") ")
|
||||
: "";
|
||||
int fixed_size = FixedSize(GetType(descriptor));
|
||||
if (fixed_size != -1) {
|
||||
@@ -143,40 +143,29 @@ void SetPrimitiveVariables(const FieldDescriptor* descriptor,
|
||||
if (HasHasbit(descriptor)) {
|
||||
// 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"] =
|
||||
GenerateSetBit(builderBitIndex) + ";";
|
||||
(*variables)["clear_has_field_bit_builder"] =
|
||||
GenerateClearBit(builderBitIndex) + ";";
|
||||
|
||||
(*variables)["set_has_field_bit_to_local"] =
|
||||
GenerateSetBitToLocal(messageBitIndex) + ";";
|
||||
(*variables)["is_field_present_message"] = GenerateGetBit(messageBitIndex);
|
||||
} else {
|
||||
(*variables)["set_has_field_bit_message"] = "";
|
||||
(*variables)["set_has_field_bit_builder"] = "";
|
||||
(*variables)["clear_has_field_bit_builder"] = "";
|
||||
|
||||
(*variables)["set_has_field_bit_to_local"] = "";
|
||||
switch (descriptor->type()) {
|
||||
case FieldDescriptor::TYPE_BYTES:
|
||||
(*variables)["is_field_present_message"] =
|
||||
"!" + (*variables)["name"] + "_.isEmpty()";
|
||||
StrCat("!", name, "_.isEmpty()");
|
||||
break;
|
||||
case FieldDescriptor::TYPE_FLOAT:
|
||||
(*variables)["is_field_present_message"] =
|
||||
"java.lang.Float.floatToRawIntBits(" + (*variables)["name"] +
|
||||
"_) != 0";
|
||||
StrCat("java.lang.Float.floatToRawIntBits(", name, "_) != 0");
|
||||
break;
|
||||
case FieldDescriptor::TYPE_DOUBLE:
|
||||
(*variables)["is_field_present_message"] =
|
||||
"java.lang.Double.doubleToRawLongBits(" + (*variables)["name"] +
|
||||
"_) != 0";
|
||||
(*variables)["is_field_present_message"] = StrCat(
|
||||
"java.lang.Double.doubleToRawLongBits(", name, "_) != 0");
|
||||
break;
|
||||
default:
|
||||
(*variables)["is_field_present_message"] =
|
||||
(*variables)["name"] + "_ != " + (*variables)["default"];
|
||||
variables->insert(
|
||||
{"is_field_present_message",
|
||||
StrCat(name, "_ != ", (*variables)["default"])});
|
||||
break;
|
||||
}
|
||||
}
|
||||
@@ -186,17 +175,15 @@ void SetPrimitiveVariables(const FieldDescriptor* descriptor,
|
||||
(*variables)["set_mutable_bit_builder"] = GenerateSetBit(builderBitIndex);
|
||||
(*variables)["clear_mutable_bit_builder"] = GenerateClearBit(builderBitIndex);
|
||||
|
||||
// For repeated fields, one bit is used for whether the array is immutable
|
||||
// in the parsing constructor.
|
||||
(*variables)["get_mutable_bit_parser"] =
|
||||
GenerateGetBitMutableLocal(builderBitIndex);
|
||||
(*variables)["set_mutable_bit_parser"] =
|
||||
GenerateSetBitMutableLocal(builderBitIndex);
|
||||
|
||||
// Always track the presence of a field explicitly in the builder, regardless
|
||||
// of syntax.
|
||||
(*variables)["get_has_field_bit_builder"] = GenerateGetBit(builderBitIndex);
|
||||
(*variables)["get_has_field_bit_from_local"] =
|
||||
GenerateGetBitFromLocal(builderBitIndex);
|
||||
(*variables)["set_has_field_bit_to_local"] =
|
||||
GenerateSetBitToLocal(messageBitIndex);
|
||||
(*variables)["set_has_field_bit_builder"] =
|
||||
GenerateSetBit(builderBitIndex) + ";";
|
||||
(*variables)["clear_has_field_bit_builder"] =
|
||||
GenerateClearBit(builderBitIndex) + ";";
|
||||
}
|
||||
|
||||
} // namespace
|
||||
@@ -206,21 +193,30 @@ void SetPrimitiveVariables(const FieldDescriptor* descriptor,
|
||||
ImmutablePrimitiveFieldGenerator::ImmutablePrimitiveFieldGenerator(
|
||||
const FieldDescriptor* descriptor, int messageBitIndex, int builderBitIndex,
|
||||
Context* context)
|
||||
: descriptor_(descriptor), name_resolver_(context->GetNameResolver()) {
|
||||
: descriptor_(descriptor),
|
||||
message_bit_index_(messageBitIndex),
|
||||
builder_bit_index_(builderBitIndex),
|
||||
name_resolver_(context->GetNameResolver()) {
|
||||
SetPrimitiveVariables(descriptor, messageBitIndex, builderBitIndex,
|
||||
context->GetFieldGeneratorInfo(descriptor),
|
||||
name_resolver_, &variables_);
|
||||
name_resolver_, &variables_, context);
|
||||
}
|
||||
|
||||
ImmutablePrimitiveFieldGenerator::~ImmutablePrimitiveFieldGenerator() {}
|
||||
|
||||
int ImmutablePrimitiveFieldGenerator::GetMessageBitIndex() const {
|
||||
return message_bit_index_;
|
||||
}
|
||||
|
||||
int ImmutablePrimitiveFieldGenerator::GetBuilderBitIndex() const {
|
||||
return builder_bit_index_;
|
||||
}
|
||||
|
||||
int ImmutablePrimitiveFieldGenerator::GetNumBitsForMessage() const {
|
||||
return HasHasbit(descriptor_) ? 1 : 0;
|
||||
}
|
||||
|
||||
int ImmutablePrimitiveFieldGenerator::GetNumBitsForBuilder() const {
|
||||
return GetNumBitsForMessage();
|
||||
}
|
||||
int ImmutablePrimitiveFieldGenerator::GetNumBitsForBuilder() const { return 1; }
|
||||
|
||||
void ImmutablePrimitiveFieldGenerator::GenerateInterfaceMembers(
|
||||
io::Printer* printer) const {
|
||||
@@ -235,7 +231,7 @@ void ImmutablePrimitiveFieldGenerator::GenerateInterfaceMembers(
|
||||
|
||||
void ImmutablePrimitiveFieldGenerator::GenerateMembers(
|
||||
io::Printer* printer) const {
|
||||
printer->Print(variables_, "private $field_type$ $name$_;\n");
|
||||
printer->Print(variables_, "private $field_type$ $name$_ = $default$;\n");
|
||||
PrintExtraFieldInfo(variables_, printer);
|
||||
if (HasHazzer(descriptor_)) {
|
||||
WriteFieldAccessorDocComment(printer, descriptor_, HAZZER);
|
||||
@@ -285,9 +281,9 @@ void ImmutablePrimitiveFieldGenerator::GenerateBuilderMembers(
|
||||
printer->Print(variables_,
|
||||
"$deprecation$public Builder "
|
||||
"${$set$capitalized_name$$}$($type$ value) {\n"
|
||||
"$null_check$"
|
||||
" $set_has_field_bit_builder$\n"
|
||||
" $null_check$\n"
|
||||
" $name$_ = value;\n"
|
||||
" $set_has_field_bit_builder$\n"
|
||||
" $on_changed$\n"
|
||||
" return this;\n"
|
||||
"}\n");
|
||||
@@ -359,9 +355,8 @@ void ImmutablePrimitiveFieldGenerator::GenerateInitializationCode(
|
||||
|
||||
void ImmutablePrimitiveFieldGenerator::GenerateBuilderClearCode(
|
||||
io::Printer* printer) const {
|
||||
printer->Print(variables_,
|
||||
"$name$_ = $default$;\n"
|
||||
"$clear_has_field_bit_builder$\n");
|
||||
// No need to clear the has-bit since we clear the bitField ints all at once.
|
||||
printer->Print(variables_, "$name$_ = $default$;\n");
|
||||
}
|
||||
|
||||
void ImmutablePrimitiveFieldGenerator::GenerateMergingCode(
|
||||
@@ -381,35 +376,20 @@ void ImmutablePrimitiveFieldGenerator::GenerateMergingCode(
|
||||
|
||||
void ImmutablePrimitiveFieldGenerator::GenerateBuildingCode(
|
||||
io::Printer* printer) const {
|
||||
if (HasHazzer(descriptor_)) {
|
||||
if (IsDefaultValueJavaDefault(descriptor_)) {
|
||||
printer->Print(variables_,
|
||||
"if ($get_has_field_bit_from_local$) {\n"
|
||||
" result.$name$_ = $name$_;\n"
|
||||
" $set_has_field_bit_to_local$;\n"
|
||||
"}\n");
|
||||
} else {
|
||||
printer->Print(variables_,
|
||||
"if ($get_has_field_bit_from_local$) {\n"
|
||||
" $set_has_field_bit_to_local$;\n"
|
||||
"}\n"
|
||||
"result.$name$_ = $name$_;\n");
|
||||
}
|
||||
} else {
|
||||
printer->Print(variables_, "result.$name$_ = $name$_;\n");
|
||||
printer->Print(variables_,
|
||||
"if ($get_has_field_bit_from_local$) {\n"
|
||||
" result.$name$_ = $name$_;\n");
|
||||
if (GetNumBitsForMessage() > 0) {
|
||||
printer->Print(variables_, " $set_has_field_bit_to_local$\n");
|
||||
}
|
||||
printer->Print("}\n");
|
||||
}
|
||||
|
||||
void ImmutablePrimitiveFieldGenerator::GenerateParsingCode(
|
||||
void ImmutablePrimitiveFieldGenerator::GenerateBuilderParsingCode(
|
||||
io::Printer* printer) const {
|
||||
printer->Print(variables_,
|
||||
"$set_has_field_bit_message$\n"
|
||||
"$name$_ = input.read$capitalized_type$();\n");
|
||||
}
|
||||
|
||||
void ImmutablePrimitiveFieldGenerator::GenerateParsingDoneCode(
|
||||
io::Printer* printer) const {
|
||||
// noop for primitives.
|
||||
"$name$_ = input.read$capitalized_type$();\n"
|
||||
"$set_has_field_bit_builder$\n");
|
||||
}
|
||||
|
||||
void ImmutablePrimitiveFieldGenerator::GenerateSerializationCode(
|
||||
@@ -591,7 +571,7 @@ void ImmutablePrimitiveOneofFieldGenerator::GenerateBuilderMembers(
|
||||
printer->Print(variables_,
|
||||
"$deprecation$public Builder "
|
||||
"${$set$capitalized_name$$}$($type$ value) {\n"
|
||||
"$null_check$"
|
||||
" $null_check$\n"
|
||||
" $set_oneof_case_message$;\n"
|
||||
" $oneof_name$_ = value;\n"
|
||||
" $on_changed$\n"
|
||||
@@ -614,12 +594,15 @@ void ImmutablePrimitiveOneofFieldGenerator::GenerateBuilderMembers(
|
||||
printer->Annotate("{", "}", descriptor_);
|
||||
}
|
||||
|
||||
void ImmutablePrimitiveOneofFieldGenerator::GenerateBuilderClearCode(
|
||||
io::Printer* printer) const {
|
||||
// No-Op: When a primitive field is in a oneof, clearing the oneof clears that
|
||||
// field.
|
||||
}
|
||||
|
||||
void ImmutablePrimitiveOneofFieldGenerator::GenerateBuildingCode(
|
||||
io::Printer* printer) const {
|
||||
printer->Print(variables_,
|
||||
"if ($has_oneof_case_message$) {\n"
|
||||
" result.$oneof_name$_ = $oneof_name$_;\n"
|
||||
"}\n");
|
||||
// no-op
|
||||
}
|
||||
|
||||
void ImmutablePrimitiveOneofFieldGenerator::GenerateMergingCode(
|
||||
@@ -628,7 +611,7 @@ void ImmutablePrimitiveOneofFieldGenerator::GenerateMergingCode(
|
||||
"set$capitalized_name$(other.get$capitalized_name$());\n");
|
||||
}
|
||||
|
||||
void ImmutablePrimitiveOneofFieldGenerator::GenerateParsingCode(
|
||||
void ImmutablePrimitiveOneofFieldGenerator::GenerateBuilderParsingCode(
|
||||
io::Printer* printer) const {
|
||||
printer->Print(variables_,
|
||||
"$oneof_name$_ = input.read$capitalized_type$();\n"
|
||||
@@ -677,11 +660,8 @@ RepeatedImmutablePrimitiveFieldGenerator::
|
||||
int messageBitIndex,
|
||||
int builderBitIndex,
|
||||
Context* context)
|
||||
: descriptor_(descriptor), name_resolver_(context->GetNameResolver()) {
|
||||
SetPrimitiveVariables(descriptor, messageBitIndex, builderBitIndex,
|
||||
context->GetFieldGeneratorInfo(descriptor),
|
||||
name_resolver_, &variables_);
|
||||
}
|
||||
: ImmutablePrimitiveFieldGenerator(descriptor, messageBitIndex,
|
||||
builderBitIndex, context) {}
|
||||
|
||||
RepeatedImmutablePrimitiveFieldGenerator::
|
||||
~RepeatedImmutablePrimitiveFieldGenerator() {}
|
||||
@@ -710,7 +690,8 @@ void RepeatedImmutablePrimitiveFieldGenerator::GenerateInterfaceMembers(
|
||||
|
||||
void RepeatedImmutablePrimitiveFieldGenerator::GenerateMembers(
|
||||
io::Printer* printer) const {
|
||||
printer->Print(variables_, "private $field_list_type$ $name$_;\n");
|
||||
printer->Print(variables_, "@SuppressWarnings(\"serial\")\n"
|
||||
"private $field_list_type$ $name$_;\n");
|
||||
PrintExtraFieldInfo(variables_, printer);
|
||||
WriteFieldAccessorDocComment(printer, descriptor_, LIST_GETTER);
|
||||
printer->Print(variables_,
|
||||
@@ -760,7 +741,7 @@ void RepeatedImmutablePrimitiveFieldGenerator::GenerateBuilderMembers(
|
||||
" if (!$get_mutable_bit_builder$) {\n"
|
||||
" $name$_ = $mutable_copy_list$;\n"
|
||||
" $set_mutable_bit_builder$;\n"
|
||||
" }\n"
|
||||
" }\n"
|
||||
"}\n");
|
||||
|
||||
// Note: We return an unmodifiable list because otherwise the caller
|
||||
@@ -795,7 +776,7 @@ void RepeatedImmutablePrimitiveFieldGenerator::GenerateBuilderMembers(
|
||||
printer->Print(variables_,
|
||||
"$deprecation$public Builder ${$set$capitalized_name$$}$(\n"
|
||||
" int index, $type$ value) {\n"
|
||||
"$null_check$"
|
||||
" $null_check$\n"
|
||||
" ensure$capitalized_name$IsMutable();\n"
|
||||
" $repeated_set$(index, value);\n"
|
||||
" $on_changed$\n"
|
||||
@@ -807,7 +788,7 @@ void RepeatedImmutablePrimitiveFieldGenerator::GenerateBuilderMembers(
|
||||
printer->Print(variables_,
|
||||
"$deprecation$public Builder "
|
||||
"${$add$capitalized_name$$}$($type$ value) {\n"
|
||||
"$null_check$"
|
||||
" $null_check$\n"
|
||||
" ensure$capitalized_name$IsMutable();\n"
|
||||
" $repeated_add$(value);\n"
|
||||
" $on_changed$\n"
|
||||
@@ -945,9 +926,7 @@ void RepeatedImmutablePrimitiveFieldGenerator::GenerateInitializationCode(
|
||||
|
||||
void RepeatedImmutablePrimitiveFieldGenerator::GenerateBuilderClearCode(
|
||||
io::Printer* printer) const {
|
||||
printer->Print(variables_,
|
||||
"$name$_ = $empty_list$;\n"
|
||||
"$clear_mutable_bit_builder$;\n");
|
||||
printer->Print(variables_, "$name$_ = $empty_list$;\n");
|
||||
}
|
||||
|
||||
void RepeatedImmutablePrimitiveFieldGenerator::GenerateMergingCode(
|
||||
@@ -982,38 +961,24 @@ void RepeatedImmutablePrimitiveFieldGenerator::GenerateBuildingCode(
|
||||
"result.$name$_ = $name$_;\n");
|
||||
}
|
||||
|
||||
void RepeatedImmutablePrimitiveFieldGenerator::GenerateParsingCode(
|
||||
void RepeatedImmutablePrimitiveFieldGenerator::GenerateBuilderParsingCode(
|
||||
io::Printer* printer) const {
|
||||
printer->Print(variables_,
|
||||
"if (!$get_mutable_bit_parser$) {\n"
|
||||
" $name$_ = $create_list$;\n"
|
||||
" $set_mutable_bit_parser$;\n"
|
||||
"$type$ v = input.read$capitalized_type$();\n"
|
||||
"ensure$capitalized_name$IsMutable();\n"
|
||||
"$repeated_add$(v);\n");
|
||||
}
|
||||
|
||||
void RepeatedImmutablePrimitiveFieldGenerator::
|
||||
GenerateBuilderParsingCodeFromPacked(io::Printer* printer) const {
|
||||
printer->Print(variables_,
|
||||
"int length = input.readRawVarint32();\n"
|
||||
"int limit = input.pushLimit(length);\n"
|
||||
"ensure$capitalized_name$IsMutable();\n"
|
||||
"while (input.getBytesUntilLimit() > 0) {\n"
|
||||
" $repeated_add$(input.read$capitalized_type$());\n"
|
||||
"}\n"
|
||||
"$repeated_add$(input.read$capitalized_type$());\n");
|
||||
}
|
||||
|
||||
void RepeatedImmutablePrimitiveFieldGenerator::GenerateParsingCodeFromPacked(
|
||||
io::Printer* printer) const {
|
||||
printer->Print(
|
||||
variables_,
|
||||
"int length = input.readRawVarint32();\n"
|
||||
"int limit = input.pushLimit(length);\n"
|
||||
"if (!$get_mutable_bit_parser$ && input.getBytesUntilLimit() > 0) {\n"
|
||||
" $name$_ = $create_list$;\n"
|
||||
" $set_mutable_bit_parser$;\n"
|
||||
"}\n"
|
||||
"while (input.getBytesUntilLimit() > 0) {\n"
|
||||
" $repeated_add$(input.read$capitalized_type$());\n"
|
||||
"}\n"
|
||||
"input.popLimit(limit);\n");
|
||||
}
|
||||
|
||||
void RepeatedImmutablePrimitiveFieldGenerator::GenerateParsingDoneCode(
|
||||
io::Printer* printer) const {
|
||||
printer->Print(variables_,
|
||||
"if ($get_mutable_bit_parser$) {\n"
|
||||
" $name_make_immutable$; // C\n"
|
||||
"}\n");
|
||||
"input.popLimit(limit);\n");
|
||||
}
|
||||
|
||||
void RepeatedImmutablePrimitiveFieldGenerator::GenerateSerializationCode(
|
||||
+26
-22
@@ -37,7 +37,8 @@
|
||||
|
||||
#include <map>
|
||||
#include <string>
|
||||
#include <google/protobuf/compiler/java/java_field.h>
|
||||
|
||||
#include "google/protobuf/compiler/java/field.h"
|
||||
|
||||
namespace google {
|
||||
namespace protobuf {
|
||||
@@ -61,10 +62,16 @@ class ImmutablePrimitiveFieldGenerator : public ImmutableFieldGenerator {
|
||||
int messageBitIndex,
|
||||
int builderBitIndex,
|
||||
Context* context);
|
||||
ImmutablePrimitiveFieldGenerator(const ImmutablePrimitiveFieldGenerator&) =
|
||||
delete;
|
||||
ImmutablePrimitiveFieldGenerator& operator=(
|
||||
const ImmutablePrimitiveFieldGenerator&) = delete;
|
||||
~ImmutablePrimitiveFieldGenerator() override;
|
||||
|
||||
// implements ImmutableFieldGenerator
|
||||
// ---------------------------------------
|
||||
int GetMessageBitIndex() const override;
|
||||
int GetBuilderBitIndex() const override;
|
||||
int GetNumBitsForMessage() const override;
|
||||
int GetNumBitsForBuilder() const override;
|
||||
void GenerateInterfaceMembers(io::Printer* printer) const override;
|
||||
@@ -74,8 +81,7 @@ class ImmutablePrimitiveFieldGenerator : public ImmutableFieldGenerator {
|
||||
void GenerateBuilderClearCode(io::Printer* printer) const override;
|
||||
void GenerateMergingCode(io::Printer* printer) const override;
|
||||
void GenerateBuildingCode(io::Printer* printer) const override;
|
||||
void GenerateParsingCode(io::Printer* printer) const override;
|
||||
void GenerateParsingDoneCode(io::Printer* printer) const override;
|
||||
void GenerateBuilderParsingCode(io::Printer* printer) const override;
|
||||
void GenerateSerializationCode(io::Printer* printer) const override;
|
||||
void GenerateSerializedSizeCode(io::Printer* printer) const override;
|
||||
void GenerateFieldBuilderInitializationCode(
|
||||
@@ -88,11 +94,10 @@ class ImmutablePrimitiveFieldGenerator : public ImmutableFieldGenerator {
|
||||
|
||||
protected:
|
||||
const FieldDescriptor* descriptor_;
|
||||
int message_bit_index_;
|
||||
int builder_bit_index_;
|
||||
std::map<std::string, std::string> variables_;
|
||||
ClassNameResolver* name_resolver_;
|
||||
|
||||
private:
|
||||
GOOGLE_DISALLOW_EVIL_CONSTRUCTORS(ImmutablePrimitiveFieldGenerator);
|
||||
};
|
||||
|
||||
class ImmutablePrimitiveOneofFieldGenerator
|
||||
@@ -101,26 +106,32 @@ class ImmutablePrimitiveOneofFieldGenerator
|
||||
ImmutablePrimitiveOneofFieldGenerator(const FieldDescriptor* descriptor,
|
||||
int messageBitIndex,
|
||||
int builderBitIndex, Context* context);
|
||||
~ImmutablePrimitiveOneofFieldGenerator();
|
||||
ImmutablePrimitiveOneofFieldGenerator(
|
||||
const ImmutablePrimitiveOneofFieldGenerator&) = delete;
|
||||
ImmutablePrimitiveOneofFieldGenerator& operator=(
|
||||
const ImmutablePrimitiveOneofFieldGenerator&) = delete;
|
||||
~ImmutablePrimitiveOneofFieldGenerator() override;
|
||||
|
||||
void GenerateMembers(io::Printer* printer) const override;
|
||||
void GenerateBuilderMembers(io::Printer* printer) const override;
|
||||
void GenerateBuilderClearCode(io::Printer* printer) const override;
|
||||
void GenerateBuildingCode(io::Printer* printer) const override;
|
||||
void GenerateMergingCode(io::Printer* printer) const override;
|
||||
void GenerateParsingCode(io::Printer* printer) const override;
|
||||
void GenerateBuilderParsingCode(io::Printer* printer) const override;
|
||||
void GenerateSerializationCode(io::Printer* printer) const override;
|
||||
void GenerateSerializedSizeCode(io::Printer* printer) const override;
|
||||
|
||||
private:
|
||||
GOOGLE_DISALLOW_EVIL_CONSTRUCTORS(ImmutablePrimitiveOneofFieldGenerator);
|
||||
};
|
||||
|
||||
class RepeatedImmutablePrimitiveFieldGenerator
|
||||
: public ImmutableFieldGenerator {
|
||||
: public ImmutablePrimitiveFieldGenerator {
|
||||
public:
|
||||
explicit RepeatedImmutablePrimitiveFieldGenerator(
|
||||
const FieldDescriptor* descriptor, int messageBitIndex,
|
||||
int builderBitIndex, Context* context);
|
||||
RepeatedImmutablePrimitiveFieldGenerator(
|
||||
const RepeatedImmutablePrimitiveFieldGenerator&) = delete;
|
||||
RepeatedImmutablePrimitiveFieldGenerator& operator=(
|
||||
const RepeatedImmutablePrimitiveFieldGenerator&) = delete;
|
||||
~RepeatedImmutablePrimitiveFieldGenerator() override;
|
||||
|
||||
// implements ImmutableFieldGenerator ---------------------------------------
|
||||
@@ -133,9 +144,9 @@ class RepeatedImmutablePrimitiveFieldGenerator
|
||||
void GenerateBuilderClearCode(io::Printer* printer) const override;
|
||||
void GenerateMergingCode(io::Printer* printer) const override;
|
||||
void GenerateBuildingCode(io::Printer* printer) const override;
|
||||
void GenerateParsingCode(io::Printer* printer) const override;
|
||||
void GenerateParsingCodeFromPacked(io::Printer* printer) const override;
|
||||
void GenerateParsingDoneCode(io::Printer* printer) const override;
|
||||
void GenerateBuilderParsingCode(io::Printer* printer) const override;
|
||||
void GenerateBuilderParsingCodeFromPacked(
|
||||
io::Printer* printer) const override;
|
||||
void GenerateSerializationCode(io::Printer* printer) const override;
|
||||
void GenerateSerializedSizeCode(io::Printer* printer) const override;
|
||||
void GenerateFieldBuilderInitializationCode(
|
||||
@@ -145,13 +156,6 @@ class RepeatedImmutablePrimitiveFieldGenerator
|
||||
void GenerateKotlinDslMembers(io::Printer* printer) const override;
|
||||
|
||||
std::string GetBoxedType() const override;
|
||||
|
||||
private:
|
||||
const FieldDescriptor* descriptor_;
|
||||
std::map<std::string, std::string> variables_;
|
||||
ClassNameResolver* name_resolver_;
|
||||
|
||||
GOOGLE_DISALLOW_EVIL_CONSTRUCTORS(RepeatedImmutablePrimitiveFieldGenerator);
|
||||
};
|
||||
|
||||
} // namespace java
|
||||
+5
-6
@@ -32,7 +32,7 @@
|
||||
// Based on original Protocol Buffers design by
|
||||
// Sanjay Ghemawat, Jeff Dean, and others.
|
||||
|
||||
#include <google/protobuf/compiler/java/java_primitive_field_lite.h>
|
||||
#include <google/protobuf/compiler/java/primitive_field_lite.h>
|
||||
|
||||
#include <cstdint>
|
||||
#include <map>
|
||||
@@ -40,13 +40,13 @@
|
||||
|
||||
#include <google/protobuf/stubs/logging.h>
|
||||
#include <google/protobuf/stubs/common.h>
|
||||
#include <google/protobuf/compiler/java/java_context.h>
|
||||
#include <google/protobuf/compiler/java/java_doc_comment.h>
|
||||
#include <google/protobuf/compiler/java/java_helpers.h>
|
||||
#include <google/protobuf/compiler/java/java_name_resolver.h>
|
||||
#include <google/protobuf/io/printer.h>
|
||||
#include <google/protobuf/wire_format.h>
|
||||
#include <google/protobuf/stubs/strutil.h>
|
||||
#include <google/protobuf/compiler/java/context.h>
|
||||
#include <google/protobuf/compiler/java/doc_comment.h>
|
||||
#include <google/protobuf/compiler/java/helpers.h>
|
||||
#include <google/protobuf/compiler/java/name_resolver.h>
|
||||
|
||||
namespace google {
|
||||
namespace protobuf {
|
||||
@@ -160,7 +160,6 @@ void SetPrimitiveVariables(const FieldDescriptor* descriptor,
|
||||
|
||||
(*variables)["is_field_present_message"] = GenerateGetBit(messageBitIndex);
|
||||
} else {
|
||||
(*variables)["set_has_field_bit_message"] = "";
|
||||
(*variables)["set_has_field_bit_message"] = "";
|
||||
(*variables)["clear_has_field_bit_message"] = "";
|
||||
|
||||
+2
-2
@@ -39,7 +39,7 @@
|
||||
#include <map>
|
||||
#include <string>
|
||||
|
||||
#include <google/protobuf/compiler/java/java_field.h>
|
||||
#include <google/protobuf/compiler/java/field.h>
|
||||
|
||||
namespace google {
|
||||
namespace protobuf {
|
||||
@@ -93,7 +93,7 @@ class ImmutablePrimitiveOneofFieldLiteGenerator
|
||||
ImmutablePrimitiveOneofFieldLiteGenerator(const FieldDescriptor* descriptor,
|
||||
int messageBitIndex,
|
||||
Context* context);
|
||||
~ImmutablePrimitiveOneofFieldLiteGenerator();
|
||||
~ImmutablePrimitiveOneofFieldLiteGenerator() override;
|
||||
|
||||
void GenerateMembers(io::Printer* printer) const override;
|
||||
void GenerateBuilderMembers(io::Printer* printer) const override;
|
||||
+10
-5
@@ -32,14 +32,17 @@
|
||||
// Based on original Protocol Buffers design by
|
||||
// Sanjay Ghemawat, Jeff Dean, and others.
|
||||
|
||||
#include <google/protobuf/compiler/java/java_service.h>
|
||||
#include <google/protobuf/compiler/java/service.h>
|
||||
|
||||
#include <google/protobuf/compiler/java/java_context.h>
|
||||
#include <google/protobuf/compiler/java/java_doc_comment.h>
|
||||
#include <google/protobuf/compiler/java/java_helpers.h>
|
||||
#include <google/protobuf/compiler/java/java_name_resolver.h>
|
||||
#include <google/protobuf/io/printer.h>
|
||||
#include <google/protobuf/stubs/strutil.h>
|
||||
#include <google/protobuf/compiler/java/context.h>
|
||||
#include <google/protobuf/compiler/java/doc_comment.h>
|
||||
#include <google/protobuf/compiler/java/helpers.h>
|
||||
#include <google/protobuf/compiler/java/name_resolver.h>
|
||||
|
||||
// Must be last.
|
||||
#include <google/protobuf/port_def.inc>
|
||||
|
||||
namespace google {
|
||||
namespace protobuf {
|
||||
@@ -472,3 +475,5 @@ void ImmutableServiceGenerator::GenerateBlockingMethodSignature(
|
||||
} // namespace compiler
|
||||
} // namespace protobuf
|
||||
} // namespace google
|
||||
|
||||
#include <google/protobuf/port_undef.inc>
|
||||
+1
-1
@@ -78,7 +78,7 @@ class ImmutableServiceGenerator : public ServiceGenerator {
|
||||
public:
|
||||
ImmutableServiceGenerator(const ServiceDescriptor* descriptor,
|
||||
Context* context);
|
||||
virtual ~ImmutableServiceGenerator();
|
||||
~ImmutableServiceGenerator() override;
|
||||
|
||||
void Generate(io::Printer* printer) override;
|
||||
|
||||
+5
-5
@@ -30,19 +30,19 @@
|
||||
|
||||
// Author: xiaofeng@google.com (Feng Xiao)
|
||||
|
||||
#include <google/protobuf/compiler/java/java_shared_code_generator.h>
|
||||
#include <google/protobuf/compiler/java/shared_code_generator.h>
|
||||
|
||||
#include <memory>
|
||||
|
||||
#include <google/protobuf/compiler/java/java_helpers.h>
|
||||
#include <google/protobuf/compiler/java/java_name_resolver.h>
|
||||
#include <google/protobuf/compiler/java/java_names.h>
|
||||
#include <google/protobuf/compiler/code_generator.h>
|
||||
#include <google/protobuf/descriptor.pb.h>
|
||||
#include <google/protobuf/io/printer.h>
|
||||
#include <google/protobuf/io/zero_copy_stream.h>
|
||||
#include <google/protobuf/descriptor.h>
|
||||
#include <google/protobuf/stubs/strutil.h>
|
||||
#include <google/protobuf/compiler/java/helpers.h>
|
||||
#include <google/protobuf/compiler/java/name_resolver.h>
|
||||
#include <google/protobuf/compiler/java/names.h>
|
||||
#include <google/protobuf/descriptor.pb.h>
|
||||
|
||||
namespace google {
|
||||
namespace protobuf {
|
||||
+1
-1
@@ -40,7 +40,7 @@
|
||||
#include <vector>
|
||||
|
||||
#include <google/protobuf/stubs/common.h>
|
||||
#include <google/protobuf/compiler/java/java_options.h>
|
||||
#include <google/protobuf/compiler/java/options.h>
|
||||
|
||||
namespace google {
|
||||
namespace protobuf {
|
||||
+94
-112
@@ -33,21 +33,21 @@
|
||||
// Based on original Protocol Buffers design by
|
||||
// Sanjay Ghemawat, Jeff Dean, and others.
|
||||
|
||||
#include <google/protobuf/compiler/java/java_string_field.h>
|
||||
#include "google/protobuf/compiler/java/string_field.h"
|
||||
|
||||
#include <cstdint>
|
||||
#include <map>
|
||||
#include <string>
|
||||
|
||||
#include <google/protobuf/stubs/logging.h>
|
||||
#include <google/protobuf/stubs/common.h>
|
||||
#include <google/protobuf/compiler/java/java_context.h>
|
||||
#include <google/protobuf/compiler/java/java_doc_comment.h>
|
||||
#include <google/protobuf/compiler/java/java_helpers.h>
|
||||
#include <google/protobuf/compiler/java/java_name_resolver.h>
|
||||
#include <google/protobuf/io/printer.h>
|
||||
#include <google/protobuf/wire_format.h>
|
||||
#include <google/protobuf/stubs/strutil.h>
|
||||
#include "google/protobuf/stubs/logging.h"
|
||||
#include "google/protobuf/stubs/common.h"
|
||||
#include "google/protobuf/io/printer.h"
|
||||
#include "google/protobuf/wire_format.h"
|
||||
#include "google/protobuf/stubs/strutil.h"
|
||||
#include "google/protobuf/compiler/java/context.h"
|
||||
#include "google/protobuf/compiler/java/doc_comment.h"
|
||||
#include "google/protobuf/compiler/java/helpers.h"
|
||||
#include "google/protobuf/compiler/java/name_resolver.h"
|
||||
|
||||
namespace google {
|
||||
namespace protobuf {
|
||||
@@ -59,11 +59,11 @@ using internal::WireFormatLite;
|
||||
|
||||
namespace {
|
||||
|
||||
void SetPrimitiveVariables(const FieldDescriptor* descriptor,
|
||||
int messageBitIndex, int builderBitIndex,
|
||||
const FieldGeneratorInfo* info,
|
||||
ClassNameResolver* name_resolver,
|
||||
std::map<std::string, std::string>* variables) {
|
||||
void SetPrimitiveVariables(
|
||||
const FieldDescriptor* descriptor, int messageBitIndex, int builderBitIndex,
|
||||
const FieldGeneratorInfo* info, ClassNameResolver* name_resolver,
|
||||
std::map<std::string, std::string>* variables,
|
||||
Context* context) {
|
||||
SetCommonFieldVariables(descriptor, info, variables);
|
||||
|
||||
(*variables)["empty_list"] = "com.google.protobuf.LazyStringArrayList.EMPTY";
|
||||
@@ -77,9 +77,7 @@ void SetPrimitiveVariables(const FieldDescriptor* descriptor,
|
||||
(*variables)["tag_size"] = StrCat(
|
||||
WireFormat::TagSize(descriptor->number(), GetType(descriptor)));
|
||||
(*variables)["null_check"] =
|
||||
" if (value == null) {\n"
|
||||
" throw new NullPointerException();\n"
|
||||
" }\n";
|
||||
"if (value == null) { throw new NullPointerException(); }";
|
||||
(*variables)["isStringEmpty"] = "com.google.protobuf.GeneratedMessage" +
|
||||
GeneratedCodeVersionSuffix() +
|
||||
".isStringEmpty";
|
||||
@@ -93,34 +91,33 @@ void SetPrimitiveVariables(const FieldDescriptor* descriptor,
|
||||
// by the proto compiler
|
||||
(*variables)["deprecation"] =
|
||||
descriptor->options().deprecated() ? "@java.lang.Deprecated " : "";
|
||||
(*variables)["kt_deprecation"] =
|
||||
descriptor->options().deprecated()
|
||||
? "@kotlin.Deprecated(message = \"Field " + (*variables)["name"] +
|
||||
" is deprecated\") "
|
||||
: "";
|
||||
variables->insert(
|
||||
{"kt_deprecation",
|
||||
descriptor->options().deprecated()
|
||||
? StrCat("@kotlin.Deprecated(message = \"Field ",
|
||||
(*variables)["name"], " is deprecated\") ")
|
||||
: ""});
|
||||
(*variables)["on_changed"] = "onChanged();";
|
||||
|
||||
if (HasHasbit(descriptor)) {
|
||||
// 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);
|
||||
(*variables)["set_has_field_bit_to_local"] =
|
||||
GenerateSetBitToLocal(messageBitIndex);
|
||||
|
||||
// Note that these have a trailing ";".
|
||||
(*variables)["set_has_field_bit_message"] =
|
||||
GenerateSetBit(messageBitIndex) + ";";
|
||||
(*variables)["set_has_field_bit_builder"] =
|
||||
GenerateSetBit(builderBitIndex) + ";";
|
||||
(*variables)["clear_has_field_bit_builder"] =
|
||||
GenerateClearBit(builderBitIndex) + ";";
|
||||
|
||||
(*variables)["is_field_present_message"] = GenerateGetBit(messageBitIndex);
|
||||
} else {
|
||||
(*variables)["get_has_field_bit_message"] = "";
|
||||
(*variables)["set_has_field_bit_to_local"] = "";
|
||||
(*variables)["set_has_field_bit_message"] = "";
|
||||
(*variables)["set_has_field_bit_builder"] = "";
|
||||
(*variables)["clear_has_field_bit_builder"] = "";
|
||||
|
||||
(*variables)["is_field_present_message"] =
|
||||
"!" + (*variables)["isStringEmpty"] + "(" + (*variables)["name"] + "_)";
|
||||
variables->insert({"is_field_present_message",
|
||||
StrCat("!", (*variables)["isStringEmpty"], "(",
|
||||
(*variables)["name"], "_)")});
|
||||
}
|
||||
|
||||
// For repeated builders, one bit is used for whether the array is immutable.
|
||||
@@ -128,17 +125,13 @@ void SetPrimitiveVariables(const FieldDescriptor* descriptor,
|
||||
(*variables)["set_mutable_bit_builder"] = GenerateSetBit(builderBitIndex);
|
||||
(*variables)["clear_mutable_bit_builder"] = GenerateClearBit(builderBitIndex);
|
||||
|
||||
// For repeated fields, one bit is used for whether the array is immutable
|
||||
// in the parsing constructor.
|
||||
(*variables)["get_mutable_bit_parser"] =
|
||||
GenerateGetBitMutableLocal(builderBitIndex);
|
||||
(*variables)["set_mutable_bit_parser"] =
|
||||
GenerateSetBitMutableLocal(builderBitIndex);
|
||||
|
||||
(*variables)["get_has_field_bit_builder"] = GenerateGetBit(builderBitIndex);
|
||||
(*variables)["get_has_field_bit_from_local"] =
|
||||
GenerateGetBitFromLocal(builderBitIndex);
|
||||
(*variables)["set_has_field_bit_to_local"] =
|
||||
GenerateSetBitToLocal(messageBitIndex);
|
||||
(*variables)["set_has_field_bit_builder"] =
|
||||
GenerateSetBit(builderBitIndex) + ";";
|
||||
(*variables)["clear_has_field_bit_builder"] =
|
||||
GenerateClearBit(builderBitIndex) + ";";
|
||||
}
|
||||
|
||||
} // namespace
|
||||
@@ -148,21 +141,30 @@ void SetPrimitiveVariables(const FieldDescriptor* descriptor,
|
||||
ImmutableStringFieldGenerator::ImmutableStringFieldGenerator(
|
||||
const FieldDescriptor* descriptor, int messageBitIndex, int builderBitIndex,
|
||||
Context* context)
|
||||
: descriptor_(descriptor), name_resolver_(context->GetNameResolver()) {
|
||||
: descriptor_(descriptor),
|
||||
message_bit_index_(messageBitIndex),
|
||||
builder_bit_index_(builderBitIndex),
|
||||
name_resolver_(context->GetNameResolver()) {
|
||||
SetPrimitiveVariables(descriptor, messageBitIndex, builderBitIndex,
|
||||
context->GetFieldGeneratorInfo(descriptor),
|
||||
name_resolver_, &variables_);
|
||||
name_resolver_, &variables_, context);
|
||||
}
|
||||
|
||||
ImmutableStringFieldGenerator::~ImmutableStringFieldGenerator() {}
|
||||
|
||||
int ImmutableStringFieldGenerator::GetMessageBitIndex() const {
|
||||
return message_bit_index_;
|
||||
}
|
||||
|
||||
int ImmutableStringFieldGenerator::GetBuilderBitIndex() const {
|
||||
return builder_bit_index_;
|
||||
}
|
||||
|
||||
int ImmutableStringFieldGenerator::GetNumBitsForMessage() const {
|
||||
return HasHasbit(descriptor_) ? 1 : 0;
|
||||
}
|
||||
|
||||
int ImmutableStringFieldGenerator::GetNumBitsForBuilder() const {
|
||||
return GetNumBitsForMessage();
|
||||
}
|
||||
int ImmutableStringFieldGenerator::GetNumBitsForBuilder() const { return 1; }
|
||||
|
||||
// A note about how strings are handled. This code used to just store a String
|
||||
// in the Message. This had two issues:
|
||||
@@ -214,7 +216,9 @@ void ImmutableStringFieldGenerator::GenerateInterfaceMembers(
|
||||
|
||||
void ImmutableStringFieldGenerator::GenerateMembers(
|
||||
io::Printer* printer) const {
|
||||
printer->Print(variables_, "private volatile java.lang.Object $name$_;\n");
|
||||
printer->Print(variables_,
|
||||
"@SuppressWarnings(\"serial\")\n"
|
||||
"private volatile java.lang.Object $name$_ = $default$;\n");
|
||||
PrintExtraFieldInfo(variables_, printer);
|
||||
|
||||
if (HasHazzer(descriptor_)) {
|
||||
@@ -333,9 +337,9 @@ void ImmutableStringFieldGenerator::GenerateBuilderMembers(
|
||||
printer->Print(variables_,
|
||||
"$deprecation$public Builder ${$set$capitalized_name$$}$(\n"
|
||||
" java.lang.String value) {\n"
|
||||
"$null_check$"
|
||||
" $set_has_field_bit_builder$\n"
|
||||
" $null_check$\n"
|
||||
" $name$_ = value;\n"
|
||||
" $set_has_field_bit_builder$\n"
|
||||
" $on_changed$\n"
|
||||
" return this;\n"
|
||||
"}\n");
|
||||
@@ -344,14 +348,14 @@ void ImmutableStringFieldGenerator::GenerateBuilderMembers(
|
||||
/* builder */ true);
|
||||
printer->Print(
|
||||
variables_,
|
||||
"$deprecation$public Builder ${$clear$capitalized_name$$}$() {\n"
|
||||
" $clear_has_field_bit_builder$\n");
|
||||
"$deprecation$public Builder ${$clear$capitalized_name$$}$() {\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_,
|
||||
" $name$_ = getDefaultInstance().get$capitalized_name$();\n");
|
||||
printer->Print(variables_,
|
||||
" $clear_has_field_bit_builder$\n"
|
||||
" $on_changed$\n"
|
||||
" return this;\n"
|
||||
"}\n");
|
||||
@@ -362,14 +366,14 @@ void ImmutableStringFieldGenerator::GenerateBuilderMembers(
|
||||
variables_,
|
||||
"$deprecation$public Builder ${$set$capitalized_name$Bytes$}$(\n"
|
||||
" com.google.protobuf.ByteString value) {\n"
|
||||
"$null_check$");
|
||||
" $null_check$\n");
|
||||
printer->Annotate("{", "}", descriptor_);
|
||||
if (CheckUtf8(descriptor_)) {
|
||||
printer->Print(variables_, " checkByteStringIsUtf8(value);\n");
|
||||
}
|
||||
printer->Print(variables_,
|
||||
" $set_has_field_bit_builder$\n"
|
||||
" $name$_ = value;\n"
|
||||
" $set_has_field_bit_builder$\n"
|
||||
" $on_changed$\n"
|
||||
" return this;\n"
|
||||
"}\n");
|
||||
@@ -416,9 +420,7 @@ void ImmutableStringFieldGenerator::GenerateInitializationCode(
|
||||
|
||||
void ImmutableStringFieldGenerator::GenerateBuilderClearCode(
|
||||
io::Printer* printer) const {
|
||||
printer->Print(variables_,
|
||||
"$name$_ = $default$;\n"
|
||||
"$clear_has_field_bit_builder$\n");
|
||||
printer->Print(variables_, "$name$_ = $default$;\n");
|
||||
}
|
||||
|
||||
void ImmutableStringFieldGenerator::GenerateMergingCode(
|
||||
@@ -428,14 +430,15 @@ void ImmutableStringFieldGenerator::GenerateMergingCode(
|
||||
// all string fields to Strings when copying fields from a Message.
|
||||
printer->Print(variables_,
|
||||
"if (other.has$capitalized_name$()) {\n"
|
||||
" $set_has_field_bit_builder$\n"
|
||||
" $name$_ = other.$name$_;\n"
|
||||
" $set_has_field_bit_builder$\n"
|
||||
" $on_changed$\n"
|
||||
"}\n");
|
||||
} else {
|
||||
printer->Print(variables_,
|
||||
"if (!other.get$capitalized_name$().isEmpty()) {\n"
|
||||
" $name$_ = other.$name$_;\n"
|
||||
" $set_has_field_bit_builder$\n"
|
||||
" $on_changed$\n"
|
||||
"}\n");
|
||||
}
|
||||
@@ -443,35 +446,28 @@ void ImmutableStringFieldGenerator::GenerateMergingCode(
|
||||
|
||||
void ImmutableStringFieldGenerator::GenerateBuildingCode(
|
||||
io::Printer* printer) const {
|
||||
if (HasHazzer(descriptor_)) {
|
||||
printer->Print(variables_,
|
||||
"if ($get_has_field_bit_from_local$) {\n"
|
||||
" $set_has_field_bit_to_local$;\n"
|
||||
"}\n");
|
||||
printer->Print(variables_,
|
||||
"if ($get_has_field_bit_from_local$) {\n"
|
||||
" result.$name$_ = $name$_;\n");
|
||||
if (GetNumBitsForMessage() > 0) {
|
||||
printer->Print(variables_, " $set_has_field_bit_to_local$;\n");
|
||||
}
|
||||
printer->Print(variables_, "result.$name$_ = $name$_;\n");
|
||||
printer->Print("}\n");
|
||||
}
|
||||
|
||||
void ImmutableStringFieldGenerator::GenerateParsingCode(
|
||||
void ImmutableStringFieldGenerator::GenerateBuilderParsingCode(
|
||||
io::Printer* printer) const {
|
||||
if (CheckUtf8(descriptor_)) {
|
||||
printer->Print(variables_,
|
||||
"java.lang.String s = input.readStringRequireUtf8();\n"
|
||||
"$set_has_field_bit_message$\n"
|
||||
"$name$_ = s;\n");
|
||||
"$name$_ = input.readStringRequireUtf8();\n"
|
||||
"$set_has_field_bit_builder$\n");
|
||||
} else {
|
||||
printer->Print(variables_,
|
||||
"com.google.protobuf.ByteString bs = input.readBytes();\n"
|
||||
"$set_has_field_bit_message$\n"
|
||||
"$name$_ = bs;\n");
|
||||
"$name$_ = input.readBytes();\n"
|
||||
"$set_has_field_bit_builder$\n");
|
||||
}
|
||||
}
|
||||
|
||||
void ImmutableStringFieldGenerator::GenerateParsingDoneCode(
|
||||
io::Printer* printer) const {
|
||||
// noop for strings.
|
||||
}
|
||||
|
||||
void ImmutableStringFieldGenerator::GenerateSerializationCode(
|
||||
io::Printer* printer) const {
|
||||
printer->Print(variables_,
|
||||
@@ -655,7 +651,7 @@ void ImmutableStringOneofFieldGenerator::GenerateBuilderMembers(
|
||||
printer->Print(variables_,
|
||||
"$deprecation$public Builder ${$set$capitalized_name$$}$(\n"
|
||||
" java.lang.String value) {\n"
|
||||
"$null_check$"
|
||||
" $null_check$\n"
|
||||
" $set_oneof_case_message$;\n"
|
||||
" $oneof_name$_ = value;\n"
|
||||
" $on_changed$\n"
|
||||
@@ -682,7 +678,7 @@ void ImmutableStringOneofFieldGenerator::GenerateBuilderMembers(
|
||||
variables_,
|
||||
"$deprecation$public Builder ${$set$capitalized_name$Bytes$}$(\n"
|
||||
" com.google.protobuf.ByteString value) {\n"
|
||||
"$null_check$");
|
||||
" $null_check$\n");
|
||||
printer->Annotate("{", "}", descriptor_);
|
||||
if (CheckUtf8(descriptor_)) {
|
||||
printer->Print(variables_, " checkByteStringIsUtf8(value);\n");
|
||||
@@ -695,6 +691,11 @@ void ImmutableStringOneofFieldGenerator::GenerateBuilderMembers(
|
||||
"}\n");
|
||||
}
|
||||
|
||||
void ImmutableStringOneofFieldGenerator::GenerateBuilderClearCode(
|
||||
io::Printer* printer) const {
|
||||
// No-Op: String fields in oneofs are correctly cleared by clearing the oneof
|
||||
}
|
||||
|
||||
void ImmutableStringOneofFieldGenerator::GenerateMergingCode(
|
||||
io::Printer* printer) const {
|
||||
// Allow a slight breach of abstraction here in order to avoid forcing
|
||||
@@ -707,13 +708,10 @@ void ImmutableStringOneofFieldGenerator::GenerateMergingCode(
|
||||
|
||||
void ImmutableStringOneofFieldGenerator::GenerateBuildingCode(
|
||||
io::Printer* printer) const {
|
||||
printer->Print(variables_,
|
||||
"if ($has_oneof_case_message$) {\n"
|
||||
" result.$oneof_name$_ = $oneof_name$_;\n"
|
||||
"}\n");
|
||||
// No-Op: oneof fields are built by a single statement
|
||||
}
|
||||
|
||||
void ImmutableStringOneofFieldGenerator::GenerateParsingCode(
|
||||
void ImmutableStringOneofFieldGenerator::GenerateBuilderParsingCode(
|
||||
io::Printer* printer) const {
|
||||
if (CheckUtf8(descriptor_)) {
|
||||
printer->Print(variables_,
|
||||
@@ -749,11 +747,8 @@ void ImmutableStringOneofFieldGenerator::GenerateSerializedSizeCode(
|
||||
RepeatedImmutableStringFieldGenerator::RepeatedImmutableStringFieldGenerator(
|
||||
const FieldDescriptor* descriptor, int messageBitIndex, int builderBitIndex,
|
||||
Context* context)
|
||||
: descriptor_(descriptor), name_resolver_(context->GetNameResolver()) {
|
||||
SetPrimitiveVariables(descriptor, messageBitIndex, builderBitIndex,
|
||||
context->GetFieldGeneratorInfo(descriptor),
|
||||
name_resolver_, &variables_);
|
||||
}
|
||||
: ImmutableStringFieldGenerator(descriptor, messageBitIndex,
|
||||
builderBitIndex, context) {}
|
||||
|
||||
RepeatedImmutableStringFieldGenerator::
|
||||
~RepeatedImmutableStringFieldGenerator() {}
|
||||
@@ -796,6 +791,7 @@ void RepeatedImmutableStringFieldGenerator::GenerateInterfaceMembers(
|
||||
void RepeatedImmutableStringFieldGenerator::GenerateMembers(
|
||||
io::Printer* printer) const {
|
||||
printer->Print(variables_,
|
||||
"@SuppressWarnings(\"serial\")\n"
|
||||
"private com.google.protobuf.LazyStringList $name$_;\n");
|
||||
PrintExtraFieldInfo(variables_, printer);
|
||||
WriteFieldAccessorDocComment(printer, descriptor_, LIST_GETTER);
|
||||
@@ -891,7 +887,7 @@ void RepeatedImmutableStringFieldGenerator::GenerateBuilderMembers(
|
||||
printer->Print(variables_,
|
||||
"$deprecation$public Builder ${$set$capitalized_name$$}$(\n"
|
||||
" int index, java.lang.String value) {\n"
|
||||
"$null_check$"
|
||||
" $null_check$\n"
|
||||
" ensure$capitalized_name$IsMutable();\n"
|
||||
" $name$_.set(index, value);\n"
|
||||
" $on_changed$\n"
|
||||
@@ -903,7 +899,7 @@ void RepeatedImmutableStringFieldGenerator::GenerateBuilderMembers(
|
||||
printer->Print(variables_,
|
||||
"$deprecation$public Builder ${$add$capitalized_name$$}$(\n"
|
||||
" java.lang.String value) {\n"
|
||||
"$null_check$"
|
||||
" $null_check$\n"
|
||||
" ensure$capitalized_name$IsMutable();\n"
|
||||
" $name$_.add(value);\n"
|
||||
" $on_changed$\n"
|
||||
@@ -940,7 +936,7 @@ void RepeatedImmutableStringFieldGenerator::GenerateBuilderMembers(
|
||||
variables_,
|
||||
"$deprecation$public Builder ${$add$capitalized_name$Bytes$}$(\n"
|
||||
" com.google.protobuf.ByteString value) {\n"
|
||||
"$null_check$");
|
||||
" $null_check$\n");
|
||||
printer->Annotate("{", "}", descriptor_);
|
||||
if (CheckUtf8(descriptor_)) {
|
||||
printer->Print(variables_, " checkByteStringIsUtf8(value);\n");
|
||||
@@ -992,7 +988,7 @@ void RepeatedImmutableStringFieldGenerator::GenerateKotlinDslMembers(
|
||||
// List<String> += String
|
||||
WriteFieldAccessorDocComment(printer, descriptor_, LIST_ADDER,
|
||||
/* builder */ false);
|
||||
printer->Print(variables_,
|
||||
printer->Print(variables_,
|
||||
"@kotlin.jvm.JvmSynthetic\n"
|
||||
"@kotlin.jvm.JvmName(\"plusAssign$kt_capitalized_name$\")\n"
|
||||
"@Suppress(\"NOTHING_TO_INLINE\")\n"
|
||||
@@ -1104,33 +1100,19 @@ void RepeatedImmutableStringFieldGenerator::GenerateBuildingCode(
|
||||
"result.$name$_ = $name$_;\n");
|
||||
}
|
||||
|
||||
void RepeatedImmutableStringFieldGenerator::GenerateParsingCode(
|
||||
void RepeatedImmutableStringFieldGenerator::GenerateBuilderParsingCode(
|
||||
io::Printer* printer) const {
|
||||
if (CheckUtf8(descriptor_)) {
|
||||
printer->Print(variables_,
|
||||
"java.lang.String s = input.readStringRequireUtf8();\n");
|
||||
"java.lang.String s = input.readStringRequireUtf8();\n"
|
||||
"ensure$capitalized_name$IsMutable();\n"
|
||||
"$name$_.add(s);\n");
|
||||
} else {
|
||||
printer->Print(variables_,
|
||||
"com.google.protobuf.ByteString bs = input.readBytes();\n");
|
||||
"com.google.protobuf.ByteString bs = input.readBytes();\n"
|
||||
"ensure$capitalized_name$IsMutable();\n"
|
||||
"$name$_.add(bs);\n");
|
||||
}
|
||||
printer->Print(variables_,
|
||||
"if (!$get_mutable_bit_parser$) {\n"
|
||||
" $name$_ = new com.google.protobuf.LazyStringArrayList();\n"
|
||||
" $set_mutable_bit_parser$;\n"
|
||||
"}\n");
|
||||
if (CheckUtf8(descriptor_)) {
|
||||
printer->Print(variables_, "$name$_.add(s);\n");
|
||||
} else {
|
||||
printer->Print(variables_, "$name$_.add(bs);\n");
|
||||
}
|
||||
}
|
||||
|
||||
void RepeatedImmutableStringFieldGenerator::GenerateParsingDoneCode(
|
||||
io::Printer* printer) const {
|
||||
printer->Print(variables_,
|
||||
"if ($get_mutable_bit_parser$) {\n"
|
||||
" $name$_ = $name$_.getUnmodifiableView();\n"
|
||||
"}\n");
|
||||
}
|
||||
|
||||
void RepeatedImmutableStringFieldGenerator::GenerateSerializationCode(
|
||||
+25
-21
@@ -38,7 +38,8 @@
|
||||
|
||||
#include <map>
|
||||
#include <string>
|
||||
#include <google/protobuf/compiler/java/java_field.h>
|
||||
|
||||
#include "google/protobuf/compiler/java/field.h"
|
||||
|
||||
namespace google {
|
||||
namespace protobuf {
|
||||
@@ -61,10 +62,15 @@ class ImmutableStringFieldGenerator : public ImmutableFieldGenerator {
|
||||
explicit ImmutableStringFieldGenerator(const FieldDescriptor* descriptor,
|
||||
int messageBitIndex,
|
||||
int builderBitIndex, Context* context);
|
||||
~ImmutableStringFieldGenerator();
|
||||
ImmutableStringFieldGenerator(const ImmutableStringFieldGenerator&) = delete;
|
||||
ImmutableStringFieldGenerator& operator=(
|
||||
const ImmutableStringFieldGenerator&) = delete;
|
||||
~ImmutableStringFieldGenerator() override;
|
||||
|
||||
// implements ImmutableFieldGenerator
|
||||
// ---------------------------------------
|
||||
int GetMessageBitIndex() const override;
|
||||
int GetBuilderBitIndex() const override;
|
||||
int GetNumBitsForMessage() const override;
|
||||
int GetNumBitsForBuilder() const override;
|
||||
void GenerateInterfaceMembers(io::Printer* printer) const override;
|
||||
@@ -74,8 +80,7 @@ class ImmutableStringFieldGenerator : public ImmutableFieldGenerator {
|
||||
void GenerateBuilderClearCode(io::Printer* printer) const override;
|
||||
void GenerateMergingCode(io::Printer* printer) const override;
|
||||
void GenerateBuildingCode(io::Printer* printer) const override;
|
||||
void GenerateParsingCode(io::Printer* printer) const override;
|
||||
void GenerateParsingDoneCode(io::Printer* printer) const override;
|
||||
void GenerateBuilderParsingCode(io::Printer* printer) const override;
|
||||
void GenerateSerializationCode(io::Printer* printer) const override;
|
||||
void GenerateSerializedSizeCode(io::Printer* printer) const override;
|
||||
void GenerateFieldBuilderInitializationCode(
|
||||
@@ -88,11 +93,10 @@ class ImmutableStringFieldGenerator : public ImmutableFieldGenerator {
|
||||
|
||||
protected:
|
||||
const FieldDescriptor* descriptor_;
|
||||
int message_bit_index_;
|
||||
int builder_bit_index_;
|
||||
std::map<std::string, std::string> variables_;
|
||||
ClassNameResolver* name_resolver_;
|
||||
|
||||
private:
|
||||
GOOGLE_DISALLOW_EVIL_CONSTRUCTORS(ImmutableStringFieldGenerator);
|
||||
};
|
||||
|
||||
class ImmutableStringOneofFieldGenerator
|
||||
@@ -101,25 +105,33 @@ class ImmutableStringOneofFieldGenerator
|
||||
ImmutableStringOneofFieldGenerator(const FieldDescriptor* descriptor,
|
||||
int messageBitIndex, int builderBitIndex,
|
||||
Context* context);
|
||||
~ImmutableStringOneofFieldGenerator();
|
||||
ImmutableStringOneofFieldGenerator(
|
||||
const ImmutableStringOneofFieldGenerator&) = delete;
|
||||
ImmutableStringOneofFieldGenerator& operator=(
|
||||
const ImmutableStringOneofFieldGenerator&) = delete;
|
||||
~ImmutableStringOneofFieldGenerator() override;
|
||||
|
||||
private:
|
||||
void GenerateMembers(io::Printer* printer) const override;
|
||||
void GenerateBuilderMembers(io::Printer* printer) const override;
|
||||
void GenerateBuilderClearCode(io::Printer* printer) const override;
|
||||
void GenerateMergingCode(io::Printer* printer) const override;
|
||||
void GenerateBuildingCode(io::Printer* printer) const override;
|
||||
void GenerateParsingCode(io::Printer* printer) const override;
|
||||
void GenerateBuilderParsingCode(io::Printer* printer) const override;
|
||||
void GenerateSerializationCode(io::Printer* printer) const override;
|
||||
void GenerateSerializedSizeCode(io::Printer* printer) const override;
|
||||
|
||||
GOOGLE_DISALLOW_EVIL_CONSTRUCTORS(ImmutableStringOneofFieldGenerator);
|
||||
};
|
||||
|
||||
class RepeatedImmutableStringFieldGenerator : public ImmutableFieldGenerator {
|
||||
class RepeatedImmutableStringFieldGenerator
|
||||
: public ImmutableStringFieldGenerator {
|
||||
public:
|
||||
explicit RepeatedImmutableStringFieldGenerator(
|
||||
const FieldDescriptor* descriptor, int messageBitIndex,
|
||||
int builderBitIndex, Context* context);
|
||||
RepeatedImmutableStringFieldGenerator(
|
||||
const RepeatedImmutableStringFieldGenerator&) = delete;
|
||||
RepeatedImmutableStringFieldGenerator& operator=(
|
||||
const RepeatedImmutableStringFieldGenerator&) = delete;
|
||||
~RepeatedImmutableStringFieldGenerator() override;
|
||||
|
||||
// implements ImmutableFieldGenerator ---------------------------------------
|
||||
@@ -132,8 +144,7 @@ class RepeatedImmutableStringFieldGenerator : public ImmutableFieldGenerator {
|
||||
void GenerateBuilderClearCode(io::Printer* printer) const override;
|
||||
void GenerateMergingCode(io::Printer* printer) const override;
|
||||
void GenerateBuildingCode(io::Printer* printer) const override;
|
||||
void GenerateParsingCode(io::Printer* printer) const override;
|
||||
void GenerateParsingDoneCode(io::Printer* printer) const override;
|
||||
void GenerateBuilderParsingCode(io::Printer* printer) const override;
|
||||
void GenerateSerializationCode(io::Printer* printer) const override;
|
||||
void GenerateSerializedSizeCode(io::Printer* printer) const override;
|
||||
void GenerateFieldBuilderInitializationCode(
|
||||
@@ -143,13 +154,6 @@ class RepeatedImmutableStringFieldGenerator : public ImmutableFieldGenerator {
|
||||
void GenerateKotlinDslMembers(io::Printer* printer) const override;
|
||||
|
||||
std::string GetBoxedType() const override;
|
||||
|
||||
private:
|
||||
const FieldDescriptor* descriptor_;
|
||||
std::map<std::string, std::string> variables_;
|
||||
ClassNameResolver* name_resolver_;
|
||||
|
||||
GOOGLE_DISALLOW_EVIL_CONSTRUCTORS(RepeatedImmutableStringFieldGenerator);
|
||||
};
|
||||
|
||||
} // namespace java
|
||||
+6
-6
@@ -33,7 +33,7 @@
|
||||
// Based on original Protocol Buffers design by
|
||||
// Sanjay Ghemawat, Jeff Dean, and others.
|
||||
|
||||
#include <google/protobuf/compiler/java/java_string_field_lite.h>
|
||||
#include <google/protobuf/compiler/java/string_field_lite.h>
|
||||
|
||||
#include <cstdint>
|
||||
#include <map>
|
||||
@@ -41,13 +41,13 @@
|
||||
|
||||
#include <google/protobuf/stubs/logging.h>
|
||||
#include <google/protobuf/stubs/common.h>
|
||||
#include <google/protobuf/compiler/java/java_context.h>
|
||||
#include <google/protobuf/compiler/java/java_doc_comment.h>
|
||||
#include <google/protobuf/compiler/java/java_helpers.h>
|
||||
#include <google/protobuf/compiler/java/java_name_resolver.h>
|
||||
#include <google/protobuf/io/printer.h>
|
||||
#include <google/protobuf/wire_format.h>
|
||||
#include <google/protobuf/stubs/strutil.h>
|
||||
#include <google/protobuf/compiler/java/context.h>
|
||||
#include <google/protobuf/compiler/java/doc_comment.h>
|
||||
#include <google/protobuf/compiler/java/helpers.h>
|
||||
#include <google/protobuf/compiler/java/name_resolver.h>
|
||||
|
||||
namespace google {
|
||||
namespace protobuf {
|
||||
@@ -758,7 +758,7 @@ void RepeatedImmutableStringFieldLiteGenerator::GenerateKotlinDslMembers(
|
||||
"$kt_deprecation$public val $kt_name$: "
|
||||
"com.google.protobuf.kotlin.DslList"
|
||||
"<kotlin.String, ${$$kt_capitalized_name$Proxy$}$>\n"
|
||||
" @kotlin.OptIn"
|
||||
"@kotlin.OptIn"
|
||||
"(com.google.protobuf.kotlin.OnlyForUseByGeneratedProtoCode::class)\n"
|
||||
" get() = com.google.protobuf.kotlin.DslList(\n"
|
||||
" $kt_dsl_builder$.${$get$capitalized_name$List$}$()\n"
|
||||
+1
-1
@@ -40,7 +40,7 @@
|
||||
#include <map>
|
||||
#include <string>
|
||||
|
||||
#include <google/protobuf/compiler/java/java_field.h>
|
||||
#include <google/protobuf/compiler/java/field.h>
|
||||
|
||||
namespace google {
|
||||
namespace protobuf {
|
||||
Reference in new issue
Block a user