Skip to content

Commit 57770eb

Browse files
Remove defunct protected mergeFromAndMakeImmutableInternal method. This method was planned to be used by gencode but was never used in practice.
As a protected method never actually called by any gencode, removal is not considered a breaking change. PiperOrigin-RevId: 827551358
1 parent 255753a commit 57770eb

File tree

1 file changed

+0
-21
lines changed

1 file changed

+0
-21
lines changed

java/core/src/main/java/com/google/protobuf/GeneratedMessage.java

Lines changed: 0 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -117,27 +117,6 @@ public Descriptor getDescriptorForType() {
117117
return internalGetFieldAccessorTable().descriptor;
118118
}
119119

120-
/**
121-
* TODO: This method should be removed. It enables parsing directly into an
122-
* "immutable" message. Have to leave it for now to support old gencode.
123-
*
124-
* @deprecated use newBuilder().mergeFrom() instead
125-
*/
126-
@Deprecated
127-
protected void mergeFromAndMakeImmutableInternal(
128-
CodedInputStream input, ExtensionRegistryLite extensionRegistry)
129-
throws InvalidProtocolBufferException {
130-
Schema<GeneratedMessage> schema = Protobuf.getInstance().schemaFor(this);
131-
try {
132-
schema.mergeFrom(this, CodedInputStreamReader.forCodedInput(input), extensionRegistry);
133-
} catch (InvalidProtocolBufferException e) {
134-
throw e.setUnfinishedMessage(this);
135-
} catch (IOException e) {
136-
throw new InvalidProtocolBufferException(e).setUnfinishedMessage(this);
137-
}
138-
schema.makeImmutable(this);
139-
}
140-
141120
/**
142121
* Internal helper to return a modifiable map containing all the fields. The returned Map is
143122
* modifiable so that the caller can add additional extension fields to implement {@link

0 commit comments

Comments
 (0)