From b6b86e21fb67e22b762b7230427bce00ee8c9fec Mon Sep 17 00:00:00 2001
From: Sandy Zhang <sandyzhang@google.com>
Date: Thu, 6 Jul 2023 09:02:53 -0700
Subject: [PATCH] Mark OneofDescriptor.isSynthetic() deprecated.

This API will be removed in a future breaking change.

PiperOrigin-RevId: 546004442
---
 .../main/java/com/google/protobuf/Descriptors.java    | 10 ++++++----
 .../com/google/protobuf/LegacyDescriptorsUtil.java    | 11 +++++++++++
 2 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/java/core/src/main/java/com/google/protobuf/Descriptors.java b/java/core/src/main/java/com/google/protobuf/Descriptors.java
index e866d199b3ca..75456869fa12 100644
--- a/java/core/src/main/java/com/google/protobuf/Descriptors.java
+++ b/java/core/src/main/java/com/google/protobuf/Descriptors.java
@@ -2820,10 +2820,6 @@ public OneofOptions getOptions() {
       return proto.getOptions();
     }
 
-    public boolean isSynthetic() {
-      return fields.length == 1 && fields[0].isProto3Optional;
-    }
-
     /** Get a list of this message type's fields. */
     public List<FieldDescriptor> getFields() {
       return Collections.unmodifiableList(Arrays.asList(fields));
@@ -2838,6 +2834,12 @@ public OneofDescriptorProto toProto() {
       return proto;
     }
 
+    @Deprecated
+    public
+    boolean isSynthetic() {
+      return fields.length == 1 && fields[0].isProto3Optional;
+    }
+
     private void setProto(final OneofDescriptorProto proto) {
       this.proto = proto;
     }
diff --git a/java/core/src/main/java/com/google/protobuf/LegacyDescriptorsUtil.java b/java/core/src/main/java/com/google/protobuf/LegacyDescriptorsUtil.java
index f7cad4eae581..b091752a4809 100644
--- a/java/core/src/main/java/com/google/protobuf/LegacyDescriptorsUtil.java
+++ b/java/core/src/main/java/com/google/protobuf/LegacyDescriptorsUtil.java
@@ -31,6 +31,7 @@
 package com.google.protobuf;
 
 import com.google.protobuf.Descriptors.FileDescriptor;
+import com.google.protobuf.Descriptors.OneofDescriptor;
 
 /**
  * This file is meant to be a temporary housing for legacy descriptor APIs we want to deprecate and
@@ -69,5 +70,15 @@ public static Syntax getSyntax(FileDescriptor descriptor) {
     private LegacyFileDescriptor() {}
   }
 
+  /** Wraps OneofDescriptor */
+  public static final class LegacyOneofDescriptor {
+
+    public static boolean isSynthetic(OneofDescriptor descriptor) {
+      return descriptor.isSynthetic();
+    }
+
+    private LegacyOneofDescriptor() {}
+  }
+
   private LegacyDescriptorsUtil() {}
 }