linux pbuf36
This commit is contained in:
1 parent
e2dd18b3fa
commit
9d9046fac4
415 files changed
+23591
-30905
No files matched your search
@@ -69,14 +69,14 @@ bool IsConflicting(const FieldDescriptor* field1, const string& name1,
|
||||
// field1 is repeated, and field2 is not.
|
||||
if (name1 + "Count" == name2) {
|
||||
*info = "both repeated field \"" + field1->name() + "\" and singular " +
|
||||
"field \"" + field2->name() + "\" generates the method \"" +
|
||||
"get" + name1 + "Count()\"";
|
||||
"field \"" + field2->name() + "\" generate the method \"" +
|
||||
"get" + name1 + "Count()\"";
|
||||
return true;
|
||||
}
|
||||
if (name1 + "List" == name2) {
|
||||
*info = "both repeated field \"" + field1->name() + "\" and singular " +
|
||||
"field \"" + field2->name() + "\" generates the method \"" +
|
||||
"get" + name1 + "List()\"";
|
||||
"field \"" + field2->name() + "\" generate the method \"" +
|
||||
"get" + name1 + "List()\"";
|
||||
return true;
|
||||
}
|
||||
// Well, there are obviously many more conflicting cases, but it probably
|
||||
|
||||
@@ -33,9 +33,6 @@
|
||||
|
||||
#include <map>
|
||||
#include <memory>
|
||||
#ifndef _SHARED_PTR_H
|
||||
#include <google/protobuf/stubs/shared_ptr.h>
|
||||
#endif
|
||||
#include <vector>
|
||||
|
||||
#include <google/protobuf/stubs/common.h>
|
||||
@@ -97,7 +94,7 @@ class Context {
|
||||
void InitializeFieldGeneratorInfoForFields(
|
||||
const std::vector<const FieldDescriptor*>& fields);
|
||||
|
||||
google::protobuf::scoped_ptr<ClassNameResolver> name_resolver_;
|
||||
std::unique_ptr<ClassNameResolver> name_resolver_;
|
||||
std::map<const FieldDescriptor*, FieldGeneratorInfo>
|
||||
field_generator_info_map_;
|
||||
std::map<const OneofDescriptor*, OneofGeneratorInfo>
|
||||
|
||||
@@ -36,12 +36,12 @@
|
||||
#include <string>
|
||||
|
||||
#include <google/protobuf/compiler/java/java_context.h>
|
||||
#include <google/protobuf/compiler/java/java_enum.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/io/printer.h>
|
||||
#include <google/protobuf/descriptor.pb.h>
|
||||
#include <google/protobuf/io/printer.h>
|
||||
#include <google/protobuf/stubs/strutil.h>
|
||||
|
||||
namespace google {
|
||||
|
||||
@@ -80,7 +80,7 @@ void SetEnumVariables(const FieldDescriptor* descriptor,
|
||||
// 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.
|
||||
// with v2.5.0/v2.6.1, and remove the @SuppressWarnings annotations.
|
||||
(*variables)["for_number"] = "valueOf";
|
||||
|
||||
if (SupportFieldPresence(descriptor->file())) {
|
||||
@@ -199,6 +199,7 @@ GenerateMembers(io::Printer* printer) const {
|
||||
WriteFieldDocComment(printer, descriptor_);
|
||||
printer->Print(variables_,
|
||||
"$deprecation$public $type$ ${$get$capitalized_name$$}$() {\n"
|
||||
" @SuppressWarnings(\"deprecation\")\n"
|
||||
" $type$ result = $type$.$for_number$($name$_);\n"
|
||||
" return result == null ? $unknown$ : result;\n"
|
||||
"}\n");
|
||||
@@ -237,6 +238,7 @@ GenerateBuilderMembers(io::Printer* printer) const {
|
||||
WriteFieldDocComment(printer, descriptor_);
|
||||
printer->Print(variables_,
|
||||
"$deprecation$public $type$ ${$get$capitalized_name$$}$() {\n"
|
||||
" @SuppressWarnings(\"deprecation\")\n"
|
||||
" $type$ result = $type$.$for_number$($name$_);\n"
|
||||
" return result == null ? $unknown$ : result;\n"
|
||||
"}\n");
|
||||
@@ -320,6 +322,7 @@ GenerateParsingCode(io::Printer* printer) const {
|
||||
} 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"
|
||||
@@ -412,6 +415,7 @@ GenerateMembers(io::Printer* printer) const {
|
||||
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"
|
||||
" (java.lang.Integer) $oneof_name$_);\n"
|
||||
" return result == null ? $unknown$ : result;\n"
|
||||
@@ -456,6 +460,7 @@ GenerateBuilderMembers(io::Printer* printer) const {
|
||||
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"
|
||||
" (java.lang.Integer) $oneof_name$_);\n"
|
||||
" return result == null ? $unknown$ : result;\n"
|
||||
@@ -517,6 +522,7 @@ GenerateParsingCode(io::Printer* printer) const {
|
||||
} 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"
|
||||
@@ -626,6 +632,7 @@ GenerateMembers(io::Printer* printer) const {
|
||||
" new com.google.protobuf.Internal.ListAdapter.Converter<\n"
|
||||
" java.lang.Integer, $type$>() {\n"
|
||||
" public $type$ convert(java.lang.Integer from) {\n"
|
||||
" @SuppressWarnings(\"deprecation\")\n"
|
||||
" $type$ result = $type$.$for_number$(from);\n"
|
||||
" return result == null ? $unknown$ : result;\n"
|
||||
" }\n"
|
||||
@@ -667,8 +674,7 @@ GenerateMembers(io::Printer* printer) const {
|
||||
printer->Annotate("{", "}", descriptor_);
|
||||
}
|
||||
|
||||
if (descriptor_->is_packed() &&
|
||||
context_->HasGeneratedMethods(descriptor_->containing_type())) {
|
||||
if (descriptor_->is_packed()) {
|
||||
printer->Print(variables_,
|
||||
"private int $name$MemoizedSerializedSize;\n");
|
||||
}
|
||||
@@ -879,6 +885,7 @@ GenerateParsingCode(io::Printer* printer) const {
|
||||
} 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"
|
||||
|
||||
@@ -165,6 +165,7 @@ GenerateMembers(io::Printer* printer) const {
|
||||
if (SupportFieldPresence(descriptor_->file())) {
|
||||
WriteFieldDocComment(printer, descriptor_);
|
||||
printer->Print(variables_,
|
||||
"@java.lang.Override\n"
|
||||
"$deprecation$public boolean ${$has$capitalized_name$$}$() {\n"
|
||||
" return $get_has_field_bit_message$;\n"
|
||||
"}\n");
|
||||
@@ -173,6 +174,7 @@ GenerateMembers(io::Printer* printer) const {
|
||||
if (SupportUnknownEnumValue(descriptor_->file())) {
|
||||
WriteFieldDocComment(printer, descriptor_);
|
||||
printer->Print(variables_,
|
||||
"@java.lang.Override\n"
|
||||
"$deprecation$public int ${$get$capitalized_name$Value$}$() {\n"
|
||||
" return $name$_;\n"
|
||||
"}\n");
|
||||
@@ -180,6 +182,7 @@ GenerateMembers(io::Printer* printer) const {
|
||||
}
|
||||
WriteFieldDocComment(printer, descriptor_);
|
||||
printer->Print(variables_,
|
||||
"@java.lang.Override\n"
|
||||
"$deprecation$public $type$ ${$get$capitalized_name$$}$() {\n"
|
||||
" $type$ result = $type$.forNumber($name$_);\n"
|
||||
" return result == null ? $unknown$ : result;\n"
|
||||
@@ -217,6 +220,7 @@ GenerateBuilderMembers(io::Printer* printer) const {
|
||||
if (SupportFieldPresence(descriptor_->file())) {
|
||||
WriteFieldDocComment(printer, descriptor_);
|
||||
printer->Print(variables_,
|
||||
"@java.lang.Override\n"
|
||||
"$deprecation$public boolean ${$has$capitalized_name$$}$() {\n"
|
||||
" return instance.has$capitalized_name$();\n"
|
||||
"}\n");
|
||||
@@ -225,6 +229,7 @@ GenerateBuilderMembers(io::Printer* printer) const {
|
||||
if (SupportUnknownEnumValue(descriptor_->file())) {
|
||||
WriteFieldDocComment(printer, descriptor_);
|
||||
printer->Print(variables_,
|
||||
"@java.lang.Override\n"
|
||||
"$deprecation$public int ${$get$capitalized_name$Value$}$() {\n"
|
||||
" return instance.get$capitalized_name$Value();\n"
|
||||
"}\n");
|
||||
@@ -241,6 +246,7 @@ GenerateBuilderMembers(io::Printer* printer) const {
|
||||
}
|
||||
WriteFieldDocComment(printer, descriptor_);
|
||||
printer->Print(variables_,
|
||||
"@java.lang.Override\n"
|
||||
"$deprecation$public $type$ ${$get$capitalized_name$$}$() {\n"
|
||||
" return instance.get$capitalized_name$();\n"
|
||||
"}\n");
|
||||
@@ -378,6 +384,7 @@ GenerateMembers(io::Printer* printer) const {
|
||||
if (SupportFieldPresence(descriptor_->file())) {
|
||||
WriteFieldDocComment(printer, descriptor_);
|
||||
printer->Print(variables_,
|
||||
"@java.lang.Override\n"
|
||||
"$deprecation$public boolean ${$has$capitalized_name$$}$() {\n"
|
||||
" return $has_oneof_case_message$;\n"
|
||||
"}\n");
|
||||
@@ -386,6 +393,7 @@ GenerateMembers(io::Printer* printer) const {
|
||||
if (SupportUnknownEnumValue(descriptor_->file())) {
|
||||
WriteFieldDocComment(printer, descriptor_);
|
||||
printer->Print(variables_,
|
||||
"@java.lang.Override\n"
|
||||
"$deprecation$public int ${$get$capitalized_name$Value$}$() {\n"
|
||||
" if ($has_oneof_case_message$) {\n"
|
||||
" return (java.lang.Integer) $oneof_name$_;\n"
|
||||
@@ -396,6 +404,7 @@ GenerateMembers(io::Printer* printer) const {
|
||||
}
|
||||
WriteFieldDocComment(printer, descriptor_);
|
||||
printer->Print(variables_,
|
||||
"@java.lang.Override\n"
|
||||
"$deprecation$public $type$ ${$get$capitalized_name$$}$() {\n"
|
||||
" if ($has_oneof_case_message$) {\n"
|
||||
" $type$ result = $type$.forNumber((java.lang.Integer) $oneof_name$_);\n"
|
||||
@@ -439,6 +448,7 @@ GenerateBuilderMembers(io::Printer* printer) const {
|
||||
if (SupportFieldPresence(descriptor_->file())) {
|
||||
WriteFieldDocComment(printer, descriptor_);
|
||||
printer->Print(variables_,
|
||||
"@java.lang.Override\n"
|
||||
"$deprecation$public boolean ${$has$capitalized_name$$}$() {\n"
|
||||
" return instance.has$capitalized_name$();\n"
|
||||
"}\n");
|
||||
@@ -447,6 +457,7 @@ GenerateBuilderMembers(io::Printer* printer) const {
|
||||
if (SupportUnknownEnumValue(descriptor_->file())) {
|
||||
WriteFieldDocComment(printer, descriptor_);
|
||||
printer->Print(variables_,
|
||||
"@java.lang.Override\n"
|
||||
"$deprecation$public int ${$get$capitalized_name$Value$}$() {\n"
|
||||
" return instance.get$capitalized_name$Value();\n"
|
||||
"}\n");
|
||||
@@ -463,6 +474,7 @@ GenerateBuilderMembers(io::Printer* printer) const {
|
||||
}
|
||||
WriteFieldDocComment(printer, descriptor_);
|
||||
printer->Print(variables_,
|
||||
"@java.lang.Override\n"
|
||||
"$deprecation$public $type$ ${$get$capitalized_name$$}$() {\n"
|
||||
" return instance.get$capitalized_name$();\n"
|
||||
"}\n");
|
||||
@@ -611,6 +623,7 @@ GenerateMembers(io::Printer* printer) const {
|
||||
" java.lang.Integer, $type$> $name$_converter_ =\n"
|
||||
" new com.google.protobuf.Internal.ListAdapter.Converter<\n"
|
||||
" java.lang.Integer, $type$>() {\n"
|
||||
" @java.lang.Override\n"
|
||||
" public $type$ convert(java.lang.Integer from) {\n"
|
||||
" $type$ result = $type$.forNumber(from);\n"
|
||||
" return result == null ? $unknown$ : result;\n"
|
||||
@@ -619,6 +632,7 @@ GenerateMembers(io::Printer* printer) const {
|
||||
PrintExtraFieldInfo(variables_, printer);
|
||||
WriteFieldDocComment(printer, descriptor_);
|
||||
printer->Print(variables_,
|
||||
"@java.lang.Override\n"
|
||||
"$deprecation$public java.util.List<$type$> "
|
||||
"${$get$capitalized_name$List$}$() {\n"
|
||||
" return new com.google.protobuf.Internal.ListAdapter<\n"
|
||||
@@ -627,12 +641,14 @@ GenerateMembers(io::Printer* printer) const {
|
||||
printer->Annotate("{", "}", descriptor_);
|
||||
WriteFieldDocComment(printer, descriptor_);
|
||||
printer->Print(variables_,
|
||||
"@java.lang.Override\n"
|
||||
"$deprecation$public int ${$get$capitalized_name$Count$}$() {\n"
|
||||
" return $name$_.size();\n"
|
||||
"}\n");
|
||||
printer->Annotate("{", "}", descriptor_);
|
||||
WriteFieldDocComment(printer, descriptor_);
|
||||
printer->Print(variables_,
|
||||
"@java.lang.Override\n"
|
||||
"$deprecation$public $type$ ${$get$capitalized_name$$}$(int index) {\n"
|
||||
" return $name$_converter_.convert($name$_.getInt(index));\n"
|
||||
"}\n");
|
||||
@@ -640,6 +656,7 @@ GenerateMembers(io::Printer* printer) const {
|
||||
if (SupportUnknownEnumValue(descriptor_->file())) {
|
||||
WriteFieldDocComment(printer, descriptor_);
|
||||
printer->Print(variables_,
|
||||
"@java.lang.Override\n"
|
||||
"$deprecation$public java.util.List<java.lang.Integer>\n"
|
||||
"${$get$capitalized_name$ValueList$}$() {\n"
|
||||
" return $name$_;\n"
|
||||
@@ -647,6 +664,7 @@ GenerateMembers(io::Printer* printer) const {
|
||||
printer->Annotate("{", "}", descriptor_);
|
||||
WriteFieldDocComment(printer, descriptor_);
|
||||
printer->Print(variables_,
|
||||
"@java.lang.Override\n"
|
||||
"$deprecation$public int ${$get$capitalized_name$Value$}$(int index) {\n"
|
||||
" return $name$_.getInt(index);\n"
|
||||
"}\n");
|
||||
@@ -732,6 +750,7 @@ void RepeatedImmutableEnumFieldLiteGenerator::
|
||||
GenerateBuilderMembers(io::Printer* printer) const {
|
||||
WriteFieldDocComment(printer, descriptor_);
|
||||
printer->Print(variables_,
|
||||
"@java.lang.Override\n"
|
||||
"$deprecation$public java.util.List<$type$> "
|
||||
"${$get$capitalized_name$List$}$() {\n"
|
||||
" return instance.get$capitalized_name$List();\n"
|
||||
@@ -739,12 +758,14 @@ GenerateBuilderMembers(io::Printer* printer) const {
|
||||
printer->Annotate("{", "}", descriptor_);
|
||||
WriteFieldDocComment(printer, descriptor_);
|
||||
printer->Print(variables_,
|
||||
"@java.lang.Override\n"
|
||||
"$deprecation$public int ${$get$capitalized_name$Count$}$() {\n"
|
||||
" return instance.get$capitalized_name$Count();\n"
|
||||
"}\n");
|
||||
printer->Annotate("{", "}", descriptor_);
|
||||
WriteFieldDocComment(printer, descriptor_);
|
||||
printer->Print(variables_,
|
||||
"@java.lang.Override\n"
|
||||
"$deprecation$public $type$ ${$get$capitalized_name$$}$(int index) {\n"
|
||||
" return instance.get$capitalized_name$(index);\n"
|
||||
"}\n");
|
||||
@@ -787,6 +808,7 @@ GenerateBuilderMembers(io::Printer* printer) const {
|
||||
if (SupportUnknownEnumValue(descriptor_->file())) {
|
||||
WriteFieldDocComment(printer, descriptor_);
|
||||
printer->Print(variables_,
|
||||
"@java.lang.Override\n"
|
||||
"$deprecation$public java.util.List<java.lang.Integer>\n"
|
||||
"${$get$capitalized_name$ValueList$}$() {\n"
|
||||
" return java.util.Collections.unmodifiableList(\n"
|
||||
@@ -795,6 +817,7 @@ GenerateBuilderMembers(io::Printer* printer) const {
|
||||
printer->Annotate("{", "}", descriptor_);
|
||||
WriteFieldDocComment(printer, descriptor_);
|
||||
printer->Print(variables_,
|
||||
"@java.lang.Override\n"
|
||||
"$deprecation$public int ${$get$capitalized_name$Value$}$(int index) {\n"
|
||||
" return instance.get$capitalized_name$Value(index);\n"
|
||||
"}\n");
|
||||
|
||||
@@ -36,12 +36,12 @@
|
||||
#include <string>
|
||||
|
||||
#include <google/protobuf/compiler/java/java_context.h>
|
||||
#include <google/protobuf/compiler/java/java_enum_lite.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/io/printer.h>
|
||||
#include <google/protobuf/descriptor.pb.h>
|
||||
#include <google/protobuf/io/printer.h>
|
||||
#include <google/protobuf/stubs/strutil.h>
|
||||
|
||||
namespace google {
|
||||
@@ -135,6 +135,7 @@ void EnumLiteGenerator::Generate(io::Printer* printer) {
|
||||
|
||||
printer->Print(
|
||||
"\n"
|
||||
"@java.lang.Override\n"
|
||||
"public final int getNumber() {\n");
|
||||
if (SupportUnknownEnumValue(descriptor_->file())) {
|
||||
printer->Print(
|
||||
@@ -182,6 +183,7 @@ void EnumLiteGenerator::Generate(io::Printer* printer) {
|
||||
"private static final com.google.protobuf.Internal.EnumLiteMap<\n"
|
||||
" $classname$> internalValueMap =\n"
|
||||
" new com.google.protobuf.Internal.EnumLiteMap<$classname$>() {\n"
|
||||
" @java.lang.Override\n"
|
||||
" public $classname$ findValueByNumber(int number) {\n"
|
||||
" return $classname$.forNumber(number);\n"
|
||||
" }\n"
|
||||
|
||||
@@ -141,6 +141,7 @@ void ImmutableExtensionGenerator::Generate(io::Printer* printer) {
|
||||
" $singular_type$.class,\n"
|
||||
" $prototype$);\n");
|
||||
}
|
||||
printer->Annotate("name", descriptor_);
|
||||
}
|
||||
|
||||
int ImmutableExtensionGenerator::GenerateNonNestedInitializationCode(
|
||||
|
||||
@@ -96,6 +96,7 @@ void ImmutableExtensionLiteGenerator::Generate(io::Printer* printer) {
|
||||
" com.google.protobuf.WireFormat.FieldType.$type_constant$,\n"
|
||||
" $singular_type$.class);\n");
|
||||
}
|
||||
printer->Annotate("name", descriptor_);
|
||||
}
|
||||
|
||||
int ImmutableExtensionLiteGenerator::GenerateNonNestedInitializationCode(
|
||||
|
||||
@@ -35,9 +35,6 @@
|
||||
#include <google/protobuf/compiler/java/java_field.h>
|
||||
|
||||
#include <memory>
|
||||
#ifndef _SHARED_PTR_H
|
||||
#include <google/protobuf/stubs/shared_ptr.h>
|
||||
#endif
|
||||
|
||||
#include <google/protobuf/stubs/logging.h>
|
||||
#include <google/protobuf/stubs/common.h>
|
||||
@@ -214,8 +211,7 @@ template <>
|
||||
FieldGeneratorMap<ImmutableFieldGenerator>::FieldGeneratorMap(
|
||||
const Descriptor* descriptor, Context* context)
|
||||
: descriptor_(descriptor),
|
||||
field_generators_(new google::protobuf::scoped_ptr<
|
||||
ImmutableFieldGenerator>[descriptor->field_count()]) {
|
||||
field_generators_(descriptor->field_count()) {
|
||||
|
||||
// Construct all the FieldGenerators and assign them bit indices for their
|
||||
// bit fields.
|
||||
@@ -237,8 +233,7 @@ template <>
|
||||
FieldGeneratorMap<ImmutableFieldLiteGenerator>::FieldGeneratorMap(
|
||||
const Descriptor* descriptor, Context* context)
|
||||
: descriptor_(descriptor),
|
||||
field_generators_(new google::protobuf::scoped_ptr<
|
||||
ImmutableFieldLiteGenerator>[descriptor->field_count()]) {
|
||||
field_generators_(descriptor->field_count()) {
|
||||
// Construct all the FieldGenerators and assign them bit indices for their
|
||||
// bit fields.
|
||||
int messageBitIndex = 0;
|
||||
|
||||
@@ -37,9 +37,6 @@
|
||||
|
||||
#include <map>
|
||||
#include <memory>
|
||||
#ifndef _SHARED_PTR_H
|
||||
#include <google/protobuf/stubs/shared_ptr.h>
|
||||
#endif
|
||||
#include <string>
|
||||
|
||||
#include <google/protobuf/stubs/common.h>
|
||||
@@ -141,7 +138,7 @@ class FieldGeneratorMap {
|
||||
const Descriptor* descriptor_;
|
||||
Context* context_;
|
||||
ClassNameResolver* name_resolver_;
|
||||
google::protobuf::scoped_array<google::protobuf::scoped_ptr<FieldGeneratorType> > field_generators_;
|
||||
std::vector<std::unique_ptr<FieldGeneratorType>> field_generators_;
|
||||
|
||||
GOOGLE_DISALLOW_EVIL_CONSTRUCTORS(FieldGeneratorMap);
|
||||
};
|
||||
@@ -163,6 +160,14 @@ template<>
|
||||
FieldGeneratorMap<ImmutableFieldGenerator>::~FieldGeneratorMap();
|
||||
|
||||
|
||||
template <>
|
||||
FieldGeneratorMap<ImmutableFieldLiteGenerator>::FieldGeneratorMap(
|
||||
const Descriptor* descriptor, Context* context);
|
||||
|
||||
template <>
|
||||
FieldGeneratorMap<ImmutableFieldLiteGenerator>::~FieldGeneratorMap();
|
||||
|
||||
|
||||
// Field information used in FieldGeneartors.
|
||||
struct FieldGeneratorInfo {
|
||||
string name;
|
||||
|
||||
@@ -35,9 +35,6 @@
|
||||
#include <google/protobuf/compiler/java/java_file.h>
|
||||
|
||||
#include <memory>
|
||||
#ifndef _SHARED_PTR_H
|
||||
#include <google/protobuf/stubs/shared_ptr.h>
|
||||
#endif
|
||||
#include <set>
|
||||
|
||||
#include <google/protobuf/compiler/java/java_context.h>
|
||||
@@ -51,9 +48,9 @@
|
||||
#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/descriptor.pb.h>
|
||||
#include <google/protobuf/dynamic_message.h>
|
||||
#include <google/protobuf/stubs/strutil.h>
|
||||
|
||||
@@ -136,7 +133,7 @@ void CollectExtensions(const FileDescriptorProto& file_proto,
|
||||
"descriptor.proto is not in the transitive dependencies. "
|
||||
"This normally should not happen. Please report a bug.";
|
||||
DynamicMessageFactory factory;
|
||||
google::protobuf::scoped_ptr<Message> dynamic_file_proto(
|
||||
std::unique_ptr<Message> dynamic_file_proto(
|
||||
factory.GetPrototype(file_proto_desc)->New());
|
||||
GOOGLE_CHECK(dynamic_file_proto.get() != NULL);
|
||||
GOOGLE_CHECK(dynamic_file_proto->ParseFromString(file_data));
|
||||
@@ -189,10 +186,8 @@ FileGenerator::FileGenerator(const FileDescriptor* file, const Options& options,
|
||||
bool immutable_api)
|
||||
: file_(file),
|
||||
java_package_(FileJavaPackage(file, immutable_api)),
|
||||
message_generators_(
|
||||
new google::protobuf::scoped_ptr<MessageGenerator>[file->message_type_count()]),
|
||||
extension_generators_(
|
||||
new google::protobuf::scoped_ptr<ExtensionGenerator>[file->extension_count()]),
|
||||
message_generators_(file->message_type_count()),
|
||||
extension_generators_(file->extension_count()),
|
||||
context_(new Context(file, options)),
|
||||
name_resolver_(context_->GetNameResolver()),
|
||||
options_(options),
|
||||
@@ -228,6 +223,16 @@ bool FileGenerator::Validate(string* error) {
|
||||
"option to specify a different outer class name for the .proto file.");
|
||||
return false;
|
||||
}
|
||||
// Print a warning if optimize_for = LITE_RUNTIME is used.
|
||||
if (file_->options().optimize_for() == FileOptions::LITE_RUNTIME) {
|
||||
GOOGLE_LOG(WARNING)
|
||||
<< "The optimize_for = LITE_RUNTIME option is no longer supported by "
|
||||
<< "protobuf Java code generator and may generate broken code. It "
|
||||
<< "will be ignored by protoc in the future and protoc will always "
|
||||
<< "generate full runtime code for Java. To use Java Lite runtime, "
|
||||
<< "users should use the Java Lite plugin instead. See:\n"
|
||||
<< " https://github.com/google/protobuf/blob/master/java/lite.md";
|
||||
}
|
||||
return true;
|
||||
}
|
||||
|
||||
@@ -309,7 +314,7 @@ void FileGenerator::Generate(io::Printer* printer) {
|
||||
}
|
||||
if (HasGenericServices(file_, context_->EnforceLite())) {
|
||||
for (int i = 0; i < file_->service_count(); i++) {
|
||||
google::protobuf::scoped_ptr<ServiceGenerator> generator(
|
||||
std::unique_ptr<ServiceGenerator> generator(
|
||||
generator_factory_->NewServiceGenerator(file_->service(i)));
|
||||
generator->Generate(printer);
|
||||
}
|
||||
@@ -435,7 +440,7 @@ void FileGenerator::GenerateDescriptorInitializationCodeForImmutable(
|
||||
" com.google.protobuf.ExtensionRegistry.newInstance();\n");
|
||||
FieldDescriptorSet::iterator it;
|
||||
for (it = extensions.begin(); it != extensions.end(); it++) {
|
||||
google::protobuf::scoped_ptr<ExtensionGenerator> generator(
|
||||
std::unique_ptr<ExtensionGenerator> generator(
|
||||
generator_factory_->NewExtensionGenerator(*it));
|
||||
bytecode_estimate += generator->GenerateRegistrationCode(printer);
|
||||
MaybeRestartJavaMethod(
|
||||
@@ -588,7 +593,7 @@ static void GenerateSibling(const string& package_dir,
|
||||
io::AnnotationProtoCollector<GeneratedCodeInfo> annotation_collector(
|
||||
&annotations);
|
||||
|
||||
google::protobuf::scoped_ptr<io::ZeroCopyOutputStream> output(context->Open(filename));
|
||||
std::unique_ptr<io::ZeroCopyOutputStream> output(context->Open(filename));
|
||||
io::Printer printer(output.get(), '$',
|
||||
annotate_code ? &annotation_collector : NULL);
|
||||
|
||||
@@ -607,7 +612,7 @@ static void GenerateSibling(const string& package_dir,
|
||||
(generator->*pfn)(&printer);
|
||||
|
||||
if (annotate_code) {
|
||||
google::protobuf::scoped_ptr<io::ZeroCopyOutputStream> info_output(
|
||||
std::unique_ptr<io::ZeroCopyOutputStream> info_output(
|
||||
context->Open(info_full_path));
|
||||
annotations.SerializeToZeroCopyStream(info_output.get());
|
||||
annotation_list->push_back(info_full_path);
|
||||
@@ -650,7 +655,7 @@ void FileGenerator::GenerateSiblings(const string& package_dir,
|
||||
}
|
||||
if (HasGenericServices(file_, context_->EnforceLite())) {
|
||||
for (int i = 0; i < file_->service_count(); i++) {
|
||||
google::protobuf::scoped_ptr<ServiceGenerator> generator(
|
||||
std::unique_ptr<ServiceGenerator> generator(
|
||||
generator_factory_->NewServiceGenerator(file_->service(i)));
|
||||
GenerateSibling<ServiceGenerator>(
|
||||
package_dir, java_package_, file_->service(i), context, file_list,
|
||||
|
||||
@@ -36,9 +36,6 @@
|
||||
#define GOOGLE_PROTOBUF_COMPILER_JAVA_FILE_H__
|
||||
|
||||
#include <memory>
|
||||
#ifndef _SHARED_PTR_H
|
||||
#include <google/protobuf/stubs/shared_ptr.h>
|
||||
#endif
|
||||
#include <string>
|
||||
#include <vector>
|
||||
#include <google/protobuf/stubs/common.h>
|
||||
@@ -101,10 +98,10 @@ class FileGenerator {
|
||||
string java_package_;
|
||||
string classname_;
|
||||
|
||||
google::protobuf::scoped_array<google::protobuf::scoped_ptr<MessageGenerator> > message_generators_;
|
||||
google::protobuf::scoped_array<google::protobuf::scoped_ptr<ExtensionGenerator> > extension_generators_;
|
||||
google::protobuf::scoped_ptr<GeneratorFactory> generator_factory_;
|
||||
google::protobuf::scoped_ptr<Context> context_;
|
||||
std::vector<std::unique_ptr<MessageGenerator>> message_generators_;
|
||||
std::vector<std::unique_ptr<ExtensionGenerator>> extension_generators_;
|
||||
std::unique_ptr<GeneratorFactory> generator_factory_;
|
||||
std::unique_ptr<Context> context_;
|
||||
ClassNameResolver* name_resolver_;
|
||||
const Options options_;
|
||||
bool immutable_api_;
|
||||
|
||||
@@ -35,9 +35,6 @@
|
||||
#include <google/protobuf/compiler/java/java_generator.h>
|
||||
|
||||
#include <memory>
|
||||
#ifndef _SHARED_PTR_H
|
||||
#include <google/protobuf/stubs/shared_ptr.h>
|
||||
#endif
|
||||
|
||||
#include <google/protobuf/compiler/java/java_file.h>
|
||||
#include <google/protobuf/compiler/java/java_generator_factory.h>
|
||||
@@ -45,9 +42,9 @@
|
||||
#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/descriptor.pb.h>
|
||||
|
||||
#include <google/protobuf/stubs/strutil.h>
|
||||
|
||||
@@ -144,7 +141,7 @@ bool JavaGenerator::Generate(const FileDescriptor* file,
|
||||
}
|
||||
|
||||
// Generate main java file.
|
||||
google::protobuf::scoped_ptr<io::ZeroCopyOutputStream> output(
|
||||
std::unique_ptr<io::ZeroCopyOutputStream> output(
|
||||
context->Open(java_filename));
|
||||
GeneratedCodeInfo annotations;
|
||||
io::AnnotationProtoCollector<GeneratedCodeInfo> annotation_collector(
|
||||
@@ -160,7 +157,7 @@ bool JavaGenerator::Generate(const FileDescriptor* file,
|
||||
&all_annotations);
|
||||
|
||||
if (file_options.annotate_code) {
|
||||
google::protobuf::scoped_ptr<io::ZeroCopyOutputStream> info_output(
|
||||
std::unique_ptr<io::ZeroCopyOutputStream> info_output(
|
||||
context->Open(info_full_path));
|
||||
annotations.SerializeToZeroCopyStream(info_output.get());
|
||||
}
|
||||
@@ -175,7 +172,7 @@ bool JavaGenerator::Generate(const FileDescriptor* file,
|
||||
if (!file_options.output_list_file.empty()) {
|
||||
// Generate output list. This is just a simple text file placed in a
|
||||
// deterministic location which lists the .java files being generated.
|
||||
google::protobuf::scoped_ptr<io::ZeroCopyOutputStream> srclist_raw_output(
|
||||
std::unique_ptr<io::ZeroCopyOutputStream> srclist_raw_output(
|
||||
context->Open(file_options.output_list_file));
|
||||
io::Printer srclist_printer(srclist_raw_output.get(), '$');
|
||||
for (int i = 0; i < all_files.size(); i++) {
|
||||
@@ -186,7 +183,7 @@ bool JavaGenerator::Generate(const FileDescriptor* file,
|
||||
if (!file_options.annotation_list_file.empty()) {
|
||||
// Generate output list. This is just a simple text file placed in a
|
||||
// deterministic location which lists the .java files being generated.
|
||||
google::protobuf::scoped_ptr<io::ZeroCopyOutputStream> annotation_list_raw_output(
|
||||
std::unique_ptr<io::ZeroCopyOutputStream> annotation_list_raw_output(
|
||||
context->Open(file_options.annotation_list_file));
|
||||
io::Printer annotation_list_printer(annotation_list_raw_output.get(), '$');
|
||||
for (int i = 0; i < all_annotations.size(); i++) {
|
||||
|
||||
@@ -75,6 +75,8 @@ const char* kForbiddenWordList[] = {
|
||||
"class",
|
||||
};
|
||||
|
||||
const int kDefaultLookUpStartFieldNumber = 40;
|
||||
|
||||
bool IsForbidden(const string& field_name) {
|
||||
for (int i = 0; i < GOOGLE_ARRAYSIZE(kForbiddenWordList); ++i) {
|
||||
if (field_name == kForbiddenWordList[i]) {
|
||||
@@ -103,6 +105,20 @@ string FieldName(const FieldDescriptor* field) {
|
||||
}
|
||||
|
||||
|
||||
// Judge whether should use table or use look up.
|
||||
// Copied from com.google.protobuf.SchemaUtil.shouldUseTableSwitch
|
||||
bool ShouldUseTable(int lo, int hi, int number_of_fields) {
|
||||
if (hi < kDefaultLookUpStartFieldNumber) {
|
||||
return true;
|
||||
}
|
||||
int64 table_space_cost = (static_cast<int64>(hi) - lo + 1); // words
|
||||
int64 table_time_cost = 3; // comparisons
|
||||
int64 lookup_space_cost = 3 + 2 * static_cast<int64>(number_of_fields);
|
||||
int64 lookup_time_cost = 3 + number_of_fields;
|
||||
return table_space_cost + 3 * table_time_cost <=
|
||||
lookup_space_cost + 3 * lookup_time_cost;
|
||||
}
|
||||
|
||||
} // namespace
|
||||
|
||||
void PrintGeneratedAnnotation(io::Printer* printer, char delimiter,
|
||||
@@ -915,6 +931,23 @@ void EscapeUtf16ToString(uint16 code, string* output) {
|
||||
output->append(StringPrintf("\\u%04x", code));
|
||||
}
|
||||
}
|
||||
|
||||
std::pair<int, int> GetTableDrivenNumberOfEntriesAndLookUpStartFieldNumber(
|
||||
const FieldDescriptor** fields, int count) {
|
||||
GOOGLE_CHECK_GT(count, 0);
|
||||
int table_driven_number_of_entries = count;
|
||||
int look_up_start_field_number = 0;
|
||||
for (int i = 0; i < count; i++) {
|
||||
const int field_number = fields[i]->number();
|
||||
if (ShouldUseTable(fields[0]->number(), field_number, i + 1)) {
|
||||
table_driven_number_of_entries =
|
||||
field_number - fields[0]->number() + 1 + count - i - 1;
|
||||
look_up_start_field_number = field_number + 1;
|
||||
}
|
||||
}
|
||||
return std::make_pair(
|
||||
table_driven_number_of_entries, look_up_start_field_number);
|
||||
}
|
||||
} // namespace java
|
||||
} // namespace compiler
|
||||
} // namespace protobuf
|
||||
|
||||
@@ -37,8 +37,8 @@
|
||||
|
||||
#include <string>
|
||||
#include <google/protobuf/compiler/java/java_context.h>
|
||||
#include <google/protobuf/io/printer.h>
|
||||
#include <google/protobuf/descriptor.pb.h>
|
||||
#include <google/protobuf/io/printer.h>
|
||||
#include <google/protobuf/descriptor.h>
|
||||
|
||||
namespace google {
|
||||
@@ -414,6 +414,11 @@ void EscapeUtf16ToString(uint16 code, string* output);
|
||||
// bit 3: whether the field is a map field with proto2 enum value.
|
||||
// bits 4-7: unused
|
||||
int GetExperimentalJavaFieldType(const FieldDescriptor* field);
|
||||
|
||||
// To get the total number of entries need to be built for experimental runtime
|
||||
// and the first field number that are not in the table part
|
||||
std::pair<int, int> GetTableDrivenNumberOfEntriesAndLookUpStartFieldNumber(
|
||||
const FieldDescriptor** fields, int count);
|
||||
} // namespace java
|
||||
} // namespace compiler
|
||||
} // namespace protobuf
|
||||
|
||||
@@ -301,6 +301,7 @@ GenerateMembers(io::Printer* printer) const {
|
||||
"}\n");
|
||||
printer->Print(
|
||||
variables_,
|
||||
"@java.lang.Override\n"
|
||||
"$deprecation$\n"
|
||||
"public int ${$get$capitalized_name$Count$}$() {\n"
|
||||
" return internalGet$capitalized_name$().size();\n"
|
||||
@@ -309,6 +310,7 @@ GenerateMembers(io::Printer* printer) const {
|
||||
WriteFieldDocComment(printer, descriptor_);
|
||||
printer->Print(
|
||||
variables_,
|
||||
"@java.lang.Override\n"
|
||||
"$deprecation$\n"
|
||||
"public boolean ${$contains$capitalized_name$$}$(\n"
|
||||
" $key_type$ key) {\n"
|
||||
@@ -339,6 +341,7 @@ GenerateMembers(io::Printer* printer) const {
|
||||
WriteFieldDocComment(printer, descriptor_);
|
||||
printer->Print(
|
||||
variables_,
|
||||
"@java.lang.Override\n"
|
||||
"$deprecation$\n"
|
||||
"public java.util.Map<$boxed_key_type$, $value_enum_type$>\n"
|
||||
"${$get$capitalized_name$Map$}$() {\n"
|
||||
@@ -352,6 +355,7 @@ GenerateMembers(io::Printer* printer) const {
|
||||
WriteFieldDocComment(printer, descriptor_);
|
||||
printer->Print(
|
||||
variables_,
|
||||
"@java.lang.Override\n"
|
||||
"$deprecation$\n"
|
||||
"public $value_enum_type$ ${$get$capitalized_name$OrDefault$}$(\n"
|
||||
" $key_type$ key,\n"
|
||||
@@ -367,6 +371,7 @@ GenerateMembers(io::Printer* printer) const {
|
||||
WriteFieldDocComment(printer, descriptor_);
|
||||
printer->Print(
|
||||
variables_,
|
||||
"@java.lang.Override\n"
|
||||
"$deprecation$\n"
|
||||
"public $value_enum_type$ ${$get$capitalized_name$OrThrow$}$(\n"
|
||||
" $key_type$ key) {\n"
|
||||
@@ -385,6 +390,7 @@ GenerateMembers(io::Printer* printer) const {
|
||||
"/**\n"
|
||||
" * Use {@link #get$capitalized_name$ValueMap()} instead.\n"
|
||||
" */\n"
|
||||
"@java.lang.Override\n"
|
||||
"@java.lang.Deprecated\n"
|
||||
"public java.util.Map<$boxed_key_type$, $boxed_value_type$>\n"
|
||||
"${$get$capitalized_name$Value$}$() {\n"
|
||||
@@ -394,6 +400,7 @@ GenerateMembers(io::Printer* printer) const {
|
||||
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"
|
||||
@@ -404,6 +411,7 @@ GenerateMembers(io::Printer* printer) const {
|
||||
WriteFieldDocComment(printer, descriptor_);
|
||||
printer->Print(
|
||||
variables_,
|
||||
"@java.lang.Override\n"
|
||||
"$deprecation$\n"
|
||||
"public $value_type$ ${$get$capitalized_name$ValueOrDefault$}$(\n"
|
||||
" $key_type$ key,\n"
|
||||
@@ -417,6 +425,7 @@ GenerateMembers(io::Printer* printer) const {
|
||||
WriteFieldDocComment(printer, descriptor_);
|
||||
printer->Print(
|
||||
variables_,
|
||||
"@java.lang.Override\n"
|
||||
"$deprecation$\n"
|
||||
"public $value_type$ ${$get$capitalized_name$ValueOrThrow$}$(\n"
|
||||
" $key_type$ key) {\n"
|
||||
@@ -436,6 +445,7 @@ GenerateMembers(io::Printer* printer) const {
|
||||
"/**\n"
|
||||
" * Use {@link #get$capitalized_name$Map()} instead.\n"
|
||||
" */\n"
|
||||
"@java.lang.Override\n"
|
||||
"@java.lang.Deprecated\n"
|
||||
"public java.util.Map<$type_parameters$> "
|
||||
"${$get$capitalized_name$$}$() {\n"
|
||||
@@ -445,6 +455,7 @@ GenerateMembers(io::Printer* printer) const {
|
||||
WriteFieldDocComment(printer, descriptor_);
|
||||
printer->Print(
|
||||
variables_,
|
||||
"@java.lang.Override\n"
|
||||
"$deprecation$\n"
|
||||
"public java.util.Map<$type_parameters$> "
|
||||
"${$get$capitalized_name$Map$}$() {\n"
|
||||
@@ -455,6 +466,7 @@ GenerateMembers(io::Printer* printer) const {
|
||||
WriteFieldDocComment(printer, descriptor_);
|
||||
printer->Print(
|
||||
variables_,
|
||||
"@java.lang.Override\n"
|
||||
"$deprecation$\n"
|
||||
"public $value_type$ ${$get$capitalized_name$OrDefault$}$(\n"
|
||||
" $key_type$ key,\n"
|
||||
@@ -468,6 +480,7 @@ GenerateMembers(io::Printer* printer) const {
|
||||
WriteFieldDocComment(printer, descriptor_);
|
||||
printer->Print(
|
||||
variables_,
|
||||
"@java.lang.Override\n"
|
||||
"$deprecation$\n"
|
||||
"public $value_type$ ${$get$capitalized_name$OrThrow$}$(\n"
|
||||
" $key_type$ key) {\n"
|
||||
@@ -519,6 +532,7 @@ void ImmutableMapFieldLiteGenerator::
|
||||
GenerateBuilderMembers(io::Printer* printer) const {
|
||||
printer->Print(
|
||||
variables_,
|
||||
"@java.lang.Override\n"
|
||||
"$deprecation$\n"
|
||||
"public int ${$get$capitalized_name$Count$}$() {\n"
|
||||
" return instance.get$capitalized_name$Map().size();\n"
|
||||
@@ -527,6 +541,7 @@ GenerateBuilderMembers(io::Printer* printer) const {
|
||||
WriteFieldDocComment(printer, descriptor_);
|
||||
printer->Print(
|
||||
variables_,
|
||||
"@java.lang.Override\n"
|
||||
"$deprecation$\n"
|
||||
"public boolean ${$contains$capitalized_name$$}$(\n"
|
||||
" $key_type$ key) {\n"
|
||||
@@ -570,6 +585,7 @@ GenerateBuilderMembers(io::Printer* printer) const {
|
||||
WriteFieldDocComment(printer, descriptor_);
|
||||
printer->Print(
|
||||
variables_,
|
||||
"@java.lang.Override\n"
|
||||
"$deprecation$\n"
|
||||
"public java.util.Map<$boxed_key_type$, $value_enum_type$>\n"
|
||||
"${$get$capitalized_name$Map$}$() {\n"
|
||||
@@ -580,6 +596,7 @@ GenerateBuilderMembers(io::Printer* printer) const {
|
||||
WriteFieldDocComment(printer, descriptor_);
|
||||
printer->Print(
|
||||
variables_,
|
||||
"@java.lang.Override\n"
|
||||
"$deprecation$\n"
|
||||
"public $value_enum_type$ ${$get$capitalized_name$OrDefault$}$(\n"
|
||||
" $key_type$ key,\n"
|
||||
@@ -595,6 +612,7 @@ GenerateBuilderMembers(io::Printer* printer) const {
|
||||
WriteFieldDocComment(printer, descriptor_);
|
||||
printer->Print(
|
||||
variables_,
|
||||
"@java.lang.Override\n"
|
||||
"$deprecation$\n"
|
||||
"public $value_enum_type$ ${$get$capitalized_name$OrThrow$}$(\n"
|
||||
" $key_type$ key) {\n"
|
||||
@@ -636,6 +654,7 @@ GenerateBuilderMembers(io::Printer* printer) const {
|
||||
"/**\n"
|
||||
" * Use {@link #get$capitalized_name$ValueMap()} instead.\n"
|
||||
" */\n"
|
||||
"@java.lang.Override\n"
|
||||
"@java.lang.Deprecated\n"
|
||||
"public java.util.Map<$boxed_key_type$, $boxed_value_type$>\n"
|
||||
"${$get$capitalized_name$Value$}$() {\n"
|
||||
@@ -645,6 +664,7 @@ GenerateBuilderMembers(io::Printer* printer) const {
|
||||
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"
|
||||
@@ -655,6 +675,7 @@ GenerateBuilderMembers(io::Printer* printer) const {
|
||||
WriteFieldDocComment(printer, descriptor_);
|
||||
printer->Print(
|
||||
variables_,
|
||||
"@java.lang.Override\n"
|
||||
"$deprecation$\n"
|
||||
"public $value_type$ ${$get$capitalized_name$ValueOrDefault$}$(\n"
|
||||
" $key_type$ key,\n"
|
||||
@@ -668,6 +689,7 @@ GenerateBuilderMembers(io::Printer* printer) const {
|
||||
WriteFieldDocComment(printer, descriptor_);
|
||||
printer->Print(
|
||||
variables_,
|
||||
"@java.lang.Override\n"
|
||||
"$deprecation$\n"
|
||||
"public $value_type$ ${$get$capitalized_name$ValueOrThrow$}$(\n"
|
||||
" $key_type$ key) {\n"
|
||||
@@ -709,6 +731,7 @@ GenerateBuilderMembers(io::Printer* printer) const {
|
||||
"/**\n"
|
||||
" * Use {@link #get$capitalized_name$Map()} instead.\n"
|
||||
" */\n"
|
||||
"@java.lang.Override\n"
|
||||
"@java.lang.Deprecated\n"
|
||||
"public java.util.Map<$type_parameters$> "
|
||||
"${$get$capitalized_name$$}$() {\n"
|
||||
@@ -718,6 +741,7 @@ GenerateBuilderMembers(io::Printer* printer) const {
|
||||
WriteFieldDocComment(printer, descriptor_);
|
||||
printer->Print(
|
||||
variables_,
|
||||
"@java.lang.Override\n"
|
||||
"$deprecation$"
|
||||
"public java.util.Map<$type_parameters$> "
|
||||
"${$get$capitalized_name$Map$}$() {\n"
|
||||
@@ -728,6 +752,7 @@ GenerateBuilderMembers(io::Printer* printer) const {
|
||||
WriteFieldDocComment(printer, descriptor_);
|
||||
printer->Print(
|
||||
variables_,
|
||||
"@java.lang.Override\n"
|
||||
"$deprecation$\n"
|
||||
"public $value_type$ ${$get$capitalized_name$OrDefault$}$(\n"
|
||||
" $key_type$ key,\n"
|
||||
@@ -741,6 +766,7 @@ GenerateBuilderMembers(io::Printer* printer) const {
|
||||
WriteFieldDocComment(printer, descriptor_);
|
||||
printer->Print(
|
||||
variables_,
|
||||
"@java.lang.Override\n"
|
||||
"$deprecation$\n"
|
||||
"public $value_type$ ${$get$capitalized_name$OrThrow$}$(\n"
|
||||
" $key_type$ key) {\n"
|
||||
|
||||
@@ -38,9 +38,6 @@
|
||||
#include <google/protobuf/stubs/hash.h>
|
||||
#include <map>
|
||||
#include <memory>
|
||||
#ifndef _SHARED_PTR_H
|
||||
#include <google/protobuf/stubs/shared_ptr.h>
|
||||
#endif
|
||||
#include <vector>
|
||||
|
||||
#include <google/protobuf/compiler/java/java_context.h>
|
||||
@@ -52,9 +49,9 @@
|
||||
#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.pb.h>
|
||||
#include <google/protobuf/wire_format.h>
|
||||
#include <google/protobuf/stubs/substitute.h>
|
||||
#include <google/protobuf/stubs/strutil.h>
|
||||
@@ -437,11 +434,11 @@ void ImmutableMessageGenerator::Generate(io::Printer* printer) {
|
||||
for (int j = 0; j < descriptor_->oneof_decl(i)->field_count(); j++) {
|
||||
const FieldDescriptor* field = descriptor_->oneof_decl(i)->field(j);
|
||||
printer->Print(
|
||||
"$field_name$($field_number$),\n",
|
||||
"field_name",
|
||||
ToUpper(field->name()),
|
||||
"field_number",
|
||||
SimpleItoa(field->number()));
|
||||
"$deprecation$$field_name$($field_number$),\n",
|
||||
"deprecation",
|
||||
field->options().deprecated() ? "@java.lang.Deprecated " : "",
|
||||
"field_name", ToUpper(field->name()),
|
||||
"field_number", SimpleItoa(field->number()));
|
||||
}
|
||||
printer->Print(
|
||||
"$cap_oneof_name$_NOT_SET(0);\n",
|
||||
@@ -555,6 +552,7 @@ void ImmutableMessageGenerator::Generate(io::Printer* printer) {
|
||||
GenerateParser(printer);
|
||||
|
||||
printer->Print(
|
||||
"@java.lang.Override\n"
|
||||
"public $classname$ getDefaultInstanceForType() {\n"
|
||||
" return DEFAULT_INSTANCE;\n"
|
||||
"}\n"
|
||||
@@ -578,7 +576,7 @@ void ImmutableMessageGenerator::Generate(io::Printer* printer) {
|
||||
|
||||
void ImmutableMessageGenerator::
|
||||
GenerateMessageSerializationMethods(io::Printer* printer) {
|
||||
google::protobuf::scoped_array<const FieldDescriptor * > sorted_fields(
|
||||
std::unique_ptr<const FieldDescriptor * []> sorted_fields(
|
||||
SortFieldsByNumber(descriptor_));
|
||||
|
||||
std::vector<const Descriptor::ExtensionRange*> sorted_extensions;
|
||||
@@ -588,6 +586,7 @@ GenerateMessageSerializationMethods(io::Printer* printer) {
|
||||
std::sort(sorted_extensions.begin(), sorted_extensions.end(),
|
||||
ExtensionRangeOrdering());
|
||||
printer->Print(
|
||||
"@java.lang.Override\n"
|
||||
"public void writeTo(com.google.protobuf.CodedOutputStream output)\n"
|
||||
" throws java.io.IOException {\n");
|
||||
printer->Indent();
|
||||
@@ -648,6 +647,7 @@ GenerateMessageSerializationMethods(io::Printer* printer) {
|
||||
printer->Print(
|
||||
"}\n"
|
||||
"\n"
|
||||
"@java.lang.Override\n"
|
||||
"public int getSerializedSize() {\n"
|
||||
" int size = memoizedSize;\n"
|
||||
" if (size != -1) return size;\n"
|
||||
@@ -789,6 +789,7 @@ void ImmutableMessageGenerator::GenerateSerializeOneExtensionRange(
|
||||
void ImmutableMessageGenerator::GenerateBuilder(io::Printer* printer) {
|
||||
// LITE_RUNTIME implements this at the GeneratedMessageLite level.
|
||||
printer->Print(
|
||||
"@java.lang.Override\n"
|
||||
"public Builder newBuilderForType() { return newBuilder(); }\n");
|
||||
|
||||
printer->Print(
|
||||
@@ -798,6 +799,7 @@ void ImmutableMessageGenerator::GenerateBuilder(io::Printer* printer) {
|
||||
"public static Builder newBuilder($classname$ prototype) {\n"
|
||||
" return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);\n"
|
||||
"}\n"
|
||||
"@java.lang.Override\n"
|
||||
"public Builder toBuilder() {\n"
|
||||
" return this == DEFAULT_INSTANCE\n"
|
||||
" ? new Builder() : new Builder().mergeFrom(this);\n"
|
||||
@@ -841,6 +843,7 @@ GenerateDescriptorMethods(io::Printer* printer) {
|
||||
if (!map_fields.empty()) {
|
||||
printer->Print(
|
||||
"@SuppressWarnings({\"rawtypes\"})\n"
|
||||
"@java.lang.Override\n"
|
||||
"protected com.google.protobuf.MapField internalGetMapField(\n"
|
||||
" int number) {\n"
|
||||
" switch (number) {\n");
|
||||
@@ -866,6 +869,7 @@ GenerateDescriptorMethods(io::Printer* printer) {
|
||||
"}\n");
|
||||
}
|
||||
printer->Print(
|
||||
"@java.lang.Override\n"
|
||||
"protected com.google.protobuf.GeneratedMessage$ver$.FieldAccessorTable\n"
|
||||
" internalGetFieldAccessorTable() {\n"
|
||||
" return $fileclass$.internal_$identifier$_fieldAccessorTable\n"
|
||||
@@ -889,6 +893,7 @@ void ImmutableMessageGenerator::GenerateIsInitialized(
|
||||
printer->Print(
|
||||
"private byte memoizedIsInitialized = -1;\n");
|
||||
printer->Print(
|
||||
"@java.lang.Override\n"
|
||||
"public final boolean isInitialized() {\n");
|
||||
printer->Indent();
|
||||
|
||||
@@ -1209,7 +1214,7 @@ GenerateExtensionRegistrationCode(io::Printer* printer) {
|
||||
// ===================================================================
|
||||
void ImmutableMessageGenerator::
|
||||
GenerateParsingConstructor(io::Printer* printer) {
|
||||
google::protobuf::scoped_array<const FieldDescriptor * > sorted_fields(
|
||||
std::unique_ptr<const FieldDescriptor * []> sorted_fields(
|
||||
SortFieldsByNumber(descriptor_));
|
||||
|
||||
printer->Print(
|
||||
@@ -1259,19 +1264,9 @@ GenerateParsingConstructor(io::Printer* printer) {
|
||||
printer->Indent();
|
||||
|
||||
printer->Print(
|
||||
"case 0:\n" // zero signals EOF / limit reached
|
||||
" done = true;\n"
|
||||
" break;\n"
|
||||
"default: {\n"
|
||||
" if (!parseUnknownField$suffix$(\n"
|
||||
" input, unknownFields, extensionRegistry, tag)) {\n"
|
||||
" done = true;\n" // it's an endgroup tag
|
||||
" }\n"
|
||||
" break;\n"
|
||||
"}\n",
|
||||
"suffix",
|
||||
descriptor_->file()->syntax() == FileDescriptor::SYNTAX_PROTO3 ? "Proto3"
|
||||
: "");
|
||||
"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];
|
||||
@@ -1309,6 +1304,18 @@ GenerateParsingConstructor(io::Printer* printer) {
|
||||
}
|
||||
}
|
||||
|
||||
printer->Print(
|
||||
"default: {\n"
|
||||
" if (!parseUnknownField$suffix$(\n"
|
||||
" input, unknownFields, extensionRegistry, tag)) {\n"
|
||||
" done = true;\n" // it's an endgroup tag
|
||||
" }\n"
|
||||
" break;\n"
|
||||
"}\n",
|
||||
"suffix",
|
||||
descriptor_->file()->syntax() == FileDescriptor::SYNTAX_PROTO3 ? "Proto3"
|
||||
: "");
|
||||
|
||||
printer->Outdent();
|
||||
printer->Outdent();
|
||||
printer->Print(
|
||||
@@ -1356,6 +1363,7 @@ void ImmutableMessageGenerator::GenerateParser(io::Printer* printer) {
|
||||
"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"
|
||||
|
||||
@@ -38,9 +38,6 @@
|
||||
#include <google/protobuf/stubs/hash.h>
|
||||
#include <map>
|
||||
#include <memory>
|
||||
#ifndef _SHARED_PTR_H
|
||||
#include <google/protobuf/stubs/shared_ptr.h>
|
||||
#endif
|
||||
#include <vector>
|
||||
|
||||
#include <google/protobuf/compiler/java/java_context.h>
|
||||
@@ -50,9 +47,9 @@
|
||||
#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/descriptor.pb.h>
|
||||
#include <google/protobuf/wire_format.h>
|
||||
#include <google/protobuf/stubs/substitute.h>
|
||||
#include <google/protobuf/stubs/strutil.h>
|
||||
@@ -180,11 +177,13 @@ Generate(io::Printer* printer) {
|
||||
// to subclass a different GeneratedMessage class (e.g., in v3.0.0 release
|
||||
// we changed all generated code to subclass GeneratedMessageV3).
|
||||
printer->Print(
|
||||
"@java.lang.Override\n"
|
||||
"public final Builder setUnknownFields(\n"
|
||||
" final com.google.protobuf.UnknownFieldSet unknownFields) {\n"
|
||||
" return super.setUnknownFields$suffix$(unknownFields);\n"
|
||||
"}\n"
|
||||
"\n"
|
||||
"@java.lang.Override\n"
|
||||
"public final Builder mergeUnknownFields(\n"
|
||||
" final com.google.protobuf.UnknownFieldSet unknownFields) {\n"
|
||||
" return super.mergeUnknownFields(unknownFields);\n"
|
||||
@@ -277,6 +276,7 @@ GenerateDescriptorMethods(io::Printer* printer) {
|
||||
"}\n");
|
||||
}
|
||||
printer->Print(
|
||||
"@java.lang.Override\n"
|
||||
"protected com.google.protobuf.GeneratedMessage$ver$.FieldAccessorTable\n"
|
||||
" internalGetFieldAccessorTable() {\n"
|
||||
" return $fileclass$.internal_$identifier$_fieldAccessorTable\n"
|
||||
@@ -333,6 +333,7 @@ GenerateCommonBuilderMethods(io::Printer* printer) {
|
||||
"}\n");
|
||||
|
||||
printer->Print(
|
||||
"@java.lang.Override\n"
|
||||
"public Builder clear() {\n"
|
||||
" super.clear();\n");
|
||||
|
||||
@@ -361,6 +362,7 @@ GenerateCommonBuilderMethods(io::Printer* printer) {
|
||||
"\n");
|
||||
|
||||
printer->Print(
|
||||
"@java.lang.Override\n"
|
||||
"public com.google.protobuf.Descriptors.Descriptor\n"
|
||||
" getDescriptorForType() {\n"
|
||||
" return $fileclass$.internal_$identifier$_descriptor;\n"
|
||||
@@ -371,6 +373,7 @@ GenerateCommonBuilderMethods(io::Printer* printer) {
|
||||
|
||||
// LITE runtime implements this in GeneratedMessageLite.
|
||||
printer->Print(
|
||||
"@java.lang.Override\n"
|
||||
"public $classname$ getDefaultInstanceForType() {\n"
|
||||
" return $classname$.getDefaultInstance();\n"
|
||||
"}\n"
|
||||
@@ -378,6 +381,7 @@ GenerateCommonBuilderMethods(io::Printer* printer) {
|
||||
"classname", name_resolver_->GetImmutableClassName(descriptor_));
|
||||
|
||||
printer->Print(
|
||||
"@java.lang.Override\n"
|
||||
"public $classname$ build() {\n"
|
||||
" $classname$ result = buildPartial();\n"
|
||||
" if (!result.isInitialized()) {\n"
|
||||
@@ -389,6 +393,7 @@ GenerateCommonBuilderMethods(io::Printer* printer) {
|
||||
"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_));
|
||||
@@ -457,27 +462,33 @@ GenerateCommonBuilderMethods(io::Printer* printer) {
|
||||
// to subclass a different GeneratedMessage class (e.g., in v3.0.0 release
|
||||
// we changed all generated code to subclass GeneratedMessageV3).
|
||||
printer->Print(
|
||||
"@java.lang.Override\n"
|
||||
"public Builder clone() {\n"
|
||||
" return (Builder) super.clone();\n"
|
||||
"}\n"
|
||||
"@java.lang.Override\n"
|
||||
"public Builder setField(\n"
|
||||
" com.google.protobuf.Descriptors.FieldDescriptor field,\n"
|
||||
" java.lang.Object value) {\n"
|
||||
" return (Builder) super.setField(field, value);\n"
|
||||
"}\n"
|
||||
"@java.lang.Override\n"
|
||||
"public Builder clearField(\n"
|
||||
" com.google.protobuf.Descriptors.FieldDescriptor field) {\n"
|
||||
" return (Builder) super.clearField(field);\n"
|
||||
"}\n"
|
||||
"@java.lang.Override\n"
|
||||
"public Builder clearOneof(\n"
|
||||
" com.google.protobuf.Descriptors.OneofDescriptor oneof) {\n"
|
||||
" return (Builder) super.clearOneof(oneof);\n"
|
||||
"}\n"
|
||||
"@java.lang.Override\n"
|
||||
"public Builder setRepeatedField(\n"
|
||||
" com.google.protobuf.Descriptors.FieldDescriptor field,\n"
|
||||
" int index, java.lang.Object value) {\n"
|
||||
" return (Builder) super.setRepeatedField(field, index, value);\n"
|
||||
"}\n"
|
||||
"@java.lang.Override\n"
|
||||
"public Builder addRepeatedField(\n"
|
||||
" com.google.protobuf.Descriptors.FieldDescriptor field,\n"
|
||||
" java.lang.Object value) {\n"
|
||||
@@ -486,24 +497,28 @@ GenerateCommonBuilderMethods(io::Printer* printer) {
|
||||
|
||||
if (descriptor_->extension_range_count() > 0) {
|
||||
printer->Print(
|
||||
"@java.lang.Override\n"
|
||||
"public <Type> Builder setExtension(\n"
|
||||
" com.google.protobuf.GeneratedMessage.GeneratedExtension<\n"
|
||||
" $classname$, Type> extension,\n"
|
||||
" Type value) {\n"
|
||||
" return (Builder) super.setExtension(extension, value);\n"
|
||||
"}\n"
|
||||
"@java.lang.Override\n"
|
||||
"public <Type> Builder setExtension(\n"
|
||||
" com.google.protobuf.GeneratedMessage.GeneratedExtension<\n"
|
||||
" $classname$, java.util.List<Type>> extension,\n"
|
||||
" int index, Type value) {\n"
|
||||
" return (Builder) super.setExtension(extension, index, value);\n"
|
||||
"}\n"
|
||||
"@java.lang.Override\n"
|
||||
"public <Type> Builder addExtension(\n"
|
||||
" com.google.protobuf.GeneratedMessage.GeneratedExtension<\n"
|
||||
" $classname$, java.util.List<Type>> extension,\n"
|
||||
" Type value) {\n"
|
||||
" return (Builder) super.addExtension(extension, value);\n"
|
||||
"}\n"
|
||||
"@java.lang.Override\n"
|
||||
"public <Type> Builder clearExtension(\n"
|
||||
" com.google.protobuf.GeneratedMessage.GeneratedExtension<\n"
|
||||
" $classname$, ?> extension) {\n"
|
||||
@@ -516,6 +531,7 @@ GenerateCommonBuilderMethods(io::Printer* printer) {
|
||||
|
||||
if (context_->HasGeneratedMethods(descriptor_)) {
|
||||
printer->Print(
|
||||
"@java.lang.Override\n"
|
||||
"public Builder mergeFrom(com.google.protobuf.Message other) {\n"
|
||||
" if (other instanceof $classname$) {\n"
|
||||
" return mergeFrom(($classname$)other);\n"
|
||||
@@ -602,6 +618,7 @@ GenerateCommonBuilderMethods(io::Printer* printer) {
|
||||
void MessageBuilderGenerator::
|
||||
GenerateBuilderParsingMethods(io::Printer* printer) {
|
||||
printer->Print(
|
||||
"@java.lang.Override\n"
|
||||
"public Builder mergeFrom(\n"
|
||||
" com.google.protobuf.CodedInputStream input,\n"
|
||||
" com.google.protobuf.ExtensionRegistryLite extensionRegistry)\n"
|
||||
@@ -627,6 +644,7 @@ GenerateBuilderParsingMethods(io::Printer* printer) {
|
||||
void MessageBuilderGenerator::GenerateIsInitialized(
|
||||
io::Printer* printer) {
|
||||
printer->Print(
|
||||
"@java.lang.Override\n"
|
||||
"public final boolean isInitialized() {\n");
|
||||
printer->Indent();
|
||||
|
||||
|
||||
@@ -38,9 +38,6 @@
|
||||
#include <google/protobuf/stubs/hash.h>
|
||||
#include <map>
|
||||
#include <memory>
|
||||
#ifndef _SHARED_PTR_H
|
||||
#include <google/protobuf/stubs/shared_ptr.h>
|
||||
#endif
|
||||
#include <vector>
|
||||
|
||||
#include <google/protobuf/compiler/java/java_context.h>
|
||||
@@ -50,12 +47,12 @@
|
||||
#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/descriptor.pb.h>
|
||||
#include <google/protobuf/wire_format.h>
|
||||
#include <google/protobuf/stubs/strutil.h>
|
||||
#include <google/protobuf/stubs/substitute.h>
|
||||
#include <google/protobuf/stubs/strutil.h>
|
||||
|
||||
namespace google {
|
||||
namespace protobuf {
|
||||
@@ -109,6 +106,7 @@ Generate(io::Printer* printer) {
|
||||
|
||||
// oneofCase() and clearOneof()
|
||||
printer->Print(vars,
|
||||
"@java.lang.Override\n"
|
||||
"public $oneof_capitalized_name$Case\n"
|
||||
" get$oneof_capitalized_name$Case() {\n"
|
||||
" return instance.get$oneof_capitalized_name$Case();\n"
|
||||
|
||||
@@ -147,12 +147,14 @@ GenerateMembers(io::Printer* printer) const {
|
||||
if (SupportFieldPresence(descriptor_->file())) {
|
||||
WriteFieldDocComment(printer, descriptor_);
|
||||
printer->Print(variables_,
|
||||
"@java.lang.Override\n"
|
||||
"$deprecation$public boolean ${$has$capitalized_name$$}$() {\n"
|
||||
" return $get_has_field_bit_message$;\n"
|
||||
"}\n");
|
||||
printer->Annotate("{", "}", descriptor_);
|
||||
WriteFieldDocComment(printer, descriptor_);
|
||||
printer->Print(variables_,
|
||||
"@java.lang.Override\n"
|
||||
"$deprecation$public $type$ ${$get$capitalized_name$$}$() {\n"
|
||||
" return $name$_ == null ? $type$.getDefaultInstance() : $name$_;\n"
|
||||
"}\n");
|
||||
@@ -160,12 +162,14 @@ GenerateMembers(io::Printer* printer) const {
|
||||
} else {
|
||||
WriteFieldDocComment(printer, descriptor_);
|
||||
printer->Print(variables_,
|
||||
"@java.lang.Override\n"
|
||||
"$deprecation$public boolean ${$has$capitalized_name$$}$() {\n"
|
||||
" return $name$_ != null;\n"
|
||||
"}\n");
|
||||
printer->Annotate("{", "}", descriptor_);
|
||||
WriteFieldDocComment(printer, descriptor_);
|
||||
printer->Print(variables_,
|
||||
"@java.lang.Override\n"
|
||||
"$deprecation$public $type$ ${$get$capitalized_name$$}$() {\n"
|
||||
" return $name$_ == null ? $type$.getDefaultInstance() : $name$_;\n"
|
||||
"}\n");
|
||||
@@ -195,7 +199,11 @@ GenerateMembers(io::Printer* printer) const {
|
||||
// Field.Builder mergeField(Field value)
|
||||
WriteFieldDocComment(printer, descriptor_);
|
||||
printer->Print(variables_,
|
||||
"@java.lang.SuppressWarnings({\"ReferenceEquality\"})\n"
|
||||
"private void merge$capitalized_name$($type$ value) {\n"
|
||||
" if (value == null) {\n"
|
||||
" throw new NullPointerException();\n"
|
||||
" }\n"
|
||||
" if ($name$_ != null &&\n"
|
||||
" $name$_ != $type$.getDefaultInstance()) {\n"
|
||||
" $name$_ =\n"
|
||||
@@ -223,6 +231,7 @@ GenerateBuilderMembers(io::Printer* printer) const {
|
||||
// boolean hasField()
|
||||
WriteFieldDocComment(printer, descriptor_);
|
||||
printer->Print(variables_,
|
||||
"@java.lang.Override\n"
|
||||
"$deprecation$public boolean ${$has$capitalized_name$$}$() {\n"
|
||||
" return instance.has$capitalized_name$();\n"
|
||||
"}\n");
|
||||
@@ -231,6 +240,7 @@ GenerateBuilderMembers(io::Printer* printer) const {
|
||||
// Field getField()
|
||||
WriteFieldDocComment(printer, descriptor_);
|
||||
printer->Print(variables_,
|
||||
"@java.lang.Override\n"
|
||||
"$deprecation$public $type$ ${$get$capitalized_name$$}$() {\n"
|
||||
" return instance.get$capitalized_name$();\n"
|
||||
"}\n");
|
||||
@@ -396,12 +406,14 @@ GenerateMembers(io::Printer* printer) const {
|
||||
PrintExtraFieldInfo(variables_, printer);
|
||||
WriteFieldDocComment(printer, descriptor_);
|
||||
printer->Print(variables_,
|
||||
"@java.lang.Override\n"
|
||||
"$deprecation$public boolean ${$has$capitalized_name$$}$() {\n"
|
||||
" return $has_oneof_case_message$;\n"
|
||||
"}\n");
|
||||
printer->Annotate("{", "}", descriptor_);
|
||||
WriteFieldDocComment(printer, descriptor_);
|
||||
printer->Print(variables_,
|
||||
"@java.lang.Override\n"
|
||||
"$deprecation$public $type$ ${$get$capitalized_name$$}$() {\n"
|
||||
" if ($has_oneof_case_message$) {\n"
|
||||
" return ($type$) $oneof_name$_;\n"
|
||||
@@ -434,6 +446,9 @@ GenerateMembers(io::Printer* printer) const {
|
||||
WriteFieldDocComment(printer, descriptor_);
|
||||
printer->Print(variables_,
|
||||
"private void merge$capitalized_name$($type$ value) {\n"
|
||||
" if (value == null) {\n"
|
||||
" throw new NullPointerException();\n"
|
||||
" }\n"
|
||||
" if ($has_oneof_case_message$ &&\n"
|
||||
" $oneof_name$_ != $type$.getDefaultInstance()) {\n"
|
||||
" $oneof_name$_ = $type$.newBuilder(($type$) $oneof_name$_)\n"
|
||||
@@ -464,6 +479,7 @@ GenerateBuilderMembers(io::Printer* printer) const {
|
||||
// boolean hasField()
|
||||
WriteFieldDocComment(printer, descriptor_);
|
||||
printer->Print(variables_,
|
||||
"@java.lang.Override\n"
|
||||
"$deprecation$public boolean ${$has$capitalized_name$$}$() {\n"
|
||||
" return instance.has$capitalized_name$();\n"
|
||||
"}\n");
|
||||
@@ -472,6 +488,7 @@ GenerateBuilderMembers(io::Printer* printer) const {
|
||||
// Field getField()
|
||||
WriteFieldDocComment(printer, descriptor_);
|
||||
printer->Print(variables_,
|
||||
"@java.lang.Override\n"
|
||||
"$deprecation$public $type$ ${$get$capitalized_name$$}$() {\n"
|
||||
" return instance.get$capitalized_name$();\n"
|
||||
"}\n");
|
||||
@@ -624,6 +641,7 @@ GenerateMembers(io::Printer* printer) const {
|
||||
PrintExtraFieldInfo(variables_, printer);
|
||||
WriteFieldDocComment(printer, descriptor_);
|
||||
printer->Print(variables_,
|
||||
"@java.lang.Override\n"
|
||||
"$deprecation$public java.util.List<$type$> "
|
||||
"${$get$capitalized_name$List$}$() {\n"
|
||||
" return $name$_;\n" // note: unmodifiable list
|
||||
@@ -638,12 +656,14 @@ GenerateMembers(io::Printer* printer) const {
|
||||
printer->Annotate("{", "}", descriptor_);
|
||||
WriteFieldDocComment(printer, descriptor_);
|
||||
printer->Print(variables_,
|
||||
"@java.lang.Override\n"
|
||||
"$deprecation$public int ${$get$capitalized_name$Count$}$() {\n"
|
||||
" return $name$_.size();\n"
|
||||
"}\n");
|
||||
printer->Annotate("{", "}", descriptor_);
|
||||
WriteFieldDocComment(printer, descriptor_);
|
||||
printer->Print(variables_,
|
||||
"@java.lang.Override\n"
|
||||
"$deprecation$public $type$ ${$get$capitalized_name$$}$(int index) {\n"
|
||||
" return $name$_.get(index);\n"
|
||||
"}\n");
|
||||
@@ -761,6 +781,7 @@ GenerateBuilderMembers(io::Printer* printer) const {
|
||||
// List<Field> getRepeatedFieldList()
|
||||
WriteFieldDocComment(printer, descriptor_);
|
||||
printer->Print(variables_,
|
||||
"@java.lang.Override\n"
|
||||
"$deprecation$public java.util.List<$type$> "
|
||||
"${$get$capitalized_name$List$}$() {\n"
|
||||
" return java.util.Collections.unmodifiableList(\n"
|
||||
@@ -771,6 +792,7 @@ GenerateBuilderMembers(io::Printer* printer) const {
|
||||
// int getRepeatedFieldCount()
|
||||
WriteFieldDocComment(printer, descriptor_);
|
||||
printer->Print(variables_,
|
||||
"@java.lang.Override\n"
|
||||
"$deprecation$public int ${$get$capitalized_name$Count$}$() {\n"
|
||||
" return instance.get$capitalized_name$Count();\n"
|
||||
"}");
|
||||
@@ -779,6 +801,7 @@ GenerateBuilderMembers(io::Printer* printer) const {
|
||||
// Field getRepeatedField(int index)
|
||||
WriteFieldDocComment(printer, descriptor_);
|
||||
printer->Print(variables_,
|
||||
"@java.lang.Override\n"
|
||||
"$deprecation$public $type$ ${$get$capitalized_name$$}$(int index) {\n"
|
||||
" return instance.get$capitalized_name$(index);\n"
|
||||
"}\n");
|
||||
|
||||
@@ -38,9 +38,6 @@
|
||||
#include <google/protobuf/stubs/hash.h>
|
||||
#include <map>
|
||||
#include <memory>
|
||||
#ifndef _SHARED_PTR_H
|
||||
#include <google/protobuf/stubs/shared_ptr.h>
|
||||
#endif
|
||||
#include <vector>
|
||||
|
||||
#include <google/protobuf/compiler/java/java_context.h>
|
||||
@@ -52,9 +49,9 @@
|
||||
#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.pb.h>
|
||||
#include <google/protobuf/wire_format.h>
|
||||
#include <google/protobuf/stubs/substitute.h>
|
||||
#include <google/protobuf/stubs/strutil.h>
|
||||
@@ -310,6 +307,7 @@ void ImmutableMessageLiteGenerator::Generate(io::Printer* printer) {
|
||||
" default: return null;\n"
|
||||
" }\n"
|
||||
"}\n"
|
||||
"@java.lang.Override\n"
|
||||
"public int getNumber() {\n"
|
||||
" return this.value;\n"
|
||||
"}\n",
|
||||
@@ -318,6 +316,7 @@ void ImmutableMessageLiteGenerator::Generate(io::Printer* printer) {
|
||||
printer->Print("};\n\n");
|
||||
// oneofCase()
|
||||
printer->Print(vars,
|
||||
"@java.lang.Override\n"
|
||||
"public $oneof_capitalized_name$Case\n"
|
||||
"get$oneof_capitalized_name$Case() {\n"
|
||||
" return $oneof_capitalized_name$Case.forNumber(\n"
|
||||
@@ -356,6 +355,7 @@ void ImmutableMessageLiteGenerator::Generate(io::Printer* printer) {
|
||||
}
|
||||
|
||||
printer->Print(
|
||||
"@java.lang.Override\n"
|
||||
"@java.lang.SuppressWarnings({\"unchecked\", \"fallthrough\"})\n"
|
||||
"protected final java.lang.Object dynamicMethod(\n"
|
||||
" com.google.protobuf.GeneratedMessageLite.MethodToInvoke method,\n"
|
||||
@@ -369,22 +369,7 @@ void ImmutableMessageLiteGenerator::Generate(io::Printer* printer) {
|
||||
printer->Indent();
|
||||
printer->Indent();
|
||||
|
||||
printer->Print("case IS_INITIALIZED: {\n");
|
||||
printer->Indent();
|
||||
GenerateDynamicMethodIsInitialized(printer);
|
||||
printer->Outdent();
|
||||
|
||||
printer->Print("}\n");
|
||||
|
||||
printer->Print(
|
||||
"case MAKE_IMMUTABLE: {\n");
|
||||
|
||||
printer->Indent();
|
||||
GenerateDynamicMethodMakeImmutable(printer);
|
||||
printer->Outdent();
|
||||
|
||||
printer->Print(
|
||||
"}\n"
|
||||
"case NEW_BUILDER: {\n");
|
||||
|
||||
printer->Indent();
|
||||
@@ -392,6 +377,22 @@ void ImmutableMessageLiteGenerator::Generate(io::Printer* printer) {
|
||||
printer->Outdent();
|
||||
|
||||
if (!EnableExperimentalRuntimeForLite()) {
|
||||
printer->Print(
|
||||
"}\n"
|
||||
"case IS_INITIALIZED: {\n");
|
||||
printer->Indent();
|
||||
GenerateDynamicMethodIsInitialized(printer);
|
||||
printer->Outdent();
|
||||
|
||||
printer->Print("}\n");
|
||||
|
||||
printer->Print(
|
||||
"case MAKE_IMMUTABLE: {\n");
|
||||
|
||||
printer->Indent();
|
||||
GenerateDynamicMethodMakeImmutable(printer);
|
||||
printer->Outdent();
|
||||
|
||||
printer->Print(
|
||||
"}\n"
|
||||
"case VISIT: {\n");
|
||||
@@ -399,15 +400,16 @@ void ImmutableMessageLiteGenerator::Generate(io::Printer* printer) {
|
||||
printer->Indent();
|
||||
GenerateDynamicMethodVisit(printer);
|
||||
printer->Outdent();
|
||||
|
||||
printer->Print(
|
||||
"}\n"
|
||||
"case MERGE_FROM_STREAM: {\n");
|
||||
|
||||
printer->Indent();
|
||||
GenerateDynamicMethodMergeFromStream(printer);
|
||||
printer->Outdent();
|
||||
}
|
||||
|
||||
printer->Print(
|
||||
"}\n"
|
||||
"case MERGE_FROM_STREAM: {\n");
|
||||
|
||||
printer->Indent();
|
||||
GenerateDynamicMethodMergeFromStream(printer);
|
||||
printer->Outdent();
|
||||
|
||||
printer->Print(
|
||||
"}\n"
|
||||
@@ -420,14 +422,20 @@ void ImmutableMessageLiteGenerator::Generate(io::Printer* printer) {
|
||||
// manipulating static fields but that has exceptional cost on Android as
|
||||
// it will generate an extra class for every message. Instead, use the
|
||||
// double-check locking pattern which works just as well.
|
||||
" if (PARSER == null) {"
|
||||
//
|
||||
// The "parser" temporary mirrors the "PARSER" field to eliminate a read
|
||||
// at the final return statement.
|
||||
" com.google.protobuf.Parser<$classname$> parser = PARSER;\n"
|
||||
" if (parser == null) {\n"
|
||||
" synchronized ($classname$.class) {\n"
|
||||
" if (PARSER == null) {\n"
|
||||
" PARSER = new DefaultInstanceBasedParser(DEFAULT_INSTANCE);\n"
|
||||
" parser = PARSER;\n"
|
||||
" if (parser == null) {\n"
|
||||
" parser = new DefaultInstanceBasedParser(DEFAULT_INSTANCE);\n"
|
||||
" PARSER = parser;\n"
|
||||
" }\n"
|
||||
" }\n"
|
||||
" }\n"
|
||||
" return PARSER;\n",
|
||||
" return parser;\n",
|
||||
"classname", name_resolver_->GetImmutableClassName(descriptor_));
|
||||
|
||||
printer->Outdent();
|
||||
@@ -475,8 +483,9 @@ void ImmutableMessageLiteGenerator::Generate(io::Printer* printer) {
|
||||
|
||||
printer->Print(
|
||||
"static {\n"
|
||||
" // New instances are implicitly immutable so no need to make\n"
|
||||
" // immutable.\n"
|
||||
" DEFAULT_INSTANCE = new $classname$();\n"
|
||||
" DEFAULT_INSTANCE.makeImmutable();\n"
|
||||
"}\n"
|
||||
"\n",
|
||||
"classname", descriptor_->name());
|
||||
@@ -491,6 +500,7 @@ void ImmutableMessageLiteGenerator::Generate(io::Printer* printer) {
|
||||
"}\n",
|
||||
"classname", descriptor_->name());
|
||||
}
|
||||
|
||||
printer->Print(
|
||||
"public static $classname$ getDefaultInstance() {\n"
|
||||
" return DEFAULT_INSTANCE;\n"
|
||||
@@ -519,6 +529,7 @@ void ImmutableMessageLiteGenerator::Generate(io::Printer* printer) {
|
||||
.Generate(printer);
|
||||
}
|
||||
|
||||
|
||||
printer->Outdent();
|
||||
printer->Print("}\n\n");
|
||||
}
|
||||
@@ -528,7 +539,11 @@ void ImmutableMessageLiteGenerator::Generate(io::Printer* printer) {
|
||||
|
||||
void ImmutableMessageLiteGenerator::
|
||||
GenerateMessageSerializationMethods(io::Printer* printer) {
|
||||
google::protobuf::scoped_array<const FieldDescriptor * > sorted_fields(
|
||||
if (EnableExperimentalRuntimeForLite()) {
|
||||
return;
|
||||
}
|
||||
|
||||
std::unique_ptr<const FieldDescriptor * []> sorted_fields(
|
||||
SortFieldsByNumber(descriptor_));
|
||||
|
||||
std::vector<const Descriptor::ExtensionRange*> sorted_extensions;
|
||||
@@ -539,6 +554,7 @@ GenerateMessageSerializationMethods(io::Printer* printer) {
|
||||
ExtensionRangeOrdering());
|
||||
|
||||
printer->Print(
|
||||
"@java.lang.Override\n"
|
||||
"public void writeTo(com.google.protobuf.CodedOutputStream output)\n"
|
||||
" throws java.io.IOException {\n");
|
||||
printer->Indent();
|
||||
@@ -594,6 +610,7 @@ GenerateMessageSerializationMethods(io::Printer* printer) {
|
||||
printer->Print(
|
||||
"}\n"
|
||||
"\n"
|
||||
"@java.lang.Override\n"
|
||||
"public int getSerializedSize() {\n"
|
||||
" int size = memoizedSerializedSize;\n"
|
||||
" if (size != -1) return size;\n"
|
||||
@@ -1005,38 +1022,7 @@ void ImmutableMessageLiteGenerator::GenerateDynamicMethodMergeFromStream(
|
||||
" done = true;\n"
|
||||
" break;\n");
|
||||
|
||||
if (descriptor_->extension_range_count() > 0) {
|
||||
if (descriptor_->options().message_set_wire_format()) {
|
||||
printer->Print(
|
||||
"default: {\n"
|
||||
" if (!parseUnknownFieldAsMessageSet(\n"
|
||||
" getDefaultInstanceForType(), input, extensionRegistry,\n"
|
||||
" tag)) {\n"
|
||||
" done = true;\n" // it's an endgroup tag
|
||||
" }\n"
|
||||
" break;\n"
|
||||
"}\n");
|
||||
} else {
|
||||
printer->Print(
|
||||
"default: {\n"
|
||||
" if (!parseUnknownField(getDefaultInstanceForType(),\n"
|
||||
" input, extensionRegistry, tag)) {\n"
|
||||
" done = true;\n" // it's an endgroup tag
|
||||
" }\n"
|
||||
" break;\n"
|
||||
"}\n");
|
||||
}
|
||||
} else {
|
||||
printer->Print(
|
||||
"default: {\n"
|
||||
" if (!parseUnknownField(tag, input)) {\n"
|
||||
" done = true;\n" // it's an endgroup tag
|
||||
" }\n"
|
||||
" break;\n"
|
||||
"}\n");
|
||||
}
|
||||
|
||||
google::protobuf::scoped_array<const FieldDescriptor* > sorted_fields(
|
||||
std::unique_ptr<const FieldDescriptor* []> sorted_fields(
|
||||
SortFieldsByNumber(descriptor_));
|
||||
for (int i = 0; i < descriptor_->field_count(); i++) {
|
||||
const FieldDescriptor* field = sorted_fields[i];
|
||||
@@ -1073,6 +1059,37 @@ void ImmutableMessageLiteGenerator::GenerateDynamicMethodMergeFromStream(
|
||||
}
|
||||
}
|
||||
|
||||
if (descriptor_->extension_range_count() > 0) {
|
||||
if (descriptor_->options().message_set_wire_format()) {
|
||||
printer->Print(
|
||||
"default: {\n"
|
||||
" if (!parseUnknownFieldAsMessageSet(\n"
|
||||
" getDefaultInstanceForType(), input, extensionRegistry,\n"
|
||||
" tag)) {\n"
|
||||
" done = true;\n" // it's an endgroup tag
|
||||
" }\n"
|
||||
" break;\n"
|
||||
"}\n");
|
||||
} else {
|
||||
printer->Print(
|
||||
"default: {\n"
|
||||
" if (!parseUnknownField(getDefaultInstanceForType(),\n"
|
||||
" input, extensionRegistry, tag)) {\n"
|
||||
" done = true;\n" // it's an endgroup tag
|
||||
" }\n"
|
||||
" break;\n"
|
||||
"}\n");
|
||||
}
|
||||
} else {
|
||||
printer->Print(
|
||||
"default: {\n"
|
||||
" if (!parseUnknownField(tag, input)) {\n"
|
||||
" done = true;\n" // it's an endgroup tag
|
||||
" }\n"
|
||||
" break;\n"
|
||||
"}\n");
|
||||
}
|
||||
|
||||
printer->Outdent();
|
||||
printer->Outdent();
|
||||
printer->Print(
|
||||
|
||||
@@ -35,9 +35,6 @@
|
||||
// worth.
|
||||
|
||||
#include <memory>
|
||||
#ifndef _SHARED_PTR_H
|
||||
#include <google/protobuf/stubs/shared_ptr.h>
|
||||
#endif
|
||||
|
||||
#include <google/protobuf/compiler/java/java_generator.h>
|
||||
#include <google/protobuf/compiler/command_line_interface.h>
|
||||
@@ -76,7 +73,7 @@ class TestGenerator : public CodeGenerator {
|
||||
|
||||
void TryInsert(const string& filename, const string& insertion_point,
|
||||
GeneratorContext* context) const {
|
||||
google::protobuf::scoped_ptr<io::ZeroCopyOutputStream> output(
|
||||
std::unique_ptr<io::ZeroCopyOutputStream> output(
|
||||
context->OpenForInsert(filename, insertion_point));
|
||||
io::Printer printer(output.get(), '$');
|
||||
printer.Print("// inserted $name$\n", "name", insertion_point);
|
||||
|
||||
@@ -633,8 +633,7 @@ GenerateMembers(io::Printer* printer) const {
|
||||
"}\n");
|
||||
printer->Annotate("{", "}", descriptor_);
|
||||
|
||||
if (descriptor_->is_packed() &&
|
||||
context_->HasGeneratedMethods(descriptor_->containing_type())) {
|
||||
if (descriptor_->is_packed()) {
|
||||
printer->Print(variables_,
|
||||
"private int $name$MemoizedSerializedSize = -1;\n");
|
||||
}
|
||||
|
||||
@@ -222,6 +222,7 @@ GenerateMembers(io::Printer* printer) const {
|
||||
if (SupportFieldPresence(descriptor_->file())) {
|
||||
WriteFieldDocComment(printer, descriptor_);
|
||||
printer->Print(variables_,
|
||||
"@java.lang.Override\n"
|
||||
"$deprecation$public boolean ${$has$capitalized_name$$}$() {\n"
|
||||
" return $get_has_field_bit_message$;\n"
|
||||
"}\n");
|
||||
@@ -230,6 +231,7 @@ GenerateMembers(io::Printer* printer) const {
|
||||
|
||||
WriteFieldDocComment(printer, descriptor_);
|
||||
printer->Print(variables_,
|
||||
"@java.lang.Override\n"
|
||||
"$deprecation$public $type$ ${$get$capitalized_name$$}$() {\n"
|
||||
" return $name$_;\n"
|
||||
"}\n");
|
||||
@@ -266,6 +268,7 @@ GenerateBuilderMembers(io::Printer* printer) const {
|
||||
if (SupportFieldPresence(descriptor_->file())) {
|
||||
WriteFieldDocComment(printer, descriptor_);
|
||||
printer->Print(variables_,
|
||||
"@java.lang.Override\n"
|
||||
"$deprecation$public boolean ${$has$capitalized_name$$}$() {\n"
|
||||
" return instance.has$capitalized_name$();\n"
|
||||
"}\n");
|
||||
@@ -274,6 +277,7 @@ GenerateBuilderMembers(io::Printer* printer) const {
|
||||
|
||||
WriteFieldDocComment(printer, descriptor_);
|
||||
printer->Print(variables_,
|
||||
"@java.lang.Override\n"
|
||||
"$deprecation$public $type$ ${$get$capitalized_name$$}$() {\n"
|
||||
" return instance.get$capitalized_name$();\n"
|
||||
"}\n");
|
||||
@@ -488,6 +492,7 @@ GenerateMembers(io::Printer* printer) const {
|
||||
if (SupportFieldPresence(descriptor_->file())) {
|
||||
WriteFieldDocComment(printer, descriptor_);
|
||||
printer->Print(variables_,
|
||||
"@java.lang.Override\n"
|
||||
"$deprecation$public boolean ${$has$capitalized_name$$}$() {\n"
|
||||
" return $has_oneof_case_message$;\n"
|
||||
"}\n");
|
||||
@@ -496,6 +501,7 @@ GenerateMembers(io::Printer* printer) const {
|
||||
|
||||
WriteFieldDocComment(printer, descriptor_);
|
||||
printer->Print(variables_,
|
||||
"@java.lang.Override\n"
|
||||
"$deprecation$public $type$ ${$get$capitalized_name$$}$() {\n"
|
||||
" if ($has_oneof_case_message$) {\n"
|
||||
" return ($boxed_type$) $oneof_name$_;\n"
|
||||
@@ -528,6 +534,7 @@ GenerateBuilderMembers(io::Printer* printer) const {
|
||||
if (SupportFieldPresence(descriptor_->file())) {
|
||||
WriteFieldDocComment(printer, descriptor_);
|
||||
printer->Print(variables_,
|
||||
"@java.lang.Override\n"
|
||||
"$deprecation$public boolean ${$has$capitalized_name$$}$() {\n"
|
||||
" return instance.has$capitalized_name$();\n"
|
||||
"}\n");
|
||||
@@ -536,6 +543,7 @@ GenerateBuilderMembers(io::Printer* printer) const {
|
||||
|
||||
WriteFieldDocComment(printer, descriptor_);
|
||||
printer->Print(variables_,
|
||||
"@java.lang.Override\n"
|
||||
"$deprecation$public $type$ ${$get$capitalized_name$$}$() {\n"
|
||||
" return instance.get$capitalized_name$();\n"
|
||||
"}\n");
|
||||
@@ -645,6 +653,7 @@ GenerateMembers(io::Printer* printer) const {
|
||||
PrintExtraFieldInfo(variables_, printer);
|
||||
WriteFieldDocComment(printer, descriptor_);
|
||||
printer->Print(variables_,
|
||||
"@java.lang.Override\n"
|
||||
"$deprecation$public java.util.List<$boxed_type$>\n"
|
||||
" ${$get$capitalized_name$List$}$() {\n"
|
||||
" return $name$_;\n" // note: unmodifiable list
|
||||
@@ -652,12 +661,14 @@ GenerateMembers(io::Printer* printer) const {
|
||||
printer->Annotate("{", "}", descriptor_);
|
||||
WriteFieldDocComment(printer, descriptor_);
|
||||
printer->Print(variables_,
|
||||
"@java.lang.Override\n"
|
||||
"$deprecation$public int ${$get$capitalized_name$Count$}$() {\n"
|
||||
" return $name$_.size();\n"
|
||||
"}\n");
|
||||
printer->Annotate("{", "}", descriptor_);
|
||||
WriteFieldDocComment(printer, descriptor_);
|
||||
printer->Print(variables_,
|
||||
"@java.lang.Override\n"
|
||||
"$deprecation$public $type$ ${$get$capitalized_name$$}$(int index) {\n"
|
||||
" return $repeated_get$(index);\n"
|
||||
"}\n");
|
||||
@@ -711,6 +722,7 @@ void RepeatedImmutablePrimitiveFieldLiteGenerator::
|
||||
GenerateBuilderMembers(io::Printer* printer) const {
|
||||
WriteFieldDocComment(printer, descriptor_);
|
||||
printer->Print(variables_,
|
||||
"@java.lang.Override\n"
|
||||
"$deprecation$public java.util.List<$boxed_type$>\n"
|
||||
" ${$get$capitalized_name$List$}$() {\n"
|
||||
" return java.util.Collections.unmodifiableList(\n"
|
||||
@@ -719,12 +731,14 @@ GenerateBuilderMembers(io::Printer* printer) const {
|
||||
printer->Annotate("{", "}", descriptor_);
|
||||
WriteFieldDocComment(printer, descriptor_);
|
||||
printer->Print(variables_,
|
||||
"@java.lang.Override\n"
|
||||
"$deprecation$public int ${$get$capitalized_name$Count$}$() {\n"
|
||||
" return instance.get$capitalized_name$Count();\n"
|
||||
"}\n");
|
||||
printer->Annotate("{", "}", descriptor_);
|
||||
WriteFieldDocComment(printer, descriptor_);
|
||||
printer->Print(variables_,
|
||||
"@java.lang.Override\n"
|
||||
"$deprecation$public $type$ ${$get$capitalized_name$$}$(int index) {\n"
|
||||
" return instance.get$capitalized_name$(index);\n"
|
||||
"}\n");
|
||||
|
||||
@@ -33,16 +33,13 @@
|
||||
#include <google/protobuf/compiler/java/java_shared_code_generator.h>
|
||||
|
||||
#include <memory>
|
||||
#ifndef _SHARED_PTR_H
|
||||
#include <google/protobuf/stubs/shared_ptr.h>
|
||||
#endif
|
||||
|
||||
#include <google/protobuf/compiler/java/java_helpers.h>
|
||||
#include <google/protobuf/compiler/java/java_name_resolver.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.pb.h>
|
||||
#include <google/protobuf/descriptor.h>
|
||||
#include <google/protobuf/stubs/strutil.h>
|
||||
|
||||
@@ -69,11 +66,11 @@ void SharedCodeGenerator::Generate(GeneratorContext* context,
|
||||
string classname = name_resolver_->GetDescriptorClassName(file_);
|
||||
string filename = package_dir + classname + ".java";
|
||||
file_list->push_back(filename);
|
||||
google::protobuf::scoped_ptr<io::ZeroCopyOutputStream> output(context->Open(filename));
|
||||
std::unique_ptr<io::ZeroCopyOutputStream> output(context->Open(filename));
|
||||
GeneratedCodeInfo annotations;
|
||||
io::AnnotationProtoCollector<GeneratedCodeInfo> annotation_collector(
|
||||
&annotations);
|
||||
google::protobuf::scoped_ptr<io::Printer> printer(
|
||||
std::unique_ptr<io::Printer> printer(
|
||||
new io::Printer(output.get(), '$',
|
||||
options_.annotate_code ? &annotation_collector : NULL));
|
||||
string info_relative_path = classname + ".java.pb.meta";
|
||||
@@ -108,7 +105,7 @@ void SharedCodeGenerator::Generate(GeneratorContext* context,
|
||||
"}\n");
|
||||
|
||||
if (options_.annotate_code) {
|
||||
google::protobuf::scoped_ptr<io::ZeroCopyOutputStream> info_output(
|
||||
std::unique_ptr<io::ZeroCopyOutputStream> info_output(
|
||||
context->Open(info_full_path));
|
||||
annotations.SerializeToZeroCopyStream(info_output.get());
|
||||
annotation_file_list->push_back(info_full_path);
|
||||
|
||||
@@ -36,9 +36,6 @@
|
||||
#define GOOGLE_PROTOBUF_COMPILER_JAVA_SHARED_CODE_GENERATOR_H__
|
||||
|
||||
#include <memory>
|
||||
#ifndef _SHARED_PTR_H
|
||||
#include <google/protobuf/stubs/shared_ptr.h>
|
||||
#endif
|
||||
#include <string>
|
||||
#include <vector>
|
||||
|
||||
@@ -77,7 +74,7 @@ class SharedCodeGenerator {
|
||||
void GenerateDescriptors(io::Printer* printer);
|
||||
|
||||
private:
|
||||
google::protobuf::scoped_ptr<ClassNameResolver> name_resolver_;
|
||||
std::unique_ptr<ClassNameResolver> name_resolver_;
|
||||
const FileDescriptor* file_;
|
||||
const Options options_;
|
||||
GOOGLE_DISALLOW_EVIL_CONSTRUCTORS(SharedCodeGenerator);
|
||||
|
||||
@@ -192,6 +192,7 @@ GenerateMembers(io::Printer* printer) const {
|
||||
if (SupportFieldPresence(descriptor_->file())) {
|
||||
WriteFieldDocComment(printer, descriptor_);
|
||||
printer->Print(variables_,
|
||||
"@java.lang.Override\n"
|
||||
"$deprecation$public boolean ${$has$capitalized_name$$}$() {\n"
|
||||
" return $get_has_field_bit_message$;\n"
|
||||
"}\n");
|
||||
@@ -200,12 +201,14 @@ GenerateMembers(io::Printer* printer) const {
|
||||
|
||||
WriteFieldDocComment(printer, descriptor_);
|
||||
printer->Print(variables_,
|
||||
"@java.lang.Override\n"
|
||||
"$deprecation$public java.lang.String ${$get$capitalized_name$$}$() {\n"
|
||||
" return $name$_;\n"
|
||||
"}\n");
|
||||
printer->Annotate("{", "}", descriptor_);
|
||||
WriteFieldDocComment(printer, descriptor_);
|
||||
printer->Print(variables_,
|
||||
"@java.lang.Override\n"
|
||||
"$deprecation$public com.google.protobuf.ByteString\n"
|
||||
" ${$get$capitalized_name$Bytes$}$() {\n"
|
||||
" return com.google.protobuf.ByteString.copyFromUtf8($name$_);\n"
|
||||
@@ -249,6 +252,7 @@ GenerateBuilderMembers(io::Printer* printer) const {
|
||||
if (SupportFieldPresence(descriptor_->file())) {
|
||||
WriteFieldDocComment(printer, descriptor_);
|
||||
printer->Print(variables_,
|
||||
"@java.lang.Override\n"
|
||||
"$deprecation$public boolean ${$has$capitalized_name$$}$() {\n"
|
||||
" return instance.has$capitalized_name$();\n"
|
||||
"}\n");
|
||||
@@ -257,6 +261,7 @@ GenerateBuilderMembers(io::Printer* printer) const {
|
||||
|
||||
WriteFieldDocComment(printer, descriptor_);
|
||||
printer->Print(variables_,
|
||||
"@java.lang.Override\n"
|
||||
"$deprecation$public java.lang.String ${$get$capitalized_name$$}$() {\n"
|
||||
" return instance.get$capitalized_name$();\n"
|
||||
"}\n");
|
||||
@@ -264,6 +269,7 @@ GenerateBuilderMembers(io::Printer* printer) const {
|
||||
|
||||
WriteFieldDocComment(printer, descriptor_);
|
||||
printer->Print(variables_,
|
||||
"@java.lang.Override\n"
|
||||
"$deprecation$public com.google.protobuf.ByteString\n"
|
||||
" ${$get$capitalized_name$Bytes$}$() {\n"
|
||||
" return instance.get$capitalized_name$Bytes();\n"
|
||||
@@ -419,6 +425,7 @@ GenerateMembers(io::Printer* printer) const {
|
||||
if (SupportFieldPresence(descriptor_->file())) {
|
||||
WriteFieldDocComment(printer, descriptor_);
|
||||
printer->Print(variables_,
|
||||
"@java.lang.Override\n"
|
||||
"$deprecation$public boolean ${$has$capitalized_name$$}$() {\n"
|
||||
" return $has_oneof_case_message$;\n"
|
||||
"}\n");
|
||||
@@ -427,6 +434,7 @@ GenerateMembers(io::Printer* printer) const {
|
||||
|
||||
WriteFieldDocComment(printer, descriptor_);
|
||||
printer->Print(variables_,
|
||||
"@java.lang.Override\n"
|
||||
"$deprecation$public java.lang.String ${$get$capitalized_name$$}$() {\n"
|
||||
" java.lang.String ref $default_init$;\n"
|
||||
" if ($has_oneof_case_message$) {\n"
|
||||
@@ -438,6 +446,7 @@ GenerateMembers(io::Printer* printer) const {
|
||||
WriteFieldDocComment(printer, descriptor_);
|
||||
|
||||
printer->Print(variables_,
|
||||
"@java.lang.Override\n"
|
||||
"$deprecation$public com.google.protobuf.ByteString\n"
|
||||
" ${$get$capitalized_name$Bytes$}$() {\n"
|
||||
" java.lang.String ref $default_init$;\n"
|
||||
@@ -489,6 +498,7 @@ GenerateBuilderMembers(io::Printer* printer) const {
|
||||
if (SupportFieldPresence(descriptor_->file())) {
|
||||
WriteFieldDocComment(printer, descriptor_);
|
||||
printer->Print(variables_,
|
||||
"@java.lang.Override\n"
|
||||
"$deprecation$public boolean ${$has$capitalized_name$$}$() {\n"
|
||||
" return instance.has$capitalized_name$();\n"
|
||||
"}\n");
|
||||
@@ -497,6 +507,7 @@ GenerateBuilderMembers(io::Printer* printer) const {
|
||||
|
||||
WriteFieldDocComment(printer, descriptor_);
|
||||
printer->Print(variables_,
|
||||
"@java.lang.Override\n"
|
||||
"$deprecation$public java.lang.String ${$get$capitalized_name$$}$() {\n"
|
||||
" return instance.get$capitalized_name$();\n"
|
||||
"}\n");
|
||||
@@ -504,6 +515,7 @@ GenerateBuilderMembers(io::Printer* printer) const {
|
||||
|
||||
WriteFieldDocComment(printer, descriptor_);
|
||||
printer->Print(variables_,
|
||||
"@java.lang.Override\n"
|
||||
"$deprecation$public com.google.protobuf.ByteString\n"
|
||||
" ${$get$capitalized_name$Bytes$}$() {\n"
|
||||
" return instance.get$capitalized_name$Bytes();\n"
|
||||
@@ -641,6 +653,7 @@ GenerateMembers(io::Printer* printer) const {
|
||||
PrintExtraFieldInfo(variables_, printer);
|
||||
WriteFieldDocComment(printer, descriptor_);
|
||||
printer->Print(variables_,
|
||||
"@java.lang.Override\n"
|
||||
"$deprecation$public java.util.List<java.lang.String> "
|
||||
"${$get$capitalized_name$List$}$() {\n"
|
||||
" return $name$_;\n" // note: unmodifiable list
|
||||
@@ -648,12 +661,14 @@ GenerateMembers(io::Printer* printer) const {
|
||||
printer->Annotate("{", "}", descriptor_);
|
||||
WriteFieldDocComment(printer, descriptor_);
|
||||
printer->Print(variables_,
|
||||
"@java.lang.Override\n"
|
||||
"$deprecation$public int ${$get$capitalized_name$Count$}$() {\n"
|
||||
" return $name$_.size();\n"
|
||||
"}\n");
|
||||
printer->Annotate("{", "}", descriptor_);
|
||||
WriteFieldDocComment(printer, descriptor_);
|
||||
printer->Print(variables_,
|
||||
"@java.lang.Override\n"
|
||||
"$deprecation$public java.lang.String "
|
||||
"${$get$capitalized_name$$}$(int index) {\n"
|
||||
" return $name$_.get(index);\n"
|
||||
@@ -661,6 +676,7 @@ GenerateMembers(io::Printer* printer) const {
|
||||
printer->Annotate("{", "}", descriptor_);
|
||||
WriteFieldDocComment(printer, descriptor_);
|
||||
printer->Print(variables_,
|
||||
"@java.lang.Override\n"
|
||||
"$deprecation$public com.google.protobuf.ByteString\n"
|
||||
" ${$get$capitalized_name$Bytes$}$(int index) {\n"
|
||||
" return com.google.protobuf.ByteString.copyFromUtf8(\n"
|
||||
@@ -725,6 +741,7 @@ void RepeatedImmutableStringFieldLiteGenerator::
|
||||
GenerateBuilderMembers(io::Printer* printer) const {
|
||||
WriteFieldDocComment(printer, descriptor_);
|
||||
printer->Print(variables_,
|
||||
"@java.lang.Override\n"
|
||||
"$deprecation$public java.util.List<java.lang.String>\n"
|
||||
" ${$get$capitalized_name$List$}$() {\n"
|
||||
" return java.util.Collections.unmodifiableList(\n"
|
||||
@@ -733,12 +750,14 @@ GenerateBuilderMembers(io::Printer* printer) const {
|
||||
printer->Annotate("{", "}", descriptor_);
|
||||
WriteFieldDocComment(printer, descriptor_);
|
||||
printer->Print(variables_,
|
||||
"@java.lang.Override\n"
|
||||
"$deprecation$public int ${$get$capitalized_name$Count$}$() {\n"
|
||||
" return instance.get$capitalized_name$Count();\n"
|
||||
"}\n");
|
||||
printer->Annotate("{", "}", descriptor_);
|
||||
WriteFieldDocComment(printer, descriptor_);
|
||||
printer->Print(variables_,
|
||||
"@java.lang.Override\n"
|
||||
"$deprecation$public java.lang.String "
|
||||
"${$get$capitalized_name$$}$(int index) {\n"
|
||||
" return instance.get$capitalized_name$(index);\n"
|
||||
@@ -746,6 +765,7 @@ GenerateBuilderMembers(io::Printer* printer) const {
|
||||
printer->Annotate("{", "}", descriptor_);
|
||||
WriteFieldDocComment(printer, descriptor_);
|
||||
printer->Print(variables_,
|
||||
"@java.lang.Override\n"
|
||||
"$deprecation$public com.google.protobuf.ByteString\n"
|
||||
" ${$get$capitalized_name$Bytes$}$(int index) {\n"
|
||||
" return instance.get$capitalized_name$Bytes(index);\n"
|
||||
|
||||
Reference in new issue
Block a user