Skip to content

Commit 58d55aa

Browse files
suztomosuztomo
authored
deps: regenerating with new Protobuf (1.111.0-sp) (#1382)
* fix: applying a different code generation * deps: Protobuf 3.16.3 * ci: linkage monitor is not needed Linakge Monitor compares the library with the latest version of other Cloud libraries. It does not work for old branches.
1 parent 4bea0ec commit 58d55aa

File tree

59 files changed

+3177
-4738
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

59 files changed

+3177
-4738
lines changed

‎.github/workflows/ci.yaml‎

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -51,22 +51,6 @@ jobs:
5151
java-version: ${{matrix.java}}
5252
- run: java -version
5353
- run: .kokoro/dependencies.sh
54-
linkage-monitor:
55-
runs-on: ubuntu-latest
56-
steps:
57-
- uses: actions/checkout@v2
58-
- uses: actions/setup-java@v1
59-
with:
60-
java-version: 8
61-
- run: java -version
62-
- name: Install artifacts to local Maven repository
63-
run: .kokoro/build.sh
64-
shell: bash
65-
- name: >-
66-
Validate any conflicts with regard to com.google.cloud:libraries-bom
67-
(latest release)
68-
uses: >-
69-
GoogleCloudPlatform/cloud-opensource-java/linkage-monitor@v1-linkagemonitor
7054
lint:
7155
runs-on: ubuntu-latest
7256
steps:

‎pom.xml‎

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,20 @@
5858

5959
<dependencyManagement>
6060
<dependencies>
61+
<dependency>
62+
<groupId>io.grpc</groupId>
63+
<artifactId>grpc-bom</artifactId>
64+
<version>1.36.3</version>
65+
<type>pom</type>
66+
<scope>import</scope>
67+
</dependency>
68+
<dependency>
69+
<groupId>com.google.protobuf</groupId>
70+
<artifactId>protobuf-bom</artifactId>
71+
<version>3.16.3</version>
72+
<type>pom</type>
73+
<scope>import</scope>
74+
</dependency>
6175
<dependency>
6276
<groupId>com.google.cloud</groupId>
6377
<artifactId>google-cloud-shared-dependencies</artifactId>
@@ -203,4 +217,4 @@
203217
</plugin>
204218
</plugins>
205219
</reporting>
206-
</project>
220+
</project>

‎proto-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/AcknowledgeRequest.java‎

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

56-
private AcknowledgeRequest(
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-
int mutable_bitField0_ = 0;
65-
com.google.protobuf.UnknownFieldSet.Builder unknownFields =
66-
com.google.protobuf.UnknownFieldSet.newBuilder();
67-
try {
68-
boolean done = false;
69-
while (!done) {
70-
int tag = input.readTag();
71-
switch (tag) {
72-
case 0:
73-
done = true;
74-
break;
75-
case 10:
76-
{
77-
java.lang.String s = input.readStringRequireUtf8();
78-
79-
subscription_ = s;
80-
break;
81-
}
82-
case 18:
83-
{
84-
java.lang.String s = input.readStringRequireUtf8();
85-
if (!((mutable_bitField0_ & 0x00000001) != 0)) {
86-
ackIds_ = new com.google.protobuf.LazyStringArrayList();
87-
mutable_bitField0_ |= 0x00000001;
88-
}
89-
ackIds_.add(s);
90-
break;
91-
}
92-
default:
93-
{
94-
if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
95-
done = true;
96-
}
97-
break;
98-
}
99-
}
100-
}
101-
} catch (com.google.protobuf.InvalidProtocolBufferException e) {
102-
throw e.setUnfinishedMessage(this);
103-
} catch (java.io.IOException e) {
104-
throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
105-
} finally {
106-
if (((mutable_bitField0_ & 0x00000001) != 0)) {
107-
ackIds_ = ackIds_.getUnmodifiableView();
108-
}
109-
this.unknownFields = unknownFields.build();
110-
makeExtensionsImmutable();
111-
}
112-
}
113-
11456
public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
11557
return com.google.pubsub.v1.PubsubProto
11658
.internal_static_google_pubsub_v1_AcknowledgeRequest_descriptor;
@@ -270,7 +212,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
270212
for (int i = 0; i < ackIds_.size(); i++) {
271213
com.google.protobuf.GeneratedMessageV3.writeString(output, 2, ackIds_.getRaw(i));
272214
}
273-
unknownFields.writeTo(output);
215+
getUnknownFields().writeTo(output);
274216
}
275217

