Skip to content

Commit 070c47b

Browse files
chore(bazel): update protobuf to v3.21.7 (#256)
- [ ] 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 37793e6 commit 070c47b

40 files changed

+2635
-3892
lines changed

java-filestore/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-filestore</artifactId>
22-
<version>1.4.4</version>
22+
<version>1.4.5</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-filestore:1.4.4'
29+
implementation 'com.google.cloud:google-cloud-filestore:1.4.5'
3030
```
3131

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

3434
```Scala
35-
libraryDependencies += "com.google.cloud" % "google-cloud-filestore" % "1.4.4"
35+
libraryDependencies += "com.google.cloud" % "google-cloud-filestore" % "1.4.5"
3636
```
3737

3838
## Authentication

java-filestore/proto-google-cloud-filestore-v1/src/main/java/com/google/cloud/common/OperationMetadata.java

Lines changed: 81 additions & 123 deletions
Original file line numberDiff line numberDiff line change
@@ -55,108 +55,6 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
5555
return this.unknownFields;
5656
}
5757

58-
private OperationMetadata(
59-
com.google.protobuf.CodedInputStream input,
60-
com.google.protobuf.ExtensionRegistryLite extensionRegistry)
61-
throws com.google.protobuf.InvalidProtocolBufferException {
62-
this();
63-
if (extensionRegistry == null) {
64-
throw new java.lang.NullPointerException();
65-
}
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-
com.google.protobuf.Timestamp.Builder subBuilder = null;
79-
if (createTime_ != null) {
80-
subBuilder = createTime_.toBuilder();
81-
}
82-
createTime_ =
83-
input.readMessage(com.google.protobuf.Timestamp.parser(), extensionRegistry);
84-
if (subBuilder != null) {
85-
subBuilder.mergeFrom(createTime_);
86-
createTime_ = subBuilder.buildPartial();
87-
}
88-
89-
break;
90-
}
91-
case 18:
92-
{
93-
com.google.protobuf.Timestamp.Builder subBuilder = null;
94-
if (endTime_ != null) {
95-
subBuilder = endTime_.toBuilder();
96-
}
97-
endTime_ =
98-
input.readMessage(com.google.protobuf.Timestamp.parser(), extensionRegistry);
99-
if (subBuilder != null) {
100-
subBuilder.mergeFrom(endTime_);
101-
endTime_ = subBuilder.buildPartial();
102-
}
103-
104-
break;
105-
}
106-
case 26:
107-
{
108-
java.lang.String s = input.readStringRequireUtf8();
109-
110-
target_ = s;
111-
break;
112-
}
113-
case 34:
114-
{
115-
java.lang.String s = input.readStringRequireUtf8();
116-
117-
verb_ = s;
118-
break;
119-
}
120-
case 42:
121-
{
122-
java.lang.String s = input.readStringRequireUtf8();
123-
124-
statusDetail_ = s;
125-
break;
126-
}
127-
case 48:
128-
{
129-
cancelRequested_ = input.readBool();
130-
break;
131-
}
132-
case 58:
133-
{
134-
java.lang.String s = input.readStringRequireUtf8();
135-
136-
apiVersion_ = s;
137-
break;
138-
}
139-
default:
140-
{
141-
if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
142-
done = true;
143-
}
144-
break;
145-
}
146-
}
147-
}
148-
} catch (com.google.protobuf.InvalidProtocolBufferException e) {
149-
throw e.setUnfinishedMessage(this);
150-
} catch (com.google.protobuf.UninitializedMessageException e) {
151-
throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
152-
} catch (java.io.IOException e) {
153-
throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
154-
} finally {
155-
this.unknownFields = unknownFields.build();
156-
makeExtensionsImmutable();
157-
}
158-
}
159-
16058
public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
16159
return com.google.cloud.common.OperationMetadataOuterClass
16260
.internal_static_google_cloud_common_OperationMetadata_descriptor;
@@ -522,7 +420,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
522420
if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(apiVersion_)) {
523421
com.google.protobuf.GeneratedMessageV3.writeString(output, 7, apiVersion_);
524422
}
525-
unknownFields.writeTo(output);
423+
getUnknownFields().writeTo(output);
526424
}
527425

528426
@java.lang.Override
@@ -552,7 +450,7 @@ public int getSerializedSize() {
552450
if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(apiVersion_)) {
553451
size += com.google.protobuf.GeneratedMessageV3.computeStringSize(7, apiVersion_);
554452
}
555-
size += unknownFields.getSerializedSize();
453+
size += getUnknownFields().getSerializedSize();
556454
memoizedSize = size;
557455
return size;
558456
}
@@ -581,7 +479,7 @@ public boolean equals(final java.lang.Object obj) {
581479
if (!getStatusDetail().equals(other.getStatusDetail())) return false;
582480
if (getCancelRequested() != other.getCancelRequested()) return false;
583481
if (!getApiVersion().equals(other.getApiVersion())) return false;
584-
if (!unknownFields.equals(other.unknownFields)) return false;
482+
if (!getUnknownFields().equals(other.getUnknownFields())) return false;
585483
return true;
586484
}
587485

@@ -610,7 +508,7 @@ public int hashCode() {
610508
hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean(getCancelRequested());
611509
hash = (37 * hash) + API_VERSION_FIELD_NUMBER;
612510
hash = (53 * hash) + getApiVersion().hashCode();
613-
hash = (29 * hash) + unknownFields.hashCode();
511+
hash = (29 * hash) + getUnknownFields().hashCode();
614512
memoizedHashCode = hash;
615513
return hash;
616514
}
@@ -739,17 +637,10 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
739637
}
740638

741639
// Construct using com.google.cloud.common.OperationMetadata.newBuilder()
742-
private Builder() {
743-
maybeForceBuilderInitialization();
744-
}
640+
private Builder() {}
745641

746642
private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
747643
super(parent);
748-
maybeForceBuilderInitialization();
749-
}
750-
751-
private void maybeForceBuilderInitialization() {
752-
if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {}
753644
}
754645

755646
@java.lang.Override
@@ -893,7 +784,7 @@ public Builder mergeFrom(com.google.cloud.common.OperationMetadata other) {
893784
apiVersion_ = other.apiVersion_;
894785
onChanged();
895786
}
896-
this.mergeUnknownFields(other.unknownFields);
787+
this.mergeUnknownFields(other.getUnknownFields());
897788
onChanged();
898789
return this;
899790
}
@@ -908,17 +799,73 @@ public Builder mergeFrom(
908799
com.google.protobuf.CodedInputStream input,
909800
com.google.protobuf.ExtensionRegistryLite extensionRegistry)
910801
throws java.io.IOException {
911-
com.google.cloud.common.OperationMetadata parsedMessage = null;
802+
if (extensionRegistry == null) {
803+
throw new java.lang.NullPointerException();
804+
}
912805
try {
913-
parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
806+
boolean done = false;
807+
while (!done) {
808+
int tag = input.readTag();
809+
switch (tag) {
810+
case 0:
811+
done = true;
812+
break;
813+
case 10:
814+
{
815+
input.readMessage(getCreateTimeFieldBuilder().getBuilder(), extensionRegistry);
816+
817+
break;
818+
} // case 10
819+
case 18:
820+
{
821+
input.readMessage(getEndTimeFieldBuilder().getBuilder(), extensionRegistry);
822+
823+
break;
824+
} // case 18
825+
case 26:
826+
{
827+
target_ = input.readStringRequireUtf8();
828+
829+
break;
830+
} // case 26
831+
case 34:
832+
{
833+
verb_ = input.readStringRequireUtf8();
834+
835+
break;
836+
} // case 34
837+
case 42:
838+
{
839+
statusDetail_ = input.readStringRequireUtf8();
840+
841+
break;
842+
} // case 42
843+
case 48:
844+
{
845+
cancelRequested_ = input.readBool();
846+
847+
break;
848+
} // case 48
849+
case 58:
850+
{
851+
apiVersion_ = input.readStringRequireUtf8();
852+
853+
break;
854+
} // case 58
855+
default:
856+
{
857+
if (!super.parseUnknownField(input, extensionRegistry, tag)) {
858+
done = true; // was an endgroup tag
859+
}
860+
break;
861+
} // default:
862+
} // switch (tag)
863+
} // while (!done)
914864
} catch (com.google.protobuf.InvalidProtocolBufferException e) {
915-
parsedMessage = (com.google.cloud.common.OperationMetadata) e.getUnfinishedMessage();
916865
throw e.unwrapIOException();
917866
} finally {
918-
if (parsedMessage != null) {
919-
mergeFrom(parsedMessage);
920-
}
921-
}
867+
onChanged();
868+
} // finally
922869
return this;
923870
}
924871

@@ -1828,7 +1775,18 @@ public OperationMetadata parsePartialFrom(
18281775
com.google.protobuf.CodedInputStream input,
18291776
com.google.protobuf.ExtensionRegistryLite extensionRegistry)
18301777
throws com.google.protobuf.InvalidProtocolBufferException {
1831-
return new OperationMetadata(input, extensionRegistry);
1778+
Builder builder = newBuilder();
1779+
try {
1780+
builder.mergeFrom(input, extensionRegistry);
1781+
} catch (com.google.protobuf.InvalidProtocolBufferException e) {
1782+
throw e.setUnfinishedMessage(builder.buildPartial());
1783+
} catch (com.google.protobuf.UninitializedMessageException e) {
1784+
throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
1785+
} catch (java.io.IOException e) {
1786+
throw new com.google.protobuf.InvalidProtocolBufferException(e)
1787+
.setUnfinishedMessage(builder.buildPartial());
1788+
}
1789+
return builder.buildPartial();
18321790
}
18331791
};
18341792

0 commit comments

Comments
 (0)