Skip to content

Commit b2e1530

Browse files
gcf-owl-bot[bot]gcf-owl-bot[bot]
authored
chore(bazel): update protobuf to v3.21.7 (#1115)
- [ ] Regenerate this pull request now. PiperOrigin-RevId: 477955264 Source-Link: https://togithub.com/googleapis/googleapis/commit/a724450af76d0001f23602684c49cd6a4b3a5654 Source-Link: https://togithub.com/googleapis/googleapis-gen/commit/4abcbcaec855e74a0b22a4988cf9e0eb61a83094 Copy-Tag: eyJwIjoiLmdpdGh1Yi8uT3dsQm90LnlhbWwiLCJoIjoiNGFiY2JjYWVjODU1ZTc0YTBiMjJhNDk4OGNmOWUwZWI2MWE4MzA5NCJ9
1 parent 17a6e26 commit b2e1530

File tree

62 files changed

+3759
-5645
lines changed

Some content is hidden

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

62 files changed

+3759
-5645
lines changed

‎proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/BigQueryOptions.java

Lines changed: 51 additions & 70 deletions
Original file line numberDiff line numberDiff line change
@@ -50,55 +50,6 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
5050
return this.unknownFields;
5151
}
5252

53-
private BigQueryOptions(
54-
com.google.protobuf.CodedInputStream input,
55-
com.google.protobuf.ExtensionRegistryLite extensionRegistry)
56-
throws com.google.protobuf.InvalidProtocolBufferException {
57-
this();
58-
if (extensionRegistry == null) {
59-
throw new java.lang.NullPointerException();
60-
}
61-
com.google.protobuf.UnknownFieldSet.Builder unknownFields =
62-
com.google.protobuf.UnknownFieldSet.newBuilder();
63-
try {
64-
boolean done = false;
65-
while (!done) {
66-
int tag = input.readTag();
67-
switch (tag) {
68-
case 0:
69-
done = true;
70-
break;
71-
case 8:
72-
{
73-
usePartitionedTables_ = input.readBool();
74-
break;
75-
}
76-
case 24:
77-
{
78-
usesTimestampColumnPartitioning_ = input.readBool();
79-
break;
80-
}
81-
default:
82-
{
83-
if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
84-
done = true;
85-
}
86-
break;
87-
}
88-
}
89-
}
90-
} catch (com.google.protobuf.InvalidProtocolBufferException e) {
91-
throw e.setUnfinishedMessage(this);
92-
} catch (com.google.protobuf.UninitializedMessageException e) {
93-
throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
94-
} catch (java.io.IOException e) {
95-
throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
96-
} finally {
97-
this.unknownFields = unknownFields.build();
98-
makeExtensionsImmutable();
99-
}
100-
}
101-
10253
public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
10354
return com.google.logging.v2.LoggingConfigProto
10455
.internal_static_google_logging_v2_BigQueryOptions_descriptor;
@@ -183,7 +134,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
183134
if (usesTimestampColumnPartitioning_ != false) {
184135
output.writeBool(3, usesTimestampColumnPartitioning_);
185136
}
186-
unknownFields.writeTo(output);
137+
getUnknownFields().writeTo(output);
187138
}
188139

189140
@java.lang.Override
@@ -200,7 +151,7 @@ public int getSerializedSize() {
200151
com.google.protobuf.CodedOutputStream.computeBoolSize(
201152
3, usesTimestampColumnPartitioning_);
202153
}
203-
size += unknownFields.getSerializedSize();
154+
size += getUnknownFields().getSerializedSize();
204155
memoizedSize = size;
205156
return size;
206157
}
@@ -218,7 +169,7 @@ public boolean equals(final java.lang.Object obj) {
218169
if (getUsePartitionedTables() != other.getUsePartitionedTables()) return false;
219170
if (getUsesTimestampColumnPartitioning() != other.getUsesTimestampColumnPartitioning())
220171
return false;
221-
if (!unknownFields.equals(other.unknownFields)) return false;
172+
if (!getUnknownFields().equals(other.getUnknownFields())) return false;
222173
return true;
223174
}
224175

