Restoring authorship annotation for Ruslan Kovalev <[email protected]>. Commit 2 of 2.

1 files changed, 769 insertions, 769 deletions

diff --git a/contrib/libs/protoc/src/google/protobuf/compiler/java/java_message.cc b/contrib/libs/protoc/src/google/protobuf/compiler/java/java_message.cc
index a2d6fc0a4ae..029d886cdef 100644
--- a/contrib/libs/protoc/src/google/protobuf/compiler/java/java_message.cc
+++ b/contrib/libs/protoc/src/google/protobuf/compiler/java/java_message.cc
@@ -1,45 +1,45 @@
-// Protocol Buffers - Google's data interchange format 
-// Copyright 2008 Google Inc.  All rights reserved. 
-// https://developers.google.com/protocol-buffers/ 
-// 
-// Redistribution and use in source and binary forms, with or without 
-// modification, are permitted provided that the following conditions are 
-// met: 
-// 
-//     * Redistributions of source code must retain the above copyright 
-// notice, this list of conditions and the following disclaimer. 
-//     * Redistributions in binary form must reproduce the above 
-// copyright notice, this list of conditions and the following disclaimer 
-// in the documentation and/or other materials provided with the 
-// distribution. 
-//     * Neither the name of Google Inc. nor the names of its 
-// contributors may be used to endorse or promote products derived from 
-// this software without specific prior written permission. 
-// 
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS 
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT 
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR 
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT 
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, 
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT 
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, 
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY 
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE 
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
- 
-// Author: [email protected] (Kenton Varda) 
-//  Based on original Protocol Buffers design by 
-//  Sanjay Ghemawat, Jeff Dean, and others. 
- 
+// Protocol Buffers - Google's data interchange format
+// Copyright 2008 Google Inc.  All rights reserved.
+// https://developers.google.com/protocol-buffers/
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//     * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//     * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//     * Neither the name of Google Inc. nor the names of its
+// contributors may be used to endorse or promote products derived from
+// this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+// Author: [email protected] (Kenton Varda)
+//  Based on original Protocol Buffers design by
+//  Sanjay Ghemawat, Jeff Dean, and others.
+
 #include <google/protobuf/compiler/java/java_message.h>
- 
-#include <algorithm> 
+
+#include <algorithm>
 #include <cstdint>
-#include <map> 
-#include <memory> 
-#include <vector> 
- 
+#include <map>
+#include <memory>
+#include <vector>
+
 #include <google/protobuf/compiler/java/java_context.h>
 #include <google/protobuf/compiler/java/java_doc_comment.h>
 #include <google/protobuf/compiler/java/java_enum.h>
@@ -55,27 +55,27 @@
 #include <google/protobuf/wire_format.h>
 #include <google/protobuf/stubs/strutil.h>
 #include <google/protobuf/stubs/substitute.h>
