Skip to content
This repository was archived by the owner on Sep 16, 2023. It is now read-only.

Commit 75dfede

Browse files
mpeddada1mpeddada1
authored
deps: regenerating with new Protobuf (2.1.x) (#886)
* fix: applying a different code generation * deps: shared deps 2.10.1
1 parent e52feef commit 75dfede

25 files changed

Lines changed: 1682 additions & 2559 deletions

‎pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@
8787
<dependency>
8888
<groupId>com.google.cloud</groupId>
8989
<artifactId>google-cloud-shared-dependencies</artifactId>
90-
<version>2.10.0</version>
90+
<version>2.10.1</version>
9191
<type>pom</type>
9292
<scope>import</scope>
9393
</dependency>

‎proto-google-cloud-secretmanager-v1/src/main/java/com/google/cloud/secretmanager/v1/AccessSecretVersionRequest.java‎

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

55-
private AccessSecretVersionRequest(
56-
com.google.protobuf.CodedInputStream input,
57-
com.google.protobuf.ExtensionRegistryLite extensionRegistry)
58-
throws com.google.protobuf.InvalidProtocolBufferException {
59-
this();
60-
if (extensionRegistry == null) {
61-
throw new java.lang.NullPointerException();
62-
}
63-
com.google.protobuf.UnknownFieldSet.Builder unknownFields =
64-
com.google.protobuf.UnknownFieldSet.newBuilder();
65-
try {
66-
boolean done = false;
67-
while (!done) {
68-
int tag = input.readTag();
69-
switch (tag) {
70-
case 0:
71-
done = true;
72-
break;
73-
case 10:
74-
{
75-
java.lang.String s = input.readStringRequireUtf8();
76-
77-
name_ = s;
78-
break;
79-
}
80-
default:
81-
{
82-
if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
83-
done = true;
84-
}
85-
break;
86-
}
87-
}
88-
}
89-
} catch (com.google.protobuf.InvalidProtocolBufferException e) {
90-
throw e.setUnfinishedMessage(this);
91-
} catch (java.io.IOException e) {
92-
throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
93-
} finally {
94-
this.unknownFields = unknownFields.build();
95-
makeExtensionsImmutable();
96-
}
97-
}
98-
9955
public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
10056
return com.google.cloud.secretmanager.v1.ServiceProto
10157
.internal_static_google_cloud_secretmanager_v1_AccessSecretVersionRequest_descriptor;
@@ -187,7 +143,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
187143
if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(name_)) {
188144
com.google.protobuf.GeneratedMessageV3.writeString(output, 1, name_);
189145
}
190-
unknownFields.writeTo(output);
146+
getUnknownFields().writeTo(output);
191147
}
192148

193149
@java.lang.Override
@@ -199,7 +155,7 @@ public int getSerializedSize() {
199155
if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(name_)) {
200156
size += com.google.protobuf.GeneratedMessageV3.computeStringSize(1, name_);
201157
}
202-
size += unknownFields.getSerializedSize();
158+
size += getUnknownFields().getSerializedSize();
203159
memoizedSize = size;
204160
return size;
205161
}
@@ -216,7 +172,7 @@ public boolean equals(final java.lang.Object obj) {
216172
(com.google.cloud.secretmanager.v1.AccessSecretVersionRequest) obj;
217173

218174
if (!getName().equals(other.getName())) return false;
219-
if (!unknownFields.equals(other.unknownFields)) return false;
175+
if (!getUnknownFields().equals(other.getUnknownFields())) return false;
220176
return true;
221177
}
222178

@@ -229,7 +185,7 @@ public int hashCode() {
229185
hash = (19 * hash) + getDescriptor().hashCode();
230186
hash = (37 * hash) + NAME_FIELD_NUMBER;
231187
hash = (53 * hash) + getName().hashCode();
232-
hash = (29 * hash) + unknownFields.hashCode();
188+
hash = (29 * hash) + getUnknownFields().hashCode();
233189
memoizedHashCode = hash;
234190
return hash;
235191
}
@@ -359,17 +315,10 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
359315
}
360316

361317
// Construct using com.google.cloud.secretmanager.v1.AccessSecretVersionRequest.newBuilder()
362-
private Builder() {
363-
maybeForceBuilderInitialization();
364-
}
318+
private Builder() {}
365319

366320
private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
367321
super(parent);
368-
maybeForceBuilderInitialization();
369-
}
370-
371-
private void maybeForceBuilderInitialization() {
372-
if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {}
373322
}
374323

