third_party/protobuf/src/google/protobuf/compiler/java/java_string_field.cc - Issue 1322483002: Revert https://codereview.chromium.org/1291903002 (protobuf roll).

Unified Diff: third_party/protobuf/src/google/protobuf/compiler/java/java_string_field.cc

Issue 1322483002: Revert https://codereview.chromium.org/1291903002 (protobuf roll). (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 5 years, 4 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « third_party/protobuf/src/google/protobuf/compiler/java/java_string_field.h ('k') | third_party/protobuf/src/google/protobuf/compiler/java/java_string_field_lite.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/protobuf/src/google/protobuf/compiler/java/java_string_field.cc

diff --git a/third_party/protobuf/src/google/protobuf/compiler/java/java_string_field.cc b/third_party/protobuf/src/google/protobuf/compiler/java/java_string_field.cc

index 68e863ccc396cf919a10cb43db2021e14d371f51..4815663b1db3848e1be682d3c97b8f1bd1df64d9 100644

--- a/third_party/protobuf/src/google/protobuf/compiler/java/java_string_field.cc

+++ b/third_party/protobuf/src/google/protobuf/compiler/java/java_string_field.cc

@@ -1,6 +1,6 @@

// Protocol Buffers - Google's data interchange format

-// https://developers.google.com/protocol-buffers/

+// http://code.google.com/p/protobuf/

// Redistribution and use in source and binary forms, with or without

// modification, are permitted provided that the following conditions are

@@ -36,12 +36,10 @@

#include <map>

#include <string>

-#include <google/protobuf/stubs/common.h>

-#include <google/protobuf/compiler/java/java_context.h>

+#include <google/protobuf/compiler/java/java_string_field.h>

#include <google/protobuf/compiler/java/java_doc_comment.h>

+#include <google/protobuf/stubs/common.h>

#include <google/protobuf/compiler/java/java_helpers.h>

-#include <google/protobuf/compiler/java/java_name_resolver.h>

-#include <google/protobuf/compiler/java/java_string_field.h>

#include <google/protobuf/io/printer.h>

#include <google/protobuf/wire_format.h>

#include <google/protobuf/stubs/strutil.h>

