Skip to content

Commit cae59d0

Browse files
chore(bazel): update protobuf to v3.21.12 (#2245)
* chore(bazel): update protobuf to v3.21.12 PiperOrigin-RevId: 503267695 Source-Link: googleapis/googleapis@c790590 Source-Link: https://github.com/googleapis/googleapis-gen/commit/b98230b9e68a3828cf138296e9a20e03749ae0a0 Copy-Tag: eyJwIjoiLmdpdGh1Yi8uT3dsQm90LnlhbWwiLCJoIjoiYjk4MjMwYjllNjhhMzgyOGNmMTM4Mjk2ZTlhMjBlMDM3NDlhZTBhMCJ9 * 🦉 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 1adaf7c commit cae59d0

File tree

102 files changed

+6105
-4590
lines changed

Some content is hidden

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

102 files changed

+6105
-4590
lines changed

proto-google-cloud-spanner-admin-database-v1/src/main/java/com/google/spanner/admin/database/v1/Backup.java

Lines changed: 212 additions & 202 deletions
Large diffs are not rendered by default.

proto-google-cloud-spanner-admin-database-v1/src/main/java/com/google/spanner/admin/database/v1/BackupInfo.java

Lines changed: 82 additions & 71 deletions
Large diffs are not rendered by default.

proto-google-cloud-spanner-admin-database-v1/src/main/java/com/google/spanner/admin/database/v1/CopyBackupEncryptionConfig.java

Lines changed: 32 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -259,7 +259,7 @@ private EncryptionType(int value) {
259259
}
260260

261261
public static final int ENCRYPTION_TYPE_FIELD_NUMBER = 1;
262-
private int encryptionType_;
262+
private int encryptionType_ = 0;
263263
/**
264264
*
265265
*
@@ -293,9 +293,8 @@ public int getEncryptionTypeValue() {
293293
@java.lang.Override
294294
public com.google.spanner.admin.database.v1.CopyBackupEncryptionConfig.EncryptionType
295295
getEncryptionType() {
296-
@SuppressWarnings("deprecation")
297296
com.google.spanner.admin.database.v1.CopyBackupEncryptionConfig.EncryptionType result =
298-
com.google.spanner.admin.database.v1.CopyBackupEncryptionConfig.EncryptionType.valueOf(
297+
com.google.spanner.admin.database.v1.CopyBackupEncryptionConfig.EncryptionType.forNumber(
299298
encryptionType_);
300299
return result == null
301300
? com.google.spanner.admin.database.v1.CopyBackupEncryptionConfig.EncryptionType
@@ -304,7 +303,9 @@ public int getEncryptionTypeValue() {
304303
}
305304

306305
public static final int KMS_KEY_NAME_FIELD_NUMBER = 2;
307-
private volatile java.lang.Object kmsKeyName_;
306+
307+
@SuppressWarnings("serial")
308+
private volatile java.lang.Object kmsKeyName_ = "";
308309
/**
309310
*
310311
*
@@ -577,10 +578,9 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
577578
@java.lang.Override
578579
public Builder clear() {
579580
super.clear();
581+
bitField0_ = 0;
580582
encryptionType_ = 0;
581-
582583
kmsKeyName_ = "";
583-
584584
return this;
585585
}
586586

@@ -609,12 +609,24 @@ public com.google.spanner.admin.database.v1.CopyBackupEncryptionConfig build() {
609609
public com.google.spanner.admin.database.v1.CopyBackupEncryptionConfig buildPartial() {
610610
com.google.spanner.admin.database.v1.CopyBackupEncryptionConfig result =
611611
new com.google.spanner.admin.database.v1.CopyBackupEncryptionConfig(this);
612-
result.encryptionType_ = encryptionType_;
613-
result.kmsKeyName_ = kmsKeyName_;
612+
if (bitField0_ != 0) {
613+
buildPartial0(result);
614+
}
614615
onBuilt();
615616
return result;
616617
}
617618

619+
private void buildPartial0(
620+
com.google.spanner.admin.database.v1.CopyBackupEncryptionConfig result) {
621+
int from_bitField0_ = bitField0_;
622+
if (((from_bitField0_ & 0x00000001) != 0)) {
623+
result.encryptionType_ = encryptionType_;
624+
}
625+
if (((from_bitField0_ & 0x00000002) != 0)) {
626+
result.kmsKeyName_ = kmsKeyName_;
627+
}
628+
}
629+
618630
@java.lang.Override
619631
public Builder clone() {
620632
return super.clone();
@@ -668,6 +680,7 @@ public Builder mergeFrom(
668680
}
669681
if (!other.getKmsKeyName().isEmpty()) {
670682
kmsKeyName_ = other.kmsKeyName_;
683+
bitField0_ |= 0x00000002;
671684
onChanged();
672685
}
673686
this.mergeUnknownFields(other.getUnknownFields());
@@ -699,13 +712,13 @@ public Builder mergeFrom(
699712
case 8:
700713
{
701714
encryptionType_ = input.readEnum();
702-
715+
bitField0_ |= 0x00000001;
703716
break;
704717
} // case 8
705718
case 18:
706719
{
707720
kmsKeyName_ = input.readStringRequireUtf8();
708-
721+
bitField0_ |= 0x00000002;
709722
break;
710723
} // case 18
711724
default:
@@ -725,6 +738,8 @@ public Builder mergeFrom(
725738
return this;
726739
}
727740

741+
private int bitField0_;
742+
728743
private int encryptionType_ = 0;
729744
/**
730745
*
@@ -758,8 +773,8 @@ public int getEncryptionTypeValue() {
758773
* @return This builder for chaining.
759774
*/
760775
public Builder setEncryptionTypeValue(int value) {
761-
762776
encryptionType_ = value;
777+
bitField0_ |= 0x00000001;
763778
onChanged();
764779
return this;
765780
}
@@ -779,9 +794,8 @@ public Builder setEncryptionTypeValue(int value) {
779794
@java.lang.Override
780795
public com.google.spanner.admin.database.v1.CopyBackupEncryptionConfig.EncryptionType
781796
getEncryptionType() {
782-
@SuppressWarnings("deprecation")
783797
com.google.spanner.admin.database.v1.CopyBackupEncryptionConfig.EncryptionType result =
784-
com.google.spanner.admin.database.v1.CopyBackupEncryptionConfig.EncryptionType.valueOf(
798+
com.google.spanner.admin.database.v1.CopyBackupEncryptionConfig.EncryptionType.forNumber(
785799
encryptionType_);
786800
return result == null
787801
? com.google.spanner.admin.database.v1.CopyBackupEncryptionConfig.EncryptionType
@@ -807,7 +821,7 @@ public Builder setEncryptionType(
807821
if (value == null) {
808822
throw new NullPointerException();
809823
}
810-
824+
bitField0_ |= 0x00000001;
811825
encryptionType_ = value.getNumber();
812826
onChanged();
813827
return this;
@@ -826,7 +840,7 @@ public Builder setEncryptionType(
826840
* @return This builder for chaining.
827841
*/
828842
public Builder clearEncryptionType() {
829-
843+
bitField0_ = (bitField0_ & ~0x00000001);
830844
encryptionType_ = 0;
831845
onChanged();
832846
return this;
@@ -911,8 +925,8 @@ public Builder setKmsKeyName(java.lang.String value) {
911925
if (value == null) {
912926
throw new NullPointerException();
913927
}
914-
915928
kmsKeyName_ = value;
929+
bitField0_ |= 0x00000002;
916930
onChanged();
917931
return this;
918932
}
@@ -934,8 +948,8 @@ public Builder setKmsKeyName(java.lang.String value) {
934948
* @return This builder for chaining.
935949
*/
936950
public Builder clearKmsKeyName() {
937-
938951
kmsKeyName_ = getDefaultInstance().getKmsKeyName();
952+
bitField0_ = (bitField0_ & ~0x00000002);
939953
onChanged();
940954
return this;
941955
}
@@ -962,8 +976,8 @@ public Builder setKmsKeyNameBytes(com.google.protobuf.ByteString value) {
962976
throw new NullPointerException();
963977
}
964978
checkByteStringIsUtf8(value);
965-
966979
kmsKeyName_ = value;
980+
bitField0_ |= 0x00000002;
967981
onChanged();
968982
return this;
969983
}

0 commit comments

Comments
 (0)