Migrate away from `OneofDescriptor.isSynthetic()`

PiperOrigin-RevId: 544416186
pull/13163/head
Sandy Zhang 2 years ago committed by Copybara-Service
parent b17c4f9e5f
commit 137e9b57a8
  1. 2
      java/core/src/main/java/com/google/protobuf/DescriptorMessageInfoFactory.java
  2. 3
      java/core/src/main/java/com/google/protobuf/GeneratedMessageV3.java

@ -167,7 +167,7 @@ final class DescriptorMessageInfoFactory implements MessageInfoFactory {
} }
}; };
} }
if (fd.getContainingOneof() != null && !fd.getContainingOneof().isSynthetic()) { if (fd.getRealContainingOneof() != null) {
// Build a oneof member field for non-synthetic oneofs. // Build a oneof member field for non-synthetic oneofs.
builder.withField(buildOneofMember(messageType, fd, oneofState, enforceUtf8, enumVerifier)); builder.withField(buildOneofMember(messageType, fd, oneofState, enforceUtf8, enumVerifier));
continue; continue;

@ -2460,8 +2460,7 @@ public abstract class GeneratedMessageV3 extends AbstractMessage implements Seri
final Class<? extends Builder<?>> builderClass, final Class<? extends Builder<?>> builderClass,
final String containingOneofCamelCaseName) { final String containingOneofCamelCaseName) {
isOneofField = isOneofField =
descriptor.getContainingOneof() != null descriptor.getRealContainingOneof() != null;
&& !descriptor.getContainingOneof().isSynthetic();
hasHasMethod = descriptor.hasPresence(); hasHasMethod = descriptor.hasPresence();
ReflectionInvoker reflectionInvoker = ReflectionInvoker reflectionInvoker =
new ReflectionInvoker( new ReflectionInvoker(

Loading…
Cancel
Save