Skip to content

Commit 52a59b7

Browse files
chore(bazel): update protobuf to v3.21.7 (#223)
* 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 b1dc1d3 commit 52a59b7

23 files changed

+2062
-2990
lines changed

java-service-control/README.md

+3-3
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-control</artifactId>
22-
<version>1.3.3</version>
22+
<version>1.3.4</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-control:1.3.3'
29+
implementation 'com.google.cloud:google-cloud-service-control:1.3.4'
3030
```
3131

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

3434
```Scala
35-
libraryDependencies += "com.google.cloud" % "google-cloud-service-control" % "1.3.3"
35+
libraryDependencies += "com.google.cloud" % "google-cloud-service-control" % "1.3.4"
3636
```
3737

3838
## Authentication

java-service-control/proto-google-cloud-service-control-v1/src/main/java/com/google/api/servicecontrol/v1/AllocateQuotaRequest.java

+58-91
Original file line numberDiff line numberDiff line change
@@ -53,75 +53,6 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
5353
return this.unknownFields;
5454
}
5555

56-
private AllocateQuotaRequest(
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-
com.google.protobuf.UnknownFieldSet.Builder unknownFields =
65-
com.google.protobuf.UnknownFieldSet.newBuilder();
66-
try {
67-
boolean done = false;
68-
while (!done) {
69-
int tag = input.readTag();
70-
switch (tag) {
71-
case 0:
72-
done = true;
73-
break;
74-
case 10:
75-
{
76-
java.lang.String s = input.readStringRequireUtf8();
77-
78-
serviceName_ = s;
79-
break;
80-
}
81-
case 18:
82-
{
83-
com.google.api.servicecontrol.v1.QuotaOperation.Builder subBuilder = null;
84-
if (allocateOperation_ != null) {
85-
subBuilder = allocateOperation_.toBuilder();
86-
}
87-
allocateOperation_ =
88-
input.readMessage(
89-
com.google.api.servicecontrol.v1.QuotaOperation.parser(), extensionRegistry);
90-
if (subBuilder != null) {
91-
subBuilder.mergeFrom(allocateOperation_);
92-
allocateOperation_ = subBuilder.buildPartial();
93-
}
94-
95-
break;
96-
}
97-
case 34:
98-
{
99-
java.lang.String s = input.readStringRequireUtf8();
100-
101-
serviceConfigId_ = s;
102-
break;
103-
}
104-
default:
105-
{
106-
if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
107-
done = true;
108-
}
109-
break;
110-
}
111-
}
112-
}
113-
} catch (com.google.protobuf.InvalidProtocolBufferException e) {
114-
throw e.setUnfinishedMessage(this);
115-
} catch (com.google.protobuf.UninitializedMessageException e) {
116-
throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
117-
} catch (java.io.IOException e) {
118-
throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
119-
} finally {
120-
this.unknownFields = unknownFields.build();
121-
makeExtensionsImmutable();
122-
}
123-
}
124-
12556
public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
12657
return com.google.api.servicecontrol.v1.QuotaControllerProto
12758
.internal_static_google_api_servicecontrol_v1_AllocateQuotaRequest_descriptor;
@@ -314,7 +245,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
314245
if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(serviceConfigId_)) {
315246
com.google.protobuf.GeneratedMessageV3.writeString(output, 4, serviceConfigId_);
316247
}
317-
unknownFields.writeTo(output);
248+
getUnknownFields().writeTo(output);
318249
}
319250

320251
@java.lang.Override
@@ -332,7 +263,7 @@ public int getSerializedSize() {
332263
if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(serviceConfigId_)) {
333264
size += com.google.protobuf.GeneratedMessageV3.computeStringSize(4, serviceConfigId_);
334265
}
335-
size += unknownFields.getSerializedSize();
266+
size += getUnknownFields().getSerializedSize();
336267
memoizedSize = size;
337268
return size;
338269
}
@@ -354,7 +285,7 @@ public boolean equals(final java.lang.Object obj) {
354285
if (!getAllocateOperation().equals(other.getAllocateOperation())) return false;
355286
}
356287
if (!getServiceConfigId().equals(other.getServiceConfigId())) return false;
357-
if (!unknownFields.equals(other.unknownFields)) return false;
288+
if (!getUnknownFields().equals(other.getUnknownFields())) return false;
358289
return true;
359290
}
360291

@@ -373,7 +304,7 @@ public int hashCode() {
373304
}
374305
hash = (37 * hash) + SERVICE_CONFIG_ID_FIELD_NUMBER;
375306
hash = (53 * hash) + getServiceConfigId().hashCode();
376-
hash = (29 * hash) + unknownFields.hashCode();
307+
hash = (29 * hash) + getUnknownFields().hashCode();
377308
memoizedHashCode = hash;
378309
return hash;
379310
}
@@ -503,17 +434,10 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
503434
}
504435

505436
// Construct using com.google.api.servicecontrol.v1.AllocateQuotaRequest.newBuilder()
506-
private Builder() {
507-
maybeForceBuilderInitialization();
508-
}
437+
private Builder() {}
509438

510439
private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
511440
super(parent);
512-
maybeForceBuilderInitialization();
513-
}
514-
515-
private void maybeForceBuilderInitialization() {
516-
if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {}
517441
}
518442

519443
@java.lang.Override
@@ -624,7 +548,7 @@ public Builder mergeFrom(com.google.api.servicecontrol.v1.AllocateQuotaRequest o
624548
serviceConfigId_ = other.serviceConfigId_;
625549
onChanged();
626550
}
627-
this.mergeUnknownFields(other.unknownFields);
551+
this.mergeUnknownFields(other.getUnknownFields());
628552
onChanged();
629553
return this;
630554
}
@@ -639,18 +563,50 @@ public Builder mergeFrom(
639563
com.google.protobuf.CodedInputStream input,
640564
com.google.protobuf.ExtensionRegistryLite extensionRegistry)
641565
throws java.io.IOException {
642-
com.google.api.servicecontrol.v1.AllocateQuotaRequest parsedMessage = null;
566+
if (extensionRegistry == null) {
567+
throw new java.lang.NullPointerException();
568+
}
643569
try {
644-
parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
570+
boolean done = false;
571+
while (!done) {
572+
int tag = input.readTag();
573+
switch (tag) {
574+
case 0:
575+
done = true;
576+
break;
577+
case 10:
578+
{
579+
serviceName_ = input.readStringRequireUtf8();
580+
581+
break;
582+
} // case 10
583+
case 18:
584+
{
585+
input.readMessage(
586+
getAllocateOperationFieldBuilder().getBuilder(), extensionRegistry);
587+
588+
break;
589+
} // case 18
590+
case 34:
591+
{
592+
serviceConfigId_ = input.readStringRequireUtf8();
593+
594+
break;
595+
} // case 34
596+
default:
597+
{
598+
if (!super.parseUnknownField(input, extensionRegistry, tag)) {
599+
done = true; // was an endgroup tag
600+
}
601+
break;
602+
} // default:
603+
} // switch (tag)
604+
} // while (!done)
645605
} catch (com.google.protobuf.InvalidProtocolBufferException e) {
646-
parsedMessage =
647-
(com.google.api.servicecontrol.v1.AllocateQuotaRequest) e.getUnfinishedMessage();
648606
throw e.unwrapIOException();
649607
} finally {
650-
if (parsedMessage != null) {
651-
mergeFrom(parsedMessage);
652-
}
653-
}
608+
onChanged();
609+
} // finally
654610
return this;
655611
}
656612

@@ -1105,7 +1061,18 @@ public AllocateQuotaRequest parsePartialFrom(
11051061
com.google.protobuf.CodedInputStream input,
11061062
com.google.protobuf.ExtensionRegistryLite extensionRegistry)
11071063
throws com.google.protobuf.InvalidProtocolBufferException {
1108-
return new AllocateQuotaRequest(input, extensionRegistry);
1064+
Builder builder = newBuilder();
1065+
try {
1066+
builder.mergeFrom(input, extensionRegistry);
1067+
} catch (com.google.protobuf.InvalidProtocolBufferException e) {
1068+
throw e.setUnfinishedMessage(builder.buildPartial());
1069+
} catch (com.google.protobuf.UninitializedMessageException e) {
1070+
throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
1071+
} catch (java.io.IOException e) {
1072+
throw new com.google.protobuf.InvalidProtocolBufferException(e)
1073+
.setUnfinishedMessage(builder.buildPartial());
1074+
}
1075+
return builder.buildPartial();
11091076
}
11101077
};
11111078

0 commit comments

Comments
 (0)