fix: BQTableSchemaToProtoDescriptor setting of FieldOption. (#2743)

PhongChuong · web-flow · commit fb57909e75c3 · 2024-10-28T14:06:09.000-04:00
This is to unblock protocol buffer version updates.
diff --git a/google-cloud-bigquerystorage/src/main/java/com/google/cloud/bigquery/storage/v1/BQTableSchemaToProtoDescriptor.java b/google-cloud-bigquerystorage/src/main/java/com/google/cloud/bigquery/storage/v1/BQTableSchemaToProtoDescriptor.java
@@ -26,7 +26,7 @@
 import com.google.protobuf.Descriptors;
 import com.google.protobuf.Descriptors.Descriptor;
 import com.google.protobuf.Descriptors.FileDescriptor;
-import com.google.protobuf.ExtensionLite;
+import com.google.protobuf.Message;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
@@ -217,13 +217,13 @@ private static FieldDescriptorProto convertBQTableFieldToProtoField(
     // Sets columnName annotation when field name is not proto comptaible.
     if (!BigQuerySchemaUtil.isProtoCompatible(fieldName)) {
       fieldDescriptor.setName(BigQuerySchemaUtil.generatePlaceholderFieldName(fieldName));
-      fieldDescriptor.setOptions(
-          FieldOptions.newBuilder()
-              .setExtension(
-                  (ExtensionLite<FieldOptions, String>) AnnotationsProto.columnName,
-                  // Remove ExtensionLite after protobuf linkage error is resolved.
-                  fieldName)
-              .build());
+
+      // The following work around (instead of setting FieldOptions directly) for when
+      // FieldOptions.Builder changes from GeneratedMessageV3 in 3.25 to GeneratedMessage in 4.28 as
+      // it no longer depends on FieldOptions.
+      Message.Builder fieldOptionBuilder = FieldOptions.newBuilder();
+      fieldOptionBuilder.setField(AnnotationsProto.columnName.getDescriptor(), fieldName);
+      fieldDescriptor.setOptions((FieldOptions) fieldOptionBuilder.build());
     }
     return fieldDescriptor.build();
   }