375324
@java.lang.Override
@@ -461,7 +410,7 @@ public Builder mergeFrom(com.google.cloud.secretmanager.v1.AccessSecretVersionRe
461410
name_ = other.name_;
462411
onChanged();
463412
}
464-
this.mergeUnknownFields(other.unknownFields);
413+
this.mergeUnknownFields(other.getUnknownFields());
465414
onChanged();
466415
return this;
467416
}
@@ -476,18 +425,37 @@ public Builder mergeFrom(
476425
com.google.protobuf.CodedInputStream input,
477426
com.google.protobuf.ExtensionRegistryLite extensionRegistry)
478427
throws java.io.IOException {
479-
com.google.cloud.secretmanager.v1.AccessSecretVersionRequest parsedMessage = null;
428+
if (extensionRegistry == null) {
429+
throw new java.lang.NullPointerException();
430+
}
480431
try {
481-
parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
432+
boolean done = false;
433+
while (!done) {
434+
int tag = input.readTag();
435+
switch (tag) {
436+
case 0:
437+
done = true;
438+
break;
439+
case 10:
440+
{
441+
name_ = input.readStringRequireUtf8();
442+
443+
break;
444+
} // case 10
445+
default:
446+
{
447+
if (!super.parseUnknownField(input, extensionRegistry, tag)) {
448+
done = true; // was an endgroup tag
449+
}
450+
break;
451+
} // default:
452+
} // switch (tag)
453+
} // while (!done)
482454
} catch (com.google.protobuf.InvalidProtocolBufferException e) {
483-
parsedMessage =
484-
(com.google.cloud.secretmanager.v1.AccessSecretVersionRequest) e.getUnfinishedMessage();
485455
throw e.unwrapIOException();
486456
} finally {
487-
if (parsedMessage != null) {
488-
mergeFrom(parsedMessage);
489-
}
490-
}
457+
onChanged();
458+
} // finally
491459
return this;
492460
}
493461

@@ -655,7 +623,18 @@ public AccessSecretVersionRequest parsePartialFrom(
655623
com.google.protobuf.CodedInputStream input,
656624
com.google.protobuf.ExtensionRegistryLite extensionRegistry)
657625
throws com.google.protobuf.InvalidProtocolBufferException {
658-
return new AccessSecretVersionRequest(input, extensionRegistry);
626+
Builder builder = newBuilder();
627+
try {
628+
builder.mergeFrom(input, extensionRegistry);
629+
} catch (com.google.protobuf.InvalidProtocolBufferException e) {
630+
throw e.setUnfinishedMessage(builder.buildPartial());
631+
} catch (com.google.protobuf.UninitializedMessageException e) {
632+
throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
633+
} catch (java.io.IOException e) {
634+
throw new com.google.protobuf.InvalidProtocolBufferException(e)
635+
.setUnfinishedMessage(builder.buildPartial());
636+
}
637+
return builder.buildPartial();
659638
}
660639
};
661640

‎proto-google-cloud-secretmanager-v1/src/main/java/com/google/cloud/secretmanager/v1/AccessSecretVersionResponse.java‎

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

55-
private AccessSecretVersionResponse(
56-
com.google.protobuf.CodedInputStream input,
57-
com.google.protobuf.ExtensionRegistryLite extensionRegistry)
58-
throws com.google.protobuf.InvalidProtocolBufferException {
59-
this();
60-
if (extensionRegistry == null) {
61-
throw new java.lang.NullPointerException();
62-
}
63-
com.google.protobuf.UnknownFieldSet.Builder unknownFields =
64-
com.google.protobuf.UnknownFieldSet.newBuilder();
65-
try {
66-
boolean done = false;
67-
while (!done) {
68-
int tag = input.readTag();
69-
switch (tag) {
70-
case 0:
71-
done = true;
72-
break;
73-
case 10:
74-
{
75-
java.lang.String s = input.readStringRequireUtf8();
76-
77-
name_ = s;
78-
break;
79-
}
80-
case 18:
81-
{
82-
com.google.cloud.secretmanager.v1.SecretPayload.Builder subBuilder = null;
83-
if (payload_ != null) {
84-
subBuilder = payload_.toBuilder();
85-
}
86-
payload_ =
87-
input.readMessage(
88-
com.google.cloud.secretmanager.v1.SecretPayload.parser(), extensionRegistry);
89-
if (subBuilder != null) {
90-
subBuilder.mergeFrom(payload_);
91-
payload_ = subBuilder.buildPartial();
92-
}
93-
94-
break;
95-
}
96-
default:
97-
{
98-
if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
99-
done = true;
100-
}
101-
break;
102-
}
103-
}
104-
}
105-
} catch (com.google.protobuf.InvalidProtocolBufferException e) {
106-
throw e.setUnfinishedMessage(this);
107-
} catch (java.io.IOException e) {
108-
throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
109-
} finally {
110-
this.unknownFields = unknownFields.build();
111-
makeExtensionsImmutable();
112-
}
113-
}
114-
11555
public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
11656
return com.google.cloud.secretmanager.v1.ServiceProto
11757
.internal_static_google_cloud_secretmanager_v1_AccessSecretVersionResponse_descriptor;
@@ -246,7 +186,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
246186
if (payload_ != null) {
247187
output.writeMessage(2, getPayload());
248188
}
249-
unknownFields.writeTo(output);
189+
getUnknownFields().writeTo(output);
250190
}
251191

