Skip to content

Commit 43247a6

Browse files
gcf-owl-bot[bot]gcf-owl-bot[bot]
authored
chore(bazel): update protobuf to v3.21.12 (#1309)
* 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 f6824f0 commit 43247a6

File tree

67 files changed

+2681
-1785
lines changed

Some content is hidden

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

67 files changed

+2681
-1785
lines changed

‎proto-google-cloud-pubsublite-v1/src/main/java/com/google/cloud/pubsublite/proto/AttributeValues.java

Lines changed: 17 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,8 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
6868
}
6969

7070
public static final int VALUES_FIELD_NUMBER = 1;
71+
72+
@SuppressWarnings("serial")
7173
private java.util.List<com.google.protobuf.ByteString> values_;
7274
/**
7375
*
@@ -318,8 +320,8 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
318320
@java.lang.Override
319321
public Builder clear() {
320322
super.clear();
323+
bitField0_ = 0;
321324
values_ = java.util.Collections.emptyList();
322-
bitField0_ = (bitField0_ & ~0x00000001);
323325
return this;
324326
}
325327

@@ -347,14 +349,25 @@ public com.google.cloud.pubsublite.proto.AttributeValues build() {
347349
public com.google.cloud.pubsublite.proto.AttributeValues buildPartial() {
348350
com.google.cloud.pubsublite.proto.AttributeValues result =
349351
new com.google.cloud.pubsublite.proto.AttributeValues(this);
350-
int from_bitField0_ = bitField0_;
352+
buildPartialRepeatedFields(result);
353+
if (bitField0_ != 0) {
354+
buildPartial0(result);
355+
}
356+
onBuilt();
357+
return result;
358+
}
359+
360+
private void buildPartialRepeatedFields(
361+
com.google.cloud.pubsublite.proto.AttributeValues result) {
351362
if (((bitField0_ & 0x00000001) != 0)) {
352363
values_ = java.util.Collections.unmodifiableList(values_);
353364
bitField0_ = (bitField0_ & ~0x00000001);
354365
}
355366
result.values_ = values_;
356-
onBuilt();
357-
return result;
367+
}
368+
369+
private void buildPartial0(com.google.cloud.pubsublite.proto.AttributeValues result) {
370+
int from_bitField0_ = bitField0_;
358371
}
359372

360373
@java.lang.Override

‎proto-google-cloud-pubsublite-v1/src/main/java/com/google/cloud/pubsublite/proto/CommitCursorRequest.java

Lines changed: 54 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,9 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
6868
}
6969

7070
public static final int SUBSCRIPTION_FIELD_NUMBER = 1;
71-
private volatile java.lang.Object subscription_;
71+
72+
@SuppressWarnings("serial")
73+
private volatile java.lang.Object subscription_ = "";
7274
/**
7375
*
7476
*
@@ -117,7 +119,7 @@ public com.google.protobuf.ByteString getSubscriptionBytes() {
117119
}
118120

119121
public static final int PARTITION_FIELD_NUMBER = 2;
120-
private long partition_;
122+
private long partition_ = 0L;
121123
/**
122124
*
123125
*
@@ -180,7 +182,9 @@ public com.google.cloud.pubsublite.proto.Cursor getCursor() {
180182
*/
181183
@java.lang.Override
182184
public com.google.cloud.pubsublite.proto.CursorOrBuilder getCursorOrBuilder() {
183-
return getCursor();
185+
return cursor_ == null
186+
? com.google.cloud.pubsublite.proto.Cursor.getDefaultInstance()
187+
: cursor_;
184188
}
185189

