Skip to content

Commit dbc3708

Browse files
chore(bazel): update protobuf to v3.21.7 (googleapis#312)
- [ ] 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 885f4de commit dbc3708

28 files changed

+1665
-2515
lines changed

java-service-management/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-management</artifactId>
22-
<version>3.1.5</version>
22+
<version>3.1.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-management:3.1.5'
29+
implementation 'com.google.cloud:google-cloud-service-management:3.1.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-management" % "3.1.5"
35+
libraryDependencies += "com.google.cloud" % "google-cloud-service-management" % "3.1.6"
3636
```
3737

3838
## Authentication

java-service-management/proto-google-cloud-service-management-v1/src/main/java/com/google/api/servicemanagement/v1/ChangeReport.java

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

57-
private ChangeReport(
58-
com.google.protobuf.CodedInputStream input,
59-
com.google.protobuf.ExtensionRegistryLite extensionRegistry)
60-
throws com.google.protobuf.InvalidProtocolBufferException {
61-
this();
62-
if (extensionRegistry == null) {
63-
throw new java.lang.NullPointerException();
64-
}
65-
int mutable_bitField0_ = 0;
66-
com.google.protobuf.UnknownFieldSet.Builder unknownFields =
67-
com.google.protobuf.UnknownFieldSet.newBuilder();
68-
try {
69-
boolean done = false;
70-
while (!done) {
71-
int tag = input.readTag();
72-
switch (tag) {
73-
case 0:
74-
done = true;
75-
break;
76-
case 10:
77-
{
78-
if (!((mutable_bitField0_ & 0x00000001) != 0)) {
79-
configChanges_ = new java.util.ArrayList<com.google.api.ConfigChange>();
80-
mutable_bitField0_ |= 0x00000001;
81-
}
82-
configChanges_.add(
83-
input.readMessage(com.google.api.ConfigChange.parser(), extensionRegistry));
84-
break;
85-
}
86-
default:
87-
{
88-
if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
89-
done = true;
90-
}
91-
break;
92-
}
93-
}
94-
}
95-
} catch (com.google.protobuf.InvalidProtocolBufferException e) {
96-
throw e.setUnfinishedMessage(this);
97-
} catch (com.google.protobuf.UninitializedMessageException e) {
98-
throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
99-
} catch (java.io.IOException e) {
100-
throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
101-
} finally {
102-
if (((mutable_bitField0_ & 0x00000001) != 0)) {
103-
configChanges_ = java.util.Collections.unmodifiableList(configChanges_);
104-
}
105-
this.unknownFields = unknownFields.build();
106-
makeExtensionsImmutable();
107-
}
108-
}
109-
11057
public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
11158
return com.google.api.servicemanagement.v1.ResourcesProto
11259
.internal_static_google_api_servicemanagement_v1_ChangeReport_descriptor;
@@ -228,7 +175,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
228175
for (int i = 0; i < configChanges_.size(); i++) {
229176
output.writeMessage(1, configChanges_.get(i));
230177
}
231-
unknownFields.writeTo(output);
178+
getUnknownFields().writeTo(output);
232179
}
233180

234181
@java.lang.Override
@@ -240,7 +187,7 @@ public int getSerializedSize() {
240187
for (int i = 0; i < configChanges_.size(); i++) {
241188
size += com.google.protobuf.CodedOutputStream.computeMessageSize(1, configChanges_.get(i));
242189
}
243-
size += unknownFields.getSerializedSize();
190+
size += getUnknownFields().getSerializedSize();
244191
memoizedSize = size;
245192
return size;
246193
}
@@ -257,7 +204,7 @@ public boolean equals(final java.lang.Object obj) {
257204
(com.google.api.servicemanagement.v1.ChangeReport) obj;
258205

259206
if (!getConfigChangesList().equals(other.getConfigChangesList())) return false;
260-
if (!unknownFields.equals(other.unknownFields)) return false;
207+
if (!getUnknownFields().equals(other.getUnknownFields())) return false;
261208
return true;
262209
}
263210

@@ -272,7 +219,7 @@ public int hashCode() {
272219
hash = (37 * hash) + CONFIG_CHANGES_FIELD_NUMBER;
273220
hash = (53 * hash) + getConfigChangesList().hashCode();
274221
}
275-
hash = (29 * hash) + unknownFields.hashCode();
222+
hash = (29 * hash) + getUnknownFields().hashCode();
276223
memoizedHashCode = hash;
277224
return hash;
278225
}
@@ -403,30 +350,22 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
403350
}
404351

405352
// Construct using com.google.api.servicemanagement.v1.ChangeReport.newBuilder()
406-
private Builder() {
407-
maybeForceBuilderInitialization();
408-
}
353+
private Builder() {}
409354

410355
private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
411356
super(parent);
412-
maybeForceBuilderInitialization();
413-
}
414-
415-
private void maybeForceBuilderInitialization() {
416-
if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {
417-
getConfigChangesFieldBuilder();
418-
}
419357
}
420358

421359
@java.lang.Override
422360
public Builder clear() {
423361
super.clear();
424362
if (configChangesBuilder_ == null) {
425363
configChanges_ = java.util.Collections.emptyList();
426-
bitField0_ = (bitField0_ & ~0x00000001);
427364
} else {
365+
configChanges_ = null;
428366
configChangesBuilder_.clear();
429367
}
368+
bitField0_ = (bitField0_ & ~0x00000001);
430369
return this;
431370
}
432371

@@ -541,7 +480,7 @@ public Builder mergeFrom(com.google.api.servicemanagement.v1.ChangeReport other)
541480
}
542481
}
543482
}
544-
this.mergeUnknownFields(other.unknownFields);
483+
this.mergeUnknownFields(other.getUnknownFields());
545484
onChanged();
546485
return this;
547486
}
@@ -556,17 +495,43 @@ public Builder mergeFrom(
556495
com.google.protobuf.CodedInputStream input,
557496
com.google.protobuf.ExtensionRegistryLite extensionRegistry)
558497
throws java.io.IOException {
559-
com.google.api.servicemanagement.v1.ChangeReport parsedMessage = null;
498+
if (extensionRegistry == null) {
499+
throw new java.lang.NullPointerException();
500+
}
560501
try {
561-
parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
502+
boolean done = false;
503+
while (!done) {
504+
int tag = input.readTag();
505+
switch (tag) {
506+
case 0:
507+
done = true;
508+
break;
509+
case 10:
510+
{
511+
com.google.api.ConfigChange m =
512+
input.readMessage(com.google.api.ConfigChange.parser(), extensionRegistry);
513+
if (configChangesBuilder_ == null) {
514+
ensureConfigChangesIsMutable();
515+
configChanges_.add(m);
516+
} else {
517+
configChangesBuilder_.addMessage(m);
518+
}
519+
break;
520+
} // case 10
521+
default:
522+
{
523+
if (!super.parseUnknownField(input, extensionRegistry, tag)) {
524+
done = true; // was an endgroup tag
525+
}
526+
break;
527+
} // default:
528+
} // switch (tag)
529+
} // while (!done)
562530
} catch (com.google.protobuf.InvalidProtocolBufferException e) {
563-
parsedMessage = (com.google.api.servicemanagement.v1.ChangeReport) e.getUnfinishedMessage();
564531
throw e.unwrapIOException();
565532
} finally {
566-
if (parsedMessage != null) {
567-
mergeFrom(parsedMessage);
568-
}
569-
}
533+
onChanged();
534+
} // finally
570535
return this;
571536
}
572537

@@ -1027,7 +992,18 @@ public ChangeReport parsePartialFrom(
1027992
com.google.protobuf.CodedInputStream input,
1028993
com.google.protobuf.ExtensionRegistryLite extensionRegistry)
1029994
throws com.google.protobuf.InvalidProtocolBufferException {
1030-
return new ChangeReport(input, extensionRegistry);
995+
Builder builder = newBuilder();
996+
try {
997+
builder.mergeFrom(input, extensionRegistry);
998+
} catch (com.google.protobuf.InvalidProtocolBufferException e) {
999+
throw e.setUnfinishedMessage(builder.buildPartial());
1000+
} catch (com.google.protobuf.UninitializedMessageException e) {
1001+
throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
1002+
} catch (java.io.IOException e) {
1003+
throw new com.google.protobuf.InvalidProtocolBufferException(e)
1004+
.setUnfinishedMessage(builder.buildPartial());
1005+
}
1006+
return builder.buildPartial();
10311007
}
10321008
};
10331009

0 commit comments

Comments
 (0)