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.
googleapis · Nov 3, 2022 · 58d55aa · 58d55aa
1 parent 4bea0ec
commit 58d55aa
Show file tree

Hide file tree

Showing 59 changed files with 3,177 additions and 4,738 deletions.
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -51,22 +51,6 @@ jobs:
  java-version: ${{matrix.java}}
  - run: java -version
  - run: .kokoro/dependencies.sh
- linkage-monitor:
- runs-on: ubuntu-latest
- steps:
- - uses: actions/checkout@v2
- - uses: actions/setup-java@v1
- with:
- java-version: 8
- - run: java -version
- - name: Install artifacts to local Maven repository
- run: .kokoro/build.sh
- shell: bash
- - name: >-
- Validate any conflicts with regard to com.google.cloud:libraries-bom
- (latest release)
- uses: >-
- GoogleCloudPlatform/cloud-opensource-java/linkage-monitor@v1-linkagemonitor
  lint:
  runs-on: ubuntu-latest
  steps:

diff --git a/pom.xml b/pom.xml
@@ -58,6 +58,20 @@
 
  <dependencyManagement>
  <dependencies>
+ <dependency>
+ <groupId>io.grpc</groupId>
+ <artifactId>grpc-bom</artifactId>
+ <version>1.36.3</version>
+ <type>pom</type>
+ <scope>import</scope>
+ </dependency>
+ <dependency>
+ <groupId>com.google.protobuf</groupId>
+ <artifactId>protobuf-bom</artifactId>
+ <version>3.16.3</version>
+ <type>pom</type>
+ <scope>import</scope>
+ </dependency>
  <dependency>
  <groupId>com.google.cloud</groupId>
  <artifactId>google-cloud-shared-dependencies</artifactId>
@@ -203,4 +217,4 @@
  </plugin>
  </plugins>
  </reporting>
-</project>
+</project>
diff --git a/proto-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/AcknowledgeRequest.java b/proto-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/AcknowledgeRequest.java
@@ -53,64 +53,6 @@ public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
  return this.unknownFields;
  }
 
- private AcknowledgeRequest(
- com.google.protobuf.CodedInputStream input,
- com.google.protobuf.ExtensionRegistryLite extensionRegistry)
- throws com.google.protobuf.InvalidProtocolBufferException {
- this();
- if (extensionRegistry == null) {
- throw new java.lang.NullPointerException();
- }
- int mutable_bitField0_ = 0;
- com.google.protobuf.UnknownFieldSet.Builder unknownFields =
- com.google.protobuf.UnknownFieldSet.newBuilder();
- try {
- boolean done = false;
- while (!done) {
- int tag = input.readTag();
- switch (tag) {
- case 0:
- done = true;
- break;
- case 10:
- {
- java.lang.String s = input.readStringRequireUtf8();
-
- subscription_ = s;
- break;
- }
- case 18:
- {
- java.lang.String s = input.readStringRequireUtf8();
- if (!((mutable_bitField0_ & 0x00000001) != 0)) {
- ackIds_ = new com.google.protobuf.LazyStringArrayList();
- mutable_bitField0_ |= 0x00000001;
- }
- ackIds_.add(s);
- break;
- }
- default:
- {
- if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
- done = true;
- }
- break;
- }
- }
- }
- } catch (com.google.protobuf.InvalidProtocolBufferException e) {
- throw e.setUnfinishedMessage(this);
- } catch (java.io.IOException e) {
- throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
- } finally {
- if (((mutable_bitField0_ & 0x00000001) != 0)) {
- ackIds_ = ackIds_.getUnmodifiableView();
- }
- this.unknownFields = unknownFields.build();
- makeExtensionsImmutable();
- }
- }
-
  public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
  return com.google.pubsub.v1.PubsubProto
  .internal_static_google_pubsub_v1_AcknowledgeRequest_descriptor;
@@ -270,7 +212,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
  for (int i = 0; i < ackIds_.size(); i++) {
  com.google.protobuf.GeneratedMessageV3.writeString(output, 2, ackIds_.getRaw(i));
  }
- unknownFields.writeTo(output);
+ getUnknownFields().writeTo(output);
  }
 
  @java.lang.Override
