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 index 3eed1bfc35..15ed5afe6a 100644 --- 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 @@ -25,6 +25,7 @@ import com.google.protobuf.Descriptors; import com.google.protobuf.Descriptors.Descriptor; import com.google.protobuf.Descriptors.FileDescriptor; +import com.google.protobuf.ExtensionLite; import java.util.ArrayList; import java.util.HashMap; import java.util.List; @@ -160,7 +161,12 @@ private static FieldDescriptorProto convertBQTableFieldToProtoField( if (!BigQuerySchemaUtil.isProtoCompatible(fieldName)) { fieldDescriptor.setName(BigQuerySchemaUtil.generatePlaceholderFieldName(fieldName)); fieldDescriptor.setOptions( - FieldOptions.newBuilder().setExtension(AnnotationsProto.columnName, fieldName).build()); + FieldOptions.newBuilder() + .setExtension( + (ExtensionLite) AnnotationsProto.columnName, + // Remove ExtensionLite after protobuf linkage error is resolved. + fieldName) + .build()); } return fieldDescriptor.build(); }