Skip to content

Commit 5df0387

Browse files
Breaking Change: The base class for generated messages will be
GeneratedMessage, not GeneratedMessageV3. Please rerun protoc on your .proto files to regenerate the binding code. https://protobuf.dev/news/2023-12-05/ https://protobuf.dev/support/cross-version-runtime-guarantee/ To fix source compatibility with surrounding code make these replacements: GeneratedMessageV3 --> GeneratedMessage SingleFieldBuilderV3 --> SingleFieldBuilder RepeatedFieldBuilderV3 --> RepeatedFieldBuilder PiperOrigin-RevId: 597642289
1 parent 81e5433 commit 5df0387

21 files changed

+1467
-5063
lines changed

java/core/BUILD.bazel

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -486,10 +486,10 @@ LITE_TEST_EXCLUSIONS = [
486486
"src/test/java/com/google/protobuf/Proto2ExtensionLookupSchemaTest.java",
487487
"src/test/java/com/google/protobuf/Proto2SchemaTest.java",
488488
"src/test/java/com/google/protobuf/Proto2UnknownEnumValueTest.java",
489-
"src/test/java/com/google/protobuf/RepeatedFieldBuilderV3Test.java",
489+
"src/test/java/com/google/protobuf/RepeatedFieldBuilderTest.java",
490490
"src/test/java/com/google/protobuf/RuntimeVersionTest.java",
491491
"src/test/java/com/google/protobuf/ServiceTest.java",
492-
"src/test/java/com/google/protobuf/SingleFieldBuilderV3Test.java",
492+
"src/test/java/com/google/protobuf/SingleFieldBuilderTest.java",
493493
"src/test/java/com/google/protobuf/TestBadIdentifiers.java",
494494
"src/test/java/com/google/protobuf/TextFormatParseInfoTreeTest.java",
495495
"src/test/java/com/google/protobuf/TextFormatParseLocationTest.java",

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
import java.util.Stack;
3535
import java.util.concurrent.ConcurrentHashMap;
3636

37-
/** A factory for message info based on protobuf descriptors for a {@link GeneratedMessageV3}. */
37+
/** A factory for message info based on protobuf descriptors for a {@link GeneratedMessage}. */
3838
@ExperimentalApi
3939
final class DescriptorMessageInfoFactory implements MessageInfoFactory {
4040
private static final String GET_DEFAULT_INSTANCE_METHOD_NAME = "getDefaultInstance";
@@ -74,12 +74,12 @@ public static DescriptorMessageInfoFactory getInstance() {
7474

7575
@Override
7676
public boolean isSupported(Class<?> messageType) {
77-
return GeneratedMessageV3.class.isAssignableFrom(messageType);
77+
return GeneratedMessage.class.isAssignableFrom(messageType);
7878
}
7979

8080
@Override
8181
public MessageInfo messageInfoFor(Class<?> messageType) {
82-
if (!GeneratedMessageV3.class.isAssignableFrom(messageType)) {
82+
if (!GeneratedMessage.class.isAssignableFrom(messageType)) {
8383
throw new IllegalArgumentException("Unsupported message type: " + messageType.getName());
8484
}
8585

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ final class ExtensionSchemaFull extends ExtensionSchema<FieldDescriptor> {
2323

2424
private static <T> long getExtensionsFieldOffset() {
2525
try {
26-
Field field = GeneratedMessageV3.ExtendableMessage.class.getDeclaredField("extensions");
26+
Field field = GeneratedMessage.ExtendableMessage.class.getDeclaredField("extensions");
2727
return UnsafeUtil.objectFieldOffset(field);
2828
} catch (Throwable e) {
2929
throw new IllegalStateException("Unable to lookup extension field offset");
@@ -32,7 +32,7 @@ private static <T> long getExtensionsFieldOffset() {
3232

3333
@Override
3434
boolean hasExtensions(MessageLite prototype) {
35-
return prototype instanceof GeneratedMessageV3.ExtendableMessage;
35+
return prototype instanceof GeneratedMessage.ExtendableMessage;
3636
}
3737

3838
@Override

0 commit comments

Comments
 (0)