Skip to content

Commit 02c0199

Browse files
chore(bazel): update protobuf to v3.21.7 (#243)
- [ ] 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 e5403f0 commit 02c0199

13 files changed

Lines changed: 764 additions & 1124 deletions

File tree

java-apigee-connect/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-apigee-connect</artifactId>
22-
<version>2.3.5</version>
22+
<version>2.3.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-apigee-connect:2.3.5'
29+
implementation 'com.google.cloud:google-cloud-apigee-connect:2.3.6'
3030
```
3131

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

3434
```Scala
35-
libraryDependencies += "com.google.cloud" % "google-cloud-apigee-connect" % "2.3.5"
35+
libraryDependencies += "com.google.cloud" % "google-cloud-apigee-connect" % "2.3.6"
3636
```
3737

3838
## Authentication

java-apigee-connect/proto-google-cloud-apigee-connect-v1/src/main/java/com/google/cloud/apigeeconnect/v1/Cluster.java

Lines changed: 51 additions & 74 deletions
Original file line numberDiff line numberDiff line change
@@ -45,59 +45,6 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
4545
return this.unknownFields;
4646
}
4747

48-
private Cluster(
49-
com.google.protobuf.CodedInputStream input,
50-
com.google.protobuf.ExtensionRegistryLite extensionRegistry)
51-
throws com.google.protobuf.InvalidProtocolBufferException {
52-
this();
53-
if (extensionRegistry == null) {
54-
throw new java.lang.NullPointerException();
55-
}
56-
com.google.protobuf.UnknownFieldSet.Builder unknownFields =
57-
com.google.protobuf.UnknownFieldSet.newBuilder();
58-
try {
59-
boolean done = false;
60-
while (!done) {
61-
int tag = input.readTag();
62-
switch (tag) {
63-
case 0:
64-
done = true;
65-
break;
66-
case 10:
67-
{
68-
java.lang.String s = input.readStringRequireUtf8();
69-
70-
name_ = s;
71-
break;
72-
}
73-
case 18:
74-
{
75-
java.lang.String s = input.readStringRequireUtf8();
76-
77-
region_ = 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 (com.google.protobuf.UninitializedMessageException e) {
92-
throw e.asInvalidProtocolBufferException().setUnfinishedMessage(this);
93-
} catch (java.io.IOException e) {
94-
throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
95-
} finally {
96-
this.unknownFields = unknownFields.build();
97-
makeExtensionsImmutable();
98-
}
99-
}
100-
10148
public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
10249
return com.google.cloud.apigeeconnect.v1.ConnectionProto
10350
.internal_static_google_cloud_apigeeconnect_v1_Cluster_descriptor;
@@ -231,7 +178,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
231178
if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(region_)) {
232179
com.google.protobuf.GeneratedMessageV3.writeString(output, 2, region_);
233180
}
234-
unknownFields.writeTo(output);
181+
getUnknownFields().writeTo(output);
235182
}
236183

237184
@java.lang.Override
@@ -246,7 +193,7 @@ public int getSerializedSize() {
246193
if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(region_)) {
247194
size += com.google.protobuf.GeneratedMessageV3.computeStringSize(2, region_);
248195
}
249-
size += unknownFields.getSerializedSize();
196+
size += getUnknownFields().getSerializedSize();
250197
memoizedSize = size;
251198
return size;
252199
}
@@ -264,7 +211,7 @@ public boolean equals(final java.lang.Object obj) {
264211

265212
if (!getName().equals(other.getName())) return false;
266213
if (!getRegion().equals(other.getRegion())) return false;
267-
if (!unknownFields.equals(other.unknownFields)) return false;
214+
if (!getUnknownFields().equals(other.getUnknownFields())) return false;
268215
return true;
269216
}
270217

@@ -279,7 +226,7 @@ public int hashCode() {
279226
hash = (53 * hash) + getName().hashCode();
280227
hash = (37 * hash) + REGION_FIELD_NUMBER;
281228
hash = (53 * hash) + getRegion().hashCode();
282-
hash = (29 * hash) + unknownFields.hashCode();
229+
hash = (29 * hash) + getUnknownFields().hashCode();
283230
memoizedHashCode = hash;
284231
return hash;
285232
}
@@ -400,17 +347,10 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
400347
}
401348

402349
// Construct using com.google.cloud.apigeeconnect.v1.Cluster.newBuilder()
403-
private Builder() {
404-
maybeForceBuilderInitialization();
405-
}
350+
private Builder() {}
406351

407352
private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
408353
super(parent);
409-
maybeForceBuilderInitialization();
410-
}
411-
412-
private void maybeForceBuilderInitialization() {
413-
if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {}
414354
}
415355

416356
@java.lang.Override
@@ -506,7 +446,7 @@ public Builder mergeFrom(com.google.cloud.apigeeconnect.v1.Cluster other) {
506446
region_ = other.region_;
507447
onChanged();
508448
}
509-
this.mergeUnknownFields(other.unknownFields);
449+
this.mergeUnknownFields(other.getUnknownFields());
510450
onChanged();
511451
return this;
512452
}
@@ -521,17 +461,43 @@ public Builder mergeFrom(
521461
com.google.protobuf.CodedInputStream input,
522462
com.google.protobuf.ExtensionRegistryLite extensionRegistry)
523463
throws java.io.IOException {
524-
com.google.cloud.apigeeconnect.v1.Cluster parsedMessage = null;
464+
if (extensionRegistry == null) {
465+
throw new java.lang.NullPointerException();
466+
}
525467
try {
526-
parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
468+
boolean done = false;
469+
while (!done) {
470+
int tag = input.readTag();
471+
switch (tag) {
472+
case 0:
473+
done = true;
474+
break;
475+
case 10:
476+
{
477+
name_ = input.readStringRequireUtf8();
478+
479+
break;
480+
} // case 10
481+
case 18:
482+
{
483+
region_ = input.readStringRequireUtf8();
484+
485+
break;
486+
} // case 18
487+
default:
488+
{
489+
if (!super.parseUnknownField(input, extensionRegistry, tag)) {
490+
done = true; // was an endgroup tag
491+
}
492+
break;
493+
} // default:
494+
} // switch (tag)
495+
} // while (!done)
527496
} catch (com.google.protobuf.InvalidProtocolBufferException e) {
528-
parsedMessage = (com.google.cloud.apigeeconnect.v1.Cluster) e.getUnfinishedMessage();
529497
throw e.unwrapIOException();
530498
} finally {
531-
if (parsedMessage != null) {
532-
mergeFrom(parsedMessage);
533-
}
534-
}
499+
onChanged();
500+
} // finally
535501
return this;
536502
}
537503

@@ -779,7 +745,18 @@ public Cluster parsePartialFrom(
779745
com.google.protobuf.CodedInputStream input,
780746
com.google.protobuf.ExtensionRegistryLite extensionRegistry)
781747
throws com.google.protobuf.InvalidProtocolBufferException {
782-
return new Cluster(input, extensionRegistry);
748+
Builder builder = newBuilder();
749+
try {
750+
builder.mergeFrom(input, extensionRegistry);
751+
} catch (com.google.protobuf.InvalidProtocolBufferException e) {
752+
throw e.setUnfinishedMessage(builder.buildPartial());
753+
} catch (com.google.protobuf.UninitializedMessageException e) {
754+
throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
755+
} catch (java.io.IOException e) {
756+
throw new com.google.protobuf.InvalidProtocolBufferException(e)
757+
.setUnfinishedMessage(builder.buildPartial());
758+
}
759+
return builder.buildPartial();
783760
}
784761
};
785762

0 commit comments

Comments
 (0)