Skip to content

Commit 7bff169

Browse files
protobuf-github-botcopybara-github
protobuf-github-bot
authored and
copybara-github
committed
Breaking Change: Remove unnecessary generated overrides for GeneratedMessage.Builder methods:
setUnknownFields mergeUnknownFields clone setField clearField clearOneof setRepeatedField addRepeatedField setExtension addExtension clearExtension PiperOrigin-RevId: 597677225
1 parent 03440ec commit 7bff169

File tree

1 file changed

+0
-97
lines changed

1 file changed

+0
-97
lines changed

‎src/google/protobuf/compiler/java/message_builder.cc‎

Lines changed: 0 additions & 97 deletions
Original file line numberDiff line numberDiff line change
@@ -11,15 +11,13 @@
1111

1212
#include "google/protobuf/compiler/java/message_builder.h"
1313

14-
#include <algorithm>
1514
#include <memory>
1615
#include <vector>
1716

1817
#include "absl/container/btree_set.h"
1918
#include "absl/container/flat_hash_map.h"
2019
#include "absl/strings/ascii.h"
2120
#include "absl/strings/str_cat.h"
22-
#include "absl/strings/substitute.h"
2321
#include "google/protobuf/compiler/java/context.h"
2422
#include "google/protobuf/compiler/java/doc_comment.h"
2523
#include "google/protobuf/compiler/java/enum.h"
@@ -28,7 +26,6 @@
2826
#include "google/protobuf/compiler/java/helpers.h"
2927
#include "google/protobuf/compiler/java/name_resolver.h"
3028
#include "google/protobuf/descriptor.pb.h"
31-
#include "google/protobuf/io/coded_stream.h"
3229
#include "google/protobuf/io/printer.h"
3330
#include "google/protobuf/wire_format.h"
3431

@@ -168,27 +165,6 @@ void MessageBuilderGenerator::Generate(io::Printer* printer) {
168165
.GenerateBuilderMembers(printer);
169166
}
170167

171-
if (context_->options().opensource_runtime) {
172-
// Override methods declared in GeneratedMessage to return the concrete
173-
// generated type so callsites won't depend on GeneratedMessage. This
174-
// is needed to keep binary compatibility when we change generated code
175-
// to subclass a different GeneratedMessage class (e.g., in v3.0.0 release
176-
// we changed all generated code to subclass GeneratedMessageV3).
177-
printer->Print(
178-
"@java.lang.Override\n"
179-
"public final Builder setUnknownFields(\n"
180-
" final com.google.protobuf.UnknownFieldSet unknownFields) {\n"
181-
" return super.setUnknownFields(unknownFields);\n"
182-
"}\n"
183-
"\n"
184-
"@java.lang.Override\n"
185-
"public final Builder mergeUnknownFields(\n"
186-
" final com.google.protobuf.UnknownFieldSet unknownFields) {\n"
187-
" return super.mergeUnknownFields(unknownFields);\n"
188-
"}\n"
189-
"\n");
190-
}
191-
192168
printer->Print(
193169
"\n"
194170
"// @@protoc_insertion_point(builder_scope:$full_name$)\n",
@@ -412,79 +388,6 @@ void MessageBuilderGenerator::GenerateCommonBuilderMethods(
412388

413389
GenerateBuildPartial(printer);
414390

415-
if (context_->options().opensource_runtime) {
416-
// Override methods declared in GeneratedMessage to return the concrete
417-
// generated type so callsites won't depend on GeneratedMessage. This
418-
// is needed to keep binary compatibility when we change generated code
419-
// to subclass a different GeneratedMessage class (e.g., in v3.0.0 release
420-
// we changed all generated code to subclass GeneratedMessageV3).
421-
printer->Print(
422-
"@java.lang.Override\n"
423-
"public Builder clone() {\n"
424-
" return super.clone();\n"
425-
"}\n"
426-
"@java.lang.Override\n"
427-
"public Builder setField(\n"
428-
" com.google.protobuf.Descriptors.FieldDescriptor field,\n"
429-
" java.lang.Object value) {\n"
430-
" return super.setField(field, value);\n"
431-
"}\n"
432-
"@java.lang.Override\n"
433-
"public Builder clearField(\n"
434-
" com.google.protobuf.Descriptors.FieldDescriptor field) {\n"
435-
" return super.clearField(field);\n"
436-
"}\n"
437-
"@java.lang.Override\n"
438-
"public Builder clearOneof(\n"
439-
" com.google.protobuf.Descriptors.OneofDescriptor oneof) {\n"
440-
" return super.clearOneof(oneof);\n"
441-
"}\n"
442-
"@java.lang.Override\n"
443-
"public Builder setRepeatedField(\n"
444-
" com.google.protobuf.Descriptors.FieldDescriptor field,\n"
445-
" int index, java.lang.Object value) {\n"
446-
" return super.setRepeatedField(field, index, value);\n"
447-
"}\n"
448-
"@java.lang.Override\n"
449-
"public Builder addRepeatedField(\n"
450-
" com.google.protobuf.Descriptors.FieldDescriptor field,\n"
451-
" java.lang.Object value) {\n"
452-
" return super.addRepeatedField(field, value);\n"
453-
"}\n");
454-
455-
if (descriptor_->extension_range_count() > 0) {
456-
printer->Print(
457-
"@java.lang.Override\n"
458-
"public <Type> Builder setExtension(\n"
459-
" com.google.protobuf.GeneratedMessage.GeneratedExtension<\n"
460-
" $classname$, Type> extension,\n"
461-
" Type value) {\n"
462-
" return super.setExtension(extension, value);\n"
463-
"}\n"
464-
"@java.lang.Override\n"
465-
"public <Type> Builder setExtension(\n"
466-
" com.google.protobuf.GeneratedMessage.GeneratedExtension<\n"
467-
" $classname$, java.util.List<Type>> extension,\n"
468-
" int index, Type value) {\n"
469-
" return super.setExtension(extension, index, value);\n"
470-
"}\n"
471-
"@java.lang.Override\n"
472-
"public <Type> Builder addExtension(\n"
473-
" com.google.protobuf.GeneratedMessage.GeneratedExtension<\n"
474-
" $classname$, java.util.List<Type>> extension,\n"
475-
" Type value) {\n"
476-
" return super.addExtension(extension, value);\n"
477-
"}\n"
478-
"@java.lang.Override\n"
479-
"public <T> Builder clearExtension(\n"
480-
" com.google.protobuf.GeneratedMessage.GeneratedExtension<\n"
481-
" $classname$, T> extension) {\n"
482-
" return super.clearExtension(extension);\n"
483-
"}\n",
484-
"classname", name_resolver_->GetImmutableClassName(descriptor_));
485-
}
486-
}
487-
488391
// -----------------------------------------------------------------
489392

490393
if (context_->HasGeneratedMethods(descriptor_)) {

0 commit comments

Comments
 (0)