Skip to content

Commit 6d20e6c

Browse files
chore(bazel): update protobuf to v3.21.7 (#305)
* chore(bazel): update protobuf to v3.21.7 PiperOrigin-RevId: 477955264 Source-Link: googleapis/googleapis@a724450 Source-Link: https://github.com/googleapis/googleapis-gen/commit/4abcbcaec855e74a0b22a4988cf9e0eb61a83094 Copy-Tag: eyJwIjoiLmdpdGh1Yi8uT3dsQm90LnlhbWwiLCJoIjoiNGFiY2JjYWVjODU1ZTc0YTBiMjJhNDk4OGNmOWUwZWI2MWE4MzA5NCJ9 * 🦉 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 c6088ce commit 6d20e6c

File tree

61 files changed

+3668
-5544
lines changed

Some content is hidden

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

61 files changed

+3668
-5544
lines changed

java-service-usage/README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,20 +19,20 @@ If you are using Maven, add this to your pom.xml file:
1919
<dependency>
2020
<groupId>com.google.cloud</groupId>
2121
<artifactId>google-cloud-service-usage</artifactId>
22-
<version>2.3.5</version>
22+
<version>2.3.6</version>
2323
</dependency>
2424
```
2525

2626
If you are using Gradle without BOM, add this to your dependencies:
2727

2828
```Groovy
29-
implementation 'com.google.cloud:google-cloud-service-usage:2.3.5'
29+
implementation 'com.google.cloud:google-cloud-service-usage:2.3.6'
3030
```
3131

3232
If you are using SBT, add this to your dependencies:
3333

3434
```Scala
35-
libraryDependencies += "com.google.cloud" % "google-cloud-service-usage" % "2.3.5"
35+
libraryDependencies += "com.google.cloud" % "google-cloud-service-usage" % "2.3.6"
3636
```
3737

3838
## Authentication

java-service-usage/proto-google-cloud-service-usage-v1/src/main/java/com/google/api/serviceusage/v1/BatchEnableServicesRequest.java

Lines changed: 52 additions & 82 deletions
Original file line numberDiff line numberDiff line change
@@ -53,66 +53,6 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
5353
return this.unknownFields;
5454
}
5555

56-
private BatchEnableServicesRequest(
57-
com.google.protobuf.CodedInputStream input,
58-
com.google.protobuf.ExtensionRegistryLite extensionRegistry)
59-
throws com.google.protobuf.InvalidProtocolBufferException {
60-
this();
61-
if (extensionRegistry == null) {
62-
throw new java.lang.NullPointerException();
63-
}
64-
int mutable_bitField0_ = 0;
65-
com.google.protobuf.UnknownFieldSet.Builder unknownFields =
66-
com.google.protobuf.UnknownFieldSet.newBuilder();
67-
try {
68-
boolean done = false;
69-
while (!done) {
70-
int tag = input.readTag();
71-
switch (tag) {
72-
case 0:
73-
done = true;
74-
break;
75-
case 10:
76-
{
77-
java.lang.String s = input.readStringRequireUtf8();
78-
79-
parent_ = s;
80-
break;
81-
}
82-
case 18:
83-
{
84-
java.lang.String s = input.readStringRequireUtf8();
85-
if (!((mutable_bitField0_ & 0x00000001) != 0)) {
86-
serviceIds_ = new com.google.protobuf.LazyStringArrayList();
87-
mutable_bitField0_ |= 0x00000001;
88-
}
89-
serviceIds_.add(s);
90-
break;
91-
}
92-
default:
93-
{
94-
if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
95-
done = true;
96-
}
97-
break;
98-
}
99-
}
100-
}
101-
} catch (com.google.protobuf.InvalidProtocolBufferException e) {
102-
throw e.setUnfinishedMessage(this);
103-
} catch (com.google.protobuf.UninitializedMessageException e) {
104-
throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
105-
} catch (java.io.IOException e) {
106-
throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
107-
} finally {
108-
if (((mutable_bitField0_ & 0x00000001) != 0)) {
109-
serviceIds_ = serviceIds_.getUnmodifiableView();
110-
}
111-
this.unknownFields = unknownFields.build();
112-
makeExtensionsImmutable();
113-
}
114-
}
115-
11656
public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
11757
return com.google.api.serviceusage.v1.ServiceUsageProto
11858
.internal_static_google_api_serviceusage_v1_BatchEnableServicesRequest_descriptor;
@@ -292,7 +232,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
292232
for (int i = 0; i < serviceIds_.size(); i++) {
293233
com.google.protobuf.GeneratedMessageV3.writeString(output, 2, serviceIds_.getRaw(i));
294234
}
295-
unknownFields.writeTo(output);
235+
getUnknownFields().writeTo(output);
296236
}
297237

298238
@java.lang.Override
@@ -312,7 +252,7 @@ public int getSerializedSize() {
312252
size += dataSize;
313253
size += 1 * getServiceIdsList().size();
314254
}
315-
size += unknownFields.getSerializedSize();
255+
size += getUnknownFields().getSerializedSize();
316256
memoizedSize = size;
317257
return size;
318258
}
@@ -330,7 +270,7 @@ public boolean equals(final java.lang.Object obj) {
330270

331271
if (!getParent().equals(other.getParent())) return false;
332272
if (!getServiceIdsList().equals(other.getServiceIdsList())) return false;
333-
if (!unknownFields.equals(other.unknownFields)) return false;
273+
if (!getUnknownFields().equals(other.getUnknownFields())) return false;
334274
return true;
335275
}
336276

@@ -347,7 +287,7 @@ public int hashCode() {
347287
hash = (37 * hash) + SERVICE_IDS_FIELD_NUMBER;
348288
hash = (53 * hash) + getServiceIdsList().hashCode();
349289
}
350-
hash = (29 * hash) + unknownFields.hashCode();
290+
hash = (29 * hash) + getUnknownFields().hashCode();
351291
memoizedHashCode = hash;
352292
return hash;
353293
}
@@ -477,17 +417,10 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
477417
}
478418

479419
// Construct using com.google.api.serviceusage.v1.BatchEnableServicesRequest.newBuilder()
480-
private Builder() {
481-
maybeForceBuilderInitialization();
482-
}
420+
private Builder() {}
483421

484422
private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
485423
super(parent);
486-
maybeForceBuilderInitialization();
487-
}
488-
489-
private void maybeForceBuilderInitialization() {
490-
if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {}
491424
}
492425

493426
@java.lang.Override
@@ -595,7 +528,7 @@ public Builder mergeFrom(com.google.api.serviceusage.v1.BatchEnableServicesReque
595528
}
596529
onChanged();
597530
}
598-
this.mergeUnknownFields(other.unknownFields);
531+
this.mergeUnknownFields(other.getUnknownFields());
599532
onChanged();
600533
return this;
601534
}
@@ -610,18 +543,44 @@ public Builder mergeFrom(
610543
com.google.protobuf.CodedInputStream input,
611544
com.google.protobuf.ExtensionRegistryLite extensionRegistry)
612545
throws java.io.IOException {
613-
com.google.api.serviceusage.v1.BatchEnableServicesRequest parsedMessage = null;
546+
if (extensionRegistry == null) {
547+
throw new java.lang.NullPointerException();
548+
}
614549
try {
615-
parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
550+
boolean done = false;
551+
while (!done) {
552+
int tag = input.readTag();
553+
switch (tag) {
554+
case 0:
555+
done = true;
556+
break;
557+
case 10:
558+
{
559+
parent_ = input.readStringRequireUtf8();
560+
561+
break;
562+
} // case 10
563+
case 18:
564+
{
565+
java.lang.String s = input.readStringRequireUtf8();
566+
ensureServiceIdsIsMutable();
567+
serviceIds_.add(s);
568+
break;
569+
} // case 18
570+
default:
571+
{
572+
if (!super.parseUnknownField(input, extensionRegistry, tag)) {
573+
done = true; // was an endgroup tag
574+
}
575+
break;
576+
} // default:
577+
} // switch (tag)
578+
} // while (!done)
616579
} catch (com.google.protobuf.InvalidProtocolBufferException e) {
617-
parsedMessage =
618-
(com.google.api.serviceusage.v1.BatchEnableServicesRequest) e.getUnfinishedMessage();
619580
throw e.unwrapIOException();
620581
} finally {
621-
if (parsedMessage != null) {
622-
mergeFrom(parsedMessage);
623-
}
624-
}
582+
onChanged();
583+
} // finally
625584
return this;
626585
}
627586

@@ -1011,7 +970,18 @@ public BatchEnableServicesRequest parsePartialFrom(
1011970
com.google.protobuf.CodedInputStream input,
1012971
com.google.protobuf.ExtensionRegistryLite extensionRegistry)
1013972
throws com.google.protobuf.InvalidProtocolBufferException {
1014-
return new BatchEnableServicesRequest(input, extensionRegistry);
973+
Builder builder = newBuilder();
974+
try {
975+
builder.mergeFrom(input, extensionRegistry);
976+
} catch (com.google.protobuf.InvalidProtocolBufferException e) {
977+
throw e.setUnfinishedMessage(builder.buildPartial());
978+
} catch (com.google.protobuf.UninitializedMessageException e) {
979+
throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
980+
} catch (java.io.IOException e) {
981+
throw new com.google.protobuf.InvalidProtocolBufferException(e)
982+
.setUnfinishedMessage(builder.buildPartial());
983+
}
984+
return builder.buildPartial();
1015985
}
1016986
};
1017987

0 commit comments

Comments
 (0)