From 8890e81817b6e03e4dd5b7e97134ba7085e483fa Mon Sep 17 00:00:00 2001 From: Lawrence Qiu Date: Mon, 28 Oct 2024 11:27:29 -0400 Subject: [PATCH] chore: Use Protobuf Message instead of GeneratedMessageV3 --- .../cloud/storage/GenerateGrpcProtobufReflectConfig.java | 4 ++-- .../native-image/com/google/cloud/storage/reflect-config.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/google-cloud-storage/src/test/java/com/google/cloud/storage/GenerateGrpcProtobufReflectConfig.java b/google-cloud-storage/src/test/java/com/google/cloud/storage/GenerateGrpcProtobufReflectConfig.java index f94f41970a..d5895413c6 100644 --- a/google-cloud-storage/src/test/java/com/google/cloud/storage/GenerateGrpcProtobufReflectConfig.java +++ b/google-cloud-storage/src/test/java/com/google/cloud/storage/GenerateGrpcProtobufReflectConfig.java @@ -17,7 +17,7 @@ package com.google.cloud.storage; import com.google.protobuf.AbstractMessage; -import com.google.protobuf.GeneratedMessageV3; +import com.google.protobuf.Message; import com.google.protobuf.ProtocolMessageEnum; import io.github.classgraph.ClassGraph; import io.github.classgraph.ClassInfo; @@ -55,7 +55,7 @@ public static void main(String[] args) throws IOException { + " \"methods\":[{\"name\":\"\",\"parameterTypes\":[] }]\n" + " }"), Stream.of( - scanResult.getSubclasses(GeneratedMessageV3.class).stream(), + scanResult.getSubclasses(Message.class).stream(), scanResult.getSubclasses(AbstractMessage.Builder.class).stream(), scanResult.getAllEnums() .filter(ci -> ci.implementsInterface(ProtocolMessageEnum.class)) diff --git a/google-cloud-storage/src/test/resources/META-INF/native-image/com/google/cloud/storage/reflect-config.json b/google-cloud-storage/src/test/resources/META-INF/native-image/com/google/cloud/storage/reflect-config.json index 990fffdbb5..138caa1456 100644 --- a/google-cloud-storage/src/test/resources/META-INF/native-image/com/google/cloud/storage/reflect-config.json +++ b/google-cloud-storage/src/test/resources/META-INF/native-image/com/google/cloud/storage/reflect-config.json @@ -15,7 +15,7 @@ "allDeclaredMethods":true, "methods":[{"name":"","parameterTypes":[] }] }, - { "name": "com.google.protobuf.GeneratedMessageV3$Builder", "queryAllDeclaredConstructors": true, "queryAllPublicConstructors": true, "queryAllDeclaredMethods": true, "allPublicMethods": true, "allDeclaredClasses": true, "allPublicClasses": true }, + { "name": "com.google.protobuf.Message$Builder", "queryAllDeclaredConstructors": true, "queryAllPublicConstructors": true, "queryAllDeclaredMethods": true, "allPublicMethods": true, "allDeclaredClasses": true, "allPublicClasses": true }, { "name": "io.grpc.alts.internal.AltsContext", "queryAllDeclaredConstructors": true, "queryAllPublicConstructors": true, "queryAllDeclaredMethods": true, "allPublicMethods": true, "allDeclaredClasses": true, "allPublicClasses": true }, { "name": "io.grpc.alts.internal.AltsContext$Builder", "queryAllDeclaredConstructors": true, "queryAllPublicConstructors": true, "queryAllDeclaredMethods": true, "allPublicMethods": true, "allDeclaredClasses": true, "allPublicClasses": true }, { "name": "io.grpc.alts.internal.Endpoint", "queryAllDeclaredConstructors": true, "queryAllPublicConstructors": true, "queryAllDeclaredMethods": true, "allPublicMethods": true, "allDeclaredClasses": true, "allPublicClasses": true },