@@ -235,7 +186,7 @@ public int hashCode() {
235186
hash =
236187
(53 * hash)
237188
+ com.google.protobuf.Internal.hashBoolean(getUsesTimestampColumnPartitioning());
238-
hash = (29 * hash) + unknownFields.hashCode();
189+
hash = (29 * hash) + getUnknownFields().hashCode();
239190
memoizedHashCode = hash;
240191
return hash;
241192
}
@@ -363,17 +314,10 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
363314
}
364315

365316
// Construct using com.google.logging.v2.BigQueryOptions.newBuilder()
366-
private Builder() {
367-
maybeForceBuilderInitialization();
368-
}
317+
private Builder() {}
369318

370319
private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
371320
super(parent);
372-
maybeForceBuilderInitialization();
373-
}
374-
375-
private void maybeForceBuilderInitialization() {
376-
if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {}
377321
}
378322

379323
@java.lang.Override
@@ -467,7 +411,7 @@ public Builder mergeFrom(com.google.logging.v2.BigQueryOptions other) {
467411
if (other.getUsesTimestampColumnPartitioning() != false) {
468412
setUsesTimestampColumnPartitioning(other.getUsesTimestampColumnPartitioning());
469413
}
470-
this.mergeUnknownFields(other.unknownFields);
414+
this.mergeUnknownFields(other.getUnknownFields());
471415
onChanged();
472416
return this;
473417
}
@@ -482,17 +426,43 @@ public Builder mergeFrom(
482426
com.google.protobuf.CodedInputStream input,
483427
com.google.protobuf.ExtensionRegistryLite extensionRegistry)
484428
throws java.io.IOException {
485-
com.google.logging.v2.BigQueryOptions parsedMessage = null;
429+
if (extensionRegistry == null) {
430+
throw new java.lang.NullPointerException();
431+
}
486432
try {
487-
parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
433+
boolean done = false;
434+
while (!done) {
435+
int tag = input.readTag();
436+
switch (tag) {
437+
case 0:
438+
done = true;
439+
break;
440+
case 8:
441+
{
442+
usePartitionedTables_ = input.readBool();
443+
444+
break;
445+
} // case 8
446+
case 24:
447+
{
448+
usesTimestampColumnPartitioning_ = input.readBool();
449+
450+
break;
451+
} // case 24
452+
default:
453+
{
454+
if (!super.parseUnknownField(input, extensionRegistry, tag)) {
455+
done = true; // was an endgroup tag
456+
}
457+
break;
458+
} // default:
459+
} // switch (tag)
460+
} // while (!done)
488461
} catch (com.google.protobuf.InvalidProtocolBufferException e) {
489-
parsedMessage = (com.google.logging.v2.BigQueryOptions) e.getUnfinishedMessage();
490462
throw e.unwrapIOException();
491463
} finally {
492-
if (parsedMessage != null) {
493-
mergeFrom(parsedMessage);
494-
}
495-
}
464+
onChanged();
465+
} // finally
496466
return this;
497467
}
498468

@@ -674,7 +644,18 @@ public BigQueryOptions parsePartialFrom(
674644
com.google.protobuf.CodedInputStream input,
675645
com.google.protobuf.ExtensionRegistryLite extensionRegistry)
676646
throws com.google.protobuf.InvalidProtocolBufferException {
677-
return new BigQueryOptions(input, extensionRegistry);
647+
Builder builder = newBuilder();
648+
try {
649+
builder.mergeFrom(input, extensionRegistry);
650+
} catch (com.google.protobuf.InvalidProtocolBufferException e) {
651+
throw e.setUnfinishedMessage(builder.buildPartial());
652+
} catch (com.google.protobuf.UninitializedMessageException e) {
653+
throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
654+
} catch (java.io.IOException e) {
655+
throw new com.google.protobuf.InvalidProtocolBufferException(e)
656+
.setUnfinishedMessage(builder.buildPartial());
657+
}
658+
return builder.buildPartial();
678659
}
679660
};
680661