@@ -290,7 +232,7 @@ public int getSerializedSize() {
  size += dataSize;
  size += 1 * getAckIdsList().size();
  }
- size += unknownFields.getSerializedSize();
+ size += getUnknownFields().getSerializedSize();
  memoizedSize = size;
  return size;
  }
@@ -307,7 +249,7 @@ public boolean equals(final java.lang.Object obj) {
 
  if (!getSubscription().equals(other.getSubscription())) return false;
  if (!getAckIdsList().equals(other.getAckIdsList())) return false;
- if (!unknownFields.equals(other.unknownFields)) return false;
+ if (!getUnknownFields().equals(other.getUnknownFields())) return false;
  return true;
  }
 
@@ -324,7 +266,7 @@ public int hashCode() {
  hash = (37 * hash) + ACK_IDS_FIELD_NUMBER;
  hash = (53 * hash) + getAckIdsList().hashCode();
  }
- hash = (29 * hash) + unknownFields.hashCode();
+ hash = (29 * hash) + getUnknownFields().hashCode();
  memoizedHashCode = hash;
  return hash;
  }
@@ -453,17 +395,10 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
  }
 
  // Construct using com.google.pubsub.v1.AcknowledgeRequest.newBuilder()
- private Builder() {
- maybeForceBuilderInitialization();
- }
+ private Builder() {}
 
  private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
  super(parent);
- maybeForceBuilderInitialization();
- }
-
- private void maybeForceBuilderInitialization() {
- if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {}
  }
 
  @java.lang.Override
@@ -570,7 +505,7 @@ public Builder mergeFrom(com.google.pubsub.v1.AcknowledgeRequest other) {
  }
  onChanged();
  }
- this.mergeUnknownFields(other.unknownFields);
+ this.mergeUnknownFields(other.getUnknownFields());
  onChanged();
  return this;
  }
@@ -585,17 +520,44 @@ public Builder mergeFrom(
  com.google.protobuf.CodedInputStream input,
  com.google.protobuf.ExtensionRegistryLite extensionRegistry)
  throws java.io.IOException {
- com.google.pubsub.v1.AcknowledgeRequest parsedMessage = null;
+ if (extensionRegistry == null) {
+ throw new java.lang.NullPointerException();
+ }
  try {
- parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
+ boolean done = false;
+ while (!done) {
+ int tag = input.readTag();
+ switch (tag) {
+ case 0:
+ done = true;
+ break;
+ case 10:
+ {
+ subscription_ = input.readStringRequireUtf8();
+
+ break;
+ } // case 10
+ case 18:
+ {
+ java.lang.String s = input.readStringRequireUtf8();
+ ensureAckIdsIsMutable();
+ ackIds_.add(s);
+ break;
+ } // case 18
+ default:
+ {
+ if (!super.parseUnknownField(input, extensionRegistry, tag)) {
+ done = true; // was an endgroup tag
+ }
+ break;
+ } // default:
+ } // switch (tag)
+ } // while (!done)
  } catch (com.google.protobuf.InvalidProtocolBufferException e) {
- parsedMessage = (com.google.pubsub.v1.AcknowledgeRequest) e.getUnfinishedMessage();
  throw e.unwrapIOException();
  } finally {
- if (parsedMessage != null) {
- mergeFrom(parsedMessage);
- }
- }
+ onChanged();
+ } // finally
  return this;
  }
 
@@ -940,7 +902,18 @@ public AcknowledgeRequest parsePartialFrom(
  com.google.protobuf.CodedInputStream input,
  com.google.protobuf.ExtensionRegistryLite extensionRegistry)
  throws com.google.protobuf.InvalidProtocolBufferException {
- return new AcknowledgeRequest(input, extensionRegistry);
+ Builder builder = newBuilder();
+ try {
+ builder.mergeFrom(input, extensionRegistry);
+ } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+ throw e.setUnfinishedMessage(builder.buildPartial());
+ } catch (com.google.protobuf.UninitializedMessageException e) {
+ throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial());
+ } catch (java.io.IOException e) {
+ throw new com.google.protobuf.InvalidProtocolBufferException(e)
+ .setUnfinishedMessage(builder.buildPartial());
+ }
+ return builder.buildPartial();
  }
  };