Skip to content

Commit 3f4ae83

Browse files
gcf-owl-bot[bot]gcf-owl-bot[bot]
authored
deps: Update protobuf to 25.2 in WORKSPACE (#1311)
* build: Update protobuf to 25.2 in WORKSPACE build: Update grpc to 1.60.0 in WORKSPACE build: Remove pin for boringssl in WORKSPACE build: Update bazel to 6.3.0 in .bazeliskrc PiperOrigin-RevId: 603226138 Source-Link: googleapis/googleapis@2aec9e1 Source-Link: https://github.com/googleapis/googleapis-gen/commit/e9a5c2ef37b4d69c93e39141d87aae0b193c00b1 Copy-Tag: eyJwIjoiLmdpdGh1Yi8uT3dsQm90LnlhbWwiLCJoIjoiZTlhNWMyZWYzN2I0ZDY5YzkzZTM5MTQxZDg3YWFlMGIxOTNjMDBiMSJ9 * 🦉 Updates from OwlBot post-processor See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md --------- Co-authored-by: Owl Bot <gcf-owl-bot[bot]@users.noreply.github.com>
1 parent c201367 commit 3f4ae83

File tree

127 files changed

+1357
-366
lines changed

Some content is hidden

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

127 files changed

+1357
-366
lines changed

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

Lines changed: 135 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1043,6 +1043,15 @@
10431043
"allDeclaredClasses": true,
10441044
"allPublicClasses": true
10451045
},
1046+
{
1047+
"name": "com.google.protobuf.DescriptorProtos$Edition",
1048+
"queryAllDeclaredConstructors": true,
1049+
"queryAllPublicConstructors": true,
1050+
"queryAllDeclaredMethods": true,
1051+
"allPublicMethods": true,
1052+
"allDeclaredClasses": true,
1053+
"allPublicClasses": true
1054+
},
10461055
{
10471056
"name": "com.google.protobuf.DescriptorProtos$EnumDescriptorProto",
10481057
"queryAllDeclaredConstructors": true,
@@ -1178,6 +1187,114 @@
11781187
"allDeclaredClasses": true,
11791188
"allPublicClasses": true
11801189
},
1190+
{
1191+
"name": "com.google.protobuf.DescriptorProtos$FeatureSet",
1192+
"queryAllDeclaredConstructors": true,
1193+
"queryAllPublicConstructors": true,
1194+
"queryAllDeclaredMethods": true,
1195+
"allPublicMethods": true,
1196+
"allDeclaredClasses": true,
1197+
"allPublicClasses": true
1198+
},
1199+
{
1200+
"name": "com.google.protobuf.DescriptorProtos$FeatureSet$Builder",
1201+
"queryAllDeclaredConstructors": true,
1202+
"queryAllPublicConstructors": true,
1203+
"queryAllDeclaredMethods": true,
1204+
"allPublicMethods": true,
1205+
"allDeclaredClasses": true,
1206+
"allPublicClasses": true
1207+
},
1208+
{
1209+
"name": "com.google.protobuf.DescriptorProtos$FeatureSet$EnumType",
1210+
"queryAllDeclaredConstructors": true,
1211+
"queryAllPublicConstructors": true,
1212+
"queryAllDeclaredMethods": true,
1213+
"allPublicMethods": true,
1214+
"allDeclaredClasses": true,
1215+
"allPublicClasses": true
1216+
},
1217+
{
1218+
"name": "com.google.protobuf.DescriptorProtos$FeatureSet$FieldPresence",
1219+
"queryAllDeclaredConstructors": true,
1220+
"queryAllPublicConstructors": true,
1221+
"queryAllDeclaredMethods": true,
1222+
"allPublicMethods": true,
1223+
"allDeclaredClasses": true,
1224+
"allPublicClasses": true
1225+
},
1226+
{
1227+
"name": "com.google.protobuf.DescriptorProtos$FeatureSet$JsonFormat",
1228+
"queryAllDeclaredConstructors": true,
1229+
"queryAllPublicConstructors": true,
1230+
"queryAllDeclaredMethods": true,
1231+
"allPublicMethods": true,
1232+
"allDeclaredClasses": true,
1233+
"allPublicClasses": true
1234+
},
1235+
{
1236+
"name": "com.google.protobuf.DescriptorProtos$FeatureSet$MessageEncoding",
1237+
"queryAllDeclaredConstructors": true,
1238+
"queryAllPublicConstructors": true,
1239+
"queryAllDeclaredMethods": true,
1240+
"allPublicMethods": true,
1241+
"allDeclaredClasses": true,
1242+
"allPublicClasses": true
1243+
},
1244+
{
1245+
"name": "com.google.protobuf.DescriptorProtos$FeatureSet$RepeatedFieldEncoding",
1246+
"queryAllDeclaredConstructors": true,
1247+
"queryAllPublicConstructors": true,
1248+
"queryAllDeclaredMethods": true,
1249+
"allPublicMethods": true,
1250+
"allDeclaredClasses": true,
1251+
"allPublicClasses": true
1252+
},
1253+
{
1254+
"name": "com.google.protobuf.DescriptorProtos$FeatureSet$Utf8Validation",
1255+
"queryAllDeclaredConstructors": true,
1256+
"queryAllPublicConstructors": true,
1257+
"queryAllDeclaredMethods": true,
1258+
"allPublicMethods": true,
1259+
"allDeclaredClasses": true,
1260+
"allPublicClasses": true
1261+
},
1262+
{
1263+
"name": "com.google.protobuf.DescriptorProtos$FeatureSetDefaults",
1264+
"queryAllDeclaredConstructors": true,
1265+
"queryAllPublicConstructors": true,
1266+
"queryAllDeclaredMethods": true,
1267+
"allPublicMethods": true,
1268+
"allDeclaredClasses": true,
1269+
"allPublicClasses": true
1270+
},
1271+
{
1272+
"name": "com.google.protobuf.DescriptorProtos$FeatureSetDefaults$Builder",
1273+
"queryAllDeclaredConstructors": true,
1274+
"queryAllPublicConstructors": true,
1275+
"queryAllDeclaredMethods": true,
1276+
"allPublicMethods": true,
1277+
"allDeclaredClasses": true,
1278+
"allPublicClasses": true
1279+
},
1280+
{
1281+
"name": "com.google.protobuf.DescriptorProtos$FeatureSetDefaults$FeatureSetEditionDefault",
1282+
"queryAllDeclaredConstructors": true,
1283+
"queryAllPublicConstructors": true,
1284+
"queryAllDeclaredMethods": true,
1285+
"allPublicMethods": true,
1286+
"allDeclaredClasses": true,
1287+
"allPublicClasses": true
1288+
},
1289+
{
1290+
"name": "com.google.protobuf.DescriptorProtos$FeatureSetDefaults$FeatureSetEditionDefault$Builder",
1291+
"queryAllDeclaredConstructors": true,
1292+
"queryAllPublicConstructors": true,
1293+
"queryAllDeclaredMethods": true,
1294+
"allPublicMethods": true,
1295+
"allDeclaredClasses": true,
1296+
"allPublicClasses": true
1297+
},
11811298
{
11821299
"name": "com.google.protobuf.DescriptorProtos$FieldDescriptorProto",
11831300
"queryAllDeclaredConstructors": true,
@@ -1241,6 +1358,24 @@
12411358
"allDeclaredClasses": true,
12421359
"allPublicClasses": true
12431360
},
1361+
{
1362+
"name": "com.google.protobuf.DescriptorProtos$FieldOptions$EditionDefault",
1363+
"queryAllDeclaredConstructors": true,
1364+
"queryAllPublicConstructors": true,
1365+
"queryAllDeclaredMethods": true,
1366+
"allPublicMethods": true,
1367+
"allDeclaredClasses": true,
1368+
"allPublicClasses": true
1369+
},
1370+
{
1371+
"name": "com.google.protobuf.DescriptorProtos$FieldOptions$EditionDefault$Builder",
1372+
"queryAllDeclaredConstructors": true,
1373+
"queryAllPublicConstructors": true,
1374+
"queryAllDeclaredMethods": true,
1375+
"allPublicMethods": true,
1376+
"allDeclaredClasses": true,
1377+
"allPublicClasses": true
1378+
},
12441379
{
12451380
"name": "com.google.protobuf.DescriptorProtos$FieldOptions$JSType",
12461381
"queryAllDeclaredConstructors": true,

‎proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/CommonMetadata.java‎

Lines changed: 37 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
// Generated by the protocol buffer compiler. DO NOT EDIT!
1717
// source: google/datastore/admin/v1/datastore_admin.proto
1818

19+
// Protobuf Java Version: 3.25.2
1920
package com.google.datastore.admin.v1;
2021

2122
/**
@@ -55,7 +56,8 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
5556

5657
@SuppressWarnings({"rawtypes"})
5758
@java.lang.Override
58-
protected com.google.protobuf.MapField internalGetMapField(int number) {
59+
protected com.google.protobuf.MapFieldReflectionAccessor internalGetMapFieldReflection(
60+
int number) {
5961
switch (number) {
6062
case 4:
6163
return internalGetLabels();
@@ -345,6 +347,7 @@ private State(int value) {
345347
// @@protoc_insertion_point(enum_scope:google.datastore.admin.v1.CommonMetadata.State)
346348
}
347349

350+
private int bitField0_;
348351
public static final int START_TIME_FIELD_NUMBER = 1;
349352
private com.google.protobuf.Timestamp startTime_;
350353
/**
@@ -360,7 +363,7 @@ private State(int value) {
360363
*/
361364
@java.lang.Override
362365
public boolean hasStartTime() {
363-
return startTime_ != null;
366+
return ((bitField0_ & 0x00000001) != 0);
364367
}
365368
/**
366369
*
@@ -406,7 +409,7 @@ public com.google.protobuf.TimestampOrBuilder getStartTimeOrBuilder() {
406409
*/
407410
@java.lang.Override
408411
public boolean hasEndTime() {
409-
return endTime_ != null;
412+
return ((bitField0_ & 0x00000002) != 0);
410413
}
411414
/**
412415
*
@@ -631,10 +634,10 @@ public final boolean isInitialized() {
631634

632635
@java.lang.Override
633636
public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException {
634-
if (startTime_ != null) {
637+
if (((bitField0_ & 0x00000001) != 0)) {
635638
output.writeMessage(1, getStartTime());
636639
}
637-
if (endTime_ != null) {
640+
if (((bitField0_ & 0x00000002) != 0)) {
638641
output.writeMessage(2, getEndTime());
639642
}
640643
if (operationType_
@@ -656,10 +659,10 @@ public int getSerializedSize() {
656659
if (size != -1) return size;
657660

658661
size = 0;
659-
if (startTime_ != null) {
662+
if (((bitField0_ & 0x00000001) != 0)) {
660663
size += com.google.protobuf.CodedOutputStream.computeMessageSize(1, getStartTime());
661664
}
662-
if (endTime_ != null) {
665+
if (((bitField0_ & 0x00000002) != 0)) {
663666
size += com.google.protobuf.CodedOutputStream.computeMessageSize(2, getEndTime());
664667
}
665668
if (operationType_
@@ -853,7 +856,8 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
853856
}
854857

855858
@SuppressWarnings({"rawtypes"})
856-
protected com.google.protobuf.MapField internalGetMapField(int number) {
859+
protected com.google.protobuf.MapFieldReflectionAccessor internalGetMapFieldReflection(
860+
int number) {
857861
switch (number) {
858862
case 4:
859863
return internalGetLabels();
@@ -863,7 +867,8 @@ protected com.google.protobuf.MapField internalGetMapField(int number) {
863867
}
864868

865869
@SuppressWarnings({"rawtypes"})
866-
protected com.google.protobuf.MapField internalGetMutableMapField(int number) {
870+
protected com.google.protobuf.MapFieldReflectionAccessor internalGetMutableMapFieldReflection(
871+
int number) {
867872
switch (number) {
868873
case 4:
869874
return internalGetMutableLabels();
@@ -883,10 +888,20 @@ protected com.google.protobuf.MapField internalGetMutableMapField(int number) {
883888
}
884889

885890
// Construct using com.google.datastore.admin.v1.CommonMetadata.newBuilder()
886-
private Builder() {}
891+
private Builder() {
892+
maybeForceBuilderInitialization();
893+
}
887894

888895
private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
889896
super(parent);
897+
maybeForceBuilderInitialization();
898+
}
899+
900+
private void maybeForceBuilderInitialization() {
901+
if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {
902+
getStartTimeFieldBuilder();
903+
getEndTimeFieldBuilder();
904+
}
890905
}
891906

892907
@java.lang.Override
@@ -942,11 +957,14 @@ public com.google.datastore.admin.v1.CommonMetadata buildPartial() {
942957

943958
private void buildPartial0(com.google.datastore.admin.v1.CommonMetadata result) {
944959
int from_bitField0_ = bitField0_;
960+
int to_bitField0_ = 0;
945961
if (((from_bitField0_ & 0x00000001) != 0)) {
946962
result.startTime_ = startTimeBuilder_ == null ? startTime_ : startTimeBuilder_.build();
963+
to_bitField0_ |= 0x00000001;
947964
}
948965
if (((from_bitField0_ & 0x00000002) != 0)) {
949966
result.endTime_ = endTimeBuilder_ == null ? endTime_ : endTimeBuilder_.build();
967+
to_bitField0_ |= 0x00000002;
950968
}
951969
if (((from_bitField0_ & 0x00000004) != 0)) {
952970
result.operationType_ = operationType_;
@@ -958,6 +976,7 @@ private void buildPartial0(com.google.datastore.admin.v1.CommonMetadata result)
958976
if (((from_bitField0_ & 0x00000010) != 0)) {
959977
result.state_ = state_;
960978
}
979+
result.bitField0_ |= to_bitField0_;
961980
}
962981

963982
@java.lang.Override
@@ -1200,8 +1219,10 @@ public Builder mergeStartTime(com.google.protobuf.Timestamp value) {
12001219
} else {
12011220
startTimeBuilder_.mergeFrom(value);
12021221
}
1203-
bitField0_ |= 0x00000001;
1204-
onChanged();
1222+
if (startTime_ != null) {
1223+
bitField0_ |= 0x00000001;
1224+
onChanged();
1225+
}
12051226
return this;
12061227
}
12071228
/**
@@ -1379,8 +1400,10 @@ public Builder mergeEndTime(com.google.protobuf.Timestamp value) {
13791400
} else {
13801401
endTimeBuilder_.mergeFrom(value);
13811402
}
1382-
bitField0_ |= 0x00000002;
1383-
onChanged();
1403+
if (endTime_ != null) {
1404+
bitField0_ |= 0x00000002;
1405+
onChanged();
1406+
}
13841407
return this;
13851408
}
13861409
/**

‎proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/CommonMetadataOrBuilder.java‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
// Generated by the protocol buffer compiler. DO NOT EDIT!
1717
// source: google/datastore/admin/v1/datastore_admin.proto
1818

19+
// Protobuf Java Version: 3.25.2
1920
package com.google.datastore.admin.v1;
2021

2122
public interface CommonMetadataOrBuilder

0 commit comments

Comments
 (0)