‎proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/CmekSettings.java

Lines changed: 57 additions & 81 deletions
Original file line numberDiff line numberDiff line change
@@ -61,66 +61,6 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
6161
return this.unknownFields;
6262
}
6363

64-
private CmekSettings(
65-
com.google.protobuf.CodedInputStream input,
66-
com.google.protobuf.ExtensionRegistryLite extensionRegistry)
67-
throws com.google.protobuf.InvalidProtocolBufferException {
68-
this();
69-
if (extensionRegistry == null) {
70-
throw new java.lang.NullPointerException();
71-
}
72-
com.google.protobuf.UnknownFieldSet.Builder unknownFields =
73-
com.google.protobuf.UnknownFieldSet.newBuilder();
74-
try {
75-
boolean done = false;
76-
while (!done) {
77-
int tag = input.readTag();
78-
switch (tag) {
79-
case 0:
80-
done = true;
81-
break;
82-
case 10:
83-
{
84-
java.lang.String s = input.readStringRequireUtf8();
85-
86-
name_ = s;
87-
break;
88-
}
89-
case 18:
90-
{
91-
java.lang.String s = input.readStringRequireUtf8();
92-
93-
kmsKeyName_ = s;
94-
break;
95-
}
96-
case 26:
97-
{
98-
java.lang.String s = input.readStringRequireUtf8();
99-
100-
serviceAccountId_ = s;
101-
break;
102-
}
103-
default:
104-
{
105-
if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
106-
done = true;
107-
}
108-
break;
109-
}
110-
}
111-
}
112-
} catch (com.google.protobuf.InvalidProtocolBufferException e) {
113-
throw e.setUnfinishedMessage(this);
114-
} catch (com.google.protobuf.UninitializedMessageException e) {
115-
throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
116-
} catch (java.io.IOException e) {
117-
throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
118-
} finally {
119-
this.unknownFields = unknownFields.build();
120-
makeExtensionsImmutable();
121-
}
122-
}
123-
12464
public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
12565
return com.google.logging.v2.LoggingConfigProto
12666
.internal_static_google_logging_v2_CmekSettings_descriptor;
@@ -358,7 +298,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
358298
if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(serviceAccountId_)) {
359299
com.google.protobuf.GeneratedMessageV3.writeString(output, 3, serviceAccountId_);
360300
}
361-
unknownFields.writeTo(output);
301+
getUnknownFields().writeTo(output);
362302
}
363303

364304
@java.lang.Override
@@ -376,7 +316,7 @@ public int getSerializedSize() {
376316
if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(serviceAccountId_)) {
377317
size += com.google.protobuf.GeneratedMessageV3.computeStringSize(3, serviceAccountId_);
378318
}
379-
size += unknownFields.getSerializedSize();
319+
size += getUnknownFields().getSerializedSize();
380320
memoizedSize = size;
381321
return size;
382322
}
@@ -394,7 +334,7 @@ public boolean equals(final java.lang.Object obj) {
394334
if (!getName().equals(other.getName())) return false;
395335
if (!getKmsKeyName().equals(other.getKmsKeyName())) return false;
396336
if (!getServiceAccountId().equals(other.getServiceAccountId())) return false;
397-
if (!unknownFields.equals(other.unknownFields)) return false;
337+
if (!getUnknownFields().equals(other.getUnknownFields())) return false;
398338
return true;
399339
}
400340

