Skip to content

Commit 2b1d201

Browse files
diegomarquezpcloud-java-bot
diegomarquezp
and
cloud-java-bot
authored
feat: Upgrade protobuf gen code to 4.33 (#2741)
* chore: update generator version * chore: generate libraries at Mon Dec 15 18:21:02 UTC 2025 * chore: use new generated message class --------- Co-authored-by: cloud-java-bot <cloud-java-bot@google.com>
1 parent 136f164 commit 2b1d201

371 files changed

Lines changed: 13923 additions & 23742 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.kokoro/presubmit/graalvm-native-a.cfg‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
# Configure the docker image for kokoro-trampoline.
44
env_vars: {
55
key: "TRAMPOLINE_IMAGE"
6-
value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_a:3.54.1" # {x-version-update:google-cloud-shared-dependencies:current}
6+
value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_a:3.55.0-rc1" # {x-version-update:google-cloud-shared-dependencies:current}
77
}
88

99
env_vars: {

‎.kokoro/presubmit/graalvm-native-a.cfg.orig‎

Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
1+
# Format: //devtools/kokoro/config/proto/build.proto
2+
3+
# Configure the docker image for kokoro-trampoline.
4+
env_vars: {
5+
key: "TRAMPOLINE_IMAGE"
6+
<<<<<<< HEAD
7+
value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_a:3.55.0-rc1" # {x-version-update:google-cloud-shared-dependencies:current}
8+
=======
9+
value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_a:3.54.1" # {x-version-update:google-cloud-shared-dependencies:current}
10+
>>>>>>> origin/protobuf-4.x-rc
11+
}
12+
13+
env_vars: {
14+
key: "JOB_TYPE"
15+
value: "graalvm"
16+
}
17+
18+
# TODO: remove this after we've migrated all tests and scripts
19+
env_vars: {
20+
key: "GCLOUD_PROJECT"
21+
value: "gcloud-devel"
22+
}
23+
24+
env_vars: {
25+
key: "GOOGLE_CLOUD_PROJECT"
26+
value: "gcloud-devel"
27+
}
28+
29+
env_vars: {
30+
key: "GOOGLE_APPLICATION_CREDENTIALS"
31+
value: "secret_manager/java-it-service-account"
32+
}
33+
34+
env_vars: {
35+
key: "SECRET_MANAGER_KEYS"
36+
value: "java-it-service-account"
37+
}
38+
39+
env_vars: {
40+
key: "IT_SERVICE_ACCOUNT_EMAIL"
41+
value: "it-service-account@gcloud-devel.iam.gserviceaccount.com"
42+
}

‎.kokoro/presubmit/graalvm-native-b.cfg‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
# Configure the docker image for kokoro-trampoline.
44
env_vars: {
55
key: "TRAMPOLINE_IMAGE"
6-
value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_b:3.54.1" # {x-version-update:google-cloud-shared-dependencies:current}
6+
value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_b:3.55.0-rc1" # {x-version-update:google-cloud-shared-dependencies:current}
77
}
88

99
env_vars: {

‎.kokoro/presubmit/graalvm-native-b.cfg.orig‎

Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
1+
# Format: //devtools/kokoro/config/proto/build.proto
2+
3+
# Configure the docker image for kokoro-trampoline.
4+
env_vars: {
5+
key: "TRAMPOLINE_IMAGE"
6+
<<<<<<< HEAD
7+
value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_b:3.55.0-rc1" # {x-version-update:google-cloud-shared-dependencies:current}
8+
=======
9+
value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_b:3.54.1" # {x-version-update:google-cloud-shared-dependencies:current}
10+
>>>>>>> origin/protobuf-4.x-rc
11+
}
12+
13+
env_vars: {
14+
key: "JOB_TYPE"
15+
value: "graalvm"
16+
}
17+
18+
# TODO: remove this after we've migrated all tests and scripts
19+
env_vars: {
20+
key: "GCLOUD_PROJECT"
21+
value: "gcloud-devel"
22+
}
23+
24+
env_vars: {
25+
key: "GOOGLE_CLOUD_PROJECT"
26+
value: "gcloud-devel"
27+
}
28+
29+
env_vars: {
30+
key: "GOOGLE_APPLICATION_CREDENTIALS"
31+
value: "secret_manager/java-it-service-account"
32+
}
33+
34+
env_vars: {
35+
key: "SECRET_MANAGER_KEYS"
36+
value: "java-it-service-account"
37+
}
38+
39+
env_vars: {
40+
key: "IT_SERVICE_ACCOUNT_EMAIL"
41+
value: "it-service-account@gcloud-devel.iam.gserviceaccount.com"
42+
}

‎.kokoro/presubmit/graalvm-native-c.cfg‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
# Configure the docker image for kokoro-trampoline.
44
env_vars: {
55
key: "TRAMPOLINE_IMAGE"
6-
value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_c:3.54.1" # {x-version-update:google-cloud-shared-dependencies:current}
6+
value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_c:3.55.0-rc1" # {x-version-update:google-cloud-shared-dependencies:current}
77
}
88

99
env_vars: {

‎.kokoro/presubmit/graalvm-native-c.cfg.orig‎

Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
1+
# Format: //devtools/kokoro/config/proto/build.proto
2+
3+
# Configure the docker image for kokoro-trampoline.
4+
env_vars: {
5+
key: "TRAMPOLINE_IMAGE"
6+
<<<<<<< HEAD
7+
value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_c:3.55.0-rc1" # {x-version-update:google-cloud-shared-dependencies:current}
8+
=======
9+
value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_c:3.54.1" # {x-version-update:google-cloud-shared-dependencies:current}
10+
>>>>>>> origin/protobuf-4.x-rc
11+
}
12+
13+
env_vars: {
14+
key: "JOB_TYPE"
15+
value: "graalvm"
16+
}
17+
18+
# TODO: remove this after we've migrated all tests and scripts
19+
env_vars: {
20+
key: "GCLOUD_PROJECT"
21+
value: "gcloud-devel"
22+
}
23+
24+
env_vars: {
25+
key: "GOOGLE_CLOUD_PROJECT"
26+
value: "gcloud-devel"
27+
}
28+
29+
env_vars: {
30+
key: "GOOGLE_APPLICATION_CREDENTIALS"
31+
value: "secret_manager/java-it-service-account"
32+
}
33+
34+
env_vars: {
35+
key: "SECRET_MANAGER_KEYS"
36+
value: "java-it-service-account"
37+
}
38+
39+
env_vars: {
40+
key: "IT_SERVICE_ACCOUNT_EMAIL"
41+
value: "it-service-account@gcloud-devel.iam.gserviceaccount.com"
42+
}

‎generation_config.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
gapic_generator_version: 2.64.1
1+
gapic_generator_version: 2.65.0-rc1
22
googleapis_commitish: 15fa97d38ad2a38319426328c795ef76a03448bd
33
libraries_bom_version: 26.71.0
44
template_excludes:

‎google-cloud-bigtable/src/main/resources/META-INF/native-image/com.google.cloud.bigtable.admin.v2/reflect-config.json‎

Lines changed: 63 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4175,6 +4175,15 @@
41754175
"allDeclaredClasses": true,
41764176
"allPublicClasses": true
41774177
},
4178+
{
4179+
"name": "com.google.protobuf.DescriptorProtos$FeatureSet$EnforceNamingStyle",
4180+
"queryAllDeclaredConstructors": true,
4181+
"queryAllPublicConstructors": true,
4182+
"queryAllDeclaredMethods": true,
4183+
"allPublicMethods": true,
4184+
"allDeclaredClasses": true,
4185+
"allPublicClasses": true
4186+
},
41784187
{
41794188
"name": "com.google.protobuf.DescriptorProtos$FeatureSet$EnumType",
41804189
"queryAllDeclaredConstructors": true,
@@ -4229,6 +4238,33 @@
42294238
"allDeclaredClasses": true,
42304239
"allPublicClasses": true
42314240
},
4241+
{
4242+
"name": "com.google.protobuf.DescriptorProtos$FeatureSet$VisibilityFeature",
4243+
"queryAllDeclaredConstructors": true,
4244+
"queryAllPublicConstructors": true,
4245+
"queryAllDeclaredMethods": true,
4246+
"allPublicMethods": true,
4247+
"allDeclaredClasses": true,
4248+
"allPublicClasses": true
4249+
},
4250+
{
4251+
"name": "com.google.protobuf.DescriptorProtos$FeatureSet$VisibilityFeature$Builder",
4252+
"queryAllDeclaredConstructors": true,
4253+
"queryAllPublicConstructors": true,
4254+
"queryAllDeclaredMethods": true,
4255+
"allPublicMethods": true,
4256+
"allDeclaredClasses": true,
4257+
"allPublicClasses": true
4258+
},
4259+
{
4260+
"name": "com.google.protobuf.DescriptorProtos$FeatureSet$VisibilityFeature$DefaultSymbolVisibility",
4261+
"queryAllDeclaredConstructors": true,
4262+
"queryAllPublicConstructors": true,
4263+
"queryAllDeclaredMethods": true,
4264+
"allPublicMethods": true,
4265+
"allDeclaredClasses": true,
4266+
"allPublicClasses": true
4267+
},
42324268
{
42334269
"name": "com.google.protobuf.DescriptorProtos$FeatureSetDefaults",
42344270
"queryAllDeclaredConstructors": true,
@@ -4346,6 +4382,24 @@
43464382
"allDeclaredClasses": true,
43474383
"allPublicClasses": true
43484384
},
4385+
{
4386+
"name": "com.google.protobuf.DescriptorProtos$FieldOptions$FeatureSupport",
4387+
"queryAllDeclaredConstructors": true,
4388+
"queryAllPublicConstructors": true,
4389+
"queryAllDeclaredMethods": true,
4390+
"allPublicMethods": true,
4391+
"allDeclaredClasses": true,
4392+
"allPublicClasses": true
4393+
},
4394+
{
4395+
"name": "com.google.protobuf.DescriptorProtos$FieldOptions$FeatureSupport$Builder",
4396+
"queryAllDeclaredConstructors": true,
4397+
"queryAllPublicConstructors": true,
4398+
"queryAllDeclaredMethods": true,
4399+
"allPublicMethods": true,
4400+
"allDeclaredClasses": true,
4401+
"allPublicClasses": true
4402+
},
43494403
{
43504404
"name": "com.google.protobuf.DescriptorProtos$FieldOptions$JSType",
43514405
"queryAllDeclaredConstructors": true,
@@ -4652,6 +4706,15 @@
46524706
"allDeclaredClasses": true,
46534707
"allPublicClasses": true
46544708
},
4709+
{
4710+
"name": "com.google.protobuf.DescriptorProtos$SymbolVisibility",
4711+
"queryAllDeclaredConstructors": true,
4712+
"queryAllPublicConstructors": true,
4713+
"queryAllDeclaredMethods": true,
4714+
"allPublicMethods": true,
4715+
"allDeclaredClasses": true,
4716+
"allPublicClasses": true
4717+
},
46554718
{
46564719
"name": "com.google.protobuf.DescriptorProtos$UninterpretedOption",
46574720
"queryAllDeclaredConstructors": true,

‎google-cloud-bigtable/src/main/resources/META-INF/native-image/com.google.cloud.bigtable.data.v2/reflect-config.json‎

Lines changed: 63 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2636,6 +2636,15 @@
26362636
"allDeclaredClasses": true,
26372637
"allPublicClasses": true
26382638
},
2639+
{
2640+
"name": "com.google.protobuf.DescriptorProtos$FeatureSet$EnforceNamingStyle",
2641+
"queryAllDeclaredConstructors": true,
2642+
"queryAllPublicConstructors": true,
2643+
"queryAllDeclaredMethods": true,
2644+
"allPublicMethods": true,
2645+
"allDeclaredClasses": true,
2646+
"allPublicClasses": true
2647+
},
26392648
{
26402649
"name": "com.google.protobuf.DescriptorProtos$FeatureSet$EnumType",
26412650
"queryAllDeclaredConstructors": true,
@@ -2690,6 +2699,33 @@
26902699
"allDeclaredClasses": true,
26912700
"allPublicClasses": true
26922701
},
2702+
{
2703+
"name": "com.google.protobuf.DescriptorProtos$FeatureSet$VisibilityFeature",
2704+
"queryAllDeclaredConstructors": true,
2705+
"queryAllPublicConstructors": true,
2706+
"queryAllDeclaredMethods": true,
2707+
"allPublicMethods": true,
2708+
"allDeclaredClasses": true,
2709+
"allPublicClasses": true
2710+
},
2711+
{
2712+
"name": "com.google.protobuf.DescriptorProtos$FeatureSet$VisibilityFeature$Builder",
2713+
"queryAllDeclaredConstructors": true,
2714+
"queryAllPublicConstructors": true,
2715+
"queryAllDeclaredMethods": true,
2716+
"allPublicMethods": true,
2717+
"allDeclaredClasses": true,
2718+
"allPublicClasses": true
2719+
},
2720+
{
2721+
"name": "com.google.protobuf.DescriptorProtos$FeatureSet$VisibilityFeature$DefaultSymbolVisibility",
2722+
"queryAllDeclaredConstructors": true,
2723+
"queryAllPublicConstructors": true,
2724+
"queryAllDeclaredMethods": true,
2725+
"allPublicMethods": true,
2726+
"allDeclaredClasses": true,
2727+
"allPublicClasses": true
2728+
},
26932729
{
26942730
"name": "com.google.protobuf.DescriptorProtos$FeatureSetDefaults",
26952731
"queryAllDeclaredConstructors": true,
@@ -2807,6 +2843,24 @@
28072843
"allDeclaredClasses": true,
28082844
"allPublicClasses": true
28092845
},
2846+
{
2847+
"name": "com.google.protobuf.DescriptorProtos$FieldOptions$FeatureSupport",
2848+
"queryAllDeclaredConstructors": true,
2849+
"queryAllPublicConstructors": true,
2850+
"queryAllDeclaredMethods": true,
2851+
"allPublicMethods": true,
2852+
"allDeclaredClasses": true,
2853+
"allPublicClasses": true
2854+
},
2855+
{
2856+
"name": "com.google.protobuf.DescriptorProtos$FieldOptions$FeatureSupport$Builder",
2857+
"queryAllDeclaredConstructors": true,
2858+
"queryAllPublicConstructors": true,
2859+
"queryAllDeclaredMethods": true,
2860+
"allPublicMethods": true,
2861+
"allDeclaredClasses": true,
2862+
"allPublicClasses": true
2863+
},
28102864
{
28112865
"name": "com.google.protobuf.DescriptorProtos$FieldOptions$JSType",
28122866
"queryAllDeclaredConstructors": true,
@@ -3113,6 +3167,15 @@
31133167
"allDeclaredClasses": true,
31143168
"allPublicClasses": true
31153169
},
3170+
{
3171+
"name": "com.google.protobuf.DescriptorProtos$SymbolVisibility",
3172+
"queryAllDeclaredConstructors": true,
3173+
"queryAllPublicConstructors": true,
3174+
"queryAllDeclaredMethods": true,
3175+
"allPublicMethods": true,
3176+
"allDeclaredClasses": true,
3177+
"allPublicClasses": true
3178+
},
31163179
{
31173180
"name": "com.google.protobuf.DescriptorProtos$UninterpretedOption",
31183181
"queryAllDeclaredConstructors": true,

‎google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/data/v2/stub/SkipTrailersTest.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@
4646
import com.google.common.collect.ImmutableList;
4747
import com.google.protobuf.ByteString;
4848
import com.google.protobuf.BytesValue;
49-
import com.google.protobuf.GeneratedMessageV3;
49+
import com.google.protobuf.GeneratedMessage;
5050
import com.google.protobuf.StringValue;
5151
import io.grpc.BindableService;
5252
import io.grpc.MethodDescriptor;
@@ -252,14 +252,14 @@ public ServerServiceDefinition bindService() {
252252
BigtableGrpc.getReadRowsMethod(),
253253
ServerCalls.asyncServerStreamingCall(
254254
(req, observer) -> rpcs.add(ServerRpc.create(req, observer))));
255-
ImmutableList<MethodDescriptor<? extends GeneratedMessageV3, ? extends GeneratedMessageV3>>
255+
ImmutableList<MethodDescriptor<? extends GeneratedMessage, ? extends GeneratedMessage>>
256256
unaryDescriptors =
257257
ImmutableList.of(
258258
BigtableGrpc.getMutateRowMethod(),
259259
BigtableGrpc.getCheckAndMutateRowMethod(),
260260
BigtableGrpc.getReadModifyWriteRowMethod());
261261

262-
for (MethodDescriptor<? extends GeneratedMessageV3, ? extends GeneratedMessageV3> desc :
262+
for (MethodDescriptor<? extends GeneratedMessage, ? extends GeneratedMessage> desc :
263263
unaryDescriptors) {
264264
builder.addMethod(
265265
desc.toBuilder().setType(MethodDescriptor.MethodType.SERVER_STREAMING).build(),

0 commit comments

Comments
 (0)