File tree Expand file tree Collapse file tree 3 files changed +2
-16
lines changed
src/google/protobuf/compiler/java Expand file tree Collapse file tree 3 files changed +2
-16
lines changed Original file line number Diff line number Diff line change @@ -344,13 +344,6 @@ inline bool HasHasbit(const FieldDescriptor* descriptor) {
344344 return internal::cpp::HasHasbit (descriptor);
345345}
346346
347- // Whether generate classes expose public PARSER instances.
348- inline bool ExposePublicParser (const FileDescriptor* descriptor) {
349- // TODO: Mark the PARSER private in 3.1.x releases.
350- return FileDescriptorLegacy (descriptor).syntax () ==
351- FileDescriptorLegacy::Syntax::SYNTAX_PROTO2;
352- }
353-
354347// Whether unknown enum values are kept (i.e., not stored in UnknownFieldSet
355348// but in the message and can be queried using additional getters that return
356349// ints.
Original file line number Diff line number Diff line change @@ -1140,7 +1140,7 @@ void ImmutableMessageGenerator::GenerateExtensionRegistrationCode(
11401140// ===================================================================
11411141void ImmutableMessageGenerator::GenerateParser (io::Printer* printer) {
11421142 printer->Print (
1143- " $visibility$ static final com.google.protobuf.Parser<$classname$>\n "
1143+ " private static final com.google.protobuf.Parser<$classname$>\n "
11441144 " PARSER = new com.google.protobuf.AbstractParser<$classname$>() {\n "
11451145 " @java.lang.Override\n "
11461146 " public $classname$ parsePartialFrom(\n "
@@ -1173,9 +1173,6 @@ void ImmutableMessageGenerator::GenerateParser(io::Printer* printer) {
11731173 " return PARSER;\n "
11741174 " }\n "
11751175 " \n " ,
1176- " visibility" ,
1177- ExposePublicParser (descriptor_->file ()) ? " @java.lang.Deprecated public"
1178- : " private" ,
11791176 " classname" , descriptor_->name ());
11801177}
11811178
Original file line number Diff line number Diff line change @@ -62,11 +62,7 @@ void SetMessageVariables(
6262 : " " });
6363 (*variables)[" on_changed" ] = " onChanged();" ;
6464 (*variables)[" ver" ] = GeneratedCodeVersionSuffix ();
65- (*variables)[" get_parser" ] =
66- ExposePublicParser (descriptor->message_type ()->file ()) &&
67- context->options ().opensource_runtime
68- ? " PARSER"
69- : " parser()" ;
65+ (*variables)[" get_parser" ] = " parser()" ;
7066
7167 if (HasHasbit (descriptor)) {
7268 // For singular messages and builders, one bit is used for the hasField bit.
You can’t perform that action at this time.
0 commit comments