@@ -411,7 +351,7 @@ public int hashCode() {
411351
hash = (53 * hash) + getKmsKeyName().hashCode();
412352
hash = (37 * hash) + SERVICE_ACCOUNT_ID_FIELD_NUMBER;
413353
hash = (53 * hash) + getServiceAccountId().hashCode();
414-
hash = (29 * hash) + unknownFields.hashCode();
354+
hash = (29 * hash) + getUnknownFields().hashCode();
415355
memoizedHashCode = hash;
416356
return hash;
417357
}
@@ -546,17 +486,10 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
546486
}
547487

548488
// Construct using com.google.logging.v2.CmekSettings.newBuilder()
549-
private Builder() {
550-
maybeForceBuilderInitialization();
551-
}
489+
private Builder() {}
552490

553491
private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
554492
super(parent);
555-
maybeForceBuilderInitialization();
556-
}
557-
558-
private void maybeForceBuilderInitialization() {
559-
if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {}
560493
}
561494

562495
@java.lang.Override
@@ -658,7 +591,7 @@ public Builder mergeFrom(com.google.logging.v2.CmekSettings other) {
658591
serviceAccountId_ = other.serviceAccountId_;
659592
onChanged();
660593
}
661-
this.mergeUnknownFields(other.unknownFields);
594+
this.mergeUnknownFields(other.getUnknownFields());
662595
onChanged();
663596
return this;
664597
}
@@ -673,17 +606,49 @@ public Builder mergeFrom(
673606
com.google.protobuf.CodedInputStream input,
674607
com.google.protobuf.ExtensionRegistryLite extensionRegistry)
675608
throws java.io.IOException {
676-
com.google.logging.v2.CmekSettings parsedMessage = null;
609+
if (extensionRegistry == null) {
610+
throw new java.lang.NullPointerException();
611+
}
677612
try {
678-
parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
613+
boolean done = false;
614+
while (!done) {
615+
int tag = input.readTag();
616+
switch (tag) {
617+
case 0:
618+
done = true;
619+
break;
620+
case 10:
621+
{
622+
name_ = input.readStringRequireUtf8();
623+
624+
break;
625+
} // case 10
626+
case 18:
627+
{
628+
kmsKeyName_ = input.readStringRequireUtf8();
629+
630+
break;
631+
} // case 18
632+
case 26:
633+
{
634+
serviceAccountId_ = input.readStringRequireUtf8();
635+
636+
break;
637+
} // case 26
638+
default:
639+
{
640+
if (!super.parseUnknownField(input, extensionRegistry, tag)) {
641+
done = true; // was an endgroup tag
642+
}
643+
break;
644+
} // default:
645+
} // switch (tag)
646+
} // while (!done)
679647
} catch (com.google.protobuf.InvalidProtocolBufferException e) {
680-
parsedMessage = (com.google.logging.v2.CmekSettings) e.getUnfinishedMessage();
681648
throw e.unwrapIOException();
682649
} finally {
683-
if (parsedMessage != null) {
684-
mergeFrom(parsedMessage);
685-
}
686-
}
650+
onChanged();
651+
} // finally
687652
return this;
688653
}
689654

@@ -1167,7 +1132,18 @@ public CmekSettings parsePartialFrom(
11671132
com.google.protobuf.CodedInputStream input,
11681133
com.google.protobuf.ExtensionRegistryLite extensionRegistry)
11691134
throws com.google.protobuf.InvalidProtocolBufferException {
1170-
return new CmekSettings(input, extensionRegistry);
1135+
Builder builder = newBuilder();
1136+
try {
1137+
builder.mergeFrom(input, extensionRegistry);
1138+
} catch (com.google.protobuf.InvalidProtocolBufferException e) {
1139+
throw e.setUnfinishedMessage(builder.buildPartial());
1140+
} catch (com.google.protobuf.UninitializedMessageException e) {
1141+
throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
1142+
} catch (java.io.IOException e) {
1143+
throw new com.google.protobuf.InvalidProtocolBufferException(e)
1144+
.setUnfinishedMessage(builder.buildPartial());
1145+
}
1146+
return builder.buildPartial();
11711147
}
11721148
};
11731149

0 commit comments

Comments
 (0)