- 
-namespace google { 
-namespace protobuf { 
-namespace compiler { 
-namespace java { 
- 
-using internal::WireFormat; 
-using internal::WireFormatLite; 
- 
-namespace { 
+
+namespace google {
+namespace protobuf {
+namespace compiler {
+namespace java {
+
+using internal::WireFormat;
+using internal::WireFormatLite;
+
+namespace {
 TProtoStringType MapValueImmutableClassdName(const Descriptor* descriptor,
                                         ClassNameResolver* name_resolver) {
-  const FieldDescriptor* value_field = descriptor->FindFieldByName("value"); 
-  GOOGLE_CHECK_EQ(FieldDescriptor::TYPE_MESSAGE, value_field->type()); 
-  return name_resolver->GetImmutableClassName(value_field->message_type()); 
-} 
-}  // namespace 
- 
-// =================================================================== 
- 
-MessageGenerator::MessageGenerator(const Descriptor* descriptor) 
+  const FieldDescriptor* value_field = descriptor->FindFieldByName("value");
+  GOOGLE_CHECK_EQ(FieldDescriptor::TYPE_MESSAGE, value_field->type());
+  return name_resolver->GetImmutableClassName(value_field->message_type());
+}
+}  // namespace
+
+// ===================================================================
+
+MessageGenerator::MessageGenerator(const Descriptor* descriptor)
     : descriptor_(descriptor) {
   for (int i = 0; i < descriptor_->field_count(); i++) {
     if (IsRealOneof(descriptor_->field(i))) {
@@ -83,53 +83,53 @@ MessageGenerator::MessageGenerator(const Descriptor* descriptor)
     }
   }
 }
- 
-MessageGenerator::~MessageGenerator() {} 
- 
-// =================================================================== 
-ImmutableMessageGenerator::ImmutableMessageGenerator( 
-    const Descriptor* descriptor, Context* context) 
+
+MessageGenerator::~MessageGenerator() {}
+
+// ===================================================================
+ImmutableMessageGenerator::ImmutableMessageGenerator(
+    const Descriptor* descriptor, Context* context)
     : MessageGenerator(descriptor),
       context_(context),
       name_resolver_(context->GetNameResolver()),
       field_generators_(descriptor, context_) {
-  GOOGLE_CHECK(HasDescriptorMethods(descriptor->file(), context->EnforceLite())) 
-      << "Generator factory error: A non-lite message generator is used to " 
-         "generate lite messages."; 
-} 
- 
-ImmutableMessageGenerator::~ImmutableMessageGenerator() {} 
- 
-void ImmutableMessageGenerator::GenerateStaticVariables( 
-    io::Printer* printer, int* bytecode_estimate) { 
-  // Because descriptor.proto (com.google.protobuf.DescriptorProtos) is 
-  // used in the construction of descriptors, we have a tricky bootstrapping 
-  // problem.  To help control static initialization order, we make sure all 
-  // descriptors and other static data that depends on them are members of 
-  // the outermost class in the file.  This way, they will be initialized in 
-  // a deterministic order. 
- 
+  GOOGLE_CHECK(HasDescriptorMethods(descriptor->file(), context->EnforceLite()))
+      << "Generator factory error: A non-lite message generator is used to "
+         "generate lite messages.";
+}
+
+ImmutableMessageGenerator::~ImmutableMessageGenerator() {}
+
+void ImmutableMessageGenerator::GenerateStaticVariables(
+    io::Printer* printer, int* bytecode_estimate) {
+  // Because descriptor.proto (com.google.protobuf.DescriptorProtos) is
+  // used in the construction of descriptors, we have a tricky bootstrapping
+  // problem.  To help control static initialization order, we make sure all
+  // descriptors and other static data that depends on them are members of
+  // the outermost class in the file.  This way, they will be initialized in
+  // a deterministic order.
+
   std::map<TProtoStringType, TProtoStringType> vars;
-  vars["identifier"] = UniqueFileScopeIdentifier(descriptor_); 
+  vars["identifier"] = UniqueFileScopeIdentifier(descriptor_);
   vars["index"] = StrCat(descriptor_->index());
-  vars["classname"] = name_resolver_->GetImmutableClassName(descriptor_); 
-  if (descriptor_->containing_type() != NULL) { 
+  vars["classname"] = name_resolver_->GetImmutableClassName(descriptor_);
+  if (descriptor_->containing_type() != NULL) {
     vars["parent"] = UniqueFileScopeIdentifier(descriptor_->containing_type());
-  } 
-  if (MultipleJavaFiles(descriptor_->file(), /* immutable = */ true)) { 
-    // We can only make these package-private since the classes that use them 
-    // are in separate files. 
-    vars["private"] = ""; 
-  } else { 
-    vars["private"] = "private "; 
-  } 
-  if (*bytecode_estimate <= kMaxStaticSize) { 
-    vars["final"] = "final "; 
-  } else { 
-    vars["final"] = ""; 
-  } 
- 
-  // The descriptor for this type. 
+  }
+  if (MultipleJavaFiles(descriptor_->file(), /* immutable = */ true)) {
+    // We can only make these package-private since the classes that use them
+    // are in separate files.
+    vars["private"] = "";
+  } else {
+    vars["private"] = "private ";
+  }
+  if (*bytecode_estimate <= kMaxStaticSize) {
+    vars["final"] = "final ";
+  } else {
+    vars["final"] = "";
+  }
+
+  // The descriptor for this type.
   printer->Print(
       vars,
       // TODO(teboring): final needs to be added back. The way to fix it is to
@@ -137,94 +137,94 @@ void ImmutableMessageGenerator::GenerateStaticVariables(
       // the types, and then init them in clinit with the new method calls.
       "$private$static $final$com.google.protobuf.Descriptors.Descriptor\n"
       "  internal_$identifier$_descriptor;\n");
-  *bytecode_estimate += 30; 
- 
-  // And the FieldAccessorTable. 
-  GenerateFieldAccessorTable(printer, bytecode_estimate); 
- 
-  // Generate static members for all nested types. 
-  for (int i = 0; i < descriptor_->nested_type_count(); i++) { 
-    // TODO(kenton):  Reuse MessageGenerator objects? 
-    ImmutableMessageGenerator(descriptor_->nested_type(i), context_) 
-        .GenerateStaticVariables(printer, bytecode_estimate); 
-  } 
-} 
- 
-int ImmutableMessageGenerator::GenerateStaticVariableInitializers( 
-    io::Printer* printer) { 
-  int bytecode_estimate = 0; 
+  *bytecode_estimate += 30;
+
+  // And the FieldAccessorTable.
+  GenerateFieldAccessorTable(printer, bytecode_estimate);
+
+  // Generate static members for all nested types.
+  for (int i = 0; i < descriptor_->nested_type_count(); i++) {
+    // TODO(kenton):  Reuse MessageGenerator objects?
+    ImmutableMessageGenerator(descriptor_->nested_type(i), context_)
+        .GenerateStaticVariables(printer, bytecode_estimate);
+  }
+}
+
+int ImmutableMessageGenerator::GenerateStaticVariableInitializers(
+    io::Printer* printer) {
+  int bytecode_estimate = 0;
   std::map<TProtoStringType, TProtoStringType> vars;
-  vars["identifier"] = UniqueFileScopeIdentifier(descriptor_); 
+  vars["identifier"] = UniqueFileScopeIdentifier(descriptor_);
   vars["index"] = StrCat(descriptor_->index());
-  vars["classname"] = name_resolver_->GetImmutableClassName(descriptor_); 
-  if (descriptor_->containing_type() != NULL) { 
+  vars["classname"] = name_resolver_->GetImmutableClassName(descriptor_);
+  if (descriptor_->containing_type() != NULL) {
     vars["parent"] = UniqueFileScopeIdentifier(descriptor_->containing_type());
-  } 
- 
-  // The descriptor for this type. 
-  if (descriptor_->containing_type() == NULL) { 
-    printer->Print(vars, 
+  }
+
+  // The descriptor for this type.
+  if (descriptor_->containing_type() == NULL) {
+    printer->Print(vars,
                    "internal_$identifier$_descriptor =\n"
                    "  getDescriptor().getMessageTypes().get($index$);\n");
-    bytecode_estimate += 30; 
-  } else { 
+    bytecode_estimate += 30;
+  } else {
     printer->Print(
         vars,
         "internal_$identifier$_descriptor =\n"
         "  internal_$parent$_descriptor.getNestedTypes().get($index$);\n");
-    bytecode_estimate += 30; 
-  } 
- 
-  // And the FieldAccessorTable. 
-  bytecode_estimate += GenerateFieldAccessorTableInitializer(printer); 
- 
-  // Generate static member initializers for all nested types. 
-  for (int i = 0; i < descriptor_->nested_type_count(); i++) { 
-    // TODO(kenton):  Reuse MessageGenerator objects? 
-    bytecode_estimate += 
-        ImmutableMessageGenerator(descriptor_->nested_type(i), context_) 
-            .GenerateStaticVariableInitializers(printer); 
-  } 
-  return bytecode_estimate; 
-} 
- 
+    bytecode_estimate += 30;
+  }
+
+  // And the FieldAccessorTable.
+  bytecode_estimate += GenerateFieldAccessorTableInitializer(printer);
+
+  // Generate static member initializers for all nested types.
+  for (int i = 0; i < descriptor_->nested_type_count(); i++) {
+    // TODO(kenton):  Reuse MessageGenerator objects?
+    bytecode_estimate +=
+        ImmutableMessageGenerator(descriptor_->nested_type(i), context_)
+            .GenerateStaticVariableInitializers(printer);
+  }
+  return bytecode_estimate;
+}
+
 void ImmutableMessageGenerator::GenerateFieldAccessorTable(
     io::Printer* printer, int* bytecode_estimate) {
   std::map<TProtoStringType, TProtoStringType> vars;
-  vars["identifier"] = UniqueFileScopeIdentifier(descriptor_); 
-  if (MultipleJavaFiles(descriptor_->file(), /* immutable = */ true)) { 
-    // We can only make these package-private since the classes that use them 
-    // are in separate files. 
-    vars["private"] = ""; 
-  } else { 
-    vars["private"] = "private "; 
-  } 
-  if (*bytecode_estimate <= kMaxStaticSize) { 
-    vars["final"] = "final "; 
-  } else { 
-    vars["final"] = ""; 
-  } 
-  vars["ver"] = GeneratedCodeVersionSuffix(); 
+  vars["identifier"] = UniqueFileScopeIdentifier(descriptor_);
+  if (MultipleJavaFiles(descriptor_->file(), /* immutable = */ true)) {
+    // We can only make these package-private since the classes that use them
+    // are in separate files.
+    vars["private"] = "";
+  } else {
+    vars["private"] = "private ";
+  }
+  if (*bytecode_estimate <= kMaxStaticSize) {
+    vars["final"] = "final ";
+  } else {
+    vars["final"] = "";
+  }
+  vars["ver"] = GeneratedCodeVersionSuffix();
   printer->Print(
       vars,
       "$private$static $final$\n"
       "  com.google.protobuf.GeneratedMessage$ver$.FieldAccessorTable\n"
       "    internal_$identifier$_fieldAccessorTable;\n");
- 
+
   // The following bytecode_estimate calculation logic must stay in sync with
   // the similar logic in the GenerateFieldAccessorTableInitializer method below
   // to make sure that the generated static final fields are initialized  in the
   // static initialization block directly.
   //
-  // 6 bytes per field and oneof 
+  // 6 bytes per field and oneof
   *bytecode_estimate +=
       10 + 6 * descriptor_->field_count() + 6 * descriptor_->oneof_decl_count();
-} 
- 
+}
+
 int ImmutableMessageGenerator::GenerateFieldAccessorTableInitializer(
     io::Printer* printer) {
-  int bytecode_estimate = 10; 
-  printer->Print( 
+  int bytecode_estimate = 10;
+  printer->Print(
       "internal_$identifier$_fieldAccessorTable = new\n"
       "  com.google.protobuf.GeneratedMessage$ver$.FieldAccessorTable(\n"
       "    internal_$identifier$_descriptor,\n"
@@ -235,52 +235,52 @@ int ImmutableMessageGenerator::GenerateFieldAccessorTableInitializer(
   // sync with the similar logic in the GenerateFieldAccessorTable method
   // above. See the corresponding comment in GenerateFieldAccessorTable for
   // details.
-  for (int i = 0; i < descriptor_->field_count(); i++) { 
-    const FieldDescriptor* field = descriptor_->field(i); 
-    const FieldGeneratorInfo* info = context_->GetFieldGeneratorInfo(field); 
-    bytecode_estimate += 6; 
+  for (int i = 0; i < descriptor_->field_count(); i++) {
+    const FieldDescriptor* field = descriptor_->field(i);
+    const FieldGeneratorInfo* info = context_->GetFieldGeneratorInfo(field);
+    bytecode_estimate += 6;
     printer->Print("\"$field_name$\", ", "field_name", info->capitalized_name);
-  } 
+  }
   // We reproduce synthetic oneofs here since proto reflection needs these.
-  for (int i = 0; i < descriptor_->oneof_decl_count(); i++) { 
-    const OneofDescriptor* oneof = descriptor_->oneof_decl(i); 
-    const OneofGeneratorInfo* info = context_->GetOneofGeneratorInfo(oneof); 
-    bytecode_estimate += 6; 
+  for (int i = 0; i < descriptor_->oneof_decl_count(); i++) {
+    const OneofDescriptor* oneof = descriptor_->oneof_decl(i);
+    const OneofGeneratorInfo* info = context_->GetOneofGeneratorInfo(oneof);
+    bytecode_estimate += 6;
     printer->Print("\"$oneof_name$\", ", "oneof_name", info->capitalized_name);
-  } 
-  printer->Print("});\n"); 
-  return bytecode_estimate; 
-} 
- 
-// =================================================================== 
- 
-void ImmutableMessageGenerator::GenerateInterface(io::Printer* printer) { 
-  MaybePrintGeneratedAnnotation(context_, printer, descriptor_, 
-                                /* immutable = */ true, "OrBuilder"); 
-  if (descriptor_->extension_range_count() > 0) { 
-    printer->Print( 
+  }
+  printer->Print("});\n");
+  return bytecode_estimate;
+}
+
+// ===================================================================
+
+void ImmutableMessageGenerator::GenerateInterface(io::Printer* printer) {
+  MaybePrintGeneratedAnnotation(context_, printer, descriptor_,
+                                /* immutable = */ true, "OrBuilder");
+  if (descriptor_->extension_range_count() > 0) {
+    printer->Print(
         "$deprecation$public interface ${$$classname$OrBuilder$}$ extends\n"
-        "    $extra_interfaces$\n" 
-        "    com.google.protobuf.GeneratedMessage$ver$.\n" 
-        "        ExtendableMessageOrBuilder<$classname$> {\n", 
+        "    $extra_interfaces$\n"
+        "    com.google.protobuf.GeneratedMessage$ver$.\n"
+        "        ExtendableMessageOrBuilder<$classname$> {\n",
         "deprecation",
         descriptor_->options().deprecated() ? "@java.lang.Deprecated " : "",
-        "extra_interfaces", ExtraMessageOrBuilderInterfaces(descriptor_), 
+        "extra_interfaces", ExtraMessageOrBuilderInterfaces(descriptor_),
         "classname", descriptor_->name(), "{", "", "}", "", "ver",
         GeneratedCodeVersionSuffix());
-  } else { 
-    printer->Print( 
+  } else {
+    printer->Print(
         "$deprecation$public interface ${$$classname$OrBuilder$}$ extends\n"
-        "    $extra_interfaces$\n" 
-        "    com.google.protobuf.MessageOrBuilder {\n", 
+        "    $extra_interfaces$\n"
+        "    com.google.protobuf.MessageOrBuilder {\n",
         "deprecation",
         descriptor_->options().deprecated() ? "@java.lang.Deprecated " : "",
-        "extra_interfaces", ExtraMessageOrBuilderInterfaces(descriptor_), 
+        "extra_interfaces", ExtraMessageOrBuilderInterfaces(descriptor_),
         "classname", descriptor_->name(), "{", "", "}", "");
-  } 
+  }
   printer->Annotate("{", "}", descriptor_);
- 
-  printer->Indent(); 
+
+  printer->Indent();
   for (int i = 0; i < descriptor_->field_count(); i++) {
     printer->Print("\n");
     field_generators_.get(descriptor_->field(i))
@@ -295,79 +295,79 @@ void ImmutableMessageGenerator::GenerateInterface(io::Printer* printer) {
         context_->GetOneofGeneratorInfo(oneof)->capitalized_name, "classname",
         context_->GetNameResolver()->GetImmutableClassName(descriptor_));
   }
-  printer->Outdent(); 
- 
-  printer->Print("}\n"); 
-} 
- 
-// =================================================================== 
- 
-void ImmutableMessageGenerator::Generate(io::Printer* printer) { 
-  bool is_own_file = IsOwnFile(descriptor_, /* immutable = */ true); 
- 
+  printer->Outdent();
+
+  printer->Print("}\n");
+}
+
+// ===================================================================
+
+void ImmutableMessageGenerator::Generate(io::Printer* printer) {
+  bool is_own_file = IsOwnFile(descriptor_, /* immutable = */ true);
+
   std::map<TProtoStringType, TProtoStringType> variables;
   variables["static"] = is_own_file ? "" : "static ";
-  variables["classname"] = descriptor_->name(); 
-  variables["extra_interfaces"] = ExtraMessageInterfaces(descriptor_); 
-  variables["ver"] = GeneratedCodeVersionSuffix(); 
+  variables["classname"] = descriptor_->name();
+  variables["extra_interfaces"] = ExtraMessageInterfaces(descriptor_);
+  variables["ver"] = GeneratedCodeVersionSuffix();
   variables["deprecation"] =
       descriptor_->options().deprecated() ? "@java.lang.Deprecated " : "";
- 
-  WriteMessageDocComment(printer, descriptor_); 
-  MaybePrintGeneratedAnnotation(context_, printer, descriptor_, 
-                                /* immutable = */ true); 
- 
-  // The builder_type stores the super type name of the nested Builder class. 
+
+  WriteMessageDocComment(printer, descriptor_);
+  MaybePrintGeneratedAnnotation(context_, printer, descriptor_,
+                                /* immutable = */ true);
+
+  // The builder_type stores the super type name of the nested Builder class.
   TProtoStringType builder_type;
-  if (descriptor_->extension_range_count() > 0) { 
+  if (descriptor_->extension_range_count() > 0) {
     printer->Print(
         variables,
         "$deprecation$public $static$final class $classname$ extends\n");
-    printer->Annotate("classname", descriptor_); 
-    printer->Print( 
-        variables, 
-        "    com.google.protobuf.GeneratedMessage$ver$.ExtendableMessage<\n" 
-        "      $classname$> implements\n" 
-        "    $extra_interfaces$\n" 
-        "    $classname$OrBuilder {\n"); 
-    builder_type = strings::Substitute( 
-        "com.google.protobuf.GeneratedMessage$1.ExtendableBuilder<$0, ?>", 
-        name_resolver_->GetImmutableClassName(descriptor_), 
-        GeneratedCodeVersionSuffix()); 
-  } else { 
+    printer->Annotate("classname", descriptor_);
+    printer->Print(
+        variables,
+        "    com.google.protobuf.GeneratedMessage$ver$.ExtendableMessage<\n"
+        "      $classname$> implements\n"
+        "    $extra_interfaces$\n"
+        "    $classname$OrBuilder {\n");
+    builder_type = strings::Substitute(
+        "com.google.protobuf.GeneratedMessage$1.ExtendableBuilder<$0, ?>",
+        name_resolver_->GetImmutableClassName(descriptor_),
+        GeneratedCodeVersionSuffix());
+  } else {
     printer->Print(
         variables,
         "$deprecation$public $static$final class $classname$ extends\n");
-    printer->Annotate("classname", descriptor_); 
-    printer->Print(variables, 
+    printer->Annotate("classname", descriptor_);
+    printer->Print(variables,
                    "    com.google.protobuf.GeneratedMessage$ver$ implements\n"
                    "    $extra_interfaces$\n"
                    "    $classname$OrBuilder {\n");
     builder_type =
         strings::Substitute("com.google.protobuf.GeneratedMessage$0.Builder<?>",
                          GeneratedCodeVersionSuffix());
-  } 
+  }
   printer->Print("private static final long serialVersionUID = 0L;\n");
 
-  printer->Indent(); 
-  // Using builder_type, instead of Builder, prevents the Builder class from 
-  // being loaded into PermGen space when the default instance is created. 
-  // This optimizes the PermGen space usage for clients that do not modify 
-  // messages. 
-  printer->Print( 
+  printer->Indent();
+  // Using builder_type, instead of Builder, prevents the Builder class from
+  // being loaded into PermGen space when the default instance is created.
+  // This optimizes the PermGen space usage for clients that do not modify
+  // messages.
+  printer->Print(
       "// Use $classname$.newBuilder() to construct.\n"
       "private $classname$($buildertype$ builder) {\n"
       "  super(builder);\n"
       "}\n",
       "classname", descriptor_->name(), "buildertype", builder_type);
   printer->Print("private $classname$() {\n", "classname", descriptor_->name());
-  printer->Indent(); 
-  GenerateInitializers(printer); 
-  printer->Outdent(); 
-  printer->Print( 
+  printer->Indent();
+  GenerateInitializers(printer);
+  printer->Outdent();
+  printer->Print(
       "}\n"
       "\n");
- 
+
   printer->Print(variables,
                  "@java.lang.Override\n"
                  "@SuppressWarnings({\"unused\"})\n"
@@ -377,57 +377,57 @@ void ImmutableMessageGenerator::Generate(io::Printer* printer) {
                  "}\n"
                  "\n");
 
-  printer->Print( 
+  printer->Print(
       "@java.lang.Override\n"
       "public final com.google.protobuf.UnknownFieldSet\n"
       "getUnknownFields() {\n"
       "  return this.unknownFields;\n"
       "}\n");
- 
-  if (context_->HasGeneratedMethods(descriptor_)) { 
-    GenerateParsingConstructor(printer); 
-  } 
- 
-  GenerateDescriptorMethods(printer); 
- 
-  // Nested types 
-  for (int i = 0; i < descriptor_->enum_type_count(); i++) { 
+
+  if (context_->HasGeneratedMethods(descriptor_)) {
+    GenerateParsingConstructor(printer);
+  }
+
+  GenerateDescriptorMethods(printer);
+
+  // Nested types
+  for (int i = 0; i < descriptor_->enum_type_count(); i++) {
     EnumGenerator(descriptor_->enum_type(i), true, context_).Generate(printer);
-  } 
- 
-  for (int i = 0; i < descriptor_->nested_type_count(); i++) { 
-    // Don't generate Java classes for map entry messages. 
-    if (IsMapEntry(descriptor_->nested_type(i))) continue; 
+  }
+
+  for (int i = 0; i < descriptor_->nested_type_count(); i++) {
+    // Don't generate Java classes for map entry messages.
+    if (IsMapEntry(descriptor_->nested_type(i))) continue;
     ImmutableMessageGenerator messageGenerator(descriptor_->nested_type(i),
                                                context_);
-    messageGenerator.GenerateInterface(printer); 
-    messageGenerator.Generate(printer); 
-  } 
- 
+    messageGenerator.GenerateInterface(printer);
+    messageGenerator.Generate(printer);
+  }
+
   // Integers for bit fields.
   int totalBits = 0;
   for (int i = 0; i < descriptor_->field_count(); i++) {
     totalBits +=
         field_generators_.get(descriptor_->field(i)).GetNumBitsForMessage();
-  } 
+  }
   int totalInts = (totalBits + 31) / 32;
   for (int i = 0; i < totalInts; i++) {
     printer->Print("private int $bit_field_name$;\n", "bit_field_name",
                    GetBitFieldName(i));
   }
- 
-  // oneof 
+
+  // oneof
   std::map<TProtoStringType, TProtoStringType> vars;
   for (auto oneof : oneofs_) {
     vars["oneof_name"] = context_->GetOneofGeneratorInfo(oneof)->name;
     vars["oneof_capitalized_name"] =
         context_->GetOneofGeneratorInfo(oneof)->capitalized_name;
     vars["oneof_index"] = StrCat((oneof)->index());
-    // oneofCase_ and oneof_ 
-    printer->Print(vars, 
+    // oneofCase_ and oneof_
+    printer->Print(vars,
                    "private int $oneof_name$Case_ = 0;\n"
                    "private java.lang.Object $oneof_name$_;\n");
-    // OneofCase enum 
+    // OneofCase enum
     printer->Print(
         vars,
         "public enum $oneof_capitalized_name$Case\n"
@@ -435,15 +435,15 @@ void ImmutableMessageGenerator::Generate(io::Printer* printer) {
         // 3.x users
         "    implements com.google.protobuf.Internal.EnumLite,\n"
         "        com.google.protobuf.AbstractMessage.InternalOneOfEnum {\n");
-    printer->Indent(); 
+    printer->Indent();
     for (int j = 0; j < (oneof)->field_count(); j++) {
       const FieldDescriptor* field = (oneof)->field(j);
-      printer->Print( 
+      printer->Print(
           "$deprecation$$field_name$($field_number$),\n", "deprecation",
           field->options().deprecated() ? "@java.lang.Deprecated " : "",
           "field_name", ToUpper(field->name()), "field_number",
           StrCat(field->number()));
-    } 
+    }
     printer->Print("$cap_oneof_name$_NOT_SET(0);\n", "cap_oneof_name",
                    ToUpper(vars["oneof_name"]));
     printer->Print(vars,
@@ -451,7 +451,7 @@ void ImmutableMessageGenerator::Generate(io::Printer* printer) {
                    "private $oneof_capitalized_name$Case(int value) {\n"
                    "  this.value = value;\n"
                    "}\n");
-    printer->Print( 
+    printer->Print(
         vars,
         "/**\n"
         " * @param value The number of the enum to look for.\n"
@@ -470,8 +470,8 @@ void ImmutableMessageGenerator::Generate(io::Printer* printer) {
       printer->Print("    case $field_number$: return $field_name$;\n",
                      "field_number", StrCat(field->number()),
                      "field_name", ToUpper(field->name()));
-    } 
-    printer->Print( 
+    }
+    printer->Print(
         "    case 0: return $cap_oneof_name$_NOT_SET;\n"
         "    default: return null;\n"
         "  }\n"
@@ -480,66 +480,66 @@ void ImmutableMessageGenerator::Generate(io::Printer* printer) {
         "  return this.value;\n"
         "}\n",
         "cap_oneof_name", ToUpper(vars["oneof_name"]));
-    printer->Outdent(); 
-    printer->Print("};\n\n"); 
-    // oneofCase() 
-    printer->Print(vars, 
+    printer->Outdent();
+    printer->Print("};\n\n");
+    // oneofCase()
+    printer->Print(vars,
                    "public $oneof_capitalized_name$Case\n"
                    "get$oneof_capitalized_name$Case() {\n"
                    "  return $oneof_capitalized_name$Case.forNumber(\n"
                    "      $oneof_name$Case_);\n"
                    "}\n"
                    "\n");
-  } 
- 
-  if (IsAnyMessage(descriptor_)) { 
-    GenerateAnyMethods(printer); 
-  } 
- 
-  // Fields 
-  for (int i = 0; i < descriptor_->field_count(); i++) { 
-    printer->Print("public static final int $constant_name$ = $number$;\n", 
+  }
+
+  if (IsAnyMessage(descriptor_)) {
+    GenerateAnyMethods(printer);
+  }
+
+  // Fields
+  for (int i = 0; i < descriptor_->field_count(); i++) {
+    printer->Print("public static final int $constant_name$ = $number$;\n",
                    "constant_name", FieldConstantName(descriptor_->field(i)),
                    "number", StrCat(descriptor_->field(i)->number()));
     printer->Annotate("constant_name", descriptor_->field(i));
-    field_generators_.get(descriptor_->field(i)).GenerateMembers(printer); 
-    printer->Print("\n"); 
-  } 
- 
-  if (context_->HasGeneratedMethods(descriptor_)) { 
-    GenerateIsInitialized(printer); 
-    GenerateMessageSerializationMethods(printer); 
-    GenerateEqualsAndHashCode(printer); 
-  } 
- 
- 
-  GenerateParseFromMethods(printer); 
-  GenerateBuilder(printer); 
- 
-  printer->Print( 
+    field_generators_.get(descriptor_->field(i)).GenerateMembers(printer);
+    printer->Print("\n");
+  }
+
+  if (context_->HasGeneratedMethods(descriptor_)) {
+    GenerateIsInitialized(printer);
+    GenerateMessageSerializationMethods(printer);
+    GenerateEqualsAndHashCode(printer);
+  }
+
+
+  GenerateParseFromMethods(printer);
+  GenerateBuilder(printer);
+
+  printer->Print(
       "\n"
       "// @@protoc_insertion_point(class_scope:$full_name$)\n",
       "full_name", descriptor_->full_name());
- 
-  // Carefully initialize the default instance in such a way that it doesn't 
-  // conflict with other initialization. 
+
+  // Carefully initialize the default instance in such a way that it doesn't
+  // conflict with other initialization.
   printer->Print("private static final $classname$ DEFAULT_INSTANCE;\n",
                  "classname",
                  name_resolver_->GetImmutableClassName(descriptor_));
-  printer->Print( 
+  printer->Print(
       "static {\n"
       "  DEFAULT_INSTANCE = new $classname$();\n"
       "}\n"
       "\n",
       "classname", name_resolver_->GetImmutableClassName(descriptor_));
- 
-  printer->Print( 
-      "public static $classname$ getDefaultInstance() {\n" 
-      "  return DEFAULT_INSTANCE;\n" 
-      "}\n" 
-      "\n", 
-      "classname", name_resolver_->GetImmutableClassName(descriptor_)); 
- 
+
+  printer->Print(
+      "public static $classname$ getDefaultInstance() {\n"
+      "  return DEFAULT_INSTANCE;\n"
+      "}\n"
+      "\n",
+      "classname", name_resolver_->GetImmutableClassName(descriptor_));
+
   // 'of' method for Wrappers
   if (IsWrappersProtoFile(descriptor_->file())) {
     printer->Print(
@@ -551,98 +551,98 @@ void ImmutableMessageGenerator::Generate(io::Printer* printer) {
         "field_type", PrimitiveTypeName(GetJavaType(descriptor_->field(0))));
   }
 
-  GenerateParser(printer); 
- 
-  printer->Print( 
+  GenerateParser(printer);
+
+  printer->Print(
       "@java.lang.Override\n"
       "public $classname$ getDefaultInstanceForType() {\n"
       "  return DEFAULT_INSTANCE;\n"
       "}\n"
       "\n",
       "classname", name_resolver_->GetImmutableClassName(descriptor_));
- 
-  // Extensions must be declared after the DEFAULT_INSTANCE is initialized 
-  // because the DEFAULT_INSTANCE is used by the extension to lazily retrieve 
-  // the outer class's FileDescriptor. 
-  for (int i = 0; i < descriptor_->extension_count(); i++) { 
-    ImmutableExtensionGenerator(descriptor_->extension(i), context_) 
-        .Generate(printer); 
-  } 
- 
-  printer->Outdent(); 
-  printer->Print("}\n\n"); 
-} 
- 
-// =================================================================== 
- 
+
+  // Extensions must be declared after the DEFAULT_INSTANCE is initialized
+  // because the DEFAULT_INSTANCE is used by the extension to lazily retrieve
+  // the outer class's FileDescriptor.
+  for (int i = 0; i < descriptor_->extension_count(); i++) {
+    ImmutableExtensionGenerator(descriptor_->extension(i), context_)
+        .Generate(printer);
+  }
+
+  printer->Outdent();
+  printer->Print("}\n\n");
+}
+
+// ===================================================================
+
 void ImmutableMessageGenerator::GenerateMessageSerializationMethods(
     io::Printer* printer) {
   std::unique_ptr<const FieldDescriptor*[]> sorted_fields(
-      SortFieldsByNumber(descriptor_)); 
- 
+      SortFieldsByNumber(descriptor_));
+
   std::vector<const Descriptor::ExtensionRange*> sorted_extensions;
   sorted_extensions.reserve(descriptor_->extension_range_count());
-  for (int i = 0; i < descriptor_->extension_range_count(); ++i) { 
-    sorted_extensions.push_back(descriptor_->extension_range(i)); 
-  } 
-  std::sort(sorted_extensions.begin(), sorted_extensions.end(), 
-            ExtensionRangeOrdering()); 
-  printer->Print( 
+  for (int i = 0; i < descriptor_->extension_range_count(); ++i) {
+    sorted_extensions.push_back(descriptor_->extension_range(i));
+  }
+  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(); 
+  printer->Indent();
 
-  if (HasPackedFields(descriptor_)) { 
-    // writeTo(CodedOutputStream output) might be invoked without 
-    // getSerializedSize() ever being called, but we need the memoized 
+  if (HasPackedFields(descriptor_)) {
+    // writeTo(CodedOutputStream output) might be invoked without
+    // getSerializedSize() ever being called, but we need the memoized
     // sizes in case this message has packed fields. Rather than emit checks
     // for each packed field, just call getSerializedSize() up front. In most
     // cases, getSerializedSize() will have already been called anyway by one
     // of the wrapper writeTo() methods, making this call cheap.
     printer->Print("getSerializedSize();\n");
-  } 
- 
-  if (descriptor_->extension_range_count() > 0) { 
-    if (descriptor_->options().message_set_wire_format()) { 
-      printer->Print( 
+  }
+
+  if (descriptor_->extension_range_count() > 0) {
+    if (descriptor_->options().message_set_wire_format()) {
+      printer->Print(
           "com.google.protobuf.GeneratedMessage$ver$\n"
           "  .ExtendableMessage<$classname$>.ExtensionWriter\n"
           "    extensionWriter = newMessageSetExtensionWriter();\n",
           "classname", name_resolver_->GetImmutableClassName(descriptor_),
           "ver", GeneratedCodeVersionSuffix());
-    } else { 
-      printer->Print( 
+    } else {
+      printer->Print(
           "com.google.protobuf.GeneratedMessage$ver$\n"
           "  .ExtendableMessage<$classname$>.ExtensionWriter\n"
           "    extensionWriter = newExtensionWriter();\n",
           "classname", name_resolver_->GetImmutableClassName(descriptor_),
           "ver", GeneratedCodeVersionSuffix());
-    } 
-  } 
- 
-  // Merge the fields and the extension ranges, both sorted by field number. 
-  for (int i = 0, j = 0; 
+    }
+  }
+
+  // Merge the fields and the extension ranges, both sorted by field number.
+  for (int i = 0, j = 0;
        i < descriptor_->field_count() || j < sorted_extensions.size();) {
-    if (i == descriptor_->field_count()) { 
-      GenerateSerializeOneExtensionRange(printer, sorted_extensions[j++]); 
-    } else if (j == sorted_extensions.size()) { 
-      GenerateSerializeOneField(printer, sorted_fields[i++]); 
-    } else if (sorted_fields[i]->number() < sorted_extensions[j]->start) { 
-      GenerateSerializeOneField(printer, sorted_fields[i++]); 
-    } else { 
-      GenerateSerializeOneExtensionRange(printer, sorted_extensions[j++]); 
-    } 
-  } 
- 
+    if (i == descriptor_->field_count()) {
+      GenerateSerializeOneExtensionRange(printer, sorted_extensions[j++]);
+    } else if (j == sorted_extensions.size()) {
+      GenerateSerializeOneField(printer, sorted_fields[i++]);
+    } else if (sorted_fields[i]->number() < sorted_extensions[j]->start) {
+      GenerateSerializeOneField(printer, sorted_fields[i++]);
+    } else {
+      GenerateSerializeOneExtensionRange(printer, sorted_extensions[j++]);
+    }
+  }
+
   if (descriptor_->options().message_set_wire_format()) {
     printer->Print("unknownFields.writeAsMessageSetTo(output);\n");
   } else {
     printer->Print("unknownFields.writeTo(output);\n");
-  } 
- 
-  printer->Outdent(); 
-  printer->Print( 
+  }
+
+  printer->Outdent();
+  printer->Print(
       "}\n"
       "\n"
       "@java.lang.Override\n"
@@ -650,43 +650,43 @@ void ImmutableMessageGenerator::GenerateMessageSerializationMethods(
       "  int size = memoizedSize;\n"
       "  if (size != -1) return size;\n"
       "\n");
-  printer->Indent(); 
- 
+  printer->Indent();
+
   printer->Print("size = 0;\n");
 
-  for (int i = 0; i < descriptor_->field_count(); i++) { 
-    field_generators_.get(sorted_fields[i]).GenerateSerializedSizeCode(printer); 
-  } 
- 
-  if (descriptor_->extension_range_count() > 0) { 
-    if (descriptor_->options().message_set_wire_format()) { 
+  for (int i = 0; i < descriptor_->field_count(); i++) {
+    field_generators_.get(sorted_fields[i]).GenerateSerializedSizeCode(printer);
+  }
+
+  if (descriptor_->extension_range_count() > 0) {
+    if (descriptor_->options().message_set_wire_format()) {
       printer->Print("size += extensionsSerializedSizeAsMessageSet();\n");
-    } else { 
+    } else {
       printer->Print("size += extensionsSerializedSize();\n");
-    } 
-  } 
- 
+    }
+  }
+
   if (descriptor_->options().message_set_wire_format()) {
     printer->Print("size += unknownFields.getSerializedSizeAsMessageSet();\n");
   } else {
     printer->Print("size += unknownFields.getSerializedSize();\n");
-  } 
- 
+  }
+
   printer->Print(
       "memoizedSize = size;\n"
       "return size;\n");
 
-  printer->Outdent(); 
-  printer->Print( 
+  printer->Outdent();
+  printer->Print(
       "}\n"
       "\n");
-} 
- 
+}
+
 void ImmutableMessageGenerator::GenerateParseFromMethods(io::Printer* printer) {
-  // Note:  These are separate from GenerateMessageSerializationMethods() 
-  //   because they need to be generated even for messages that are optimized 
-  //   for code size. 
-  printer->Print( 
+  // Note:  These are separate from GenerateMessageSerializationMethods()
+  //   because they need to be generated even for messages that are optimized
+  //   for code size.
+  printer->Print(
       "public static $classname$ parseFrom(\n"
       "    java.nio.ByteBuffer data)\n"
       "    throws com.google.protobuf.InvalidProtocolBufferException {\n"
@@ -761,28 +761,28 @@ void ImmutableMessageGenerator::GenerateParseFromMethods(io::Printer* printer) {
       "\n",
       "classname", name_resolver_->GetImmutableClassName(descriptor_), "ver",
       GeneratedCodeVersionSuffix());
-} 
- 
-void ImmutableMessageGenerator::GenerateSerializeOneField( 
-    io::Printer* printer, const FieldDescriptor* field) { 
-  field_generators_.get(field).GenerateSerializationCode(printer); 
-} 
- 
-void ImmutableMessageGenerator::GenerateSerializeOneExtensionRange( 
-    io::Printer* printer, const Descriptor::ExtensionRange* range) { 
+}
+
+void ImmutableMessageGenerator::GenerateSerializeOneField(
+    io::Printer* printer, const FieldDescriptor* field) {
+  field_generators_.get(field).GenerateSerializationCode(printer);
+}
+
+void ImmutableMessageGenerator::GenerateSerializeOneExtensionRange(
+    io::Printer* printer, const Descriptor::ExtensionRange* range) {
   printer->Print("extensionWriter.writeUntil($end$, output);\n", "end",
                  StrCat(range->end));
-} 
- 
-// =================================================================== 
- 
-void ImmutableMessageGenerator::GenerateBuilder(io::Printer* printer) { 
-  // LITE_RUNTIME implements this at the GeneratedMessageLite level. 
-  printer->Print( 
+}
+
+// ===================================================================
+
+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( 
+
+  printer->Print(
       "public static Builder newBuilder() {\n"
       "  return DEFAULT_INSTANCE.toBuilder();\n"
       "}\n"
@@ -796,8 +796,8 @@ void ImmutableMessageGenerator::GenerateBuilder(io::Printer* printer) {
       "}\n"
       "\n",
       "classname", name_resolver_->GetImmutableClassName(descriptor_));
- 
-  printer->Print( 
+
+  printer->Print(
       "@java.lang.Override\n"
       "protected Builder newBuilderForType(\n"
       "    com.google.protobuf.GeneratedMessage$ver$.BuilderParent parent) {\n"
@@ -805,15 +805,15 @@ void ImmutableMessageGenerator::GenerateBuilder(io::Printer* printer) {
       "  return builder;\n"
       "}\n",
       "ver", GeneratedCodeVersionSuffix());
- 
-  MessageBuilderGenerator builderGenerator(descriptor_, context_); 
-  builderGenerator.Generate(printer); 
-} 
- 
+
+  MessageBuilderGenerator builderGenerator(descriptor_, context_);
+  builderGenerator.Generate(printer);
+}
+
 void ImmutableMessageGenerator::GenerateDescriptorMethods(
     io::Printer* printer) {
-  if (!descriptor_->options().no_standard_descriptor_accessor()) { 
-    printer->Print( 
+  if (!descriptor_->options().no_standard_descriptor_accessor()) {
+    printer->Print(
         "public static final com.google.protobuf.Descriptors.Descriptor\n"
         "    getDescriptor() {\n"
         "  return $fileclass$.internal_$identifier$_descriptor;\n"
@@ -821,44 +821,44 @@ void ImmutableMessageGenerator::GenerateDescriptorMethods(
         "\n",
         "fileclass", name_resolver_->GetImmutableClassName(descriptor_->file()),
         "identifier", UniqueFileScopeIdentifier(descriptor_));
-  } 
+  }
   std::vector<const FieldDescriptor*> map_fields;
-  for (int i = 0; i < descriptor_->field_count(); i++) { 
-    const FieldDescriptor* field = descriptor_->field(i); 
-    if (GetJavaType(field) == JAVATYPE_MESSAGE && 
-        IsMapEntry(field->message_type())) { 
-      map_fields.push_back(field); 
-    } 
-  } 
-  if (!map_fields.empty()) { 
-    printer->Print( 
+  for (int i = 0; i < descriptor_->field_count(); i++) {
+    const FieldDescriptor* field = descriptor_->field(i);
+    if (GetJavaType(field) == JAVATYPE_MESSAGE &&
+        IsMapEntry(field->message_type())) {
+      map_fields.push_back(field);
+    }
+  }
+  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");
-    printer->Indent(); 
-    printer->Indent(); 
-    for (int i = 0; i < map_fields.size(); ++i) { 
-      const FieldDescriptor* field = map_fields[i]; 
-      const FieldGeneratorInfo* info = context_->GetFieldGeneratorInfo(field); 
-      printer->Print( 
+    printer->Indent();
+    printer->Indent();
+    for (int i = 0; i < map_fields.size(); ++i) {
+      const FieldDescriptor* field = map_fields[i];
+      const FieldGeneratorInfo* info = context_->GetFieldGeneratorInfo(field);
+      printer->Print(
           "case $number$:\n"
           "  return internalGet$capitalized_name$();\n",
           "number", StrCat(field->number()), "capitalized_name",
           info->capitalized_name);
-    } 
-    printer->Print( 
-        "default:\n" 
-        "  throw new RuntimeException(\n" 
-        "      \"Invalid map field number: \" + number);\n"); 
-    printer->Outdent(); 
-    printer->Outdent(); 
-    printer->Print( 
-        "  }\n" 
-        "}\n"); 
-  } 
-  printer->Print( 
+    }
+    printer->Print(
+        "default:\n"
+        "  throw new RuntimeException(\n"
+        "      \"Invalid map field number: \" + number);\n");
+    printer->Outdent();
+    printer->Outdent();
+    printer->Print(
+        "  }\n"
+        "}\n");
+  }
+  printer->Print(
       "@java.lang.Override\n"
       "protected com.google.protobuf.GeneratedMessage$ver$.FieldAccessorTable\n"
       "    internalGetFieldAccessorTable() {\n"
@@ -871,53 +871,53 @@ void ImmutableMessageGenerator::GenerateDescriptorMethods(
       "fileclass", name_resolver_->GetImmutableClassName(descriptor_->file()),
       "identifier", UniqueFileScopeIdentifier(descriptor_), "ver",
       GeneratedCodeVersionSuffix());
-} 
- 
-// =================================================================== 
- 
+}
+
+// ===================================================================
+
 void ImmutableMessageGenerator::GenerateIsInitialized(io::Printer* printer) {
-  // Memoizes whether the protocol buffer is fully initialized (has all 
-  // required fields). -1 means not yet computed. 0 means false and 1 means 
-  // true. 
+  // Memoizes whether the protocol buffer is fully initialized (has all
+  // required fields). -1 means not yet computed. 0 means false and 1 means
+  // true.
   printer->Print("private byte memoizedIsInitialized = -1;\n");
-  printer->Print( 
+  printer->Print(
       "@java.lang.Override\n"
       "public final boolean isInitialized() {\n");
-  printer->Indent(); 
- 
-  // Don't directly compare to -1 to avoid an Android x86 JIT bug. 
-  printer->Print( 
+  printer->Indent();
+
+  // Don't directly compare to -1 to avoid an Android x86 JIT bug.
+  printer->Print(
       "byte isInitialized = memoizedIsInitialized;\n"
       "if (isInitialized == 1) return true;\n"
       "if (isInitialized == 0) return false;\n"
       "\n");
- 
-  // Check that all required fields in this message are set. 
-  // TODO(kenton):  We can optimize this when we switch to putting all the 
-  //   "has" fields into a single bitfield. 
-  for (int i = 0; i < descriptor_->field_count(); i++) { 
-    const FieldDescriptor* field = descriptor_->field(i); 
-    const FieldGeneratorInfo* info = context_->GetFieldGeneratorInfo(field); 
- 
-    if (field->is_required()) { 
-      printer->Print( 
+
+  // Check that all required fields in this message are set.
+  // TODO(kenton):  We can optimize this when we switch to putting all the
+  //   "has" fields into a single bitfield.
+  for (int i = 0; i < descriptor_->field_count(); i++) {
+    const FieldDescriptor* field = descriptor_->field(i);
+    const FieldGeneratorInfo* info = context_->GetFieldGeneratorInfo(field);
+
+    if (field->is_required()) {
+      printer->Print(
           "if (!has$name$()) {\n"
           "  memoizedIsInitialized = 0;\n"
           "  return false;\n"
           "}\n",
           "name", info->capitalized_name);
-    } 
-  } 
- 
-  // Now check that all embedded messages are initialized. 
-  for (int i = 0; i < descriptor_->field_count(); i++) { 
-    const FieldDescriptor* field = descriptor_->field(i); 
-    const FieldGeneratorInfo* info = context_->GetFieldGeneratorInfo(field); 
-    if (GetJavaType(field) == JAVATYPE_MESSAGE && 
-        HasRequiredFields(field->message_type())) { 
-      switch (field->label()) { 
-        case FieldDescriptor::LABEL_REQUIRED: 
-          printer->Print( 
+    }
+  }
+
+  // Now check that all embedded messages are initialized.
+  for (int i = 0; i < descriptor_->field_count(); i++) {
+    const FieldDescriptor* field = descriptor_->field(i);
+    const FieldGeneratorInfo* info = context_->GetFieldGeneratorInfo(field);
+    if (GetJavaType(field) == JAVATYPE_MESSAGE &&
+        HasRequiredFields(field->message_type())) {
+      switch (field->label()) {
+        case FieldDescriptor::LABEL_REQUIRED:
+          printer->Print(
               "if (!get$name$().isInitialized()) {\n"
               "  memoizedIsInitialized = 0;\n"
               "  return false;\n"
@@ -925,16 +925,16 @@ void ImmutableMessageGenerator::GenerateIsInitialized(io::Printer* printer) {
               "type",
               name_resolver_->GetImmutableClassName(field->message_type()),
               "name", info->capitalized_name);
-          break; 
-        case FieldDescriptor::LABEL_OPTIONAL: 
-          printer->Print( 
+          break;
+        case FieldDescriptor::LABEL_OPTIONAL:
+          printer->Print(
               "if (has$name$()) {\n"
               "  if (!get$name$().isInitialized()) {\n"
-              "    memoizedIsInitialized = 0;\n" 
-              "    return false;\n" 
-              "  }\n" 
-              "}\n", 
-              "name", info->capitalized_name); 
+              "    memoizedIsInitialized = 0;\n"
+              "    return false;\n"
+              "  }\n"
+              "}\n",
+              "name", info->capitalized_name);
           break;
         case FieldDescriptor::LABEL_REPEATED:
           if (IsMapEntry(field->message_type())) {
@@ -949,8 +949,8 @@ void ImmutableMessageGenerator::GenerateIsInitialized(io::Printer* printer) {
                 MapValueImmutableClassdName(field->message_type(),
                                             name_resolver_),
                 "name", info->capitalized_name);
-          } else { 
-            printer->Print( 
+          } else {
+            printer->Print(
                 "for (int i = 0; i < get$name$Count(); i++) {\n"
                 "  if (!get$name$(i).isInitialized()) {\n"
                 "    memoizedIsInitialized = 0;\n"
@@ -960,52 +960,52 @@ void ImmutableMessageGenerator::GenerateIsInitialized(io::Printer* printer) {
                 "type",
                 name_resolver_->GetImmutableClassName(field->message_type()),
                 "name", info->capitalized_name);
-          } 
-          break; 
-      } 
-    } 
-  } 
- 
-  if (descriptor_->extension_range_count() > 0) { 
-    printer->Print( 
+          }
+          break;
+      }
+    }
+  }
+
+  if (descriptor_->extension_range_count() > 0) {
+    printer->Print(
         "if (!extensionsAreInitialized()) {\n"
         "  memoizedIsInitialized = 0;\n"
         "  return false;\n"
         "}\n");
-  } 
- 
-  printer->Outdent(); 
- 
+  }
+
+  printer->Outdent();
+
   printer->Print("  memoizedIsInitialized = 1;\n");
- 
-  printer->Print( 
+
+  printer->Print(
       "  return true;\n"
       "}\n"
       "\n");
-} 
- 
-// =================================================================== 
- 
-namespace { 
-bool CheckHasBitsForEqualsAndHashCode(const FieldDescriptor* field) { 
-  if (field->is_repeated()) { 
-    return false; 
-  } 
+}
+
+// ===================================================================
+
+namespace {
+bool CheckHasBitsForEqualsAndHashCode(const FieldDescriptor* field) {
+  if (field->is_repeated()) {
+    return false;
+  }
   if (HasHasbit(field)) {
-    return true; 
-  } 
+    return true;
+  }
   return GetJavaType(field) == JAVATYPE_MESSAGE && !IsRealOneof(field);
-} 
-}  // namespace 
- 
+}
+}  // namespace
+
 void ImmutableMessageGenerator::GenerateEqualsAndHashCode(
     io::Printer* printer) {
-  printer->Print( 
+  printer->Print(
       "@java.lang.Override\n"
       "public boolean equals(");
   printer->Print("final java.lang.Object obj) {\n");
-  printer->Indent(); 
-  printer->Print( 
+  printer->Indent();
+  printer->Print(
       "if (obj == this) {\n"
       " return true;\n"
       "}\n"
@@ -1015,246 +1015,246 @@ void ImmutableMessageGenerator::GenerateEqualsAndHashCode(
       "$classname$ other = ($classname$) obj;\n"
       "\n",
       "classname", name_resolver_->GetImmutableClassName(descriptor_));
- 
-  for (int i = 0; i < descriptor_->field_count(); i++) { 
-    const FieldDescriptor* field = descriptor_->field(i); 
+
+  for (int i = 0; i < descriptor_->field_count(); i++) {
+    const FieldDescriptor* field = descriptor_->field(i);
     if (!IsRealOneof(field)) {
-      const FieldGeneratorInfo* info = context_->GetFieldGeneratorInfo(field); 
-      bool check_has_bits = CheckHasBitsForEqualsAndHashCode(field); 
-      if (check_has_bits) { 
-        printer->Print( 
+      const FieldGeneratorInfo* info = context_->GetFieldGeneratorInfo(field);
+      bool check_has_bits = CheckHasBitsForEqualsAndHashCode(field);
+      if (check_has_bits) {
+        printer->Print(
             "if (has$name$() != other.has$name$()) return false;\n"
             "if (has$name$()) {\n",
             "name", info->capitalized_name);
-        printer->Indent(); 
-      } 
-      field_generators_.get(field).GenerateEqualsCode(printer); 
-      if (check_has_bits) { 
-        printer->Outdent(); 
+        printer->Indent();
+      }
+      field_generators_.get(field).GenerateEqualsCode(printer);
+      if (check_has_bits) {
+        printer->Outdent();
         printer->Print("}\n");
-      } 
-    } 
-  } 
- 
-  // Compare oneofs. 
+      }
+    }
+  }
+
+  // Compare oneofs.
   for (auto oneof : oneofs_) {
-    printer->Print( 
+    printer->Print(
         "if (!get$oneof_capitalized_name$Case().equals("
         "other.get$oneof_capitalized_name$Case())) return false;\n",
         "oneof_capitalized_name",
         context_->GetOneofGeneratorInfo(oneof)->capitalized_name);
     printer->Print("switch ($oneof_name$Case_) {\n", "oneof_name",
                    context_->GetOneofGeneratorInfo(oneof)->name);
-    printer->Indent(); 
+    printer->Indent();
     for (int j = 0; j < (oneof)->field_count(); j++) {
       const FieldDescriptor* field = (oneof)->field(j);
       printer->Print("case $field_number$:\n", "field_number",
                      StrCat(field->number()));
-      printer->Indent(); 
-      field_generators_.get(field).GenerateEqualsCode(printer); 
-      printer->Print("break;\n"); 
-      printer->Outdent(); 
-    } 
-    printer->Print( 
+      printer->Indent();
+      field_generators_.get(field).GenerateEqualsCode(printer);
+      printer->Print("break;\n");
+      printer->Outdent();
+    }
+    printer->Print(
         "case 0:\n"
         "default:\n");
-    printer->Outdent(); 
-    printer->Print("}\n"); 
-  } 
- 
+    printer->Outdent();
+    printer->Print("}\n");
+  }
+
   // Always consider unknown fields for equality. This will sometimes return
   // false for non-canonical ordering when running in LITE_RUNTIME but it's
   // the best we can do.
   printer->Print(
       "if (!unknownFields.equals(other.unknownFields)) return false;\n");
-  if (descriptor_->extension_range_count() > 0) { 
-    printer->Print( 
+  if (descriptor_->extension_range_count() > 0) {
+    printer->Print(
         "if (!getExtensionFields().equals(other.getExtensionFields()))\n"
         "  return false;\n");
-  } 
+  }
   printer->Print("return true;\n");
-  printer->Outdent(); 
-  printer->Print( 
+  printer->Outdent();
+  printer->Print(
       "}\n"
       "\n");
- 
-  printer->Print( 
+
+  printer->Print(
       "@java.lang.Override\n"
       "public int hashCode() {\n");
-  printer->Indent(); 
+  printer->Indent();
   printer->Print("if (memoizedHashCode != 0) {\n");
-  printer->Indent(); 
+  printer->Indent();
   printer->Print("return memoizedHashCode;\n");
-  printer->Outdent(); 
-  printer->Print( 
+  printer->Outdent();
+  printer->Print(
       "}\n"
       "int hash = 41;\n");
- 
+
   // If we output a getDescriptor() method, use that as it is more efficient.
   if (descriptor_->options().no_standard_descriptor_accessor()) {
     printer->Print("hash = (19 * hash) + getDescriptorForType().hashCode();\n");
   } else {
     printer->Print("hash = (19 * hash) + getDescriptor().hashCode();\n");
   }
- 
-  // hashCode non-oneofs. 
-  for (int i = 0; i < descriptor_->field_count(); i++) { 
-    const FieldDescriptor* field = descriptor_->field(i); 
+
+  // hashCode non-oneofs.
+  for (int i = 0; i < descriptor_->field_count(); i++) {
+    const FieldDescriptor* field = descriptor_->field(i);
     if (!IsRealOneof(field)) {
-      const FieldGeneratorInfo* info = context_->GetFieldGeneratorInfo(field); 
-      bool check_has_bits = CheckHasBitsForEqualsAndHashCode(field); 
-      if (check_has_bits) { 
+      const FieldGeneratorInfo* info = context_->GetFieldGeneratorInfo(field);
+      bool check_has_bits = CheckHasBitsForEqualsAndHashCode(field);
+      if (check_has_bits) {
         printer->Print("if (has$name$()) {\n", "name", info->capitalized_name);
-        printer->Indent(); 
-      } 
-      field_generators_.get(field).GenerateHashCode(printer); 
-      if (check_has_bits) { 
-        printer->Outdent(); 
-        printer->Print("}\n"); 
-      } 
-    } 
-  } 
- 
-  // hashCode oneofs. 
+        printer->Indent();
+      }
+      field_generators_.get(field).GenerateHashCode(printer);
+      if (check_has_bits) {
+        printer->Outdent();
+        printer->Print("}\n");
+      }
+    }
+  }
+
+  // hashCode oneofs.
   for (auto oneof : oneofs_) {
     printer->Print("switch ($oneof_name$Case_) {\n", "oneof_name",
                    context_->GetOneofGeneratorInfo(oneof)->name);
-    printer->Indent(); 
+    printer->Indent();
     for (int j = 0; j < (oneof)->field_count(); j++) {
       const FieldDescriptor* field = (oneof)->field(j);
       printer->Print("case $field_number$:\n", "field_number",
                      StrCat(field->number()));
-      printer->Indent(); 
-      field_generators_.get(field).GenerateHashCode(printer); 
-      printer->Print("break;\n"); 
-      printer->Outdent(); 
-    } 
-    printer->Print( 
+      printer->Indent();
+      field_generators_.get(field).GenerateHashCode(printer);
+      printer->Print("break;\n");
+      printer->Outdent();
+    }
+    printer->Print(
         "case 0:\n"
         "default:\n");
-    printer->Outdent(); 
-    printer->Print("}\n"); 
-  } 
- 
-  if (descriptor_->extension_range_count() > 0) { 
+    printer->Outdent();
+    printer->Print("}\n");
+  }
+
+  if (descriptor_->extension_range_count() > 0) {
     printer->Print("hash = hashFields(hash, getExtensionFields());\n");
-  } 
- 
+  }
+
   printer->Print("hash = (29 * hash) + unknownFields.hashCode();\n");
-  printer->Print( 
+  printer->Print(
       "memoizedHashCode = hash;\n"
       "return hash;\n");
-  printer->Outdent(); 
-  printer->Print( 
+  printer->Outdent();
+  printer->Print(
       "}\n"
       "\n");
-} 
- 
-// =================================================================== 
- 
+}
+
+// ===================================================================
+
 void ImmutableMessageGenerator::GenerateExtensionRegistrationCode(
     io::Printer* printer) {
-  for (int i = 0; i < descriptor_->extension_count(); i++) { 
-    ImmutableExtensionGenerator(descriptor_->extension(i), context_) 
+  for (int i = 0; i < descriptor_->extension_count(); i++) {
+    ImmutableExtensionGenerator(descriptor_->extension(i), context_)
         .GenerateRegistrationCode(printer);
-  } 
- 
-  for (int i = 0; i < descriptor_->nested_type_count(); i++) { 
-    ImmutableMessageGenerator(descriptor_->nested_type(i), context_) 
+  }
+
+  for (int i = 0; i < descriptor_->nested_type_count(); i++) {
+    ImmutableMessageGenerator(descriptor_->nested_type(i), context_)
         .GenerateExtensionRegistrationCode(printer);
-  } 
-} 
- 
-// =================================================================== 
+  }
+}
+
+// ===================================================================
 void ImmutableMessageGenerator::GenerateParsingConstructor(
     io::Printer* printer) {
   std::unique_ptr<const FieldDescriptor*[]> sorted_fields(
-      SortFieldsByNumber(descriptor_)); 
- 
-  printer->Print( 
-      "private $classname$(\n" 
-      "    com.google.protobuf.CodedInputStream input,\n" 
-      "    com.google.protobuf.ExtensionRegistryLite extensionRegistry)\n" 
-      "    throws com.google.protobuf.InvalidProtocolBufferException {\n", 
-      "classname", descriptor_->name()); 
-  printer->Indent(); 
- 
-  // Initialize all fields to default. 
-  printer->Print( 
+      SortFieldsByNumber(descriptor_));
+
+  printer->Print(
+      "private $classname$(\n"
+      "    com.google.protobuf.CodedInputStream input,\n"
+      "    com.google.protobuf.ExtensionRegistryLite extensionRegistry)\n"
+      "    throws com.google.protobuf.InvalidProtocolBufferException {\n",
+      "classname", descriptor_->name());
+  printer->Indent();
+
+  // Initialize all fields to default.
+  printer->Print(
       "this();\n"
       "if (extensionRegistry == null) {\n"
       "  throw new java.lang.NullPointerException();\n"
       "}\n");
- 
-  // Use builder bits to track mutable repeated fields. 
-  int totalBuilderBits = 0; 
-  for (int i = 0; i < descriptor_->field_count(); i++) { 
-    const ImmutableFieldGenerator& field = 
-        field_generators_.get(descriptor_->field(i)); 
-    totalBuilderBits += field.GetNumBitsForBuilder(); 
-  } 
-  int totalBuilderInts = (totalBuilderBits + 31) / 32; 
-  for (int i = 0; i < totalBuilderInts; i++) { 
+
+  // Use builder bits to track mutable repeated fields.
+  int totalBuilderBits = 0;
+  for (int i = 0; i < descriptor_->field_count(); i++) {
+    const ImmutableFieldGenerator& field =
+        field_generators_.get(descriptor_->field(i));
+    totalBuilderBits += field.GetNumBitsForBuilder();
+  }
+  int totalBuilderInts = (totalBuilderBits + 31) / 32;
+  for (int i = 0; i < totalBuilderInts; i++) {
     printer->Print("int mutable_$bit_field_name$ = 0;\n", "bit_field_name",
                    GetBitFieldName(i));
-  } 
- 
+  }
+
   printer->Print(
-      "com.google.protobuf.UnknownFieldSet.Builder unknownFields =\n" 
-      "    com.google.protobuf.UnknownFieldSet.newBuilder();\n"); 
- 
+      "com.google.protobuf.UnknownFieldSet.Builder unknownFields =\n"
+      "    com.google.protobuf.UnknownFieldSet.newBuilder();\n");
+
   printer->Print("try {\n");
-  printer->Indent(); 
- 
-  printer->Print( 
+  printer->Indent();
+
+  printer->Print(
       "boolean done = false;\n"
       "while (!done) {\n");
-  printer->Indent(); 
- 
-  printer->Print( 
+  printer->Indent();
+
+  printer->Print(
       "int tag = input.readTag();\n"
       "switch (tag) {\n");
-  printer->Indent(); 
- 
-  printer->Print( 
+  printer->Indent();
+
+  printer->Print(
       "case 0:\n"  // zero signals EOF / limit reached
       "  done = true;\n"
       "  break;\n");
- 
-  for (int i = 0; i < descriptor_->field_count(); i++) { 
-    const FieldDescriptor* field = sorted_fields[i]; 
+
+  for (int i = 0; i < descriptor_->field_count(); i++) {
+    const FieldDescriptor* field = sorted_fields[i];
     uint32_t tag = WireFormatLite::MakeTag(
         field->number(), WireFormat::WireTypeForFieldType(field->type()));
- 
+
     printer->Print("case $tag$: {\n", "tag",
                    StrCat(static_cast<int32_t>(tag)));
-    printer->Indent(); 
- 
-    field_generators_.get(field).GenerateParsingCode(printer); 
- 
-    printer->Outdent(); 
-    printer->Print( 
+    printer->Indent();
+
+    field_generators_.get(field).GenerateParsingCode(printer);
+
+    printer->Outdent();
+    printer->Print(
         "  break;\n"
         "}\n");
- 
-    if (field->is_packable()) { 
-      // To make packed = true wire compatible, we generate parsing code from a 
-      // packed version of this field regardless of field->options().packed(). 
+
+    if (field->is_packable()) {
+      // To make packed = true wire compatible, we generate parsing code from a
+      // packed version of this field regardless of field->options().packed().
       uint32_t packed_tag = WireFormatLite::MakeTag(
           field->number(), WireFormatLite::WIRETYPE_LENGTH_DELIMITED);
       printer->Print("case $tag$: {\n", "tag",
                      StrCat(static_cast<int32_t>(packed_tag)));
-      printer->Indent(); 
- 
-      field_generators_.get(field).GenerateParsingCodeFromPacked(printer); 
- 
-      printer->Outdent(); 
-      printer->Print( 
+      printer->Indent();
+
+      field_generators_.get(field).GenerateParsingCodeFromPacked(printer);
+
+      printer->Outdent();
+      printer->Print(
           "  break;\n"
           "}\n");
-    } 
-  } 
- 
+    }
+  }
+
   printer->Print(
       "default: {\n"
       "  if (!parseUnknownField(\n"
@@ -1264,109 +1264,109 @@ void ImmutableMessageGenerator::GenerateParsingConstructor(
       "  break;\n"
       "}\n");
 
-  printer->Outdent(); 
-  printer->Outdent(); 
-  printer->Print( 
+  printer->Outdent();
+  printer->Outdent();
+  printer->Print(
       "  }\n"  // switch (tag)
       "}\n");  // while (!done)
- 
-  printer->Outdent(); 
-  printer->Print( 
-      "} catch (com.google.protobuf.InvalidProtocolBufferException e) {\n" 
-      "  throw e.setUnfinishedMessage(this);\n" 
-      "} catch (java.io.IOException e) {\n" 
-      "  throw new com.google.protobuf.InvalidProtocolBufferException(\n" 
-      "      e).setUnfinishedMessage(this);\n" 
-      "} finally {\n"); 
-  printer->Indent(); 
- 
-  // Make repeated field list immutable. 
-  for (int i = 0; i < descriptor_->field_count(); i++) { 
-    const FieldDescriptor* field = sorted_fields[i]; 
-    field_generators_.get(field).GenerateParsingDoneCode(printer); 
-  } 
- 
+
+  printer->Outdent();
+  printer->Print(
+      "} catch (com.google.protobuf.InvalidProtocolBufferException e) {\n"
+      "  throw e.setUnfinishedMessage(this);\n"
+      "} catch (java.io.IOException e) {\n"
+      "  throw new com.google.protobuf.InvalidProtocolBufferException(\n"
+      "      e).setUnfinishedMessage(this);\n"
+      "} finally {\n");
+  printer->Indent();
+
+  // Make repeated field list immutable.
+  for (int i = 0; i < descriptor_->field_count(); i++) {
+    const FieldDescriptor* field = sorted_fields[i];
+    field_generators_.get(field).GenerateParsingDoneCode(printer);
+  }
+
   // Make unknown fields immutable.
   printer->Print("this.unknownFields = unknownFields.build();\n");
- 
-  // Make extensions immutable. 
+
+  // Make extensions immutable.
   printer->Print("makeExtensionsImmutable();\n");
- 
-  printer->Outdent(); 
-  printer->Outdent(); 
-  printer->Print( 
+
+  printer->Outdent();
+  printer->Outdent();
+  printer->Print(
       "  }\n"  // finally
-      "}\n"); 
-} 
- 
-// =================================================================== 
-void ImmutableMessageGenerator::GenerateParser(io::Printer* printer) { 
-  printer->Print( 
-      "$visibility$ static final com.google.protobuf.Parser<$classname$>\n" 
-      "    PARSER = new com.google.protobuf.AbstractParser<$classname$>() {\n", 
-      "visibility", 
-      ExposePublicParser(descriptor_->file()) ? "@java.lang.Deprecated public" 
-                                              : "private", 
-      "classname", descriptor_->name()); 
-  printer->Indent(); 
-  printer->Print( 
+      "}\n");
+}
+
+// ===================================================================
+void ImmutableMessageGenerator::GenerateParser(io::Printer* printer) {
+  printer->Print(
+      "$visibility$ static final com.google.protobuf.Parser<$classname$>\n"
+      "    PARSER = new com.google.protobuf.AbstractParser<$classname$>() {\n",
+      "visibility",
+      ExposePublicParser(descriptor_->file()) ? "@java.lang.Deprecated public"
+                                              : "private",
+      "classname", descriptor_->name());
+  printer->Indent();
+  printer->Print(
       "@java.lang.Override\n"
-      "public $classname$ parsePartialFrom(\n" 
-      "    com.google.protobuf.CodedInputStream input,\n" 
-      "    com.google.protobuf.ExtensionRegistryLite extensionRegistry)\n" 
-      "    throws com.google.protobuf.InvalidProtocolBufferException {\n", 
-      "classname", descriptor_->name()); 
-  if (context_->HasGeneratedMethods(descriptor_)) { 
+      "public $classname$ parsePartialFrom(\n"
+      "    com.google.protobuf.CodedInputStream input,\n"
+      "    com.google.protobuf.ExtensionRegistryLite extensionRegistry)\n"
+      "    throws com.google.protobuf.InvalidProtocolBufferException {\n",
+      "classname", descriptor_->name());
+  if (context_->HasGeneratedMethods(descriptor_)) {
     printer->Print("  return new $classname$(input, extensionRegistry);\n",
                    "classname", descriptor_->name());
-  } else { 
-    // When parsing constructor isn't generated, use builder to parse 
-    // messages. Note, will fallback to use reflection based mergeFieldFrom() 
-    // in AbstractMessage.Builder. 
-    printer->Indent(); 
-    printer->Print( 
-        "Builder builder = newBuilder();\n" 
-        "try {\n" 
-        "  builder.mergeFrom(input, extensionRegistry);\n" 
-        "} catch (com.google.protobuf.InvalidProtocolBufferException e) {\n" 
-        "  throw e.setUnfinishedMessage(builder.buildPartial());\n" 
-        "} catch (java.io.IOException e) {\n" 
-        "  throw new com.google.protobuf.InvalidProtocolBufferException(\n" 
-        "      e.getMessage()).setUnfinishedMessage(\n" 
-        "          builder.buildPartial());\n" 
-        "}\n" 
-        "return builder.buildPartial();\n"); 
-    printer->Outdent(); 
-  } 
+  } else {
+    // When parsing constructor isn't generated, use builder to parse
+    // messages. Note, will fallback to use reflection based mergeFieldFrom()
+    // in AbstractMessage.Builder.
+    printer->Indent();
+    printer->Print(
+        "Builder builder = newBuilder();\n"
+        "try {\n"
+        "  builder.mergeFrom(input, extensionRegistry);\n"
+        "} catch (com.google.protobuf.InvalidProtocolBufferException e) {\n"
+        "  throw e.setUnfinishedMessage(builder.buildPartial());\n"
+        "} catch (java.io.IOException e) {\n"
+        "  throw new com.google.protobuf.InvalidProtocolBufferException(\n"
+        "      e.getMessage()).setUnfinishedMessage(\n"
+        "          builder.buildPartial());\n"
+        "}\n"
+        "return builder.buildPartial();\n");
+    printer->Outdent();
+  }
   printer->Print("}\n");
-  printer->Outdent(); 
-  printer->Print( 
-      "};\n" 
-      "\n"); 
- 
-  printer->Print( 
-      "public static com.google.protobuf.Parser<$classname$> parser() {\n" 
-      "  return PARSER;\n" 
-      "}\n" 
-      "\n" 
-      "@java.lang.Override\n" 
-      "public com.google.protobuf.Parser<$classname$> getParserForType() {\n" 
-      "  return PARSER;\n" 
-      "}\n" 
-      "\n", 
-      "classname", descriptor_->name()); 
-} 
- 
-// =================================================================== 
-void ImmutableMessageGenerator::GenerateInitializers(io::Printer* printer) { 
-  for (int i = 0; i < descriptor_->field_count(); i++) { 
+  printer->Outdent();
+  printer->Print(
+      "};\n"
+      "\n");
+
+  printer->Print(
+      "public static com.google.protobuf.Parser<$classname$> parser() {\n"
+      "  return PARSER;\n"
+      "}\n"
+      "\n"
+      "@java.lang.Override\n"
+      "public com.google.protobuf.Parser<$classname$> getParserForType() {\n"
+      "  return PARSER;\n"
+      "}\n"
+      "\n",
+      "classname", descriptor_->name());
+}
+
+// ===================================================================
+void ImmutableMessageGenerator::GenerateInitializers(io::Printer* printer) {
+  for (int i = 0; i < descriptor_->field_count(); i++) {
     if (!IsRealOneof(descriptor_->field(i))) {
-      field_generators_.get(descriptor_->field(i)) 
-          .GenerateInitializationCode(printer); 
-    } 
-  } 
-} 
- 
+      field_generators_.get(descriptor_->field(i))
+          .GenerateInitializationCode(printer);
+    }
+  }
+}
+
 // ===================================================================
 void ImmutableMessageGenerator::GenerateMutableCopy(io::Printer* printer) {
   printer->Print(
@@ -1639,8 +1639,8 @@ void ImmutableMessageGenerator::GenerateKotlinExtensions(
       "message", message_name);
 }
 
-void ImmutableMessageGenerator::GenerateAnyMethods(io::Printer* printer) { 
-  printer->Print( 
+void ImmutableMessageGenerator::GenerateAnyMethods(io::Printer* printer) {
+  printer->Print(
       "private static String getTypeUrl(\n"
       "    java.lang.String typeUrlPrefix,\n"
       "    com.google.protobuf.Descriptors.Descriptor descriptor) {\n"
@@ -1711,9 +1711,9 @@ void ImmutableMessageGenerator::GenerateAnyMethods(io::Printer* printer) {
       "  cachedUnpackValue = result;\n"
       "  return result;\n"
       "}\n");
-} 
- 
-}  // namespace java 
-}  // namespace compiler 
-}  // namespace protobuf 
-}  // namespace google 
+}
+
+}  // namespace java
+}  // namespace compiler
+}  // namespace protobuf
+}  // namespace google