(beam) branch master updated: Fix errorprone move serialization to private method (#36352)

[yhu]

This is an automated email from the ASF dual-hosted git repository.

yhu pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/beam.git


The following commit(s) were added to refs/heads/master by this push:
     new 24d3a7bac85 Fix errorprone move serialization to private method 
(#36352)
24d3a7bac85 is described below

commit 24d3a7bac85b5872df35e953de853da6c6218223
Author: Yi Hu <ya...@google.com>
AuthorDate: Fri Oct 3 10:04:16 2025 -0400

    Fix errorprone move serialization to private method (#36352)
---
 .../sdk/extensions/protobuf/ProtoBeamConverter.java    |  9 +++++++--
 .../beam/sdk/extensions/protobuf/ProtobufUtil.java     | 18 ------------------
 2 files changed, 7 insertions(+), 20 deletions(-)

diff --git 
a/sdks/java/extensions/protobuf/src/main/java/org/apache/beam/sdk/extensions/protobuf/ProtoBeamConverter.java
 
b/sdks/java/extensions/protobuf/src/main/java/org/apache/beam/sdk/extensions/protobuf/ProtoBeamConverter.java
index d3295b386d1..559b8dd1b51 100644
--- 
a/sdks/java/extensions/protobuf/src/main/java/org/apache/beam/sdk/extensions/protobuf/ProtoBeamConverter.java
+++ 
b/sdks/java/extensions/protobuf/src/main/java/org/apache/beam/sdk/extensions/protobuf/ProtoBeamConverter.java
@@ -505,12 +505,17 @@ public class ProtoBeamConverter {
 
     // writeObject() needs to be implemented because Descriptor is not 
serializable.
     private void writeObject(ObjectOutputStream oos) throws IOException {
-      ProtobufUtil.serializeDescriptor(oos, descriptor);
+      String messageFullName = descriptor.getFullName();
+      ProtoDomain protoDomain = ProtoDomain.buildFrom(descriptor);
+      oos.writeObject(protoDomain);
+      oos.writeObject(messageFullName);
     }
 
     // readObject() needs to be implemented because Descriptor is not 
serializable.
     private void readObject(ObjectInputStream ois) throws IOException, 
ClassNotFoundException {
-      initialize(ProtobufUtil.deserializeDescriptor(ois));
+      ProtoDomain protoDomain = (ProtoDomain) ois.readObject();
+      String messageFullName = (String) ois.readObject();
+      initialize(protoDomain.getDescriptor(messageFullName));
     }
   }
 
diff --git 
a/sdks/java/extensions/protobuf/src/main/java/org/apache/beam/sdk/extensions/protobuf/ProtobufUtil.java
 
b/sdks/java/extensions/protobuf/src/main/java/org/apache/beam/sdk/extensions/protobuf/ProtobufUtil.java
index 92ad0de98b1..c54f098be5c 100644
--- 
a/sdks/java/extensions/protobuf/src/main/java/org/apache/beam/sdk/extensions/protobuf/ProtobufUtil.java
+++ 
b/sdks/java/extensions/protobuf/src/main/java/org/apache/beam/sdk/extensions/protobuf/ProtobufUtil.java
@@ -22,9 +22,6 @@ import com.google.protobuf.Descriptors.FieldDescriptor;
 import com.google.protobuf.ExtensionRegistry;
 import com.google.protobuf.ExtensionRegistry.ExtensionInfo;
 import com.google.protobuf.Message;
-import java.io.IOException;
-import java.io.ObjectInputStream;
-import java.io.ObjectOutputStream;
 import java.lang.reflect.InvocationTargetException;
 import java.util.HashSet;
 import java.util.Set;
@@ -92,21 +89,6 @@ class ProtobufUtil {
     }
   }
 
-  static void serializeDescriptor(ObjectOutputStream oos, Descriptor 
descriptor)
-      throws IOException {
-    String messageFullName = descriptor.getFullName();
-    ProtoDomain protoDomain = ProtoDomain.buildFrom(descriptor);
-    oos.writeObject(protoDomain);
-    oos.writeObject(messageFullName);
-  }
-
-  static Descriptor deserializeDescriptor(ObjectInputStream ois)
-      throws IOException, ClassNotFoundException {
-    ProtoDomain protoDomain = (ProtoDomain) ois.readObject();
-    String messageFullName = (String) ois.readObject();
-    return protoDomain.getDescriptor(messageFullName);
-  }
-
   
////////////////////////////////////////////////////////////////////////////////////////////////
   // Disable construction of utility class
   private ProtobufUtil() {}