186190
private byte memoizedIsInitialized = -1;
@@ -404,14 +408,12 @@ private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
404408
@java.lang.Override
405409
public Builder clear() {
406410
super.clear();
411+
bitField0_ = 0;
407412
subscription_ = "";
408-
409413
partition_ = 0L;
410-
411-
if (cursorBuilder_ == null) {
412-
cursor_ = null;
413-
} else {
414-
cursor_ = null;
414+
cursor_ = null;
415+
if (cursorBuilder_ != null) {
416+
cursorBuilder_.dispose();
415417
cursorBuilder_ = null;
416418
}
417419
return this;
@@ -441,17 +443,26 @@ public com.google.cloud.pubsublite.proto.CommitCursorRequest build() {
441443
public com.google.cloud.pubsublite.proto.CommitCursorRequest buildPartial() {
442444
com.google.cloud.pubsublite.proto.CommitCursorRequest result =
443445
new com.google.cloud.pubsublite.proto.CommitCursorRequest(this);
444-
result.subscription_ = subscription_;
445-
result.partition_ = partition_;
446-
if (cursorBuilder_ == null) {
447-
result.cursor_ = cursor_;
448-
} else {
449-
result.cursor_ = cursorBuilder_.build();
446+
if (bitField0_ != 0) {
447+
buildPartial0(result);
450448
}
451449
onBuilt();
452450
return result;
453451
}
454452

453+
private void buildPartial0(com.google.cloud.pubsublite.proto.CommitCursorRequest result) {
454+
int from_bitField0_ = bitField0_;
455+
if (((from_bitField0_ & 0x00000001) != 0)) {
456+
result.subscription_ = subscription_;
457+
}
458+
if (((from_bitField0_ & 0x00000002) != 0)) {
459+
result.partition_ = partition_;
460+
}
461+
if (((from_bitField0_ & 0x00000004) != 0)) {
462+
result.cursor_ = cursorBuilder_ == null ? cursor_ : cursorBuilder_.build();
463+
}
464+
}
465+
455466
@java.lang.Override
456467
public Builder clone() {
457468
return super.clone();
@@ -500,6 +511,7 @@ public Builder mergeFrom(com.google.cloud.pubsublite.proto.CommitCursorRequest o
500511
return this;
501512
if (!other.getSubscription().isEmpty()) {
502513
subscription_ = other.subscription_;
514+
bitField0_ |= 0x00000001;
503515
onChanged();
504516
}
505517
if (other.getPartition() != 0L) {
@@ -537,19 +549,19 @@ public Builder mergeFrom(
537549
case 10:
538550
{
539551
subscription_ = input.readStringRequireUtf8();
540-
552+
bitField0_ |= 0x00000001;
541553
break;
542554
} // case 10
543555
case 16:
544556
{
545557
partition_ = input.readInt64();
546-
558+
bitField0_ |= 0x00000002;
547559
break;
548560
} // case 16
549561
case 26:
550562
{
551563
input.readMessage(getCursorFieldBuilder().getBuilder(), extensionRegistry);
552-
564+
bitField0_ |= 0x00000004;
553565
break;
554566
} // case 26
555567
default:
@@ -569,6 +581,8 @@ public Builder mergeFrom(
569581
return this;
570582
}
571583

584+
private int bitField0_;
585+
572586
private java.lang.Object subscription_ = "";
573587
/**
574588
*
@@ -630,8 +644,8 @@ public Builder setSubscription(java.lang.String value) {
630644
if (value == null) {
631645
throw new NullPointerException();
632646
}
633-
634647
subscription_ = value;
648+
bitField0_ |= 0x00000001;
635649
onChanged();
636650
return this;
637651
}
@@ -647,8 +661,8 @@ public Builder setSubscription(java.lang.String value) {
647661
* @return This builder for chaining.
648662
*/
649663
public Builder clearSubscription() {
650-
651664
subscription_ = getDefaultInstance().getSubscription();
665+
bitField0_ = (bitField0_ & ~0x00000001);
652666
onChanged();
653667
return this;
654668
}
@@ -669,8 +683,8 @@ public Builder setSubscriptionBytes(com.google.protobuf.ByteString value) {
669683
throw new NullPointerException();
670684
}
671685
checkByteStringIsUtf8(value);
672-
673686
subscription_ = value;
687+
bitField0_ |= 0x00000001;
674688
onChanged();
675689
return this;
676690
}
@@ -708,6 +722,7 @@ public long getPartition() {
708722
public Builder setPartition(long value) {
709723

710724
partition_ = value;
725+
bitField0_ |= 0x00000002;
711726
onChanged();
712727
return this;
713728
}
@@ -724,7 +739,7 @@ public Builder setPartition(long value) {
724739
* @return This builder for chaining.
725740
*/
726741
public Builder clearPartition() {
727-
742+
bitField0_ = (bitField0_ & ~0x00000002);
728743
partition_ = 0L;
729744
onChanged();
730745
return this;
@@ -748,7 +763,7 @@ public Builder clearPartition() {
748763
* @return Whether the cursor field is set.
749764
*/
750765
public boolean hasCursor() {
751-
return cursorBuilder_ != null || cursor_ != null;
766+
return ((bitField0_ & 0x00000004) != 0);
752767
}
753768
/**
754769
*
@@ -785,11 +800,11 @@ public Builder setCursor(com.google.cloud.pubsublite.proto.Cursor value) {
785800
throw new NullPointerException();
786801
}
787802
cursor_ = value;
788-
onChanged();
789803
} else {
790804
cursorBuilder_.setMessage(value);
791805
}
792-
806+
bitField0_ |= 0x00000004;
807+
onChanged();
793808
return this;
794809
}
795810
/**
@@ -804,11 +819,11 @@ public Builder setCursor(com.google.cloud.pubsublite.proto.Cursor value) {
804819
public Builder setCursor(com.google.cloud.pubsublite.proto.Cursor.Builder builderForValue) {
805820
if (cursorBuilder_ == null) {
806821
cursor_ = builderForValue.build();
807-
onChanged();
808822
} else {
809823
cursorBuilder_.setMessage(builderForValue.build());
810824
}
811-
825+
bitField0_ |= 0x00000004;
826+
onChanged();
812827
return this;
813828
}
814829
/**
@@ -822,19 +837,18 @@ public Builder setCursor(com.google.cloud.pubsublite.proto.Cursor.Builder builde
822837
*/
823838
public Builder mergeCursor(com.google.cloud.pubsublite.proto.Cursor value) {
824839
if (cursorBuilder_ == null) {
825-
if (cursor_ != null) {
826-
cursor_ =
827-
com.google.cloud.pubsublite.proto.Cursor.newBuilder(cursor_)
828-
.mergeFrom(value)
829-
.buildPartial();
840+
if (((bitField0_ & 0x00000004) != 0)
841+
&& cursor_ != null
842+
&& cursor_ != com.google.cloud.pubsublite.proto.Cursor.getDefaultInstance()) {
843+
getCursorBuilder().mergeFrom(value);
830844
} else {
831845
cursor_ = value;
832846
}
833-
onChanged();
834847
} else {
835848
cursorBuilder_.mergeFrom(value);
836849
}
837-
850+
bitField0_ |= 0x00000004;
851+
onChanged();
838852
return this;
839853
}
840854
/**
@@ -847,14 +861,13 @@ public Builder mergeCursor(com.google.cloud.pubsublite.proto.Cursor value) {
847861
* <code>.google.cloud.pubsublite.v1.Cursor cursor = 3;</code>
848862
*/
849863
public Builder clearCursor() {
850-
if (cursorBuilder_ == null) {
851-
cursor_ = null;
852-
onChanged();
853-
} else {
854-
cursor_ = null;
864+
bitField0_ = (bitField0_ & ~0x00000004);
865+
cursor_ = null;
866+
if (cursorBuilder_ != null) {
867+
cursorBuilder_.dispose();
855868
cursorBuilder_ = null;
856869
}
857-
870+
onChanged();
858871
return this;
859872
}
860873
/**
@@ -867,7 +880,7 @@ public Builder clearCursor() {
867880
* <code>.google.cloud.pubsublite.v1.Cursor cursor = 3;</code>
868881
*/
869882
public com.google.cloud.pubsublite.proto.Cursor.Builder getCursorBuilder() {
870-
883+
bitField0_ |= 0x00000004;
871884
onChanged();
872885
return getCursorFieldBuilder().getBuilder();
873886
}

0 commit comments

Comments
 (0)