276218
@java.lang.Override
@@ -290,7 +232,7 @@ public int getSerializedSize() {
290232
size += dataSize;
291233
size += 1 * getAckIdsList().size();
292234
}
293-
size += unknownFields.getSerializedSize();
235+
size += getUnknownFields().getSerializedSize();
294236
memoizedSize = size;
295237
return size;
296238
}
@@ -307,7 +249,7 @@ public boolean equals(final java.lang.Object obj) {
307249

308250
if (!getSubscription().equals(other.getSubscription())) return false;
309251
if (!getAckIdsList().equals(other.getAckIdsList())) return false;
310-
if (!unknownFields.equals(other.unknownFields)) return false;
252+
if (!getUnknownFields().equals(other.getUnknownFields())) return false;
311253
return true;
312254
}
313255

@@ -324,7 +266,7 @@ public int hashCode() {
324266
hash = (37 * hash) + ACK_IDS_FIELD_NUMBER;
325267
hash = (53 * hash) + getAckIdsList().hashCode();
326268
}
327-
hash = (29 * hash) + unknownFields.hashCode();
269+
hash = (29 * hash) + getUnknownFields().hashCode();
328270
memoizedHashCode = hash;
329271
return hash;
330272
}
@@ -453,17 +395,10 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
453395
}
454396

455397
// Construct using com.google.pubsub.v1.AcknowledgeRequest.newBuilder()
456-
private Builder() {
457-
maybeForceBuilderInitialization();
458-
}
398+
private Builder() {}
459399

460400
private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
461401
super(parent);
462-
maybeForceBuilderInitialization();
463-
}
464-
465-
private void maybeForceBuilderInitialization() {
466-
if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {}
467402
}
468403

469404
@java.lang.Override
@@ -570,7 +505,7 @@ public Builder mergeFrom(com.google.pubsub.v1.AcknowledgeRequest other) {
570505
}
571506
onChanged();
572507
}
573-
this.mergeUnknownFields(other.unknownFields);
508+
this.mergeUnknownFields(other.getUnknownFields());
574509
onChanged();
575510
return this;
576511
}
@@ -585,17 +520,44 @@ public Builder mergeFrom(
585520
com.google.protobuf.CodedInputStream input,
586521
com.google.protobuf.ExtensionRegistryLite extensionRegistry)
587522
throws java.io.IOException {
588-
com.google.pubsub.v1.AcknowledgeRequest parsedMessage = null;
523+
if (extensionRegistry == null) {
524+
throw new java.lang.NullPointerException();
525+
}
589526
try {
590-
parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
527+
boolean done = false;
528+
while (!done) {
529+
int tag = input.readTag();
530+
switch (tag) {
531+
case 0:
532+
done = true;
533+
break;
534+
case 10:
535+
{
536+
subscription_ = input.readStringRequireUtf8();
537+
538+
break;
539+
} // case 10
540+
case 18:
541+
{
542+
java.lang.String s = input.readStringRequireUtf8();
543+
ensureAckIdsIsMutable();
544+
ackIds_.add(s);
545+
break;
546+
} // case 18
547+
default:
548+
{
549+
if (!super.parseUnknownField(input, extensionRegistry, tag)) {
550+
done = true; // was an endgroup tag
551+
}
552+
break;
553+
} // default:
554+
} // switch (tag)
555+
} // while (!done)
591556
} catch (com.google.protobuf.InvalidProtocolBufferException e) {
592-
parsedMessage = (com.google.pubsub.v1.AcknowledgeRequest) e.getUnfinishedMessage();
593557
throw e.unwrapIOException();
594558
} finally {
595-
if (parsedMessage != null) {
596-
mergeFrom(parsedMessage);
597-
}
598-
}
559+
onChanged();
560+
} // finally
599561
return this;
600562
}
601563

@@ -940,7 +902,18 @@ public AcknowledgeRequest parsePartialFrom(
940902
com.google.protobuf.CodedInputStream input,
941903
com.google.protobuf.ExtensionRegistryLite extensionRegistry)
942904
throws com.google.protobuf.InvalidProtocolBufferException {
943-
return new AcknowledgeRequest(input, extensionRegistry);
905+
Builder builder = newBuilder();
906+
try {
907+
builder.mergeFrom(input, extensionRegistry);
908+
} catch (com.google.protobuf.InvalidProtocolBufferException e) {
909+
throw e.setUnfinishedMessage(builder.buildPartial());
910+
} catch (com.google.protobuf.UninitializedMessageException e) {
911+
throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
912+
} catch (java.io.IOException e) {
913+
throw new com.google.protobuf.InvalidProtocolBufferException(e)
914+
.setUnfinishedMessage(builder.buildPartial());
915+
}
916+
return builder.buildPartial();
944917
}
945918
};
946919

0 commit comments

Comments
 (0)