@@ -59,16 +57,17 @@ namespace {

void SetPrimitiveVariables(const FieldDescriptor* descriptor,

int messageBitIndex,

int builderBitIndex,

- const FieldGeneratorInfo* info,

- ClassNameResolver* name_resolver,

map<string, string>* variables) {

- SetCommonFieldVariables(descriptor, info, variables);

+ (*variables)["name"] =

+ UnderscoresToCamelCase(descriptor);

+ (*variables)["capitalized_name"] =

+ UnderscoresToCapitalizedCamelCase(descriptor);

+ (*variables)["constant_name"] = FieldConstantName(descriptor);

+ (*variables)["number"] = SimpleItoa(descriptor->number());

(*variables)["empty_list"] = "com.google.protobuf.LazyStringArrayList.EMPTY";

- (*variables)["default"] = ImmutableDefaultValue(descriptor, name_resolver);

- (*variables)["default_init"] =

- "= " + ImmutableDefaultValue(descriptor, name_resolver);

+ (*variables)["default"] = DefaultValue(descriptor);

+ (*variables)["default_init"] = ("= " + DefaultValue(descriptor));

(*variables)["capitalized_type"] = "String";

(*variables)["tag"] = SimpleItoa(WireFormat::MakeTag(descriptor));

(*variables)["tag_size"] = SimpleItoa(

@@ -85,30 +84,16 @@ void SetPrimitiveVariables(const FieldDescriptor* descriptor,

(*variables)["on_changed"] =

HasDescriptorMethods(descriptor->containing_type()) ? "onChanged();" : "";

- if (SupportFieldPresence(descriptor->file())) {

- // 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) + ";";

+ // For singular messages and builders, one bit is used for the hasField bit.

+ (*variables)["get_has_field_bit_message"] = GenerateGetBit(messageBitIndex);

+ (*variables)["set_has_field_bit_message"] = GenerateSetBit(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)["get_has_field_bit_builder"] = GenerateGetBit(builderBitIndex);

+ (*variables)["set_has_field_bit_builder"] = GenerateSetBit(builderBitIndex);

+ (*variables)["clear_has_field_bit_builder"] =

+ GenerateClearBit(builderBitIndex);

- (*variables)["is_field_present_message"] =

- "!get" + (*variables)["capitalized_name"] + "Bytes().isEmpty()";

- }

- // For repeated builders, one bit is used for whether the array is immutable.

+ // For repated builders, one bit is used for whether the array is immutable.

(*variables)["get_mutable_bit_builder"] = GenerateGetBit(builderBitIndex);

(*variables)["set_mutable_bit_builder"] = GenerateSetBit(builderBitIndex);

(*variables)["clear_mutable_bit_builder"] = GenerateClearBit(builderBitIndex);

@@ -126,34 +111,27 @@ void SetPrimitiveVariables(const FieldDescriptor* descriptor,

GenerateSetBitToLocal(messageBitIndex);

}

-bool CheckUtf8(const FieldDescriptor* descriptor) {

- return descriptor->file()->options().java_string_check_utf8();

} // namespace

// ===================================================================

-ImmutableStringFieldGenerator::

-ImmutableStringFieldGenerator(const FieldDescriptor* descriptor,

- int messageBitIndex,

- int builderBitIndex,

- Context* context)

+StringFieldGenerator::

+StringFieldGenerator(const FieldDescriptor* descriptor,

+ int messageBitIndex,

+ int builderBitIndex)

: descriptor_(descriptor), messageBitIndex_(messageBitIndex),

- builderBitIndex_(builderBitIndex), context_(context),

- name_resolver_(context->GetNameResolver()) {

+ builderBitIndex_(builderBitIndex) {

SetPrimitiveVariables(descriptor, messageBitIndex, builderBitIndex,

- context->GetFieldGeneratorInfo(descriptor),

- name_resolver_, &variables_);

+ &variables_);

}

-ImmutableStringFieldGenerator::~ImmutableStringFieldGenerator() {}

+StringFieldGenerator::~StringFieldGenerator() {}

-int ImmutableStringFieldGenerator::GetNumBitsForMessage() const {

+int StringFieldGenerator::GetNumBitsForMessage() const {

return 1;

}

-int ImmutableStringFieldGenerator::GetNumBitsForBuilder() const {

+int StringFieldGenerator::GetNumBitsForBuilder() const {

return 1;

}

@@ -189,13 +167,11 @@ int ImmutableStringFieldGenerator::GetNumBitsForBuilder() const {

// For single fields, the logic for this is done inside the generated code. For

// repeated fields, the logic is done in LazyStringArrayList and

// UnmodifiableLazyStringList.

-void ImmutableStringFieldGenerator::

+void StringFieldGenerator::

GenerateInterfaceMembers(io::Printer* printer) const {

- if (SupportFieldPresence(descriptor_->file())) {

- WriteFieldDocComment(printer, descriptor_);

- printer->Print(variables_,

- "$deprecation$boolean has$capitalized_name$();\n");

- }

+ WriteFieldDocComment(printer, descriptor_);

+ printer->Print(variables_,

+ "$deprecation$boolean has$capitalized_name$();\n");

WriteFieldDocComment(printer, descriptor_);

printer->Print(variables_,

"$deprecation$java.lang.String get$capitalized_name$();\n");

@@ -205,19 +181,15 @@ GenerateInterfaceMembers(io::Printer* printer) const {

" get$capitalized_name$Bytes();\n");

}

-void ImmutableStringFieldGenerator::

+void StringFieldGenerator::

GenerateMembers(io::Printer* printer) const {

printer->Print(variables_,

- "private volatile java.lang.Object $name$_;\n");

- PrintExtraFieldInfo(variables_, printer);

- if (SupportFieldPresence(descriptor_->file())) {

- WriteFieldDocComment(printer, descriptor_);

- printer->Print(variables_,

- "$deprecation$public boolean has$capitalized_name$() {\n"

- " return $get_has_field_bit_message$;\n"

- "}\n");

- }

+ "private java.lang.Object $name$_;\n");

+ WriteFieldDocComment(printer, descriptor_);

+ printer->Print(variables_,

+ "$deprecation$public boolean has$capitalized_name$() {\n"

+ " return $get_has_field_bit_message$;\n"

+ "}\n");

WriteFieldDocComment(printer, descriptor_);

printer->Print(variables_,

@@ -228,17 +200,10 @@ GenerateMembers(io::Printer* printer) const {

" } else {\n"

" com.google.protobuf.ByteString bs = \n"

" (com.google.protobuf.ByteString) ref;\n"

- " java.lang.String s = bs.toStringUtf8();\n");

- if (CheckUtf8(descriptor_)) {

- printer->Print(variables_,

- " $name$_ = s;\n");

- } else {

- printer->Print(variables_,

- " if (bs.isValidUtf8()) {\n"

- " $name$_ = s;\n"

- " }\n");

- }

- printer->Print(variables_,

+ " java.lang.String s = bs.toStringUtf8();\n"

+ " if (bs.isValidUtf8()) {\n"

+ " $name$_ = s;\n"

+ " }\n"

" return s;\n"

" }\n"

"}\n");

@@ -259,36 +224,24 @@ GenerateMembers(io::Printer* printer) const {

"}\n");

}

-void ImmutableStringFieldGenerator::

+void StringFieldGenerator::

GenerateBuilderMembers(io::Printer* printer) const {

printer->Print(variables_,

"private java.lang.Object $name$_ $default_init$;\n");

- if (SupportFieldPresence(descriptor_->file())) {

- WriteFieldDocComment(printer, descriptor_);

- printer->Print(variables_,

- "$deprecation$public boolean has$capitalized_name$() {\n"

- " return $get_has_field_bit_builder$;\n"

- "}\n");

- }

+ WriteFieldDocComment(printer, descriptor_);

+ printer->Print(variables_,

+ "$deprecation$public boolean has$capitalized_name$() {\n"

+ " return $get_has_field_bit_builder$;\n"

+ "}\n");

WriteFieldDocComment(printer, descriptor_);

printer->Print(variables_,

"$deprecation$public java.lang.String get$capitalized_name$() {\n"

" java.lang.Object ref = $name$_;\n"

" if (!(ref instanceof java.lang.String)) {\n"

- " com.google.protobuf.ByteString bs =\n"

- " (com.google.protobuf.ByteString) ref;\n"

- " java.lang.String s = bs.toStringUtf8();\n");

- if (CheckUtf8(descriptor_)) {

- printer->Print(variables_,

- " $name$_ = s;\n");

- } else {

- printer->Print(variables_,

- " if (bs.isValidUtf8()) {\n"

- " $name$_ = s;\n"

- " }\n");

- }

- printer->Print(variables_,

+ " java.lang.String s = ((com.google.protobuf.ByteString) ref)\n"

+ " .toStringUtf8();\n"

+ " $name$_ = s;\n"

" return s;\n"

" } else {\n"

" return (java.lang.String) ref;\n"

@@ -316,7 +269,7 @@ GenerateBuilderMembers(io::Printer* printer) const {

"$deprecation$public Builder set$capitalized_name$(\n"

" java.lang.String value) {\n"

"$null_check$"

- " $set_has_field_bit_builder$\n"

+ " $set_has_field_bit_builder$;\n"

" $name$_ = value;\n"

" $on_changed$\n"

" return this;\n"

@@ -324,7 +277,7 @@ GenerateBuilderMembers(io::Printer* printer) const {

WriteFieldDocComment(printer, descriptor_);

printer->Print(variables_,

"$deprecation$public Builder clear$capitalized_name$() {\n"

- " $clear_has_field_bit_builder$\n");

+ " $clear_has_field_bit_builder$;\n");

// 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_,

@@ -338,122 +291,89 @@ GenerateBuilderMembers(io::Printer* printer) const {

printer->Print(variables_,

"$deprecation$public Builder set$capitalized_name$Bytes(\n"

" com.google.protobuf.ByteString value) {\n"

- "$null_check$");

- if (CheckUtf8(descriptor_)) {

- printer->Print(variables_,

- " checkByteStringIsUtf8(value);\n");

- }

- printer->Print(variables_,

- " $set_has_field_bit_builder$\n"

+ "$null_check$"

+ " $set_has_field_bit_builder$;\n"

" $name$_ = value;\n"

" $on_changed$\n"

" return this;\n"

"}\n");

}

-void ImmutableStringFieldGenerator::

+void StringFieldGenerator::

GenerateFieldBuilderInitializationCode(io::Printer* printer) const {

// noop for primitives

}

-void ImmutableStringFieldGenerator::

+void StringFieldGenerator::

GenerateInitializationCode(io::Printer* printer) const {

printer->Print(variables_, "$name$_ = $default$;\n");

}

-void ImmutableStringFieldGenerator::

+void StringFieldGenerator::

GenerateBuilderClearCode(io::Printer* printer) const {

printer->Print(variables_,

"$name$_ = $default$;\n"

- "$clear_has_field_bit_builder$\n");

+ "$clear_has_field_bit_builder$;\n");

}

-void ImmutableStringFieldGenerator::

+void StringFieldGenerator::

GenerateMergingCode(io::Printer* printer) const {

- if (SupportFieldPresence(descriptor_->file())) {

- // Allow a slight breach of abstraction here in order to avoid forcing

- // 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"

- " $on_changed$\n"

- "}\n");

- } else {

- printer->Print(variables_,

- "if (!other.get$capitalized_name$().isEmpty()) {\n"

- " $name$_ = other.$name$_;\n"

- " $on_changed$\n"

- "}\n");

- }

+ // Allow a slight breach of abstraction here in order to avoid forcing

+ // 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"

+ " $on_changed$\n"

+ "}\n");

}

-void ImmutableStringFieldGenerator::

+void StringFieldGenerator::

GenerateBuildingCode(io::Printer* printer) const {

- if (SupportFieldPresence(descriptor_->file())) {

- 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"

+ " $set_has_field_bit_to_local$;\n"

+ "}\n"

"result.$name$_ = $name$_;\n");

}

-void ImmutableStringFieldGenerator::

+void StringFieldGenerator::

GenerateParsingCode(io::Printer* printer) const {

- if (CheckUtf8(descriptor_)) {

- printer->Print(variables_,

- "String s = input.readStringRequireUtf8();\n"

- "$set_has_field_bit_message$\n"

- "$name$_ = s;\n");

- } else if (!HasDescriptorMethods(descriptor_->file())) {

- // Lite runtime should attempt to reduce allocations by attempting to

- // construct the string directly from the input stream buffer. This avoids

- // spurious intermediary ByteString allocations, cutting overall allocations

- // in half.

- printer->Print(variables_,

- "String s = input.readString();\n"

- "$set_has_field_bit_message$\n"

- "$name$_ = s;\n");

- } else {

- printer->Print(variables_,

- "com.google.protobuf.ByteString bs = input.readBytes();\n"

- "$set_has_field_bit_message$\n"

- "$name$_ = bs;\n");

- }

+ printer->Print(variables_,

+ "$set_has_field_bit_message$;\n"

+ "$name$_ = input.readBytes();\n");

}

-void ImmutableStringFieldGenerator::

+void StringFieldGenerator::

GenerateParsingDoneCode(io::Printer* printer) const {

// noop for strings.

}

-void ImmutableStringFieldGenerator::

+void StringFieldGenerator::

GenerateSerializationCode(io::Printer* printer) const {

printer->Print(variables_,

- "if ($is_field_present_message$) {\n"

+ "if ($get_has_field_bit_message$) {\n"

" output.writeBytes($number$, get$capitalized_name$Bytes());\n"

"}\n");

}

-void ImmutableStringFieldGenerator::

+void StringFieldGenerator::

GenerateSerializedSizeCode(io::Printer* printer) const {

printer->Print(variables_,

- "if ($is_field_present_message$) {\n"

+ "if ($get_has_field_bit_message$) {\n"

" size += com.google.protobuf.CodedOutputStream\n"

" .computeBytesSize($number$, get$capitalized_name$Bytes());\n"

"}\n");

}

-void ImmutableStringFieldGenerator::

+void StringFieldGenerator::

GenerateEqualsCode(io::Printer* printer) const {

printer->Print(variables_,

"result = result && get$capitalized_name$()\n"

" .equals(other.get$capitalized_name$());\n");

}

-void ImmutableStringFieldGenerator::

+void StringFieldGenerator::

GenerateHashCode(io::Printer* printer) const {

printer->Print(variables_,

"hash = (37 * hash) + $constant_name$;\n");

@@ -461,279 +381,39 @@ GenerateHashCode(io::Printer* printer) const {

"hash = (53 * hash) + get$capitalized_name$().hashCode();\n");

}

-string ImmutableStringFieldGenerator::GetBoxedType() const {

+string StringFieldGenerator::GetBoxedType() const {

return "java.lang.String";

}

-// ===================================================================

-ImmutableStringOneofFieldGenerator::

-ImmutableStringOneofFieldGenerator(const FieldDescriptor* descriptor,

- int messageBitIndex,

- int builderBitIndex,

- Context* context)

- : ImmutableStringFieldGenerator(

- descriptor, messageBitIndex, builderBitIndex, context) {

- const OneofGeneratorInfo* info =

- context->GetOneofGeneratorInfo(descriptor->containing_oneof());

- SetCommonOneofVariables(descriptor, info, &variables_);

-ImmutableStringOneofFieldGenerator::

-~ImmutableStringOneofFieldGenerator() {}

-void ImmutableStringOneofFieldGenerator::

-GenerateMembers(io::Printer* printer) const {

- PrintExtraFieldInfo(variables_, printer);

- if (SupportFieldPresence(descriptor_->file())) {

- WriteFieldDocComment(printer, descriptor_);

- printer->Print(variables_,

- "$deprecation$public boolean has$capitalized_name$() {\n"

- " return $has_oneof_case_message$;\n"

- "}\n");

- }

- WriteFieldDocComment(printer, descriptor_);

- printer->Print(variables_,

- "$deprecation$public java.lang.String get$capitalized_name$() {\n"

- " java.lang.Object ref $default_init$;\n"

- " if ($has_oneof_case_message$) {\n"

- " ref = $oneof_name$_;\n"

- " }\n"

- " if (ref instanceof java.lang.String) {\n"

- " return (java.lang.String) ref;\n"

- " } else {\n"

- " com.google.protobuf.ByteString bs = \n"

- " (com.google.protobuf.ByteString) ref;\n"

- " java.lang.String s = bs.toStringUtf8();\n");

- if (CheckUtf8(descriptor_)) {

- printer->Print(variables_,

- " if ($has_oneof_case_message$) {\n"

- " $oneof_name$_ = s;\n"

- " }\n");

- } else {

- printer->Print(variables_,

- " if (bs.isValidUtf8() && ($has_oneof_case_message$)) {\n"

- " $oneof_name$_ = s;\n"

- " }\n");

- }

- printer->Print(variables_,

- " return s;\n"

- " }\n"

- "}\n");

- WriteFieldDocComment(printer, descriptor_);

- printer->Print(variables_,

- "$deprecation$public com.google.protobuf.ByteString\n"

- " get$capitalized_name$Bytes() {\n"

- " java.lang.Object ref $default_init$;\n"

- " if ($has_oneof_case_message$) {\n"

- " ref = $oneof_name$_;\n"

- " }\n"

- " if (ref instanceof java.lang.String) {\n"

- " com.google.protobuf.ByteString b = \n"

- " com.google.protobuf.ByteString.copyFromUtf8(\n"

- " (java.lang.String) ref);\n"

- " if ($has_oneof_case_message$) {\n"

- " $oneof_name$_ = b;\n"

- " }\n"

- " return b;\n"

- " } else {\n"

- " return (com.google.protobuf.ByteString) ref;\n"

- " }\n"

- "}\n");

-void ImmutableStringOneofFieldGenerator::

-GenerateBuilderMembers(io::Printer* printer) const {

- if (SupportFieldPresence(descriptor_->file())) {

- WriteFieldDocComment(printer, descriptor_);

- printer->Print(variables_,

- "$deprecation$public boolean has$capitalized_name$() {\n"

- " return $has_oneof_case_message$;\n"

- "}\n");

- }

- WriteFieldDocComment(printer, descriptor_);

- printer->Print(variables_,

- "$deprecation$public java.lang.String get$capitalized_name$() {\n"

- " java.lang.Object ref $default_init$;\n"

- " if ($has_oneof_case_message$) {\n"

- " ref = $oneof_name$_;\n"

- " }\n"

- " if (!(ref instanceof java.lang.String)) {\n"

- " com.google.protobuf.ByteString bs =\n"

- " (com.google.protobuf.ByteString) ref;\n"

- " java.lang.String s = bs.toStringUtf8();\n"

- " if ($has_oneof_case_message$) {\n");

- if (CheckUtf8(descriptor_)) {

- printer->Print(variables_,

- " $oneof_name$_ = s;\n");

- } else {

- printer->Print(variables_,

- " if (bs.isValidUtf8()) {\n"

- " $oneof_name$_ = s;\n"

- " }\n");

- }

- printer->Print(variables_,

- " }\n"

- " return s;\n"

- " } else {\n"

- " return (java.lang.String) ref;\n"

- " }\n"

- "}\n");

- WriteFieldDocComment(printer, descriptor_);

- printer->Print(variables_,

- "$deprecation$public com.google.protobuf.ByteString\n"

- " get$capitalized_name$Bytes() {\n"

- " java.lang.Object ref $default_init$;\n"

- " if ($has_oneof_case_message$) {\n"

- " ref = $oneof_name$_;\n"

- " }\n"

- " if (ref instanceof String) {\n"

- " com.google.protobuf.ByteString b = \n"

- " com.google.protobuf.ByteString.copyFromUtf8(\n"

- " (java.lang.String) ref);\n"

- " if ($has_oneof_case_message$) {\n"

- " $oneof_name$_ = b;\n"

- " }\n"

- " return b;\n"

- " } else {\n"

- " return (com.google.protobuf.ByteString) ref;\n"

- " }\n"

- "}\n");

- WriteFieldDocComment(printer, descriptor_);

- printer->Print(variables_,

- "$deprecation$public Builder set$capitalized_name$(\n"

- " java.lang.String value) {\n"

- "$null_check$"

- " $set_oneof_case_message$;\n"

- " $oneof_name$_ = value;\n"

- " $on_changed$\n"

- " return this;\n"

- "}\n");

- WriteFieldDocComment(printer, descriptor_);

- printer->Print(variables_,

- "$deprecation$public Builder clear$capitalized_name$() {\n"

- " if ($has_oneof_case_message$) {\n"

- " $clear_oneof_case_message$;\n"

- " $oneof_name$_ = null;\n"

- " $on_changed$\n"

- " }\n"

- " return this;\n"

- "}\n");

- WriteFieldDocComment(printer, descriptor_);

- printer->Print(variables_,

- "$deprecation$public Builder set$capitalized_name$Bytes(\n"

- " com.google.protobuf.ByteString value) {\n"

- "$null_check$");

- if (CheckUtf8(descriptor_)) {

- printer->Print(variables_,

- " checkByteStringIsUtf8(value);\n");

- }

- printer->Print(variables_,

- " $set_oneof_case_message$;\n"

- " $oneof_name$_ = value;\n"

- " $on_changed$\n"

- " return this;\n"

- "}\n");

-void ImmutableStringOneofFieldGenerator::

-GenerateMergingCode(io::Printer* printer) const {

- // Allow a slight breach of abstraction here in order to avoid forcing

- // all string fields to Strings when copying fields from a Message.

- printer->Print(variables_,

- "$set_oneof_case_message$;\n"

- "$oneof_name$_ = other.$oneof_name$_;\n"

- "$on_changed$\n");

-void ImmutableStringOneofFieldGenerator::

-GenerateBuildingCode(io::Printer* printer) const {

- printer->Print(variables_,

- "if ($has_oneof_case_message$) {\n"

- " result.$oneof_name$_ = $oneof_name$_;\n"

- "}\n");

-void ImmutableStringOneofFieldGenerator::

-GenerateParsingCode(io::Printer* printer) const {

- if (CheckUtf8(descriptor_)) {

- printer->Print(variables_,

- "String s = input.readStringRequireUtf8();\n"

- "$set_oneof_case_message$;\n"

- "$oneof_name$_ = s;\n");

- } else if (!HasDescriptorMethods(descriptor_->file())) {

- // Lite runtime should attempt to reduce allocations by attempting to

- // construct the string directly from the input stream buffer. This avoids

- // spurious intermediary ByteString allocations, cutting overall allocations

- // in half.

- printer->Print(variables_,

- "String s = input.readString();\n"

- "$set_oneof_case_message$;\n"

- "$oneof_name$_ = s;\n");

- } else {

- printer->Print(variables_,

- "com.google.protobuf.ByteString bs = input.readBytes();\n"

- "$set_oneof_case_message$;\n"

- "$oneof_name$_ = bs;\n");

- }

-void ImmutableStringOneofFieldGenerator::

-GenerateSerializationCode(io::Printer* printer) const {

- printer->Print(variables_,

- "if ($has_oneof_case_message$) {\n"

- " output.writeBytes($number$, get$capitalized_name$Bytes());\n"

- "}\n");

-void ImmutableStringOneofFieldGenerator::

-GenerateSerializedSizeCode(io::Printer* printer) const {

- printer->Print(variables_,

- "if ($has_oneof_case_message$) {\n"

- " size += com.google.protobuf.CodedOutputStream\n"

- " .computeBytesSize($number$, get$capitalized_name$Bytes());\n"

- "}\n");

// ===================================================================

-RepeatedImmutableStringFieldGenerator::

-RepeatedImmutableStringFieldGenerator(const FieldDescriptor* descriptor,

- int messageBitIndex,

- int builderBitIndex,

- Context* context)

+RepeatedStringFieldGenerator::

+RepeatedStringFieldGenerator(const FieldDescriptor* descriptor,

+ int messageBitIndex,

+ int builderBitIndex)

: descriptor_(descriptor), messageBitIndex_(messageBitIndex),

- builderBitIndex_(builderBitIndex), context_(context),

- name_resolver_(context->GetNameResolver()) {

+ builderBitIndex_(builderBitIndex) {

SetPrimitiveVariables(descriptor, messageBitIndex, builderBitIndex,

- context->GetFieldGeneratorInfo(descriptor),

- name_resolver_, &variables_);

+ &variables_);

}

-RepeatedImmutableStringFieldGenerator::

-~RepeatedImmutableStringFieldGenerator() {}

+RepeatedStringFieldGenerator::~RepeatedStringFieldGenerator() {}

-int RepeatedImmutableStringFieldGenerator::GetNumBitsForMessage() const {

+int RepeatedStringFieldGenerator::GetNumBitsForMessage() const {

return 0;

}

-int RepeatedImmutableStringFieldGenerator::GetNumBitsForBuilder() const {

+int RepeatedStringFieldGenerator::GetNumBitsForBuilder() const {

return 1;

}

-void RepeatedImmutableStringFieldGenerator::

+void RepeatedStringFieldGenerator::

GenerateInterfaceMembers(io::Printer* printer) const {

WriteFieldDocComment(printer, descriptor_);

printer->Print(variables_,

- "$deprecation$com.google.protobuf.ProtocolStringList\n"

- " get$capitalized_name$List();\n");

+ "$deprecation$java.util.List<java.lang.String>\n"

+ "get$capitalized_name$List();\n");

WriteFieldDocComment(printer, descriptor_);

printer->Print(variables_,

"$deprecation$int get$capitalized_name$Count();\n");

@@ -747,14 +427,13 @@ GenerateInterfaceMembers(io::Printer* printer) const {

}

-void RepeatedImmutableStringFieldGenerator::

+void RepeatedStringFieldGenerator::

GenerateMembers(io::Printer* printer) const {

printer->Print(variables_,

"private com.google.protobuf.LazyStringList $name$_;\n");

- PrintExtraFieldInfo(variables_, printer);

WriteFieldDocComment(printer, descriptor_);

printer->Print(variables_,

- "$deprecation$public com.google.protobuf.ProtocolStringList\n"

+ "$deprecation$public java.util.List<java.lang.String>\n"

" get$capitalized_name$List() {\n"

" return $name$_;\n" // note: unmodifiable list

"}\n");

@@ -782,7 +461,7 @@ GenerateMembers(io::Printer* printer) const {

}

-void RepeatedImmutableStringFieldGenerator::

+void RepeatedStringFieldGenerator::

GenerateBuilderMembers(io::Printer* printer) const {

// One field is the list and the bit field keeps track of whether the

// list is immutable. If it's immutable, the invariant is that it must

@@ -810,9 +489,9 @@ GenerateBuilderMembers(io::Printer* printer) const {

// immutable.

WriteFieldDocComment(printer, descriptor_);

printer->Print(variables_,

- "$deprecation$public com.google.protobuf.ProtocolStringList\n"

+ "$deprecation$public java.util.List<java.lang.String>\n"

" get$capitalized_name$List() {\n"

- " return $name$_.getUnmodifiableView();\n"

+ " return java.util.Collections.unmodifiableList($name$_);\n"

"}\n");

WriteFieldDocComment(printer, descriptor_);

printer->Print(variables_,

@@ -855,8 +534,7 @@ GenerateBuilderMembers(io::Printer* printer) const {

"$deprecation$public Builder addAll$capitalized_name$(\n"

" java.lang.Iterable<java.lang.String> values) {\n"

" ensure$capitalized_name$IsMutable();\n"

- " com.google.protobuf.AbstractMessageLite.Builder.addAll(\n"

- " values, $name$_);\n"

+ " super.addAll(values, $name$_);\n"

" $on_changed$\n"

" return this;\n"

"}\n");

@@ -873,12 +551,7 @@ GenerateBuilderMembers(io::Printer* printer) const {

printer->Print(variables_,

"$deprecation$public Builder add$capitalized_name$Bytes(\n"

" com.google.protobuf.ByteString value) {\n"

- "$null_check$");

- if (CheckUtf8(descriptor_)) {

- printer->Print(variables_,

- " checkByteStringIsUtf8(value);\n");

- }

- printer->Print(variables_,

+ "$null_check$"

" ensure$capitalized_name$IsMutable();\n"

" $name$_.add(value);\n"

" $on_changed$\n"

@@ -886,24 +559,24 @@ GenerateBuilderMembers(io::Printer* printer) const {

"}\n");

}

-void RepeatedImmutableStringFieldGenerator::

+void RepeatedStringFieldGenerator::

GenerateFieldBuilderInitializationCode(io::Printer* printer) const {

// noop for primitives

}

-void RepeatedImmutableStringFieldGenerator::

+void RepeatedStringFieldGenerator::

GenerateInitializationCode(io::Printer* printer) const {

printer->Print(variables_, "$name$_ = $empty_list$;\n");

}

-void RepeatedImmutableStringFieldGenerator::

+void RepeatedStringFieldGenerator::

GenerateBuilderClearCode(io::Printer* printer) const {

printer->Print(variables_,

"$name$_ = $empty_list$;\n"

"$clear_mutable_bit_builder$;\n");

}

-void RepeatedImmutableStringFieldGenerator::

+void RepeatedStringFieldGenerator::

GenerateMergingCode(io::Printer* printer) const {

// The code below does two optimizations:

// 1. If the other list is empty, there's nothing to do. This ensures we

@@ -923,50 +596,31 @@ GenerateMergingCode(io::Printer* printer) const {

"}\n");

}

-void RepeatedImmutableStringFieldGenerator::

+void RepeatedStringFieldGenerator::

GenerateBuildingCode(io::Printer* printer) const {

// The code below ensures that the result has an immutable list. If our

// list is immutable, we can just reuse it. If not, we make it immutable.

printer->Print(variables_,

"if ($get_mutable_bit_builder$) {\n"

- " $name$_ = $name$_.getUnmodifiableView();\n"

+ " $name$_ = new com.google.protobuf.UnmodifiableLazyStringList(\n"

+ " $name$_);\n"

" $clear_mutable_bit_builder$;\n"

"}\n"

"result.$name$_ = $name$_;\n");

}

-void RepeatedImmutableStringFieldGenerator::

+void RepeatedStringFieldGenerator::

GenerateParsingCode(io::Printer* printer) const {

- if (CheckUtf8(descriptor_)) {

- printer->Print(variables_,

- "String s = input.readStringRequireUtf8();\n");

- } else if (!HasDescriptorMethods(descriptor_->file())) {

- // Lite runtime should attempt to reduce allocations by attempting to

- // construct the string directly from the input stream buffer. This avoids

- // spurious intermediary ByteString allocations, cutting overall allocations

- // in half.

- printer->Print(variables_,

- "String s = input.readString();\n");

- } else {

- printer->Print(variables_,

- "com.google.protobuf.ByteString bs = input.readBytes();\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_) || !HasDescriptorMethods(descriptor_->file())) {

- printer->Print(variables_,

- "$name$_.add(s);\n");

- } else {

- printer->Print(variables_,

- "$name$_.add(bs);\n");

- }

+ "}\n"

+ "$name$_.add(input.readBytes());\n");

}

-void RepeatedImmutableStringFieldGenerator::

+void RepeatedStringFieldGenerator::

GenerateParsingCodeFromPacked(io::Printer* printer) const {

printer->Print(variables_,

"int length = input.readRawVarint32();\n"

@@ -975,30 +629,21 @@ GenerateParsingCodeFromPacked(io::Printer* printer) const {

" $name$_ = new com.google.protobuf.LazyStringArrayList();\n"

" $set_mutable_bit_parser$;\n"

"}\n"

- "while (input.getBytesUntilLimit() > 0) {\n");

- if (CheckUtf8(descriptor_)) {

- printer->Print(variables_,

- " String s = input.readStringRequireUtf8();\n");

- } else {

- printer->Print(variables_,

- " String s = input.readString();\n");

- }

- printer->Print(variables_,

- " $name$.add(s);\n");

- printer->Print(variables_,

+ "while (input.getBytesUntilLimit() > 0) {\n"

+ " $name$.add(input.read$capitalized_type$());\n"

"}\n"

"input.popLimit(limit);\n");

}

-void RepeatedImmutableStringFieldGenerator::

+void RepeatedStringFieldGenerator::

GenerateParsingDoneCode(io::Printer* printer) const {

printer->Print(variables_,

"if ($get_mutable_bit_parser$) {\n"

- " $name$_ = $name$_.getUnmodifiableView();\n"

+ " $name$_ = new com.google.protobuf.UnmodifiableLazyStringList($name$_);\n"

"}\n");

}

-void RepeatedImmutableStringFieldGenerator::

+void RepeatedStringFieldGenerator::

GenerateSerializationCode(io::Printer* printer) const {

if (descriptor_->options().packed()) {

printer->Print(variables_,

@@ -1017,7 +662,7 @@ GenerateSerializationCode(io::Printer* printer) const {

}

-void RepeatedImmutableStringFieldGenerator::

+void RepeatedStringFieldGenerator::

GenerateSerializedSizeCode(io::Printer* printer) const {

printer->Print(variables_,

"{\n"

@@ -1055,14 +700,14 @@ GenerateSerializedSizeCode(io::Printer* printer) const {

printer->Print("}\n");

}

-void RepeatedImmutableStringFieldGenerator::

+void RepeatedStringFieldGenerator::

GenerateEqualsCode(io::Printer* printer) const {

printer->Print(variables_,

"result = result && get$capitalized_name$List()\n"

" .equals(other.get$capitalized_name$List());\n");

}

-void RepeatedImmutableStringFieldGenerator::

+void RepeatedStringFieldGenerator::

GenerateHashCode(io::Printer* printer) const {

printer->Print(variables_,

"if (get$capitalized_name$Count() > 0) {\n"

@@ -1071,7 +716,7 @@ GenerateHashCode(io::Printer* printer) const {

"}\n");

}

-string RepeatedImmutableStringFieldGenerator::GetBoxedType() const {

+string RepeatedStringFieldGenerator::GetBoxedType() const {

return "String";

}