Skip to content

Commit bfeb7c4

Browse files
chore(bazel): update protobuf to v3.21.7 (googleapis#301)
- [ ] 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 077008f commit bfeb7c4

16 files changed

+946
-1466
lines changed

java-managed-identities/README.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -27,13 +27,13 @@ If you are using Maven, add this to your pom.xml file:
2727
If you are using Gradle without BOM, add this to your dependencies:
2828

2929
```Groovy
30-
implementation 'com.google.cloud:google-cloud-managed-identities:1.1.4'
30+
implementation 'com.google.cloud:google-cloud-managed-identities:1.1.5'
3131
```
3232

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

3535
```Scala
36-
libraryDependencies += "com.google.cloud" % "google-cloud-managed-identities" % "1.1.4"
36+
libraryDependencies += "com.google.cloud" % "google-cloud-managed-identities" % "1.1.5"
3737
```
3838

3939
## Authentication

java-managed-identities/proto-google-cloud-managed-identities-v1/src/main/java/com/google/cloud/managedidentities/v1/AttachTrustRequest.java

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

56-
private AttachTrustRequest(
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-
name_ = s;
79-
break;
80-
}
81-
case 18:
82-
{
83-
com.google.cloud.managedidentities.v1.Trust.Builder subBuilder = null;
84-
if (trust_ != null) {
85-
subBuilder = trust_.toBuilder();
86-
}
87-
trust_ =
88-
input.readMessage(
89-
com.google.cloud.managedidentities.v1.Trust.parser(), extensionRegistry);
90-
if (subBuilder != null) {
91-
subBuilder.mergeFrom(trust_);
92-
trust_ = subBuilder.buildPartial();
93-
}
94-
95-
break;
96-
}
97-
default:
98-
{
99-
if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
100-
done = true;
101-
}
102-
break;
103-
}
104-
}
105-
}
106-
} catch (com.google.protobuf.InvalidProtocolBufferException e) {
107-
throw e.setUnfinishedMessage(this);
108-
} catch (com.google.protobuf.UninitializedMessageException e) {
109-
throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
110-
} catch (java.io.IOException e) {
111-
throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
112-
} finally {
113-
this.unknownFields = unknownFields.build();
114-
makeExtensionsImmutable();
115-
}
116-
}
117-
11856
public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
11957
return com.google.cloud.managedidentities.v1.ManagedIdentitiesServiceProto
12058
.internal_static_google_cloud_managedidentities_v1_AttachTrustRequest_descriptor;
@@ -259,7 +197,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
259197
if (trust_ != null) {
260198
output.writeMessage(2, getTrust());
261199
}
262-
unknownFields.writeTo(output);
200+
getUnknownFields().writeTo(output);
263201
}
264202

265203
@java.lang.Override
@@ -274,7 +212,7 @@ public int getSerializedSize() {
274212
if (trust_ != null) {
275213
size += com.google.protobuf.CodedOutputStream.computeMessageSize(2, getTrust());
276214
}
277-
size += unknownFields.getSerializedSize();
215+
size += getUnknownFields().getSerializedSize();
278216
memoizedSize = size;
279217
return size;
280218
}
@@ -295,7 +233,7 @@ public boolean equals(final java.lang.Object obj) {
295233
if (hasTrust()) {
296234
if (!getTrust().equals(other.getTrust())) return false;
297235
}
298-
if (!unknownFields.equals(other.unknownFields)) return false;
236+
if (!getUnknownFields().equals(other.getUnknownFields())) return false;
299237
return true;
300238
}
301239

@@ -312,7 +250,7 @@ public int hashCode() {
312250
hash = (37 * hash) + TRUST_FIELD_NUMBER;
313251
hash = (53 * hash) + getTrust().hashCode();
314252
}
315-
hash = (29 * hash) + unknownFields.hashCode();
253+
hash = (29 * hash) + getUnknownFields().hashCode();
316254
memoizedHashCode = hash;
317255
return hash;
318256
}
@@ -443,17 +381,10 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
443381
}
444382

445383
// Construct using com.google.cloud.managedidentities.v1.AttachTrustRequest.newBuilder()
446-
private Builder() {
447-
maybeForceBuilderInitialization();
448-
}
384+
private Builder() {}
449385

450386
private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
451387
super(parent);
452-
maybeForceBuilderInitialization();
453-
}
454-
455-
private void maybeForceBuilderInitialization() {
456-
if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {}
457388
}
458389

459390
@java.lang.Override
@@ -557,7 +488,7 @@ public Builder mergeFrom(com.google.cloud.managedidentities.v1.AttachTrustReques
557488
if (other.hasTrust()) {
558489
mergeTrust(other.getTrust());
559490
}
560-
this.mergeUnknownFields(other.unknownFields);
491+
this.mergeUnknownFields(other.getUnknownFields());
561492
onChanged();
562493
return this;
563494
}
@@ -572,18 +503,43 @@ public Builder mergeFrom(
572503
com.google.protobuf.CodedInputStream input,
573504
com.google.protobuf.ExtensionRegistryLite extensionRegistry)
574505
throws java.io.IOException {
575-
com.google.cloud.managedidentities.v1.AttachTrustRequest parsedMessage = null;
506+
if (extensionRegistry == null) {
507+
throw new java.lang.NullPointerException();
508+
}
576509
try {
577-
parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
510+
boolean done = false;
511+
while (!done) {
512+
int tag = input.readTag();
513+
switch (tag) {
514+
case 0:
515+
done = true;
516+
break;
517+
case 10:
518+
{
519+
name_ = input.readStringRequireUtf8();
520+
521+
break;
522+
} // case 10
523+
case 18:
524+
{
525+
input.readMessage(getTrustFieldBuilder().getBuilder(), extensionRegistry);
526+
527+
break;
528+
} // case 18
529+
default:
530+
{
531+
if (!super.parseUnknownField(input, extensionRegistry, tag)) {
532+
done = true; // was an endgroup tag
533+
}
534+
break;
535+
} // default:
536+
} // switch (tag)
537+
} // while (!done)
578538
} catch (com.google.protobuf.InvalidProtocolBufferException e) {
579-
parsedMessage =
580-
(com.google.cloud.managedidentities.v1.AttachTrustRequest) e.getUnfinishedMessage();
581539
throw e.unwrapIOException();
582540
} finally {
583-
if (parsedMessage != null) {
584-
mergeFrom(parsedMessage);
585-
}
586-
}
541+
onChanged();
542+
} // finally
587543
return this;
588544
}
589545

@@ -943,7 +899,18 @@ public AttachTrustRequest parsePartialFrom(
943899
com.google.protobuf.CodedInputStream input,
944900
com.google.protobuf.ExtensionRegistryLite extensionRegistry)
945901
throws com.google.protobuf.InvalidProtocolBufferException {
946-
return new AttachTrustRequest(input, extensionRegistry);
902+
Builder builder = newBuilder();
903+
try {
904+
builder.mergeFrom(input, extensionRegistry);
905+
} catch (com.google.protobuf.InvalidProtocolBufferException e) {
906+
throw e.setUnfinishedMessage(builder.buildPartial());
907+
} catch (com.google.protobuf.UninitializedMessageException e) {
908+
throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
909+
} catch (java.io.IOException e) {
910+
throw new com.google.protobuf.InvalidProtocolBufferException(e)
911+
.setUnfinishedMessage(builder.buildPartial());
912+
}
913+
return builder.buildPartial();
947914
}
948915
};
949916

0 commit comments

Comments
 (0)