252192
@java.lang.Override
@@ -261,7 +201,7 @@ public int getSerializedSize() {
261201
if (payload_ != null) {
262202
size += com.google.protobuf.CodedOutputStream.computeMessageSize(2, getPayload());
263203
}
264-
size += unknownFields.getSerializedSize();
204+
size += getUnknownFields().getSerializedSize();
265205
memoizedSize = size;
266206
return size;
267207
}
@@ -282,7 +222,7 @@ public boolean equals(final java.lang.Object obj) {
282222
if (hasPayload()) {
283223
if (!getPayload().equals(other.getPayload())) return false;
284224
}
285-
if (!unknownFields.equals(other.unknownFields)) return false;
225+
if (!getUnknownFields().equals(other.getUnknownFields())) return false;
286226
return true;
287227
}
288228

@@ -299,7 +239,7 @@ public int hashCode() {
299239
hash = (37 * hash) + PAYLOAD_FIELD_NUMBER;
300240
hash = (53 * hash) + getPayload().hashCode();
301241
}
302-
hash = (29 * hash) + unknownFields.hashCode();
242+
hash = (29 * hash) + getUnknownFields().hashCode();
303243
memoizedHashCode = hash;
304244
return hash;
305245
}
@@ -429,17 +369,10 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
429369
}
430370

431371
// Construct using com.google.cloud.secretmanager.v1.AccessSecretVersionResponse.newBuilder()
432-
private Builder() {
433-
maybeForceBuilderInitialization();
434-
}
372+
private Builder() {}
435373

436374
private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
437375
super(parent);
438-
maybeForceBuilderInitialization();
439-
}
440-
441-
private void maybeForceBuilderInitialization() {
442-
if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {}
443376
}
444377

445378
@java.lang.Override
@@ -545,7 +478,7 @@ public Builder mergeFrom(com.google.cloud.secretmanager.v1.AccessSecretVersionRe
545478
if (other.hasPayload()) {
546479
mergePayload(other.getPayload());
547480
}
548-
this.mergeUnknownFields(other.unknownFields);
481+
this.mergeUnknownFields(other.getUnknownFields());
549482
onChanged();
550483
return this;
551484
}
@@ -560,19 +493,43 @@ public Builder mergeFrom(
560493
com.google.protobuf.CodedInputStream input,
561494
com.google.protobuf.ExtensionRegistryLite extensionRegistry)
562495
throws java.io.IOException {
563-
com.google.cloud.secretmanager.v1.AccessSecretVersionResponse parsedMessage = null;
496+
if (extensionRegistry == null) {
497+
throw new java.lang.NullPointerException();
498+
}
564499
try {
565-
parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
500+
boolean done = false;
501+
while (!done) {
502+
int tag = input.readTag();
503+
switch (tag) {
504+
case 0:
505+
done = true;
506+
break;
507+
case 10:
508+
{
509+
name_ = input.readStringRequireUtf8();
510+
511+
break;
512+
} // case 10
513+
case 18:
514+
{
515+
input.readMessage(getPayloadFieldBuilder().getBuilder(), extensionRegistry);
516+
517+
break;
518+
} // case 18
519+
default:
520+
{
521+
if (!super.parseUnknownField(input, extensionRegistry, tag)) {
522+
done = true; // was an endgroup tag
523+
}
524+
break;
525+
} // default:
526+
} // switch (tag)
527+
} // while (!done)
566528
} catch (com.google.protobuf.InvalidProtocolBufferException e) {
567-
parsedMessage =
568-
(com.google.cloud.secretmanager.v1.AccessSecretVersionResponse)
569-
e.getUnfinishedMessage();
570529
throw e.unwrapIOException();
571530
} finally {
572-
if (parsedMessage != null) {
573-
mergeFrom(parsedMessage);
574-
}
575-
}
531+
onChanged();
532+
} // finally
576533
return this;
577534
}
578535

@@ -906,7 +863,18 @@ public AccessSecretVersionResponse parsePartialFrom(
906863
com.google.protobuf.CodedInputStream input,
907864
com.google.protobuf.ExtensionRegistryLite extensionRegistry)
908865
throws com.google.protobuf.InvalidProtocolBufferException {
909-
return new AccessSecretVersionResponse(input, extensionRegistry);
866+
Builder builder = newBuilder();
867+
try {
868+
builder.mergeFrom(input, extensionRegistry);
869+
} catch (com.google.protobuf.InvalidProtocolBufferException e) {
870+
throw e.setUnfinishedMessage(builder.buildPartial());
871+
} catch (com.google.protobuf.UninitializedMessageException e) {
872+
throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
873+
} catch (java.io.IOException e) {
874+
throw new com.google.protobuf.InvalidProtocolBufferException(e)
875+
.setUnfinishedMessage(builder.buildPartial());
876+
}
877+
return builder.buildPartial();
910878
}
911879
};
912880

0 commit comments

Comments
 (0)