From f0df2d5e35f3cc40d9210fb8c61231777782089f Mon Sep 17 00:00:00 2001 From: yoshi-automation Date: Sat, 30 Mar 2019 00:50:28 -0700 Subject: [PATCH] Regenerate pubsub client --- .../google/pubsub/v1/AcknowledgeRequest.java | 33 +++--- .../pubsub/v1/CreateSnapshotRequest.java | 29 +++-- .../pubsub/v1/DeleteSnapshotRequest.java | 23 ++-- .../pubsub/v1/DeleteSubscriptionRequest.java | 23 ++-- .../google/pubsub/v1/DeleteTopicRequest.java | 23 ++-- .../google/pubsub/v1/ExpirationPolicy.java | 27 +++-- .../google/pubsub/v1/GetSnapshotRequest.java | 23 ++-- .../pubsub/v1/GetSubscriptionRequest.java | 23 ++-- .../com/google/pubsub/v1/GetTopicRequest.java | 23 ++-- .../pubsub/v1/ListSnapshotsRequest.java | 28 +++-- .../pubsub/v1/ListSnapshotsResponse.java | 38 +++---- .../pubsub/v1/ListSubscriptionsRequest.java | 28 +++-- .../pubsub/v1/ListSubscriptionsResponse.java | 35 +++--- .../pubsub/v1/ListTopicSnapshotsRequest.java | 28 +++-- .../pubsub/v1/ListTopicSnapshotsResponse.java | 33 +++--- .../v1/ListTopicSubscriptionsRequest.java | 28 +++-- .../v1/ListTopicSubscriptionsResponse.java | 33 +++--- .../google/pubsub/v1/ListTopicsRequest.java | 28 +++-- .../google/pubsub/v1/ListTopicsResponse.java | 38 +++---- .../pubsub/v1/MessageStoragePolicy.java | 34 +++--- .../pubsub/v1/ModifyAckDeadlineRequest.java | 36 +++---- .../pubsub/v1/ModifyPushConfigRequest.java | 29 +++-- .../com/google/pubsub/v1/PublishRequest.java | 38 +++---- .../com/google/pubsub/v1/PublishResponse.java | 31 +++--- .../com/google/pubsub/v1/PubsubMessage.java | 37 ++++--- .../com/google/pubsub/v1/PullRequest.java | 29 +++-- .../com/google/pubsub/v1/PullResponse.java | 33 +++--- .../java/com/google/pubsub/v1/PushConfig.java | 57 +++++----- .../com/google/pubsub/v1/ReceivedMessage.java | 29 +++-- .../com/google/pubsub/v1/SeekRequest.java | 30 +++--- .../com/google/pubsub/v1/SeekResponse.java | 21 ++-- .../java/com/google/pubsub/v1/Snapshot.java | 35 +++--- .../pubsub/v1/StreamingPullRequest.java | 100 +++++++++--------- .../pubsub/v1/StreamingPullResponse.java | 33 +++--- .../com/google/pubsub/v1/Subscription.java | 56 +++++----- .../main/java/com/google/pubsub/v1/Topic.java | 33 +++--- .../pubsub/v1/UpdateSnapshotRequest.java | 33 +++--- .../pubsub/v1/UpdateSubscriptionRequest.java | 33 +++--- .../google/pubsub/v1/UpdateTopicRequest.java | 33 +++--- .../google-cloud-pubsub/synth.metadata | 10 +- 40 files changed, 625 insertions(+), 689 deletions(-) diff --git a/google-api-grpc/proto-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/AcknowledgeRequest.java b/google-api-grpc/proto-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/AcknowledgeRequest.java index 61c13fd39943..9b7a3708b981 100644 --- a/google-api-grpc/proto-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/AcknowledgeRequest.java +++ b/google-api-grpc/proto-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/AcknowledgeRequest.java @@ -61,7 +61,7 @@ private AcknowledgeRequest( case 18: { java.lang.String s = input.readStringRequireUtf8(); - if (!((mutable_bitField0_ & 0x00000002) == 0x00000002)) { + if (!((mutable_bitField0_ & 0x00000002) != 0)) { ackIds_ = new com.google.protobuf.LazyStringArrayList(); mutable_bitField0_ |= 0x00000002; } @@ -70,7 +70,7 @@ private AcknowledgeRequest( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -82,7 +82,7 @@ private AcknowledgeRequest( } catch (java.io.IOException e) { throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this); } finally { - if (((mutable_bitField0_ & 0x00000002) == 0x00000002)) { + if (((mutable_bitField0_ & 0x00000002) != 0)) { ackIds_ = ackIds_.getUnmodifiableView(); } this.unknownFields = unknownFields.build(); @@ -261,11 +261,10 @@ public boolean equals(final java.lang.Object obj) { } com.google.pubsub.v1.AcknowledgeRequest other = (com.google.pubsub.v1.AcknowledgeRequest) obj; - boolean result = true; - result = result && getSubscription().equals(other.getSubscription()); - result = result && getAckIdsList().equals(other.getAckIdsList()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getSubscription().equals(other.getSubscription())) return false; + if (!getAckIdsList().equals(other.getAckIdsList())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -460,7 +459,7 @@ public com.google.pubsub.v1.AcknowledgeRequest buildPartial() { int from_bitField0_ = bitField0_; int to_bitField0_ = 0; result.subscription_ = subscription_; - if (((bitField0_ & 0x00000002) == 0x00000002)) { + if (((bitField0_ & 0x00000002) != 0)) { ackIds_ = ackIds_.getUnmodifiableView(); bitField0_ = (bitField0_ & ~0x00000002); } @@ -472,35 +471,35 @@ public com.google.pubsub.v1.AcknowledgeRequest buildPartial() { @java.lang.Override public Builder clone() { - return (Builder) super.clone(); + return super.clone(); } @java.lang.Override public Builder setField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.setField(field, value); + return super.setField(field, value); } @java.lang.Override public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) { - return (Builder) super.clearField(field); + return super.clearField(field); } @java.lang.Override public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) { - return (Builder) super.clearOneof(oneof); + return super.clearOneof(oneof); } @java.lang.Override public Builder setRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) { - return (Builder) super.setRepeatedField(field, index, value); + return super.setRepeatedField(field, index, value); } @java.lang.Override public Builder addRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.addRepeatedField(field, value); + return super.addRepeatedField(field, value); } @java.lang.Override @@ -663,7 +662,7 @@ public Builder setSubscriptionBytes(com.google.protobuf.ByteString value) { com.google.protobuf.LazyStringArrayList.EMPTY; private void ensureAckIdsIsMutable() { - if (!((bitField0_ & 0x00000002) == 0x00000002)) { + if (!((bitField0_ & 0x00000002) != 0)) { ackIds_ = new com.google.protobuf.LazyStringArrayList(ackIds_); bitField0_ |= 0x00000002; } @@ -813,7 +812,7 @@ public Builder addAckIdsBytes(com.google.protobuf.ByteString value) { @java.lang.Override public final Builder setUnknownFields(final com.google.protobuf.UnknownFieldSet unknownFields) { - return super.setUnknownFieldsProto3(unknownFields); + return super.setUnknownFields(unknownFields); } @java.lang.Override diff --git a/google-api-grpc/proto-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/CreateSnapshotRequest.java b/google-api-grpc/proto-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/CreateSnapshotRequest.java index 63958ce83e35..4801431a560c 100644 --- a/google-api-grpc/proto-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/CreateSnapshotRequest.java +++ b/google-api-grpc/proto-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/CreateSnapshotRequest.java @@ -70,7 +70,7 @@ private CreateSnapshotRequest( } case 26: { - if (!((mutable_bitField0_ & 0x00000004) == 0x00000004)) { + if (!((mutable_bitField0_ & 0x00000004) != 0)) { labels_ = com.google.protobuf.MapField.newMapField(LabelsDefaultEntryHolder.defaultEntry); mutable_bitField0_ |= 0x00000004; @@ -83,7 +83,7 @@ private CreateSnapshotRequest( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -401,12 +401,11 @@ public boolean equals(final java.lang.Object obj) { com.google.pubsub.v1.CreateSnapshotRequest other = (com.google.pubsub.v1.CreateSnapshotRequest) obj; - boolean result = true; - result = result && getName().equals(other.getName()); - result = result && getSubscription().equals(other.getSubscription()); - result = result && internalGetLabels().equals(other.internalGetLabels()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getName().equals(other.getName())) return false; + if (!getSubscription().equals(other.getSubscription())) return false; + if (!internalGetLabels().equals(other.internalGetLabels())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -637,35 +636,35 @@ public com.google.pubsub.v1.CreateSnapshotRequest buildPartial() { @java.lang.Override public Builder clone() { - return (Builder) super.clone(); + return super.clone(); } @java.lang.Override public Builder setField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.setField(field, value); + return super.setField(field, value); } @java.lang.Override public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) { - return (Builder) super.clearField(field); + return super.clearField(field); } @java.lang.Override public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) { - return (Builder) super.clearOneof(oneof); + return super.clearOneof(oneof); } @java.lang.Override public Builder setRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) { - return (Builder) super.setRepeatedField(field, index, value); + return super.setRepeatedField(field, index, value); } @java.lang.Override public Builder addRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.addRepeatedField(field, value); + return super.addRepeatedField(field, value); } @java.lang.Override @@ -1139,7 +1138,7 @@ public Builder putAllLabels(java.util.Map va @java.lang.Override public final Builder setUnknownFields(final com.google.protobuf.UnknownFieldSet unknownFields) { - return super.setUnknownFieldsProto3(unknownFields); + return super.setUnknownFields(unknownFields); } @java.lang.Override diff --git a/google-api-grpc/proto-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/DeleteSnapshotRequest.java b/google-api-grpc/proto-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/DeleteSnapshotRequest.java index ff9a16fff298..1ee47dc8aa79 100644 --- a/google-api-grpc/proto-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/DeleteSnapshotRequest.java +++ b/google-api-grpc/proto-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/DeleteSnapshotRequest.java @@ -62,7 +62,7 @@ private DeleteSnapshotRequest( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -184,10 +184,9 @@ public boolean equals(final java.lang.Object obj) { com.google.pubsub.v1.DeleteSnapshotRequest other = (com.google.pubsub.v1.DeleteSnapshotRequest) obj; - boolean result = true; - result = result && getSnapshot().equals(other.getSnapshot()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getSnapshot().equals(other.getSnapshot())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -383,35 +382,35 @@ public com.google.pubsub.v1.DeleteSnapshotRequest buildPartial() { @java.lang.Override public Builder clone() { - return (Builder) super.clone(); + return super.clone(); } @java.lang.Override public Builder setField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.setField(field, value); + return super.setField(field, value); } @java.lang.Override public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) { - return (Builder) super.clearField(field); + return super.clearField(field); } @java.lang.Override public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) { - return (Builder) super.clearOneof(oneof); + return super.clearOneof(oneof); } @java.lang.Override public Builder setRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) { - return (Builder) super.setRepeatedField(field, index, value); + return super.setRepeatedField(field, index, value); } @java.lang.Override public Builder addRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.addRepeatedField(field, value); + return super.addRepeatedField(field, value); } @java.lang.Override @@ -560,7 +559,7 @@ public Builder setSnapshotBytes(com.google.protobuf.ByteString value) { @java.lang.Override public final Builder setUnknownFields(final com.google.protobuf.UnknownFieldSet unknownFields) { - return super.setUnknownFieldsProto3(unknownFields); + return super.setUnknownFields(unknownFields); } @java.lang.Override diff --git a/google-api-grpc/proto-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/DeleteSubscriptionRequest.java b/google-api-grpc/proto-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/DeleteSubscriptionRequest.java index c652dcea6472..e46ea84b81ea 100644 --- a/google-api-grpc/proto-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/DeleteSubscriptionRequest.java +++ b/google-api-grpc/proto-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/DeleteSubscriptionRequest.java @@ -59,7 +59,7 @@ private DeleteSubscriptionRequest( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -181,10 +181,9 @@ public boolean equals(final java.lang.Object obj) { com.google.pubsub.v1.DeleteSubscriptionRequest other = (com.google.pubsub.v1.DeleteSubscriptionRequest) obj; - boolean result = true; - result = result && getSubscription().equals(other.getSubscription()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getSubscription().equals(other.getSubscription())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -377,35 +376,35 @@ public com.google.pubsub.v1.DeleteSubscriptionRequest buildPartial() { @java.lang.Override public Builder clone() { - return (Builder) super.clone(); + return super.clone(); } @java.lang.Override public Builder setField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.setField(field, value); + return super.setField(field, value); } @java.lang.Override public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) { - return (Builder) super.clearField(field); + return super.clearField(field); } @java.lang.Override public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) { - return (Builder) super.clearOneof(oneof); + return super.clearOneof(oneof); } @java.lang.Override public Builder setRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) { - return (Builder) super.setRepeatedField(field, index, value); + return super.setRepeatedField(field, index, value); } @java.lang.Override public Builder addRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.addRepeatedField(field, value); + return super.addRepeatedField(field, value); } @java.lang.Override @@ -554,7 +553,7 @@ public Builder setSubscriptionBytes(com.google.protobuf.ByteString value) { @java.lang.Override public final Builder setUnknownFields(final com.google.protobuf.UnknownFieldSet unknownFields) { - return super.setUnknownFieldsProto3(unknownFields); + return super.setUnknownFields(unknownFields); } @java.lang.Override diff --git a/google-api-grpc/proto-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/DeleteTopicRequest.java b/google-api-grpc/proto-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/DeleteTopicRequest.java index a888f27a9306..c24176a1cdc7 100644 --- a/google-api-grpc/proto-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/DeleteTopicRequest.java +++ b/google-api-grpc/proto-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/DeleteTopicRequest.java @@ -59,7 +59,7 @@ private DeleteTopicRequest( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -180,10 +180,9 @@ public boolean equals(final java.lang.Object obj) { } com.google.pubsub.v1.DeleteTopicRequest other = (com.google.pubsub.v1.DeleteTopicRequest) obj; - boolean result = true; - result = result && getTopic().equals(other.getTopic()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getTopic().equals(other.getTopic())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -376,35 +375,35 @@ public com.google.pubsub.v1.DeleteTopicRequest buildPartial() { @java.lang.Override public Builder clone() { - return (Builder) super.clone(); + return super.clone(); } @java.lang.Override public Builder setField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.setField(field, value); + return super.setField(field, value); } @java.lang.Override public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) { - return (Builder) super.clearField(field); + return super.clearField(field); } @java.lang.Override public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) { - return (Builder) super.clearOneof(oneof); + return super.clearOneof(oneof); } @java.lang.Override public Builder setRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) { - return (Builder) super.setRepeatedField(field, index, value); + return super.setRepeatedField(field, index, value); } @java.lang.Override public Builder addRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.addRepeatedField(field, value); + return super.addRepeatedField(field, value); } @java.lang.Override @@ -553,7 +552,7 @@ public Builder setTopicBytes(com.google.protobuf.ByteString value) { @java.lang.Override public final Builder setUnknownFields(final com.google.protobuf.UnknownFieldSet unknownFields) { - return super.setUnknownFieldsProto3(unknownFields); + return super.setUnknownFields(unknownFields); } @java.lang.Override diff --git a/google-api-grpc/proto-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/ExpirationPolicy.java b/google-api-grpc/proto-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/ExpirationPolicy.java index de81de031164..172b7b99ac5b 100644 --- a/google-api-grpc/proto-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/ExpirationPolicy.java +++ b/google-api-grpc/proto-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/ExpirationPolicy.java @@ -65,7 +65,7 @@ private ExpirationPolicy( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -195,13 +195,12 @@ public boolean equals(final java.lang.Object obj) { } com.google.pubsub.v1.ExpirationPolicy other = (com.google.pubsub.v1.ExpirationPolicy) obj; - boolean result = true; - result = result && (hasTtl() == other.hasTtl()); + if (hasTtl() != other.hasTtl()) return false; if (hasTtl()) { - result = result && getTtl().equals(other.getTtl()); + if (!getTtl().equals(other.getTtl())) return false; } - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -404,35 +403,35 @@ public com.google.pubsub.v1.ExpirationPolicy buildPartial() { @java.lang.Override public Builder clone() { - return (Builder) super.clone(); + return super.clone(); } @java.lang.Override public Builder setField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.setField(field, value); + return super.setField(field, value); } @java.lang.Override public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) { - return (Builder) super.clearField(field); + return super.clearField(field); } @java.lang.Override public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) { - return (Builder) super.clearOneof(oneof); + return super.clearOneof(oneof); } @java.lang.Override public Builder setRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) { - return (Builder) super.setRepeatedField(field, index, value); + return super.setRepeatedField(field, index, value); } @java.lang.Override public Builder addRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.addRepeatedField(field, value); + return super.addRepeatedField(field, value); } @java.lang.Override @@ -479,7 +478,7 @@ public Builder mergeFrom( return this; } - private com.google.protobuf.Duration ttl_ = null; + private com.google.protobuf.Duration ttl_; private com.google.protobuf.SingleFieldBuilderV3< com.google.protobuf.Duration, com.google.protobuf.Duration.Builder, @@ -699,7 +698,7 @@ public com.google.protobuf.DurationOrBuilder getTtlOrBuilder() { @java.lang.Override public final Builder setUnknownFields(final com.google.protobuf.UnknownFieldSet unknownFields) { - return super.setUnknownFieldsProto3(unknownFields); + return super.setUnknownFields(unknownFields); } @java.lang.Override diff --git a/google-api-grpc/proto-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/GetSnapshotRequest.java b/google-api-grpc/proto-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/GetSnapshotRequest.java index 5c8bba2913a8..05f6cbf9da54 100644 --- a/google-api-grpc/proto-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/GetSnapshotRequest.java +++ b/google-api-grpc/proto-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/GetSnapshotRequest.java @@ -62,7 +62,7 @@ private GetSnapshotRequest( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -183,10 +183,9 @@ public boolean equals(final java.lang.Object obj) { } com.google.pubsub.v1.GetSnapshotRequest other = (com.google.pubsub.v1.GetSnapshotRequest) obj; - boolean result = true; - result = result && getSnapshot().equals(other.getSnapshot()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getSnapshot().equals(other.getSnapshot())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -382,35 +381,35 @@ public com.google.pubsub.v1.GetSnapshotRequest buildPartial() { @java.lang.Override public Builder clone() { - return (Builder) super.clone(); + return super.clone(); } @java.lang.Override public Builder setField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.setField(field, value); + return super.setField(field, value); } @java.lang.Override public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) { - return (Builder) super.clearField(field); + return super.clearField(field); } @java.lang.Override public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) { - return (Builder) super.clearOneof(oneof); + return super.clearOneof(oneof); } @java.lang.Override public Builder setRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) { - return (Builder) super.setRepeatedField(field, index, value); + return super.setRepeatedField(field, index, value); } @java.lang.Override public Builder addRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.addRepeatedField(field, value); + return super.addRepeatedField(field, value); } @java.lang.Override @@ -559,7 +558,7 @@ public Builder setSnapshotBytes(com.google.protobuf.ByteString value) { @java.lang.Override public final Builder setUnknownFields(final com.google.protobuf.UnknownFieldSet unknownFields) { - return super.setUnknownFieldsProto3(unknownFields); + return super.setUnknownFields(unknownFields); } @java.lang.Override diff --git a/google-api-grpc/proto-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/GetSubscriptionRequest.java b/google-api-grpc/proto-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/GetSubscriptionRequest.java index a86238dfcff0..f0e42b834b14 100644 --- a/google-api-grpc/proto-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/GetSubscriptionRequest.java +++ b/google-api-grpc/proto-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/GetSubscriptionRequest.java @@ -59,7 +59,7 @@ private GetSubscriptionRequest( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -181,10 +181,9 @@ public boolean equals(final java.lang.Object obj) { com.google.pubsub.v1.GetSubscriptionRequest other = (com.google.pubsub.v1.GetSubscriptionRequest) obj; - boolean result = true; - result = result && getSubscription().equals(other.getSubscription()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getSubscription().equals(other.getSubscription())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -377,35 +376,35 @@ public com.google.pubsub.v1.GetSubscriptionRequest buildPartial() { @java.lang.Override public Builder clone() { - return (Builder) super.clone(); + return super.clone(); } @java.lang.Override public Builder setField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.setField(field, value); + return super.setField(field, value); } @java.lang.Override public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) { - return (Builder) super.clearField(field); + return super.clearField(field); } @java.lang.Override public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) { - return (Builder) super.clearOneof(oneof); + return super.clearOneof(oneof); } @java.lang.Override public Builder setRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) { - return (Builder) super.setRepeatedField(field, index, value); + return super.setRepeatedField(field, index, value); } @java.lang.Override public Builder addRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.addRepeatedField(field, value); + return super.addRepeatedField(field, value); } @java.lang.Override @@ -554,7 +553,7 @@ public Builder setSubscriptionBytes(com.google.protobuf.ByteString value) { @java.lang.Override public final Builder setUnknownFields(final com.google.protobuf.UnknownFieldSet unknownFields) { - return super.setUnknownFieldsProto3(unknownFields); + return super.setUnknownFields(unknownFields); } @java.lang.Override diff --git a/google-api-grpc/proto-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/GetTopicRequest.java b/google-api-grpc/proto-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/GetTopicRequest.java index 08f5b0aeb32d..b1fbffa56376 100644 --- a/google-api-grpc/proto-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/GetTopicRequest.java +++ b/google-api-grpc/proto-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/GetTopicRequest.java @@ -59,7 +59,7 @@ private GetTopicRequest( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -180,10 +180,9 @@ public boolean equals(final java.lang.Object obj) { } com.google.pubsub.v1.GetTopicRequest other = (com.google.pubsub.v1.GetTopicRequest) obj; - boolean result = true; - result = result && getTopic().equals(other.getTopic()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getTopic().equals(other.getTopic())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -374,35 +373,35 @@ public com.google.pubsub.v1.GetTopicRequest buildPartial() { @java.lang.Override public Builder clone() { - return (Builder) super.clone(); + return super.clone(); } @java.lang.Override public Builder setField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.setField(field, value); + return super.setField(field, value); } @java.lang.Override public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) { - return (Builder) super.clearField(field); + return super.clearField(field); } @java.lang.Override public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) { - return (Builder) super.clearOneof(oneof); + return super.clearOneof(oneof); } @java.lang.Override public Builder setRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) { - return (Builder) super.setRepeatedField(field, index, value); + return super.setRepeatedField(field, index, value); } @java.lang.Override public Builder addRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.addRepeatedField(field, value); + return super.addRepeatedField(field, value); } @java.lang.Override @@ -551,7 +550,7 @@ public Builder setTopicBytes(com.google.protobuf.ByteString value) { @java.lang.Override public final Builder setUnknownFields(final com.google.protobuf.UnknownFieldSet unknownFields) { - return super.setUnknownFieldsProto3(unknownFields); + return super.setUnknownFields(unknownFields); } @java.lang.Override diff --git a/google-api-grpc/proto-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/ListSnapshotsRequest.java b/google-api-grpc/proto-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/ListSnapshotsRequest.java index 2915d7938b03..6bd19a2aba94 100644 --- a/google-api-grpc/proto-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/ListSnapshotsRequest.java +++ b/google-api-grpc/proto-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/ListSnapshotsRequest.java @@ -27,7 +27,6 @@ private ListSnapshotsRequest(com.google.protobuf.GeneratedMessageV3.Builder b private ListSnapshotsRequest() { project_ = ""; - pageSize_ = 0; pageToken_ = ""; } @@ -76,7 +75,7 @@ private ListSnapshotsRequest( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -272,12 +271,11 @@ public boolean equals(final java.lang.Object obj) { com.google.pubsub.v1.ListSnapshotsRequest other = (com.google.pubsub.v1.ListSnapshotsRequest) obj; - boolean result = true; - result = result && getProject().equals(other.getProject()); - result = result && (getPageSize() == other.getPageSize()); - result = result && getPageToken().equals(other.getPageToken()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getProject().equals(other.getProject())) return false; + if (getPageSize() != other.getPageSize()) return false; + if (!getPageToken().equals(other.getPageToken())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -483,35 +481,35 @@ public com.google.pubsub.v1.ListSnapshotsRequest buildPartial() { @java.lang.Override public Builder clone() { - return (Builder) super.clone(); + return super.clone(); } @java.lang.Override public Builder setField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.setField(field, value); + return super.setField(field, value); } @java.lang.Override public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) { - return (Builder) super.clearField(field); + return super.clearField(field); } @java.lang.Override public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) { - return (Builder) super.clearOneof(oneof); + return super.clearOneof(oneof); } @java.lang.Override public Builder setRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) { - return (Builder) super.setRepeatedField(field, index, value); + return super.setRepeatedField(field, index, value); } @java.lang.Override public Builder addRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.addRepeatedField(field, value); + return super.addRepeatedField(field, value); } @java.lang.Override @@ -815,7 +813,7 @@ public Builder setPageTokenBytes(com.google.protobuf.ByteString value) { @java.lang.Override public final Builder setUnknownFields(final com.google.protobuf.UnknownFieldSet unknownFields) { - return super.setUnknownFieldsProto3(unknownFields); + return super.setUnknownFields(unknownFields); } @java.lang.Override diff --git a/google-api-grpc/proto-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/ListSnapshotsResponse.java b/google-api-grpc/proto-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/ListSnapshotsResponse.java index 82586a0386a2..365129f60b7e 100644 --- a/google-api-grpc/proto-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/ListSnapshotsResponse.java +++ b/google-api-grpc/proto-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/ListSnapshotsResponse.java @@ -56,7 +56,7 @@ private ListSnapshotsResponse( break; case 10: { - if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) { + if (!((mutable_bitField0_ & 0x00000001) != 0)) { snapshots_ = new java.util.ArrayList(); mutable_bitField0_ |= 0x00000001; } @@ -73,7 +73,7 @@ private ListSnapshotsResponse( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -85,7 +85,7 @@ private ListSnapshotsResponse( } catch (java.io.IOException e) { throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this); } finally { - if (((mutable_bitField0_ & 0x00000001) == 0x00000001)) { + if (((mutable_bitField0_ & 0x00000001) != 0)) { snapshots_ = java.util.Collections.unmodifiableList(snapshots_); } this.unknownFields = unknownFields.build(); @@ -269,11 +269,10 @@ public boolean equals(final java.lang.Object obj) { com.google.pubsub.v1.ListSnapshotsResponse other = (com.google.pubsub.v1.ListSnapshotsResponse) obj; - boolean result = true; - result = result && getSnapshotsList().equals(other.getSnapshotsList()); - result = result && getNextPageToken().equals(other.getNextPageToken()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getSnapshotsList().equals(other.getSnapshotsList())) return false; + if (!getNextPageToken().equals(other.getNextPageToken())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -477,7 +476,7 @@ public com.google.pubsub.v1.ListSnapshotsResponse buildPartial() { int from_bitField0_ = bitField0_; int to_bitField0_ = 0; if (snapshotsBuilder_ == null) { - if (((bitField0_ & 0x00000001) == 0x00000001)) { + if (((bitField0_ & 0x00000001) != 0)) { snapshots_ = java.util.Collections.unmodifiableList(snapshots_); bitField0_ = (bitField0_ & ~0x00000001); } @@ -493,35 +492,35 @@ public com.google.pubsub.v1.ListSnapshotsResponse buildPartial() { @java.lang.Override public Builder clone() { - return (Builder) super.clone(); + return super.clone(); } @java.lang.Override public Builder setField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.setField(field, value); + return super.setField(field, value); } @java.lang.Override public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) { - return (Builder) super.clearField(field); + return super.clearField(field); } @java.lang.Override public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) { - return (Builder) super.clearOneof(oneof); + return super.clearOneof(oneof); } @java.lang.Override public Builder setRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) { - return (Builder) super.setRepeatedField(field, index, value); + return super.setRepeatedField(field, index, value); } @java.lang.Override public Builder addRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.addRepeatedField(field, value); + return super.addRepeatedField(field, value); } @java.lang.Override @@ -602,7 +601,7 @@ public Builder mergeFrom( java.util.Collections.emptyList(); private void ensureSnapshotsIsMutable() { - if (!((bitField0_ & 0x00000001) == 0x00000001)) { + if (!((bitField0_ & 0x00000001) != 0)) { snapshots_ = new java.util.ArrayList(snapshots_); bitField0_ |= 0x00000001; } @@ -938,10 +937,7 @@ public java.util.List getSnapshotsBuilder com.google.pubsub.v1.Snapshot, com.google.pubsub.v1.Snapshot.Builder, com.google.pubsub.v1.SnapshotOrBuilder>( - snapshots_, - ((bitField0_ & 0x00000001) == 0x00000001), - getParentForChildren(), - isClean()); + snapshots_, ((bitField0_ & 0x00000001) != 0), getParentForChildren(), isClean()); snapshots_ = null; } return snapshotsBuilder_; @@ -1048,7 +1044,7 @@ public Builder setNextPageTokenBytes(com.google.protobuf.ByteString value) { @java.lang.Override public final Builder setUnknownFields(final com.google.protobuf.UnknownFieldSet unknownFields) { - return super.setUnknownFieldsProto3(unknownFields); + return super.setUnknownFields(unknownFields); } @java.lang.Override diff --git a/google-api-grpc/proto-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/ListSubscriptionsRequest.java b/google-api-grpc/proto-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/ListSubscriptionsRequest.java index c24a8ba397a9..05f05b50ade9 100644 --- a/google-api-grpc/proto-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/ListSubscriptionsRequest.java +++ b/google-api-grpc/proto-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/ListSubscriptionsRequest.java @@ -24,7 +24,6 @@ private ListSubscriptionsRequest(com.google.protobuf.GeneratedMessageV3.Builder< private ListSubscriptionsRequest() { project_ = ""; - pageSize_ = 0; pageToken_ = ""; } @@ -73,7 +72,7 @@ private ListSubscriptionsRequest( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -269,12 +268,11 @@ public boolean equals(final java.lang.Object obj) { com.google.pubsub.v1.ListSubscriptionsRequest other = (com.google.pubsub.v1.ListSubscriptionsRequest) obj; - boolean result = true; - result = result && getProject().equals(other.getProject()); - result = result && (getPageSize() == other.getPageSize()); - result = result && getPageToken().equals(other.getPageToken()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getProject().equals(other.getProject())) return false; + if (getPageSize() != other.getPageSize()) return false; + if (!getPageToken().equals(other.getPageToken())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -477,35 +475,35 @@ public com.google.pubsub.v1.ListSubscriptionsRequest buildPartial() { @java.lang.Override public Builder clone() { - return (Builder) super.clone(); + return super.clone(); } @java.lang.Override public Builder setField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.setField(field, value); + return super.setField(field, value); } @java.lang.Override public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) { - return (Builder) super.clearField(field); + return super.clearField(field); } @java.lang.Override public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) { - return (Builder) super.clearOneof(oneof); + return super.clearOneof(oneof); } @java.lang.Override public Builder setRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) { - return (Builder) super.setRepeatedField(field, index, value); + return super.setRepeatedField(field, index, value); } @java.lang.Override public Builder addRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.addRepeatedField(field, value); + return super.addRepeatedField(field, value); } @java.lang.Override @@ -809,7 +807,7 @@ public Builder setPageTokenBytes(com.google.protobuf.ByteString value) { @java.lang.Override public final Builder setUnknownFields(final com.google.protobuf.UnknownFieldSet unknownFields) { - return super.setUnknownFieldsProto3(unknownFields); + return super.setUnknownFields(unknownFields); } @java.lang.Override diff --git a/google-api-grpc/proto-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/ListSubscriptionsResponse.java b/google-api-grpc/proto-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/ListSubscriptionsResponse.java index dea6b1eadcf0..85c4cd8c296f 100644 --- a/google-api-grpc/proto-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/ListSubscriptionsResponse.java +++ b/google-api-grpc/proto-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/ListSubscriptionsResponse.java @@ -53,7 +53,7 @@ private ListSubscriptionsResponse( break; case 10: { - if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) { + if (!((mutable_bitField0_ & 0x00000001) != 0)) { subscriptions_ = new java.util.ArrayList(); mutable_bitField0_ |= 0x00000001; } @@ -70,7 +70,7 @@ private ListSubscriptionsResponse( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -82,7 +82,7 @@ private ListSubscriptionsResponse( } catch (java.io.IOException e) { throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this); } finally { - if (((mutable_bitField0_ & 0x00000001) == 0x00000001)) { + if (((mutable_bitField0_ & 0x00000001) != 0)) { subscriptions_ = java.util.Collections.unmodifiableList(subscriptions_); } this.unknownFields = unknownFields.build(); @@ -268,11 +268,10 @@ public boolean equals(final java.lang.Object obj) { com.google.pubsub.v1.ListSubscriptionsResponse other = (com.google.pubsub.v1.ListSubscriptionsResponse) obj; - boolean result = true; - result = result && getSubscriptionsList().equals(other.getSubscriptionsList()); - result = result && getNextPageToken().equals(other.getNextPageToken()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getSubscriptionsList().equals(other.getSubscriptionsList())) return false; + if (!getNextPageToken().equals(other.getNextPageToken())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -473,7 +472,7 @@ public com.google.pubsub.v1.ListSubscriptionsResponse buildPartial() { int from_bitField0_ = bitField0_; int to_bitField0_ = 0; if (subscriptionsBuilder_ == null) { - if (((bitField0_ & 0x00000001) == 0x00000001)) { + if (((bitField0_ & 0x00000001) != 0)) { subscriptions_ = java.util.Collections.unmodifiableList(subscriptions_); bitField0_ = (bitField0_ & ~0x00000001); } @@ -489,35 +488,35 @@ public com.google.pubsub.v1.ListSubscriptionsResponse buildPartial() { @java.lang.Override public Builder clone() { - return (Builder) super.clone(); + return super.clone(); } @java.lang.Override public Builder setField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.setField(field, value); + return super.setField(field, value); } @java.lang.Override public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) { - return (Builder) super.clearField(field); + return super.clearField(field); } @java.lang.Override public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) { - return (Builder) super.clearOneof(oneof); + return super.clearOneof(oneof); } @java.lang.Override public Builder setRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) { - return (Builder) super.setRepeatedField(field, index, value); + return super.setRepeatedField(field, index, value); } @java.lang.Override public Builder addRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.addRepeatedField(field, value); + return super.addRepeatedField(field, value); } @java.lang.Override @@ -598,7 +597,7 @@ public Builder mergeFrom( java.util.Collections.emptyList(); private void ensureSubscriptionsIsMutable() { - if (!((bitField0_ & 0x00000001) == 0x00000001)) { + if (!((bitField0_ & 0x00000001) != 0)) { subscriptions_ = new java.util.ArrayList(subscriptions_); bitField0_ |= 0x00000001; } @@ -937,7 +936,7 @@ public java.util.List getSubscription com.google.pubsub.v1.Subscription.Builder, com.google.pubsub.v1.SubscriptionOrBuilder>( subscriptions_, - ((bitField0_ & 0x00000001) == 0x00000001), + ((bitField0_ & 0x00000001) != 0), getParentForChildren(), isClean()); subscriptions_ = null; @@ -1051,7 +1050,7 @@ public Builder setNextPageTokenBytes(com.google.protobuf.ByteString value) { @java.lang.Override public final Builder setUnknownFields(final com.google.protobuf.UnknownFieldSet unknownFields) { - return super.setUnknownFieldsProto3(unknownFields); + return super.setUnknownFields(unknownFields); } @java.lang.Override diff --git a/google-api-grpc/proto-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/ListTopicSnapshotsRequest.java b/google-api-grpc/proto-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/ListTopicSnapshotsRequest.java index 423da7aac707..b44a2b4eff55 100644 --- a/google-api-grpc/proto-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/ListTopicSnapshotsRequest.java +++ b/google-api-grpc/proto-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/ListTopicSnapshotsRequest.java @@ -27,7 +27,6 @@ private ListTopicSnapshotsRequest(com.google.protobuf.GeneratedMessageV3.Builder private ListTopicSnapshotsRequest() { topic_ = ""; - pageSize_ = 0; pageToken_ = ""; } @@ -76,7 +75,7 @@ private ListTopicSnapshotsRequest( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -272,12 +271,11 @@ public boolean equals(final java.lang.Object obj) { com.google.pubsub.v1.ListTopicSnapshotsRequest other = (com.google.pubsub.v1.ListTopicSnapshotsRequest) obj; - boolean result = true; - result = result && getTopic().equals(other.getTopic()); - result = result && (getPageSize() == other.getPageSize()); - result = result && getPageToken().equals(other.getPageToken()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getTopic().equals(other.getTopic())) return false; + if (getPageSize() != other.getPageSize()) return false; + if (!getPageToken().equals(other.getPageToken())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -483,35 +481,35 @@ public com.google.pubsub.v1.ListTopicSnapshotsRequest buildPartial() { @java.lang.Override public Builder clone() { - return (Builder) super.clone(); + return super.clone(); } @java.lang.Override public Builder setField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.setField(field, value); + return super.setField(field, value); } @java.lang.Override public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) { - return (Builder) super.clearField(field); + return super.clearField(field); } @java.lang.Override public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) { - return (Builder) super.clearOneof(oneof); + return super.clearOneof(oneof); } @java.lang.Override public Builder setRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) { - return (Builder) super.setRepeatedField(field, index, value); + return super.setRepeatedField(field, index, value); } @java.lang.Override public Builder addRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.addRepeatedField(field, value); + return super.addRepeatedField(field, value); } @java.lang.Override @@ -815,7 +813,7 @@ public Builder setPageTokenBytes(com.google.protobuf.ByteString value) { @java.lang.Override public final Builder setUnknownFields(final com.google.protobuf.UnknownFieldSet unknownFields) { - return super.setUnknownFieldsProto3(unknownFields); + return super.setUnknownFields(unknownFields); } @java.lang.Override diff --git a/google-api-grpc/proto-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/ListTopicSnapshotsResponse.java b/google-api-grpc/proto-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/ListTopicSnapshotsResponse.java index 88799eda0d9e..48bd10153a5a 100644 --- a/google-api-grpc/proto-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/ListTopicSnapshotsResponse.java +++ b/google-api-grpc/proto-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/ListTopicSnapshotsResponse.java @@ -57,7 +57,7 @@ private ListTopicSnapshotsResponse( case 10: { java.lang.String s = input.readStringRequireUtf8(); - if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) { + if (!((mutable_bitField0_ & 0x00000001) != 0)) { snapshots_ = new com.google.protobuf.LazyStringArrayList(); mutable_bitField0_ |= 0x00000001; } @@ -73,7 +73,7 @@ private ListTopicSnapshotsResponse( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -85,7 +85,7 @@ private ListTopicSnapshotsResponse( } catch (java.io.IOException e) { throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this); } finally { - if (((mutable_bitField0_ & 0x00000001) == 0x00000001)) { + if (((mutable_bitField0_ & 0x00000001) != 0)) { snapshots_ = snapshots_.getUnmodifiableView(); } this.unknownFields = unknownFields.build(); @@ -263,11 +263,10 @@ public boolean equals(final java.lang.Object obj) { com.google.pubsub.v1.ListTopicSnapshotsResponse other = (com.google.pubsub.v1.ListTopicSnapshotsResponse) obj; - boolean result = true; - result = result && getSnapshotsList().equals(other.getSnapshotsList()); - result = result && getNextPageToken().equals(other.getNextPageToken()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getSnapshotsList().equals(other.getSnapshotsList())) return false; + if (!getNextPageToken().equals(other.getNextPageToken())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -464,7 +463,7 @@ public com.google.pubsub.v1.ListTopicSnapshotsResponse buildPartial() { new com.google.pubsub.v1.ListTopicSnapshotsResponse(this); int from_bitField0_ = bitField0_; int to_bitField0_ = 0; - if (((bitField0_ & 0x00000001) == 0x00000001)) { + if (((bitField0_ & 0x00000001) != 0)) { snapshots_ = snapshots_.getUnmodifiableView(); bitField0_ = (bitField0_ & ~0x00000001); } @@ -477,35 +476,35 @@ public com.google.pubsub.v1.ListTopicSnapshotsResponse buildPartial() { @java.lang.Override public Builder clone() { - return (Builder) super.clone(); + return super.clone(); } @java.lang.Override public Builder setField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.setField(field, value); + return super.setField(field, value); } @java.lang.Override public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) { - return (Builder) super.clearField(field); + return super.clearField(field); } @java.lang.Override public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) { - return (Builder) super.clearOneof(oneof); + return super.clearOneof(oneof); } @java.lang.Override public Builder setRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) { - return (Builder) super.setRepeatedField(field, index, value); + return super.setRepeatedField(field, index, value); } @java.lang.Override public Builder addRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.addRepeatedField(field, value); + return super.addRepeatedField(field, value); } @java.lang.Override @@ -570,7 +569,7 @@ public Builder mergeFrom( com.google.protobuf.LazyStringArrayList.EMPTY; private void ensureSnapshotsIsMutable() { - if (!((bitField0_ & 0x00000001) == 0x00000001)) { + if (!((bitField0_ & 0x00000001) != 0)) { snapshots_ = new com.google.protobuf.LazyStringArrayList(snapshots_); bitField0_ |= 0x00000001; } @@ -815,7 +814,7 @@ public Builder setNextPageTokenBytes(com.google.protobuf.ByteString value) { @java.lang.Override public final Builder setUnknownFields(final com.google.protobuf.UnknownFieldSet unknownFields) { - return super.setUnknownFieldsProto3(unknownFields); + return super.setUnknownFields(unknownFields); } @java.lang.Override diff --git a/google-api-grpc/proto-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/ListTopicSubscriptionsRequest.java b/google-api-grpc/proto-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/ListTopicSubscriptionsRequest.java index c5b03ad2c5a8..f2d1bafbeb97 100644 --- a/google-api-grpc/proto-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/ListTopicSubscriptionsRequest.java +++ b/google-api-grpc/proto-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/ListTopicSubscriptionsRequest.java @@ -24,7 +24,6 @@ private ListTopicSubscriptionsRequest(com.google.protobuf.GeneratedMessageV3.Bui private ListTopicSubscriptionsRequest() { topic_ = ""; - pageSize_ = 0; pageToken_ = ""; } @@ -73,7 +72,7 @@ private ListTopicSubscriptionsRequest( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -269,12 +268,11 @@ public boolean equals(final java.lang.Object obj) { com.google.pubsub.v1.ListTopicSubscriptionsRequest other = (com.google.pubsub.v1.ListTopicSubscriptionsRequest) obj; - boolean result = true; - result = result && getTopic().equals(other.getTopic()); - result = result && (getPageSize() == other.getPageSize()); - result = result && getPageToken().equals(other.getPageToken()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getTopic().equals(other.getTopic())) return false; + if (getPageSize() != other.getPageSize()) return false; + if (!getPageToken().equals(other.getPageToken())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -477,35 +475,35 @@ public com.google.pubsub.v1.ListTopicSubscriptionsRequest buildPartial() { @java.lang.Override public Builder clone() { - return (Builder) super.clone(); + return super.clone(); } @java.lang.Override public Builder setField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.setField(field, value); + return super.setField(field, value); } @java.lang.Override public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) { - return (Builder) super.clearField(field); + return super.clearField(field); } @java.lang.Override public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) { - return (Builder) super.clearOneof(oneof); + return super.clearOneof(oneof); } @java.lang.Override public Builder setRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) { - return (Builder) super.setRepeatedField(field, index, value); + return super.setRepeatedField(field, index, value); } @java.lang.Override public Builder addRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.addRepeatedField(field, value); + return super.addRepeatedField(field, value); } @java.lang.Override @@ -811,7 +809,7 @@ public Builder setPageTokenBytes(com.google.protobuf.ByteString value) { @java.lang.Override public final Builder setUnknownFields(final com.google.protobuf.UnknownFieldSet unknownFields) { - return super.setUnknownFieldsProto3(unknownFields); + return super.setUnknownFields(unknownFields); } @java.lang.Override diff --git a/google-api-grpc/proto-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/ListTopicSubscriptionsResponse.java b/google-api-grpc/proto-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/ListTopicSubscriptionsResponse.java index f3dc395a3deb..ae758fefe91f 100644 --- a/google-api-grpc/proto-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/ListTopicSubscriptionsResponse.java +++ b/google-api-grpc/proto-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/ListTopicSubscriptionsResponse.java @@ -55,7 +55,7 @@ private ListTopicSubscriptionsResponse( case 10: { java.lang.String s = input.readStringRequireUtf8(); - if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) { + if (!((mutable_bitField0_ & 0x00000001) != 0)) { subscriptions_ = new com.google.protobuf.LazyStringArrayList(); mutable_bitField0_ |= 0x00000001; } @@ -71,7 +71,7 @@ private ListTopicSubscriptionsResponse( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -83,7 +83,7 @@ private ListTopicSubscriptionsResponse( } catch (java.io.IOException e) { throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this); } finally { - if (((mutable_bitField0_ & 0x00000001) == 0x00000001)) { + if (((mutable_bitField0_ & 0x00000001) != 0)) { subscriptions_ = subscriptions_.getUnmodifiableView(); } this.unknownFields = unknownFields.build(); @@ -261,11 +261,10 @@ public boolean equals(final java.lang.Object obj) { com.google.pubsub.v1.ListTopicSubscriptionsResponse other = (com.google.pubsub.v1.ListTopicSubscriptionsResponse) obj; - boolean result = true; - result = result && getSubscriptionsList().equals(other.getSubscriptionsList()); - result = result && getNextPageToken().equals(other.getNextPageToken()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getSubscriptionsList().equals(other.getSubscriptionsList())) return false; + if (!getNextPageToken().equals(other.getNextPageToken())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -459,7 +458,7 @@ public com.google.pubsub.v1.ListTopicSubscriptionsResponse buildPartial() { new com.google.pubsub.v1.ListTopicSubscriptionsResponse(this); int from_bitField0_ = bitField0_; int to_bitField0_ = 0; - if (((bitField0_ & 0x00000001) == 0x00000001)) { + if (((bitField0_ & 0x00000001) != 0)) { subscriptions_ = subscriptions_.getUnmodifiableView(); bitField0_ = (bitField0_ & ~0x00000001); } @@ -472,35 +471,35 @@ public com.google.pubsub.v1.ListTopicSubscriptionsResponse buildPartial() { @java.lang.Override public Builder clone() { - return (Builder) super.clone(); + return super.clone(); } @java.lang.Override public Builder setField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.setField(field, value); + return super.setField(field, value); } @java.lang.Override public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) { - return (Builder) super.clearField(field); + return super.clearField(field); } @java.lang.Override public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) { - return (Builder) super.clearOneof(oneof); + return super.clearOneof(oneof); } @java.lang.Override public Builder setRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) { - return (Builder) super.setRepeatedField(field, index, value); + return super.setRepeatedField(field, index, value); } @java.lang.Override public Builder addRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.addRepeatedField(field, value); + return super.addRepeatedField(field, value); } @java.lang.Override @@ -566,7 +565,7 @@ public Builder mergeFrom( com.google.protobuf.LazyStringArrayList.EMPTY; private void ensureSubscriptionsIsMutable() { - if (!((bitField0_ & 0x00000001) == 0x00000001)) { + if (!((bitField0_ & 0x00000001) != 0)) { subscriptions_ = new com.google.protobuf.LazyStringArrayList(subscriptions_); bitField0_ |= 0x00000001; } @@ -811,7 +810,7 @@ public Builder setNextPageTokenBytes(com.google.protobuf.ByteString value) { @java.lang.Override public final Builder setUnknownFields(final com.google.protobuf.UnknownFieldSet unknownFields) { - return super.setUnknownFieldsProto3(unknownFields); + return super.setUnknownFields(unknownFields); } @java.lang.Override diff --git a/google-api-grpc/proto-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/ListTopicsRequest.java b/google-api-grpc/proto-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/ListTopicsRequest.java index 7730d66f0ed8..3f420628e5a4 100644 --- a/google-api-grpc/proto-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/ListTopicsRequest.java +++ b/google-api-grpc/proto-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/ListTopicsRequest.java @@ -24,7 +24,6 @@ private ListTopicsRequest(com.google.protobuf.GeneratedMessageV3.Builder buil private ListTopicsRequest() { project_ = ""; - pageSize_ = 0; pageToken_ = ""; } @@ -73,7 +72,7 @@ private ListTopicsRequest( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -268,12 +267,11 @@ public boolean equals(final java.lang.Object obj) { } com.google.pubsub.v1.ListTopicsRequest other = (com.google.pubsub.v1.ListTopicsRequest) obj; - boolean result = true; - result = result && getProject().equals(other.getProject()); - result = result && (getPageSize() == other.getPageSize()); - result = result && getPageToken().equals(other.getPageToken()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getProject().equals(other.getProject())) return false; + if (getPageSize() != other.getPageSize()) return false; + if (!getPageToken().equals(other.getPageToken())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -476,35 +474,35 @@ public com.google.pubsub.v1.ListTopicsRequest buildPartial() { @java.lang.Override public Builder clone() { - return (Builder) super.clone(); + return super.clone(); } @java.lang.Override public Builder setField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.setField(field, value); + return super.setField(field, value); } @java.lang.Override public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) { - return (Builder) super.clearField(field); + return super.clearField(field); } @java.lang.Override public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) { - return (Builder) super.clearOneof(oneof); + return super.clearOneof(oneof); } @java.lang.Override public Builder setRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) { - return (Builder) super.setRepeatedField(field, index, value); + return super.setRepeatedField(field, index, value); } @java.lang.Override public Builder addRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.addRepeatedField(field, value); + return super.addRepeatedField(field, value); } @java.lang.Override @@ -808,7 +806,7 @@ public Builder setPageTokenBytes(com.google.protobuf.ByteString value) { @java.lang.Override public final Builder setUnknownFields(final com.google.protobuf.UnknownFieldSet unknownFields) { - return super.setUnknownFieldsProto3(unknownFields); + return super.setUnknownFields(unknownFields); } @java.lang.Override diff --git a/google-api-grpc/proto-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/ListTopicsResponse.java b/google-api-grpc/proto-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/ListTopicsResponse.java index e5216615e934..351125f93298 100644 --- a/google-api-grpc/proto-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/ListTopicsResponse.java +++ b/google-api-grpc/proto-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/ListTopicsResponse.java @@ -53,7 +53,7 @@ private ListTopicsResponse( break; case 10: { - if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) { + if (!((mutable_bitField0_ & 0x00000001) != 0)) { topics_ = new java.util.ArrayList(); mutable_bitField0_ |= 0x00000001; } @@ -70,7 +70,7 @@ private ListTopicsResponse( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -82,7 +82,7 @@ private ListTopicsResponse( } catch (java.io.IOException e) { throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this); } finally { - if (((mutable_bitField0_ & 0x00000001) == 0x00000001)) { + if (((mutable_bitField0_ & 0x00000001) != 0)) { topics_ = java.util.Collections.unmodifiableList(topics_); } this.unknownFields = unknownFields.build(); @@ -264,11 +264,10 @@ public boolean equals(final java.lang.Object obj) { } com.google.pubsub.v1.ListTopicsResponse other = (com.google.pubsub.v1.ListTopicsResponse) obj; - boolean result = true; - result = result && getTopicsList().equals(other.getTopicsList()); - result = result && getNextPageToken().equals(other.getNextPageToken()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getTopicsList().equals(other.getTopicsList())) return false; + if (!getNextPageToken().equals(other.getNextPageToken())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -469,7 +468,7 @@ public com.google.pubsub.v1.ListTopicsResponse buildPartial() { int from_bitField0_ = bitField0_; int to_bitField0_ = 0; if (topicsBuilder_ == null) { - if (((bitField0_ & 0x00000001) == 0x00000001)) { + if (((bitField0_ & 0x00000001) != 0)) { topics_ = java.util.Collections.unmodifiableList(topics_); bitField0_ = (bitField0_ & ~0x00000001); } @@ -485,35 +484,35 @@ public com.google.pubsub.v1.ListTopicsResponse buildPartial() { @java.lang.Override public Builder clone() { - return (Builder) super.clone(); + return super.clone(); } @java.lang.Override public Builder setField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.setField(field, value); + return super.setField(field, value); } @java.lang.Override public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) { - return (Builder) super.clearField(field); + return super.clearField(field); } @java.lang.Override public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) { - return (Builder) super.clearOneof(oneof); + return super.clearOneof(oneof); } @java.lang.Override public Builder setRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) { - return (Builder) super.setRepeatedField(field, index, value); + return super.setRepeatedField(field, index, value); } @java.lang.Override public Builder addRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.addRepeatedField(field, value); + return super.addRepeatedField(field, value); } @java.lang.Override @@ -593,7 +592,7 @@ public Builder mergeFrom( private java.util.List topics_ = java.util.Collections.emptyList(); private void ensureTopicsIsMutable() { - if (!((bitField0_ & 0x00000001) == 0x00000001)) { + if (!((bitField0_ & 0x00000001) != 0)) { topics_ = new java.util.ArrayList(topics_); bitField0_ |= 0x00000001; } @@ -926,10 +925,7 @@ public java.util.List getTopicsBuilderList() com.google.pubsub.v1.Topic, com.google.pubsub.v1.Topic.Builder, com.google.pubsub.v1.TopicOrBuilder>( - topics_, - ((bitField0_ & 0x00000001) == 0x00000001), - getParentForChildren(), - isClean()); + topics_, ((bitField0_ & 0x00000001) != 0), getParentForChildren(), isClean()); topics_ = null; } return topicsBuilder_; @@ -1036,7 +1032,7 @@ public Builder setNextPageTokenBytes(com.google.protobuf.ByteString value) { @java.lang.Override public final Builder setUnknownFields(final com.google.protobuf.UnknownFieldSet unknownFields) { - return super.setUnknownFieldsProto3(unknownFields); + return super.setUnknownFields(unknownFields); } @java.lang.Override diff --git a/google-api-grpc/proto-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/MessageStoragePolicy.java b/google-api-grpc/proto-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/MessageStoragePolicy.java index 0417cb8c12b6..3c5a9a8f58cc 100644 --- a/google-api-grpc/proto-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/MessageStoragePolicy.java +++ b/google-api-grpc/proto-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/MessageStoragePolicy.java @@ -45,7 +45,7 @@ private MessageStoragePolicy( case 10: { java.lang.String s = input.readStringRequireUtf8(); - if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) { + if (!((mutable_bitField0_ & 0x00000001) != 0)) { allowedPersistenceRegions_ = new com.google.protobuf.LazyStringArrayList(); mutable_bitField0_ |= 0x00000001; } @@ -54,7 +54,7 @@ private MessageStoragePolicy( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -66,7 +66,7 @@ private MessageStoragePolicy( } catch (java.io.IOException e) { throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this); } finally { - if (((mutable_bitField0_ & 0x00000001) == 0x00000001)) { + if (((mutable_bitField0_ & 0x00000001) != 0)) { allowedPersistenceRegions_ = allowedPersistenceRegions_.getUnmodifiableView(); } this.unknownFields = unknownFields.build(); @@ -211,12 +211,10 @@ public boolean equals(final java.lang.Object obj) { com.google.pubsub.v1.MessageStoragePolicy other = (com.google.pubsub.v1.MessageStoragePolicy) obj; - boolean result = true; - result = - result - && getAllowedPersistenceRegionsList().equals(other.getAllowedPersistenceRegionsList()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getAllowedPersistenceRegionsList().equals(other.getAllowedPersistenceRegionsList())) + return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -397,7 +395,7 @@ public com.google.pubsub.v1.MessageStoragePolicy buildPartial() { com.google.pubsub.v1.MessageStoragePolicy result = new com.google.pubsub.v1.MessageStoragePolicy(this); int from_bitField0_ = bitField0_; - if (((bitField0_ & 0x00000001) == 0x00000001)) { + if (((bitField0_ & 0x00000001) != 0)) { allowedPersistenceRegions_ = allowedPersistenceRegions_.getUnmodifiableView(); bitField0_ = (bitField0_ & ~0x00000001); } @@ -408,35 +406,35 @@ public com.google.pubsub.v1.MessageStoragePolicy buildPartial() { @java.lang.Override public Builder clone() { - return (Builder) super.clone(); + return super.clone(); } @java.lang.Override public Builder setField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.setField(field, value); + return super.setField(field, value); } @java.lang.Override public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) { - return (Builder) super.clearField(field); + return super.clearField(field); } @java.lang.Override public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) { - return (Builder) super.clearOneof(oneof); + return super.clearOneof(oneof); } @java.lang.Override public Builder setRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) { - return (Builder) super.setRepeatedField(field, index, value); + return super.setRepeatedField(field, index, value); } @java.lang.Override public Builder addRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.addRepeatedField(field, value); + return super.addRepeatedField(field, value); } @java.lang.Override @@ -496,7 +494,7 @@ public Builder mergeFrom( com.google.protobuf.LazyStringArrayList.EMPTY; private void ensureAllowedPersistenceRegionsIsMutable() { - if (!((bitField0_ & 0x00000001) == 0x00000001)) { + if (!((bitField0_ & 0x00000001) != 0)) { allowedPersistenceRegions_ = new com.google.protobuf.LazyStringArrayList(allowedPersistenceRegions_); bitField0_ |= 0x00000001; @@ -683,7 +681,7 @@ public Builder addAllowedPersistenceRegionsBytes(com.google.protobuf.ByteString @java.lang.Override public final Builder setUnknownFields(final com.google.protobuf.UnknownFieldSet unknownFields) { - return super.setUnknownFieldsProto3(unknownFields); + return super.setUnknownFields(unknownFields); } @java.lang.Override diff --git a/google-api-grpc/proto-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/ModifyAckDeadlineRequest.java b/google-api-grpc/proto-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/ModifyAckDeadlineRequest.java index 8d1730521f59..e038955f1c87 100644 --- a/google-api-grpc/proto-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/ModifyAckDeadlineRequest.java +++ b/google-api-grpc/proto-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/ModifyAckDeadlineRequest.java @@ -25,7 +25,6 @@ private ModifyAckDeadlineRequest(com.google.protobuf.GeneratedMessageV3.Builder< private ModifyAckDeadlineRequest() { subscription_ = ""; ackIds_ = com.google.protobuf.LazyStringArrayList.EMPTY; - ackDeadlineSeconds_ = 0; } @java.lang.Override @@ -67,7 +66,7 @@ private ModifyAckDeadlineRequest( case 34: { java.lang.String s = input.readStringRequireUtf8(); - if (!((mutable_bitField0_ & 0x00000002) == 0x00000002)) { + if (!((mutable_bitField0_ & 0x00000002) != 0)) { ackIds_ = new com.google.protobuf.LazyStringArrayList(); mutable_bitField0_ |= 0x00000002; } @@ -76,7 +75,7 @@ private ModifyAckDeadlineRequest( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -88,7 +87,7 @@ private ModifyAckDeadlineRequest( } catch (java.io.IOException e) { throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this); } finally { - if (((mutable_bitField0_ & 0x00000002) == 0x00000002)) { + if (((mutable_bitField0_ & 0x00000002) != 0)) { ackIds_ = ackIds_.getUnmodifiableView(); } this.unknownFields = unknownFields.build(); @@ -292,12 +291,11 @@ public boolean equals(final java.lang.Object obj) { com.google.pubsub.v1.ModifyAckDeadlineRequest other = (com.google.pubsub.v1.ModifyAckDeadlineRequest) obj; - boolean result = true; - result = result && getSubscription().equals(other.getSubscription()); - result = result && getAckIdsList().equals(other.getAckIdsList()); - result = result && (getAckDeadlineSeconds() == other.getAckDeadlineSeconds()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getSubscription().equals(other.getSubscription())) return false; + if (!getAckIdsList().equals(other.getAckIdsList())) return false; + if (getAckDeadlineSeconds() != other.getAckDeadlineSeconds()) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -496,7 +494,7 @@ public com.google.pubsub.v1.ModifyAckDeadlineRequest buildPartial() { int from_bitField0_ = bitField0_; int to_bitField0_ = 0; result.subscription_ = subscription_; - if (((bitField0_ & 0x00000002) == 0x00000002)) { + if (((bitField0_ & 0x00000002) != 0)) { ackIds_ = ackIds_.getUnmodifiableView(); bitField0_ = (bitField0_ & ~0x00000002); } @@ -509,35 +507,35 @@ public com.google.pubsub.v1.ModifyAckDeadlineRequest buildPartial() { @java.lang.Override public Builder clone() { - return (Builder) super.clone(); + return super.clone(); } @java.lang.Override public Builder setField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.setField(field, value); + return super.setField(field, value); } @java.lang.Override public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) { - return (Builder) super.clearField(field); + return super.clearField(field); } @java.lang.Override public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) { - return (Builder) super.clearOneof(oneof); + return super.clearOneof(oneof); } @java.lang.Override public Builder setRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) { - return (Builder) super.setRepeatedField(field, index, value); + return super.setRepeatedField(field, index, value); } @java.lang.Override public Builder addRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.addRepeatedField(field, value); + return super.addRepeatedField(field, value); } @java.lang.Override @@ -703,7 +701,7 @@ public Builder setSubscriptionBytes(com.google.protobuf.ByteString value) { com.google.protobuf.LazyStringArrayList.EMPTY; private void ensureAckIdsIsMutable() { - if (!((bitField0_ & 0x00000002) == 0x00000002)) { + if (!((bitField0_ & 0x00000002) != 0)) { ackIds_ = new com.google.protobuf.LazyStringArrayList(ackIds_); bitField0_ |= 0x00000002; } @@ -909,7 +907,7 @@ public Builder clearAckDeadlineSeconds() { @java.lang.Override public final Builder setUnknownFields(final com.google.protobuf.UnknownFieldSet unknownFields) { - return super.setUnknownFieldsProto3(unknownFields); + return super.setUnknownFields(unknownFields); } @java.lang.Override diff --git a/google-api-grpc/proto-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/ModifyPushConfigRequest.java b/google-api-grpc/proto-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/ModifyPushConfigRequest.java index e541f2ae1523..3751260d2883 100644 --- a/google-api-grpc/proto-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/ModifyPushConfigRequest.java +++ b/google-api-grpc/proto-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/ModifyPushConfigRequest.java @@ -74,7 +74,7 @@ private ModifyPushConfigRequest( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -253,14 +253,13 @@ public boolean equals(final java.lang.Object obj) { com.google.pubsub.v1.ModifyPushConfigRequest other = (com.google.pubsub.v1.ModifyPushConfigRequest) obj; - boolean result = true; - result = result && getSubscription().equals(other.getSubscription()); - result = result && (hasPushConfig() == other.hasPushConfig()); + if (!getSubscription().equals(other.getSubscription())) return false; + if (hasPushConfig() != other.hasPushConfig()) return false; if (hasPushConfig()) { - result = result && getPushConfig().equals(other.getPushConfig()); + if (!getPushConfig().equals(other.getPushConfig())) return false; } - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -468,35 +467,35 @@ public com.google.pubsub.v1.ModifyPushConfigRequest buildPartial() { @java.lang.Override public Builder clone() { - return (Builder) super.clone(); + return super.clone(); } @java.lang.Override public Builder setField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.setField(field, value); + return super.setField(field, value); } @java.lang.Override public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) { - return (Builder) super.clearField(field); + return super.clearField(field); } @java.lang.Override public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) { - return (Builder) super.clearOneof(oneof); + return super.clearOneof(oneof); } @java.lang.Override public Builder setRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) { - return (Builder) super.setRepeatedField(field, index, value); + return super.setRepeatedField(field, index, value); } @java.lang.Override public Builder addRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.addRepeatedField(field, value); + return super.addRepeatedField(field, value); } @java.lang.Override @@ -646,7 +645,7 @@ public Builder setSubscriptionBytes(com.google.protobuf.ByteString value) { return this; } - private com.google.pubsub.v1.PushConfig pushConfig_ = null; + private com.google.pubsub.v1.PushConfig pushConfig_; private com.google.protobuf.SingleFieldBuilderV3< com.google.pubsub.v1.PushConfig, com.google.pubsub.v1.PushConfig.Builder, @@ -865,7 +864,7 @@ public com.google.pubsub.v1.PushConfigOrBuilder getPushConfigOrBuilder() { @java.lang.Override public final Builder setUnknownFields(final com.google.protobuf.UnknownFieldSet unknownFields) { - return super.setUnknownFieldsProto3(unknownFields); + return super.setUnknownFields(unknownFields); } @java.lang.Override diff --git a/google-api-grpc/proto-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/PublishRequest.java b/google-api-grpc/proto-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/PublishRequest.java index 9523ddea17c9..5ddd6b730156 100644 --- a/google-api-grpc/proto-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/PublishRequest.java +++ b/google-api-grpc/proto-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/PublishRequest.java @@ -60,7 +60,7 @@ private PublishRequest( } case 18: { - if (!((mutable_bitField0_ & 0x00000002) == 0x00000002)) { + if (!((mutable_bitField0_ & 0x00000002) != 0)) { messages_ = new java.util.ArrayList(); mutable_bitField0_ |= 0x00000002; } @@ -71,7 +71,7 @@ private PublishRequest( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -83,7 +83,7 @@ private PublishRequest( } catch (java.io.IOException e) { throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this); } finally { - if (((mutable_bitField0_ & 0x00000002) == 0x00000002)) { + if (((mutable_bitField0_ & 0x00000002) != 0)) { messages_ = java.util.Collections.unmodifiableList(messages_); } this.unknownFields = unknownFields.build(); @@ -266,11 +266,10 @@ public boolean equals(final java.lang.Object obj) { } com.google.pubsub.v1.PublishRequest other = (com.google.pubsub.v1.PublishRequest) obj; - boolean result = true; - result = result && getTopic().equals(other.getTopic()); - result = result && getMessagesList().equals(other.getMessagesList()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getTopic().equals(other.getTopic())) return false; + if (!getMessagesList().equals(other.getMessagesList())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -470,7 +469,7 @@ public com.google.pubsub.v1.PublishRequest buildPartial() { int to_bitField0_ = 0; result.topic_ = topic_; if (messagesBuilder_ == null) { - if (((bitField0_ & 0x00000002) == 0x00000002)) { + if (((bitField0_ & 0x00000002) != 0)) { messages_ = java.util.Collections.unmodifiableList(messages_); bitField0_ = (bitField0_ & ~0x00000002); } @@ -485,35 +484,35 @@ public com.google.pubsub.v1.PublishRequest buildPartial() { @java.lang.Override public Builder clone() { - return (Builder) super.clone(); + return super.clone(); } @java.lang.Override public Builder setField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.setField(field, value); + return super.setField(field, value); } @java.lang.Override public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) { - return (Builder) super.clearField(field); + return super.clearField(field); } @java.lang.Override public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) { - return (Builder) super.clearOneof(oneof); + return super.clearOneof(oneof); } @java.lang.Override public Builder setRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) { - return (Builder) super.setRepeatedField(field, index, value); + return super.setRepeatedField(field, index, value); } @java.lang.Override public Builder addRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.addRepeatedField(field, value); + return super.addRepeatedField(field, value); } @java.lang.Override @@ -693,7 +692,7 @@ public Builder setTopicBytes(com.google.protobuf.ByteString value) { java.util.Collections.emptyList(); private void ensureMessagesIsMutable() { - if (!((bitField0_ & 0x00000002) == 0x00000002)) { + if (!((bitField0_ & 0x00000002) != 0)) { messages_ = new java.util.ArrayList(messages_); bitField0_ |= 0x00000002; } @@ -1031,10 +1030,7 @@ public java.util.List getMessagesBui com.google.pubsub.v1.PubsubMessage, com.google.pubsub.v1.PubsubMessage.Builder, com.google.pubsub.v1.PubsubMessageOrBuilder>( - messages_, - ((bitField0_ & 0x00000002) == 0x00000002), - getParentForChildren(), - isClean()); + messages_, ((bitField0_ & 0x00000002) != 0), getParentForChildren(), isClean()); messages_ = null; } return messagesBuilder_; @@ -1042,7 +1038,7 @@ public java.util.List getMessagesBui @java.lang.Override public final Builder setUnknownFields(final com.google.protobuf.UnknownFieldSet unknownFields) { - return super.setUnknownFieldsProto3(unknownFields); + return super.setUnknownFields(unknownFields); } @java.lang.Override diff --git a/google-api-grpc/proto-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/PublishResponse.java b/google-api-grpc/proto-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/PublishResponse.java index 09cae8073b63..4d8c4ac19d3b 100644 --- a/google-api-grpc/proto-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/PublishResponse.java +++ b/google-api-grpc/proto-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/PublishResponse.java @@ -53,7 +53,7 @@ private PublishResponse( case 10: { java.lang.String s = input.readStringRequireUtf8(); - if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) { + if (!((mutable_bitField0_ & 0x00000001) != 0)) { messageIds_ = new com.google.protobuf.LazyStringArrayList(); mutable_bitField0_ |= 0x00000001; } @@ -62,7 +62,7 @@ private PublishResponse( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -74,7 +74,7 @@ private PublishResponse( } catch (java.io.IOException e) { throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this); } finally { - if (((mutable_bitField0_ & 0x00000001) == 0x00000001)) { + if (((mutable_bitField0_ & 0x00000001) != 0)) { messageIds_ = messageIds_.getUnmodifiableView(); } this.unknownFields = unknownFields.build(); @@ -205,10 +205,9 @@ public boolean equals(final java.lang.Object obj) { } com.google.pubsub.v1.PublishResponse other = (com.google.pubsub.v1.PublishResponse) obj; - boolean result = true; - result = result && getMessageIdsList().equals(other.getMessageIdsList()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getMessageIdsList().equals(other.getMessageIdsList())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -395,7 +394,7 @@ public com.google.pubsub.v1.PublishResponse build() { public com.google.pubsub.v1.PublishResponse buildPartial() { com.google.pubsub.v1.PublishResponse result = new com.google.pubsub.v1.PublishResponse(this); int from_bitField0_ = bitField0_; - if (((bitField0_ & 0x00000001) == 0x00000001)) { + if (((bitField0_ & 0x00000001) != 0)) { messageIds_ = messageIds_.getUnmodifiableView(); bitField0_ = (bitField0_ & ~0x00000001); } @@ -406,35 +405,35 @@ public com.google.pubsub.v1.PublishResponse buildPartial() { @java.lang.Override public Builder clone() { - return (Builder) super.clone(); + return super.clone(); } @java.lang.Override public Builder setField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.setField(field, value); + return super.setField(field, value); } @java.lang.Override public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) { - return (Builder) super.clearField(field); + return super.clearField(field); } @java.lang.Override public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) { - return (Builder) super.clearOneof(oneof); + return super.clearOneof(oneof); } @java.lang.Override public Builder setRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) { - return (Builder) super.setRepeatedField(field, index, value); + return super.setRepeatedField(field, index, value); } @java.lang.Override public Builder addRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.addRepeatedField(field, value); + return super.addRepeatedField(field, value); } @java.lang.Override @@ -494,7 +493,7 @@ public Builder mergeFrom( com.google.protobuf.LazyStringArrayList.EMPTY; private void ensureMessageIdsIsMutable() { - if (!((bitField0_ & 0x00000001) == 0x00000001)) { + if (!((bitField0_ & 0x00000001) != 0)) { messageIds_ = new com.google.protobuf.LazyStringArrayList(messageIds_); bitField0_ |= 0x00000001; } @@ -653,7 +652,7 @@ public Builder addMessageIdsBytes(com.google.protobuf.ByteString value) { @java.lang.Override public final Builder setUnknownFields(final com.google.protobuf.UnknownFieldSet unknownFields) { - return super.setUnknownFieldsProto3(unknownFields); + return super.setUnknownFields(unknownFields); } @java.lang.Override diff --git a/google-api-grpc/proto-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/PubsubMessage.java b/google-api-grpc/proto-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/PubsubMessage.java index e82e70355728..a6f00495369d 100644 --- a/google-api-grpc/proto-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/PubsubMessage.java +++ b/google-api-grpc/proto-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/PubsubMessage.java @@ -66,7 +66,7 @@ private PubsubMessage( } case 18: { - if (!((mutable_bitField0_ & 0x00000002) == 0x00000002)) { + if (!((mutable_bitField0_ & 0x00000002) != 0)) { attributes_ = com.google.protobuf.MapField.newMapField( AttributesDefaultEntryHolder.defaultEntry); @@ -110,7 +110,7 @@ private PubsubMessage( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -487,17 +487,16 @@ public boolean equals(final java.lang.Object obj) { } com.google.pubsub.v1.PubsubMessage other = (com.google.pubsub.v1.PubsubMessage) obj; - boolean result = true; - result = result && getData().equals(other.getData()); - result = result && internalGetAttributes().equals(other.internalGetAttributes()); - result = result && getMessageId().equals(other.getMessageId()); - result = result && (hasPublishTime() == other.hasPublishTime()); + if (!getData().equals(other.getData())) return false; + if (!internalGetAttributes().equals(other.internalGetAttributes())) return false; + if (!getMessageId().equals(other.getMessageId())) return false; + if (hasPublishTime() != other.hasPublishTime()) return false; if (hasPublishTime()) { - result = result && getPublishTime().equals(other.getPublishTime()); + if (!getPublishTime().equals(other.getPublishTime())) return false; } - result = result && getOrderingKey().equals(other.getOrderingKey()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getOrderingKey().equals(other.getOrderingKey())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -750,35 +749,35 @@ public com.google.pubsub.v1.PubsubMessage buildPartial() { @java.lang.Override public Builder clone() { - return (Builder) super.clone(); + return super.clone(); } @java.lang.Override public Builder setField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.setField(field, value); + return super.setField(field, value); } @java.lang.Override public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) { - return (Builder) super.clearField(field); + return super.clearField(field); } @java.lang.Override public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) { - return (Builder) super.clearOneof(oneof); + return super.clearOneof(oneof); } @java.lang.Override public Builder setRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) { - return (Builder) super.setRepeatedField(field, index, value); + return super.setRepeatedField(field, index, value); } @java.lang.Override public Builder addRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.addRepeatedField(field, value); + return super.addRepeatedField(field, value); } @java.lang.Override @@ -1153,7 +1152,7 @@ public Builder setMessageIdBytes(com.google.protobuf.ByteString value) { return this; } - private com.google.protobuf.Timestamp publishTime_ = null; + private com.google.protobuf.Timestamp publishTime_; private com.google.protobuf.SingleFieldBuilderV3< com.google.protobuf.Timestamp, com.google.protobuf.Timestamp.Builder, @@ -1478,7 +1477,7 @@ public Builder setOrderingKeyBytes(com.google.protobuf.ByteString value) { @java.lang.Override public final Builder setUnknownFields(final com.google.protobuf.UnknownFieldSet unknownFields) { - return super.setUnknownFieldsProto3(unknownFields); + return super.setUnknownFields(unknownFields); } @java.lang.Override diff --git a/google-api-grpc/proto-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/PullRequest.java b/google-api-grpc/proto-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/PullRequest.java index 0835c9b42936..eb45e5ee87ff 100644 --- a/google-api-grpc/proto-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/PullRequest.java +++ b/google-api-grpc/proto-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/PullRequest.java @@ -24,8 +24,6 @@ private PullRequest(com.google.protobuf.GeneratedMessageV3.Builder builder) { private PullRequest() { subscription_ = ""; - returnImmediately_ = false; - maxMessages_ = 0; } @java.lang.Override @@ -71,7 +69,7 @@ private PullRequest( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -236,12 +234,11 @@ public boolean equals(final java.lang.Object obj) { } com.google.pubsub.v1.PullRequest other = (com.google.pubsub.v1.PullRequest) obj; - boolean result = true; - result = result && getSubscription().equals(other.getSubscription()); - result = result && (getReturnImmediately() == other.getReturnImmediately()); - result = result && (getMaxMessages() == other.getMaxMessages()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getSubscription().equals(other.getSubscription())) return false; + if (getReturnImmediately() != other.getReturnImmediately()) return false; + if (getMaxMessages() != other.getMaxMessages()) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -442,35 +439,35 @@ public com.google.pubsub.v1.PullRequest buildPartial() { @java.lang.Override public Builder clone() { - return (Builder) super.clone(); + return super.clone(); } @java.lang.Override public Builder setField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.setField(field, value); + return super.setField(field, value); } @java.lang.Override public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) { - return (Builder) super.clearField(field); + return super.clearField(field); } @java.lang.Override public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) { - return (Builder) super.clearOneof(oneof); + return super.clearOneof(oneof); } @java.lang.Override public Builder setRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) { - return (Builder) super.setRepeatedField(field, index, value); + return super.setRepeatedField(field, index, value); } @java.lang.Override public Builder addRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.addRepeatedField(field, value); + return super.addRepeatedField(field, value); } @java.lang.Override @@ -725,7 +722,7 @@ public Builder clearMaxMessages() { @java.lang.Override public final Builder setUnknownFields(final com.google.protobuf.UnknownFieldSet unknownFields) { - return super.setUnknownFieldsProto3(unknownFields); + return super.setUnknownFields(unknownFields); } @java.lang.Override diff --git a/google-api-grpc/proto-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/PullResponse.java b/google-api-grpc/proto-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/PullResponse.java index 55644a3440a6..1df37195015a 100644 --- a/google-api-grpc/proto-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/PullResponse.java +++ b/google-api-grpc/proto-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/PullResponse.java @@ -52,7 +52,7 @@ private PullResponse( break; case 10: { - if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) { + if (!((mutable_bitField0_ & 0x00000001) != 0)) { receivedMessages_ = new java.util.ArrayList(); mutable_bitField0_ |= 0x00000001; } @@ -63,7 +63,7 @@ private PullResponse( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -75,7 +75,7 @@ private PullResponse( } catch (java.io.IOException e) { throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this); } finally { - if (((mutable_bitField0_ & 0x00000001) == 0x00000001)) { + if (((mutable_bitField0_ & 0x00000001) != 0)) { receivedMessages_ = java.util.Collections.unmodifiableList(receivedMessages_); } this.unknownFields = unknownFields.build(); @@ -221,10 +221,9 @@ public boolean equals(final java.lang.Object obj) { } com.google.pubsub.v1.PullResponse other = (com.google.pubsub.v1.PullResponse) obj; - boolean result = true; - result = result && getReceivedMessagesList().equals(other.getReceivedMessagesList()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getReceivedMessagesList().equals(other.getReceivedMessagesList())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -418,7 +417,7 @@ public com.google.pubsub.v1.PullResponse buildPartial() { com.google.pubsub.v1.PullResponse result = new com.google.pubsub.v1.PullResponse(this); int from_bitField0_ = bitField0_; if (receivedMessagesBuilder_ == null) { - if (((bitField0_ & 0x00000001) == 0x00000001)) { + if (((bitField0_ & 0x00000001) != 0)) { receivedMessages_ = java.util.Collections.unmodifiableList(receivedMessages_); bitField0_ = (bitField0_ & ~0x00000001); } @@ -432,35 +431,35 @@ public com.google.pubsub.v1.PullResponse buildPartial() { @java.lang.Override public Builder clone() { - return (Builder) super.clone(); + return super.clone(); } @java.lang.Override public Builder setField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.setField(field, value); + return super.setField(field, value); } @java.lang.Override public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) { - return (Builder) super.clearField(field); + return super.clearField(field); } @java.lang.Override public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) { - return (Builder) super.clearOneof(oneof); + return super.clearOneof(oneof); } @java.lang.Override public Builder setRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) { - return (Builder) super.setRepeatedField(field, index, value); + return super.setRepeatedField(field, index, value); } @java.lang.Override public Builder addRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.addRepeatedField(field, value); + return super.addRepeatedField(field, value); } @java.lang.Override @@ -537,7 +536,7 @@ public Builder mergeFrom( java.util.Collections.emptyList(); private void ensureReceivedMessagesIsMutable() { - if (!((bitField0_ & 0x00000001) == 0x00000001)) { + if (!((bitField0_ & 0x00000001) != 0)) { receivedMessages_ = new java.util.ArrayList(receivedMessages_); bitField0_ |= 0x00000001; @@ -933,7 +932,7 @@ public com.google.pubsub.v1.ReceivedMessage.Builder addReceivedMessagesBuilder(i com.google.pubsub.v1.ReceivedMessage.Builder, com.google.pubsub.v1.ReceivedMessageOrBuilder>( receivedMessages_, - ((bitField0_ & 0x00000001) == 0x00000001), + ((bitField0_ & 0x00000001) != 0), getParentForChildren(), isClean()); receivedMessages_ = null; @@ -943,7 +942,7 @@ public com.google.pubsub.v1.ReceivedMessage.Builder addReceivedMessagesBuilder(i @java.lang.Override public final Builder setUnknownFields(final com.google.protobuf.UnknownFieldSet unknownFields) { - return super.setUnknownFieldsProto3(unknownFields); + return super.setUnknownFields(unknownFields); } @java.lang.Override diff --git a/google-api-grpc/proto-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/PushConfig.java b/google-api-grpc/proto-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/PushConfig.java index 2f4ea218ae06..4e8728030da6 100644 --- a/google-api-grpc/proto-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/PushConfig.java +++ b/google-api-grpc/proto-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/PushConfig.java @@ -59,7 +59,7 @@ private PushConfig( } case 18: { - if (!((mutable_bitField0_ & 0x00000002) == 0x00000002)) { + if (!((mutable_bitField0_ & 0x00000002) != 0)) { attributes_ = com.google.protobuf.MapField.newMapField( AttributesDefaultEntryHolder.defaultEntry); @@ -92,7 +92,7 @@ private PushConfig( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -266,7 +266,7 @@ private OidcToken( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -455,11 +455,10 @@ public boolean equals(final java.lang.Object obj) { com.google.pubsub.v1.PushConfig.OidcToken other = (com.google.pubsub.v1.PushConfig.OidcToken) obj; - boolean result = true; - result = result && getServiceAccountEmail().equals(other.getServiceAccountEmail()); - result = result && getAudience().equals(other.getAudience()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getServiceAccountEmail().equals(other.getServiceAccountEmail())) return false; + if (!getAudience().equals(other.getAudience())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -661,23 +660,23 @@ public com.google.pubsub.v1.PushConfig.OidcToken buildPartial() { @java.lang.Override public Builder clone() { - return (Builder) super.clone(); + return super.clone(); } @java.lang.Override public Builder setField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.setField(field, value); + return super.setField(field, value); } @java.lang.Override public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) { - return (Builder) super.clearField(field); + return super.clearField(field); } @java.lang.Override public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) { - return (Builder) super.clearOneof(oneof); + return super.clearOneof(oneof); } @java.lang.Override @@ -685,13 +684,13 @@ public Builder setRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) { - return (Builder) super.setRepeatedField(field, index, value); + return super.setRepeatedField(field, index, value); } @java.lang.Override public Builder addRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.addRepeatedField(field, value); + return super.addRepeatedField(field, value); } @java.lang.Override @@ -984,7 +983,7 @@ public Builder setAudienceBytes(com.google.protobuf.ByteString value) { @java.lang.Override public final Builder setUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { - return super.setUnknownFieldsProto3(unknownFields); + return super.setUnknownFields(unknownFields); } @java.lang.Override @@ -1381,20 +1380,18 @@ public boolean equals(final java.lang.Object obj) { } com.google.pubsub.v1.PushConfig other = (com.google.pubsub.v1.PushConfig) obj; - boolean result = true; - result = result && getPushEndpoint().equals(other.getPushEndpoint()); - result = result && internalGetAttributes().equals(other.internalGetAttributes()); - result = result && getAuthenticationMethodCase().equals(other.getAuthenticationMethodCase()); - if (!result) return false; + if (!getPushEndpoint().equals(other.getPushEndpoint())) return false; + if (!internalGetAttributes().equals(other.internalGetAttributes())) return false; + if (!getAuthenticationMethodCase().equals(other.getAuthenticationMethodCase())) return false; switch (authenticationMethodCase_) { case 3: - result = result && getOidcToken().equals(other.getOidcToken()); + if (!getOidcToken().equals(other.getOidcToken())) return false; break; case 0: default: } - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -1632,35 +1629,35 @@ public com.google.pubsub.v1.PushConfig buildPartial() { @java.lang.Override public Builder clone() { - return (Builder) super.clone(); + return super.clone(); } @java.lang.Override public Builder setField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.setField(field, value); + return super.setField(field, value); } @java.lang.Override public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) { - return (Builder) super.clearField(field); + return super.clearField(field); } @java.lang.Override public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) { - return (Builder) super.clearOneof(oneof); + return super.clearOneof(oneof); } @java.lang.Override public Builder setRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) { - return (Builder) super.setRepeatedField(field, index, value); + return super.setRepeatedField(field, index, value); } @java.lang.Override public Builder addRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.addRepeatedField(field, value); + return super.addRepeatedField(field, value); } @java.lang.Override @@ -2308,7 +2305,7 @@ public com.google.pubsub.v1.PushConfig.OidcTokenOrBuilder getOidcTokenOrBuilder( @java.lang.Override public final Builder setUnknownFields(final com.google.protobuf.UnknownFieldSet unknownFields) { - return super.setUnknownFieldsProto3(unknownFields); + return super.setUnknownFields(unknownFields); } @java.lang.Override diff --git a/google-api-grpc/proto-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/ReceivedMessage.java b/google-api-grpc/proto-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/ReceivedMessage.java index b1c5d403e12b..686886d57e68 100644 --- a/google-api-grpc/proto-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/ReceivedMessage.java +++ b/google-api-grpc/proto-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/ReceivedMessage.java @@ -74,7 +74,7 @@ private ReceivedMessage( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -238,14 +238,13 @@ public boolean equals(final java.lang.Object obj) { } com.google.pubsub.v1.ReceivedMessage other = (com.google.pubsub.v1.ReceivedMessage) obj; - boolean result = true; - result = result && getAckId().equals(other.getAckId()); - result = result && (hasMessage() == other.hasMessage()); + if (!getAckId().equals(other.getAckId())) return false; + if (hasMessage() != other.hasMessage()) return false; if (hasMessage()) { - result = result && getMessage().equals(other.getMessage()); + if (!getMessage().equals(other.getMessage())) return false; } - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -451,35 +450,35 @@ public com.google.pubsub.v1.ReceivedMessage buildPartial() { @java.lang.Override public Builder clone() { - return (Builder) super.clone(); + return super.clone(); } @java.lang.Override public Builder setField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.setField(field, value); + return super.setField(field, value); } @java.lang.Override public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) { - return (Builder) super.clearField(field); + return super.clearField(field); } @java.lang.Override public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) { - return (Builder) super.clearOneof(oneof); + return super.clearOneof(oneof); } @java.lang.Override public Builder setRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) { - return (Builder) super.setRepeatedField(field, index, value); + return super.setRepeatedField(field, index, value); } @java.lang.Override public Builder addRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.addRepeatedField(field, value); + return super.addRepeatedField(field, value); } @java.lang.Override @@ -624,7 +623,7 @@ public Builder setAckIdBytes(com.google.protobuf.ByteString value) { return this; } - private com.google.pubsub.v1.PubsubMessage message_ = null; + private com.google.pubsub.v1.PubsubMessage message_; private com.google.protobuf.SingleFieldBuilderV3< com.google.pubsub.v1.PubsubMessage, com.google.pubsub.v1.PubsubMessage.Builder, @@ -807,7 +806,7 @@ public com.google.pubsub.v1.PubsubMessageOrBuilder getMessageOrBuilder() { @java.lang.Override public final Builder setUnknownFields(final com.google.protobuf.UnknownFieldSet unknownFields) { - return super.setUnknownFieldsProto3(unknownFields); + return super.setUnknownFields(unknownFields); } @java.lang.Override diff --git a/google-api-grpc/proto-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/SeekRequest.java b/google-api-grpc/proto-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/SeekRequest.java index 47f4f36f6bf2..df514bd902eb 100644 --- a/google-api-grpc/proto-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/SeekRequest.java +++ b/google-api-grpc/proto-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/SeekRequest.java @@ -84,7 +84,7 @@ private SeekRequest( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -385,22 +385,20 @@ public boolean equals(final java.lang.Object obj) { } com.google.pubsub.v1.SeekRequest other = (com.google.pubsub.v1.SeekRequest) obj; - boolean result = true; - result = result && getSubscription().equals(other.getSubscription()); - result = result && getTargetCase().equals(other.getTargetCase()); - if (!result) return false; + if (!getSubscription().equals(other.getSubscription())) return false; + if (!getTargetCase().equals(other.getTargetCase())) return false; switch (targetCase_) { case 2: - result = result && getTime().equals(other.getTime()); + if (!getTime().equals(other.getTime())) return false; break; case 3: - result = result && getSnapshot().equals(other.getSnapshot()); + if (!getSnapshot().equals(other.getSnapshot())) return false; break; case 0: default: } - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -619,35 +617,35 @@ public com.google.pubsub.v1.SeekRequest buildPartial() { @java.lang.Override public Builder clone() { - return (Builder) super.clone(); + return super.clone(); } @java.lang.Override public Builder setField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.setField(field, value); + return super.setField(field, value); } @java.lang.Override public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) { - return (Builder) super.clearField(field); + return super.clearField(field); } @java.lang.Override public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) { - return (Builder) super.clearOneof(oneof); + return super.clearOneof(oneof); } @java.lang.Override public Builder setRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) { - return (Builder) super.setRepeatedField(field, index, value); + return super.setRepeatedField(field, index, value); } @java.lang.Override public Builder addRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.addRepeatedField(field, value); + return super.addRepeatedField(field, value); } @java.lang.Override @@ -1225,7 +1223,7 @@ public Builder setSnapshotBytes(com.google.protobuf.ByteString value) { @java.lang.Override public final Builder setUnknownFields(final com.google.protobuf.UnknownFieldSet unknownFields) { - return super.setUnknownFieldsProto3(unknownFields); + return super.setUnknownFields(unknownFields); } @java.lang.Override diff --git a/google-api-grpc/proto-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/SeekResponse.java b/google-api-grpc/proto-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/SeekResponse.java index 0265e69576c8..e10cc7adb51b 100644 --- a/google-api-grpc/proto-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/SeekResponse.java +++ b/google-api-grpc/proto-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/SeekResponse.java @@ -49,7 +49,7 @@ private SeekResponse( break; default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -119,9 +119,8 @@ public boolean equals(final java.lang.Object obj) { } com.google.pubsub.v1.SeekResponse other = (com.google.pubsub.v1.SeekResponse) obj; - boolean result = true; - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -307,35 +306,35 @@ public com.google.pubsub.v1.SeekResponse buildPartial() { @java.lang.Override public Builder clone() { - return (Builder) super.clone(); + return super.clone(); } @java.lang.Override public Builder setField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.setField(field, value); + return super.setField(field, value); } @java.lang.Override public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) { - return (Builder) super.clearField(field); + return super.clearField(field); } @java.lang.Override public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) { - return (Builder) super.clearOneof(oneof); + return super.clearOneof(oneof); } @java.lang.Override public Builder setRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) { - return (Builder) super.setRepeatedField(field, index, value); + return super.setRepeatedField(field, index, value); } @java.lang.Override public Builder addRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.addRepeatedField(field, value); + return super.addRepeatedField(field, value); } @java.lang.Override @@ -381,7 +380,7 @@ public Builder mergeFrom( @java.lang.Override public final Builder setUnknownFields(final com.google.protobuf.UnknownFieldSet unknownFields) { - return super.setUnknownFieldsProto3(unknownFields); + return super.setUnknownFields(unknownFields); } @java.lang.Override diff --git a/google-api-grpc/proto-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/Snapshot.java b/google-api-grpc/proto-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/Snapshot.java index 9be35782091d..6fda13845b28 100644 --- a/google-api-grpc/proto-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/Snapshot.java +++ b/google-api-grpc/proto-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/Snapshot.java @@ -90,7 +90,7 @@ private Snapshot( } case 34: { - if (!((mutable_bitField0_ & 0x00000008) == 0x00000008)) { + if (!((mutable_bitField0_ & 0x00000008) != 0)) { labels_ = com.google.protobuf.MapField.newMapField(LabelsDefaultEntryHolder.defaultEntry); mutable_bitField0_ |= 0x00000008; @@ -103,7 +103,7 @@ private Snapshot( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -462,16 +462,15 @@ public boolean equals(final java.lang.Object obj) { } com.google.pubsub.v1.Snapshot other = (com.google.pubsub.v1.Snapshot) obj; - boolean result = true; - result = result && getName().equals(other.getName()); - result = result && getTopic().equals(other.getTopic()); - result = result && (hasExpireTime() == other.hasExpireTime()); + if (!getName().equals(other.getName())) return false; + if (!getTopic().equals(other.getTopic())) return false; + if (hasExpireTime() != other.hasExpireTime()) return false; if (hasExpireTime()) { - result = result && getExpireTime().equals(other.getExpireTime()); + if (!getExpireTime().equals(other.getExpireTime())) return false; } - result = result && internalGetLabels().equals(other.internalGetLabels()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!internalGetLabels().equals(other.internalGetLabels())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -717,35 +716,35 @@ public com.google.pubsub.v1.Snapshot buildPartial() { @java.lang.Override public Builder clone() { - return (Builder) super.clone(); + return super.clone(); } @java.lang.Override public Builder setField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.setField(field, value); + return super.setField(field, value); } @java.lang.Override public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) { - return (Builder) super.clearField(field); + return super.clearField(field); } @java.lang.Override public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) { - return (Builder) super.clearOneof(oneof); + return super.clearOneof(oneof); } @java.lang.Override public Builder setRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) { - return (Builder) super.setRepeatedField(field, index, value); + return super.setRepeatedField(field, index, value); } @java.lang.Override public Builder addRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.addRepeatedField(field, value); + return super.addRepeatedField(field, value); } @java.lang.Override @@ -991,7 +990,7 @@ public Builder setTopicBytes(com.google.protobuf.ByteString value) { return this; } - private com.google.protobuf.Timestamp expireTime_ = null; + private com.google.protobuf.Timestamp expireTime_; private com.google.protobuf.SingleFieldBuilderV3< com.google.protobuf.Timestamp, com.google.protobuf.Timestamp.Builder, @@ -1412,7 +1411,7 @@ public Builder putAllLabels(java.util.Map va @java.lang.Override public final Builder setUnknownFields(final com.google.protobuf.UnknownFieldSet unknownFields) { - return super.setUnknownFieldsProto3(unknownFields); + return super.setUnknownFields(unknownFields); } @java.lang.Override diff --git a/google-api-grpc/proto-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/StreamingPullRequest.java b/google-api-grpc/proto-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/StreamingPullRequest.java index 78a99998020c..20f95dbb9710 100644 --- a/google-api-grpc/proto-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/StreamingPullRequest.java +++ b/google-api-grpc/proto-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/StreamingPullRequest.java @@ -27,9 +27,8 @@ private StreamingPullRequest(com.google.protobuf.GeneratedMessageV3.Builder b private StreamingPullRequest() { subscription_ = ""; ackIds_ = com.google.protobuf.LazyStringArrayList.EMPTY; - modifyDeadlineSeconds_ = java.util.Collections.emptyList(); + modifyDeadlineSeconds_ = emptyIntList(); modifyDeadlineAckIds_ = com.google.protobuf.LazyStringArrayList.EMPTY; - streamAckDeadlineSeconds_ = 0; } @java.lang.Override @@ -66,7 +65,7 @@ private StreamingPullRequest( case 18: { java.lang.String s = input.readStringRequireUtf8(); - if (!((mutable_bitField0_ & 0x00000002) == 0x00000002)) { + if (!((mutable_bitField0_ & 0x00000002) != 0)) { ackIds_ = new com.google.protobuf.LazyStringArrayList(); mutable_bitField0_ |= 0x00000002; } @@ -75,24 +74,23 @@ private StreamingPullRequest( } case 24: { - if (!((mutable_bitField0_ & 0x00000004) == 0x00000004)) { - modifyDeadlineSeconds_ = new java.util.ArrayList(); + if (!((mutable_bitField0_ & 0x00000004) != 0)) { + modifyDeadlineSeconds_ = newIntList(); mutable_bitField0_ |= 0x00000004; } - modifyDeadlineSeconds_.add(input.readInt32()); + modifyDeadlineSeconds_.addInt(input.readInt32()); break; } case 26: { int length = input.readRawVarint32(); int limit = input.pushLimit(length); - if (!((mutable_bitField0_ & 0x00000004) == 0x00000004) - && input.getBytesUntilLimit() > 0) { - modifyDeadlineSeconds_ = new java.util.ArrayList(); + if (!((mutable_bitField0_ & 0x00000004) != 0) && input.getBytesUntilLimit() > 0) { + modifyDeadlineSeconds_ = newIntList(); mutable_bitField0_ |= 0x00000004; } while (input.getBytesUntilLimit() > 0) { - modifyDeadlineSeconds_.add(input.readInt32()); + modifyDeadlineSeconds_.addInt(input.readInt32()); } input.popLimit(limit); break; @@ -100,7 +98,7 @@ private StreamingPullRequest( case 34: { java.lang.String s = input.readStringRequireUtf8(); - if (!((mutable_bitField0_ & 0x00000008) == 0x00000008)) { + if (!((mutable_bitField0_ & 0x00000008) != 0)) { modifyDeadlineAckIds_ = new com.google.protobuf.LazyStringArrayList(); mutable_bitField0_ |= 0x00000008; } @@ -114,7 +112,7 @@ private StreamingPullRequest( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -126,13 +124,13 @@ private StreamingPullRequest( } catch (java.io.IOException e) { throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this); } finally { - if (((mutable_bitField0_ & 0x00000002) == 0x00000002)) { + if (((mutable_bitField0_ & 0x00000002) != 0)) { ackIds_ = ackIds_.getUnmodifiableView(); } - if (((mutable_bitField0_ & 0x00000004) == 0x00000004)) { - modifyDeadlineSeconds_ = java.util.Collections.unmodifiableList(modifyDeadlineSeconds_); + if (((mutable_bitField0_ & 0x00000004) != 0)) { + modifyDeadlineSeconds_.makeImmutable(); // C } - if (((mutable_bitField0_ & 0x00000008) == 0x00000008)) { + if (((mutable_bitField0_ & 0x00000008) != 0)) { modifyDeadlineAckIds_ = modifyDeadlineAckIds_.getUnmodifiableView(); } this.unknownFields = unknownFields.build(); @@ -273,7 +271,7 @@ public com.google.protobuf.ByteString getAckIdsBytes(int index) { } public static final int MODIFY_DEADLINE_SECONDS_FIELD_NUMBER = 3; - private java.util.List modifyDeadlineSeconds_; + private com.google.protobuf.Internal.IntList modifyDeadlineSeconds_; /** * * @@ -338,7 +336,7 @@ public int getModifyDeadlineSecondsCount() { * repeated int32 modify_deadline_seconds = 3; */ public int getModifyDeadlineSeconds(int index) { - return modifyDeadlineSeconds_.get(index); + return modifyDeadlineSeconds_.getInt(index); } private int modifyDeadlineSecondsMemoizedSerializedSize = -1; @@ -454,7 +452,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io output.writeUInt32NoTag(modifyDeadlineSecondsMemoizedSerializedSize); } for (int i = 0; i < modifyDeadlineSeconds_.size(); i++) { - output.writeInt32NoTag(modifyDeadlineSeconds_.get(i)); + output.writeInt32NoTag(modifyDeadlineSeconds_.getInt(i)); } for (int i = 0; i < modifyDeadlineAckIds_.size(); i++) { com.google.protobuf.GeneratedMessageV3.writeString( @@ -488,7 +486,7 @@ public int getSerializedSize() { for (int i = 0; i < modifyDeadlineSeconds_.size(); i++) { dataSize += com.google.protobuf.CodedOutputStream.computeInt32SizeNoTag( - modifyDeadlineSeconds_.get(i)); + modifyDeadlineSeconds_.getInt(i)); } size += dataSize; if (!getModifyDeadlineSecondsList().isEmpty()) { @@ -524,14 +522,13 @@ public boolean equals(final java.lang.Object obj) { com.google.pubsub.v1.StreamingPullRequest other = (com.google.pubsub.v1.StreamingPullRequest) obj; - boolean result = true; - result = result && getSubscription().equals(other.getSubscription()); - result = result && getAckIdsList().equals(other.getAckIdsList()); - result = result && getModifyDeadlineSecondsList().equals(other.getModifyDeadlineSecondsList()); - result = result && getModifyDeadlineAckIdsList().equals(other.getModifyDeadlineAckIdsList()); - result = result && (getStreamAckDeadlineSeconds() == other.getStreamAckDeadlineSeconds()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getSubscription().equals(other.getSubscription())) return false; + if (!getAckIdsList().equals(other.getAckIdsList())) return false; + if (!getModifyDeadlineSecondsList().equals(other.getModifyDeadlineSecondsList())) return false; + if (!getModifyDeadlineAckIdsList().equals(other.getModifyDeadlineAckIdsList())) return false; + if (getStreamAckDeadlineSeconds() != other.getStreamAckDeadlineSeconds()) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -708,7 +705,7 @@ public Builder clear() { ackIds_ = com.google.protobuf.LazyStringArrayList.EMPTY; bitField0_ = (bitField0_ & ~0x00000002); - modifyDeadlineSeconds_ = java.util.Collections.emptyList(); + modifyDeadlineSeconds_ = emptyIntList(); bitField0_ = (bitField0_ & ~0x00000004); modifyDeadlineAckIds_ = com.google.protobuf.LazyStringArrayList.EMPTY; bitField0_ = (bitField0_ & ~0x00000008); @@ -744,17 +741,17 @@ public com.google.pubsub.v1.StreamingPullRequest buildPartial() { int from_bitField0_ = bitField0_; int to_bitField0_ = 0; result.subscription_ = subscription_; - if (((bitField0_ & 0x00000002) == 0x00000002)) { + if (((bitField0_ & 0x00000002) != 0)) { ackIds_ = ackIds_.getUnmodifiableView(); bitField0_ = (bitField0_ & ~0x00000002); } result.ackIds_ = ackIds_; - if (((bitField0_ & 0x00000004) == 0x00000004)) { - modifyDeadlineSeconds_ = java.util.Collections.unmodifiableList(modifyDeadlineSeconds_); + if (((bitField0_ & 0x00000004) != 0)) { + modifyDeadlineSeconds_.makeImmutable(); bitField0_ = (bitField0_ & ~0x00000004); } result.modifyDeadlineSeconds_ = modifyDeadlineSeconds_; - if (((bitField0_ & 0x00000008) == 0x00000008)) { + if (((bitField0_ & 0x00000008) != 0)) { modifyDeadlineAckIds_ = modifyDeadlineAckIds_.getUnmodifiableView(); bitField0_ = (bitField0_ & ~0x00000008); } @@ -767,35 +764,35 @@ public com.google.pubsub.v1.StreamingPullRequest buildPartial() { @java.lang.Override public Builder clone() { - return (Builder) super.clone(); + return super.clone(); } @java.lang.Override public Builder setField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.setField(field, value); + return super.setField(field, value); } @java.lang.Override public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) { - return (Builder) super.clearField(field); + return super.clearField(field); } @java.lang.Override public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) { - return (Builder) super.clearOneof(oneof); + return super.clearOneof(oneof); } @java.lang.Override public Builder setRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) { - return (Builder) super.setRepeatedField(field, index, value); + return super.setRepeatedField(field, index, value); } @java.lang.Override public Builder addRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.addRepeatedField(field, value); + return super.addRepeatedField(field, value); } @java.lang.Override @@ -991,7 +988,7 @@ public Builder setSubscriptionBytes(com.google.protobuf.ByteString value) { com.google.protobuf.LazyStringArrayList.EMPTY; private void ensureAckIdsIsMutable() { - if (!((bitField0_ & 0x00000002) == 0x00000002)) { + if (!((bitField0_ & 0x00000002) != 0)) { ackIds_ = new com.google.protobuf.LazyStringArrayList(ackIds_); bitField0_ |= 0x00000002; } @@ -1166,12 +1163,11 @@ public Builder addAckIdsBytes(com.google.protobuf.ByteString value) { return this; } - private java.util.List modifyDeadlineSeconds_ = - java.util.Collections.emptyList(); + private com.google.protobuf.Internal.IntList modifyDeadlineSeconds_ = emptyIntList(); private void ensureModifyDeadlineSecondsIsMutable() { - if (!((bitField0_ & 0x00000004) == 0x00000004)) { - modifyDeadlineSeconds_ = new java.util.ArrayList(modifyDeadlineSeconds_); + if (!((bitField0_ & 0x00000004) != 0)) { + modifyDeadlineSeconds_ = mutableCopy(modifyDeadlineSeconds_); bitField0_ |= 0x00000004; } } @@ -1195,7 +1191,9 @@ private void ensureModifyDeadlineSecondsIsMutable() { * repeated int32 modify_deadline_seconds = 3; */ public java.util.List getModifyDeadlineSecondsList() { - return java.util.Collections.unmodifiableList(modifyDeadlineSeconds_); + return ((bitField0_ & 0x00000004) != 0) + ? java.util.Collections.unmodifiableList(modifyDeadlineSeconds_) + : modifyDeadlineSeconds_; } /** * @@ -1239,7 +1237,7 @@ public int getModifyDeadlineSecondsCount() { * repeated int32 modify_deadline_seconds = 3; */ public int getModifyDeadlineSeconds(int index) { - return modifyDeadlineSeconds_.get(index); + return modifyDeadlineSeconds_.getInt(index); } /** * @@ -1262,7 +1260,7 @@ public int getModifyDeadlineSeconds(int index) { */ public Builder setModifyDeadlineSeconds(int index, int value) { ensureModifyDeadlineSecondsIsMutable(); - modifyDeadlineSeconds_.set(index, value); + modifyDeadlineSeconds_.setInt(index, value); onChanged(); return this; } @@ -1287,7 +1285,7 @@ public Builder setModifyDeadlineSeconds(int index, int value) { */ public Builder addModifyDeadlineSeconds(int value) { ensureModifyDeadlineSecondsIsMutable(); - modifyDeadlineSeconds_.add(value); + modifyDeadlineSeconds_.addInt(value); onChanged(); return this; } @@ -1337,7 +1335,7 @@ public Builder addAllModifyDeadlineSeconds( * repeated int32 modify_deadline_seconds = 3; */ public Builder clearModifyDeadlineSeconds() { - modifyDeadlineSeconds_ = java.util.Collections.emptyList(); + modifyDeadlineSeconds_ = emptyIntList(); bitField0_ = (bitField0_ & ~0x00000004); onChanged(); return this; @@ -1347,7 +1345,7 @@ public Builder clearModifyDeadlineSeconds() { com.google.protobuf.LazyStringArrayList.EMPTY; private void ensureModifyDeadlineAckIdsIsMutable() { - if (!((bitField0_ & 0x00000008) == 0x00000008)) { + if (!((bitField0_ & 0x00000008) != 0)) { modifyDeadlineAckIds_ = new com.google.protobuf.LazyStringArrayList(modifyDeadlineAckIds_); bitField0_ |= 0x00000008; } @@ -1577,7 +1575,7 @@ public Builder clearStreamAckDeadlineSeconds() { @java.lang.Override public final Builder setUnknownFields(final com.google.protobuf.UnknownFieldSet unknownFields) { - return super.setUnknownFieldsProto3(unknownFields); + return super.setUnknownFields(unknownFields); } @java.lang.Override diff --git a/google-api-grpc/proto-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/StreamingPullResponse.java b/google-api-grpc/proto-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/StreamingPullResponse.java index 75a8da757312..217891b9868a 100644 --- a/google-api-grpc/proto-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/StreamingPullResponse.java +++ b/google-api-grpc/proto-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/StreamingPullResponse.java @@ -53,7 +53,7 @@ private StreamingPullResponse( break; case 10: { - if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) { + if (!((mutable_bitField0_ & 0x00000001) != 0)) { receivedMessages_ = new java.util.ArrayList(); mutable_bitField0_ |= 0x00000001; } @@ -64,7 +64,7 @@ private StreamingPullResponse( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -76,7 +76,7 @@ private StreamingPullResponse( } catch (java.io.IOException e) { throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this); } finally { - if (((mutable_bitField0_ & 0x00000001) == 0x00000001)) { + if (((mutable_bitField0_ & 0x00000001) != 0)) { receivedMessages_ = java.util.Collections.unmodifiableList(receivedMessages_); } this.unknownFields = unknownFields.build(); @@ -208,10 +208,9 @@ public boolean equals(final java.lang.Object obj) { com.google.pubsub.v1.StreamingPullResponse other = (com.google.pubsub.v1.StreamingPullResponse) obj; - boolean result = true; - result = result && getReceivedMessagesList().equals(other.getReceivedMessagesList()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getReceivedMessagesList().equals(other.getReceivedMessagesList())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -408,7 +407,7 @@ public com.google.pubsub.v1.StreamingPullResponse buildPartial() { new com.google.pubsub.v1.StreamingPullResponse(this); int from_bitField0_ = bitField0_; if (receivedMessagesBuilder_ == null) { - if (((bitField0_ & 0x00000001) == 0x00000001)) { + if (((bitField0_ & 0x00000001) != 0)) { receivedMessages_ = java.util.Collections.unmodifiableList(receivedMessages_); bitField0_ = (bitField0_ & ~0x00000001); } @@ -422,35 +421,35 @@ public com.google.pubsub.v1.StreamingPullResponse buildPartial() { @java.lang.Override public Builder clone() { - return (Builder) super.clone(); + return super.clone(); } @java.lang.Override public Builder setField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.setField(field, value); + return super.setField(field, value); } @java.lang.Override public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) { - return (Builder) super.clearField(field); + return super.clearField(field); } @java.lang.Override public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) { - return (Builder) super.clearOneof(oneof); + return super.clearOneof(oneof); } @java.lang.Override public Builder setRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) { - return (Builder) super.setRepeatedField(field, index, value); + return super.setRepeatedField(field, index, value); } @java.lang.Override public Builder addRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.addRepeatedField(field, value); + return super.addRepeatedField(field, value); } @java.lang.Override @@ -527,7 +526,7 @@ public Builder mergeFrom( java.util.Collections.emptyList(); private void ensureReceivedMessagesIsMutable() { - if (!((bitField0_ & 0x00000001) == 0x00000001)) { + if (!((bitField0_ & 0x00000001) != 0)) { receivedMessages_ = new java.util.ArrayList(receivedMessages_); bitField0_ |= 0x00000001; @@ -869,7 +868,7 @@ public com.google.pubsub.v1.ReceivedMessage.Builder addReceivedMessagesBuilder(i com.google.pubsub.v1.ReceivedMessage.Builder, com.google.pubsub.v1.ReceivedMessageOrBuilder>( receivedMessages_, - ((bitField0_ & 0x00000001) == 0x00000001), + ((bitField0_ & 0x00000001) != 0), getParentForChildren(), isClean()); receivedMessages_ = null; @@ -879,7 +878,7 @@ public com.google.pubsub.v1.ReceivedMessage.Builder addReceivedMessagesBuilder(i @java.lang.Override public final Builder setUnknownFields(final com.google.protobuf.UnknownFieldSet unknownFields) { - return super.setUnknownFieldsProto3(unknownFields); + return super.setUnknownFields(unknownFields); } @java.lang.Override diff --git a/google-api-grpc/proto-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/Subscription.java b/google-api-grpc/proto-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/Subscription.java index f5a07cb1b551..505e1aaf9465 100644 --- a/google-api-grpc/proto-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/Subscription.java +++ b/google-api-grpc/proto-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/Subscription.java @@ -25,9 +25,6 @@ private Subscription(com.google.protobuf.GeneratedMessageV3.Builder builder) private Subscription() { name_ = ""; topic_ = ""; - ackDeadlineSeconds_ = 0; - retainAckedMessages_ = false; - enableMessageOrdering_ = false; } @java.lang.Override @@ -110,7 +107,7 @@ private Subscription( } case 74: { - if (!((mutable_bitField0_ & 0x00000040) == 0x00000040)) { + if (!((mutable_bitField0_ & 0x00000040) != 0)) { labels_ = com.google.protobuf.MapField.newMapField(LabelsDefaultEntryHolder.defaultEntry); mutable_bitField0_ |= 0x00000040; @@ -144,7 +141,7 @@ private Subscription( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -739,27 +736,26 @@ public boolean equals(final java.lang.Object obj) { } com.google.pubsub.v1.Subscription other = (com.google.pubsub.v1.Subscription) obj; - boolean result = true; - result = result && getName().equals(other.getName()); - result = result && getTopic().equals(other.getTopic()); - result = result && (hasPushConfig() == other.hasPushConfig()); + if (!getName().equals(other.getName())) return false; + if (!getTopic().equals(other.getTopic())) return false; + if (hasPushConfig() != other.hasPushConfig()) return false; if (hasPushConfig()) { - result = result && getPushConfig().equals(other.getPushConfig()); + if (!getPushConfig().equals(other.getPushConfig())) return false; } - result = result && (getAckDeadlineSeconds() == other.getAckDeadlineSeconds()); - result = result && (getRetainAckedMessages() == other.getRetainAckedMessages()); - result = result && (hasMessageRetentionDuration() == other.hasMessageRetentionDuration()); + if (getAckDeadlineSeconds() != other.getAckDeadlineSeconds()) return false; + if (getRetainAckedMessages() != other.getRetainAckedMessages()) return false; + if (hasMessageRetentionDuration() != other.hasMessageRetentionDuration()) return false; if (hasMessageRetentionDuration()) { - result = result && getMessageRetentionDuration().equals(other.getMessageRetentionDuration()); + if (!getMessageRetentionDuration().equals(other.getMessageRetentionDuration())) return false; } - result = result && internalGetLabels().equals(other.internalGetLabels()); - result = result && (getEnableMessageOrdering() == other.getEnableMessageOrdering()); - result = result && (hasExpirationPolicy() == other.hasExpirationPolicy()); + if (!internalGetLabels().equals(other.internalGetLabels())) return false; + if (getEnableMessageOrdering() != other.getEnableMessageOrdering()) return false; + if (hasExpirationPolicy() != other.hasExpirationPolicy()) return false; if (hasExpirationPolicy()) { - result = result && getExpirationPolicy().equals(other.getExpirationPolicy()); + if (!getExpirationPolicy().equals(other.getExpirationPolicy())) return false; } - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -1045,35 +1041,35 @@ public com.google.pubsub.v1.Subscription buildPartial() { @java.lang.Override public Builder clone() { - return (Builder) super.clone(); + return super.clone(); } @java.lang.Override public Builder setField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.setField(field, value); + return super.setField(field, value); } @java.lang.Override public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) { - return (Builder) super.clearField(field); + return super.clearField(field); } @java.lang.Override public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) { - return (Builder) super.clearOneof(oneof); + return super.clearOneof(oneof); } @java.lang.Override public Builder setRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) { - return (Builder) super.setRepeatedField(field, index, value); + return super.setRepeatedField(field, index, value); } @java.lang.Override public Builder addRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.addRepeatedField(field, value); + return super.addRepeatedField(field, value); } @java.lang.Override @@ -1374,7 +1370,7 @@ public Builder setTopicBytes(com.google.protobuf.ByteString value) { return this; } - private com.google.pubsub.v1.PushConfig pushConfig_ = null; + private com.google.pubsub.v1.PushConfig pushConfig_; private com.google.protobuf.SingleFieldBuilderV3< com.google.pubsub.v1.PushConfig, com.google.pubsub.v1.PushConfig.Builder, @@ -1739,7 +1735,7 @@ public Builder clearRetainAckedMessages() { return this; } - private com.google.protobuf.Duration messageRetentionDuration_ = null; + private com.google.protobuf.Duration messageRetentionDuration_; private com.google.protobuf.SingleFieldBuilderV3< com.google.protobuf.Duration, com.google.protobuf.Duration.Builder, @@ -2214,7 +2210,7 @@ public Builder clearEnableMessageOrdering() { return this; } - private com.google.pubsub.v1.ExpirationPolicy expirationPolicy_ = null; + private com.google.pubsub.v1.ExpirationPolicy expirationPolicy_; private com.google.protobuf.SingleFieldBuilderV3< com.google.pubsub.v1.ExpirationPolicy, com.google.pubsub.v1.ExpirationPolicy.Builder, @@ -2470,7 +2466,7 @@ public com.google.pubsub.v1.ExpirationPolicyOrBuilder getExpirationPolicyOrBuild @java.lang.Override public final Builder setUnknownFields(final com.google.protobuf.UnknownFieldSet unknownFields) { - return super.setUnknownFieldsProto3(unknownFields); + return super.setUnknownFields(unknownFields); } @java.lang.Override diff --git a/google-api-grpc/proto-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/Topic.java b/google-api-grpc/proto-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/Topic.java index 81b43222ba96..f715829d17db 100644 --- a/google-api-grpc/proto-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/Topic.java +++ b/google-api-grpc/proto-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/Topic.java @@ -59,7 +59,7 @@ private Topic( } case 18: { - if (!((mutable_bitField0_ & 0x00000002) == 0x00000002)) { + if (!((mutable_bitField0_ & 0x00000002) != 0)) { labels_ = com.google.protobuf.MapField.newMapField(LabelsDefaultEntryHolder.defaultEntry); mutable_bitField0_ |= 0x00000002; @@ -88,7 +88,7 @@ private Topic( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -399,15 +399,14 @@ public boolean equals(final java.lang.Object obj) { } com.google.pubsub.v1.Topic other = (com.google.pubsub.v1.Topic) obj; - boolean result = true; - result = result && getName().equals(other.getName()); - result = result && internalGetLabels().equals(other.internalGetLabels()); - result = result && (hasMessageStoragePolicy() == other.hasMessageStoragePolicy()); + if (!getName().equals(other.getName())) return false; + if (!internalGetLabels().equals(other.internalGetLabels())) return false; + if (hasMessageStoragePolicy() != other.hasMessageStoragePolicy()) return false; if (hasMessageStoragePolicy()) { - result = result && getMessageStoragePolicy().equals(other.getMessageStoragePolicy()); + if (!getMessageStoragePolicy().equals(other.getMessageStoragePolicy())) return false; } - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -640,35 +639,35 @@ public com.google.pubsub.v1.Topic buildPartial() { @java.lang.Override public Builder clone() { - return (Builder) super.clone(); + return super.clone(); } @java.lang.Override public Builder setField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.setField(field, value); + return super.setField(field, value); } @java.lang.Override public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) { - return (Builder) super.clearField(field); + return super.clearField(field); } @java.lang.Override public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) { - return (Builder) super.clearOneof(oneof); + return super.clearOneof(oneof); } @java.lang.Override public Builder setRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) { - return (Builder) super.setRepeatedField(field, index, value); + return super.setRepeatedField(field, index, value); } @java.lang.Override public Builder addRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.addRepeatedField(field, value); + return super.addRepeatedField(field, value); } @java.lang.Override @@ -1000,7 +999,7 @@ public Builder putAllLabels(java.util.Map va return this; } - private com.google.pubsub.v1.MessageStoragePolicy messageStoragePolicy_ = null; + private com.google.pubsub.v1.MessageStoragePolicy messageStoragePolicy_; private com.google.protobuf.SingleFieldBuilderV3< com.google.pubsub.v1.MessageStoragePolicy, com.google.pubsub.v1.MessageStoragePolicy.Builder, @@ -1229,7 +1228,7 @@ public com.google.pubsub.v1.MessageStoragePolicyOrBuilder getMessageStoragePolic @java.lang.Override public final Builder setUnknownFields(final com.google.protobuf.UnknownFieldSet unknownFields) { - return super.setUnknownFieldsProto3(unknownFields); + return super.setUnknownFields(unknownFields); } @java.lang.Override diff --git a/google-api-grpc/proto-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/UpdateSnapshotRequest.java b/google-api-grpc/proto-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/UpdateSnapshotRequest.java index 472730603638..58c855888da1 100644 --- a/google-api-grpc/proto-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/UpdateSnapshotRequest.java +++ b/google-api-grpc/proto-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/UpdateSnapshotRequest.java @@ -83,7 +83,7 @@ private UpdateSnapshotRequest( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -247,17 +247,16 @@ public boolean equals(final java.lang.Object obj) { com.google.pubsub.v1.UpdateSnapshotRequest other = (com.google.pubsub.v1.UpdateSnapshotRequest) obj; - boolean result = true; - result = result && (hasSnapshot() == other.hasSnapshot()); + if (hasSnapshot() != other.hasSnapshot()) return false; if (hasSnapshot()) { - result = result && getSnapshot().equals(other.getSnapshot()); + if (!getSnapshot().equals(other.getSnapshot())) return false; } - result = result && (hasUpdateMask() == other.hasUpdateMask()); + if (hasUpdateMask() != other.hasUpdateMask()) return false; if (hasUpdateMask()) { - result = result && getUpdateMask().equals(other.getUpdateMask()); + if (!getUpdateMask().equals(other.getUpdateMask())) return false; } - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -478,35 +477,35 @@ public com.google.pubsub.v1.UpdateSnapshotRequest buildPartial() { @java.lang.Override public Builder clone() { - return (Builder) super.clone(); + return super.clone(); } @java.lang.Override public Builder setField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.setField(field, value); + return super.setField(field, value); } @java.lang.Override public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) { - return (Builder) super.clearField(field); + return super.clearField(field); } @java.lang.Override public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) { - return (Builder) super.clearOneof(oneof); + return super.clearOneof(oneof); } @java.lang.Override public Builder setRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) { - return (Builder) super.setRepeatedField(field, index, value); + return super.setRepeatedField(field, index, value); } @java.lang.Override public Builder addRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.addRepeatedField(field, value); + return super.addRepeatedField(field, value); } @java.lang.Override @@ -556,7 +555,7 @@ public Builder mergeFrom( return this; } - private com.google.pubsub.v1.Snapshot snapshot_ = null; + private com.google.pubsub.v1.Snapshot snapshot_; private com.google.protobuf.SingleFieldBuilderV3< com.google.pubsub.v1.Snapshot, com.google.pubsub.v1.Snapshot.Builder, @@ -731,7 +730,7 @@ public com.google.pubsub.v1.SnapshotOrBuilder getSnapshotOrBuilder() { return snapshotBuilder_; } - private com.google.protobuf.FieldMask updateMask_ = null; + private com.google.protobuf.FieldMask updateMask_; private com.google.protobuf.SingleFieldBuilderV3< com.google.protobuf.FieldMask, com.google.protobuf.FieldMask.Builder, @@ -921,7 +920,7 @@ public com.google.protobuf.FieldMaskOrBuilder getUpdateMaskOrBuilder() { @java.lang.Override public final Builder setUnknownFields(final com.google.protobuf.UnknownFieldSet unknownFields) { - return super.setUnknownFieldsProto3(unknownFields); + return super.setUnknownFields(unknownFields); } @java.lang.Override diff --git a/google-api-grpc/proto-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/UpdateSubscriptionRequest.java b/google-api-grpc/proto-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/UpdateSubscriptionRequest.java index 7843de87e2b3..abab7190e04f 100644 --- a/google-api-grpc/proto-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/UpdateSubscriptionRequest.java +++ b/google-api-grpc/proto-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/UpdateSubscriptionRequest.java @@ -80,7 +80,7 @@ private UpdateSubscriptionRequest( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -246,17 +246,16 @@ public boolean equals(final java.lang.Object obj) { com.google.pubsub.v1.UpdateSubscriptionRequest other = (com.google.pubsub.v1.UpdateSubscriptionRequest) obj; - boolean result = true; - result = result && (hasSubscription() == other.hasSubscription()); + if (hasSubscription() != other.hasSubscription()) return false; if (hasSubscription()) { - result = result && getSubscription().equals(other.getSubscription()); + if (!getSubscription().equals(other.getSubscription())) return false; } - result = result && (hasUpdateMask() == other.hasUpdateMask()); + if (hasUpdateMask() != other.hasUpdateMask()) return false; if (hasUpdateMask()) { - result = result && getUpdateMask().equals(other.getUpdateMask()); + if (!getUpdateMask().equals(other.getUpdateMask())) return false; } - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -474,35 +473,35 @@ public com.google.pubsub.v1.UpdateSubscriptionRequest buildPartial() { @java.lang.Override public Builder clone() { - return (Builder) super.clone(); + return super.clone(); } @java.lang.Override public Builder setField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.setField(field, value); + return super.setField(field, value); } @java.lang.Override public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) { - return (Builder) super.clearField(field); + return super.clearField(field); } @java.lang.Override public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) { - return (Builder) super.clearOneof(oneof); + return super.clearOneof(oneof); } @java.lang.Override public Builder setRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) { - return (Builder) super.setRepeatedField(field, index, value); + return super.setRepeatedField(field, index, value); } @java.lang.Override public Builder addRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.addRepeatedField(field, value); + return super.addRepeatedField(field, value); } @java.lang.Override @@ -552,7 +551,7 @@ public Builder mergeFrom( return this; } - private com.google.pubsub.v1.Subscription subscription_ = null; + private com.google.pubsub.v1.Subscription subscription_; private com.google.protobuf.SingleFieldBuilderV3< com.google.pubsub.v1.Subscription, com.google.pubsub.v1.Subscription.Builder, @@ -733,7 +732,7 @@ public com.google.pubsub.v1.SubscriptionOrBuilder getSubscriptionOrBuilder() { return subscriptionBuilder_; } - private com.google.protobuf.FieldMask updateMask_ = null; + private com.google.protobuf.FieldMask updateMask_; private com.google.protobuf.SingleFieldBuilderV3< com.google.protobuf.FieldMask, com.google.protobuf.FieldMask.Builder, @@ -923,7 +922,7 @@ public com.google.protobuf.FieldMaskOrBuilder getUpdateMaskOrBuilder() { @java.lang.Override public final Builder setUnknownFields(final com.google.protobuf.UnknownFieldSet unknownFields) { - return super.setUnknownFieldsProto3(unknownFields); + return super.setUnknownFields(unknownFields); } @java.lang.Override diff --git a/google-api-grpc/proto-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/UpdateTopicRequest.java b/google-api-grpc/proto-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/UpdateTopicRequest.java index 66371d9bdc6f..d9cad096d9d9 100644 --- a/google-api-grpc/proto-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/UpdateTopicRequest.java +++ b/google-api-grpc/proto-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/UpdateTopicRequest.java @@ -79,7 +79,7 @@ private UpdateTopicRequest( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -251,17 +251,16 @@ public boolean equals(final java.lang.Object obj) { } com.google.pubsub.v1.UpdateTopicRequest other = (com.google.pubsub.v1.UpdateTopicRequest) obj; - boolean result = true; - result = result && (hasTopic() == other.hasTopic()); + if (hasTopic() != other.hasTopic()) return false; if (hasTopic()) { - result = result && getTopic().equals(other.getTopic()); + if (!getTopic().equals(other.getTopic())) return false; } - result = result && (hasUpdateMask() == other.hasUpdateMask()); + if (hasUpdateMask() != other.hasUpdateMask()) return false; if (hasUpdateMask()) { - result = result && getUpdateMask().equals(other.getUpdateMask()); + if (!getUpdateMask().equals(other.getUpdateMask())) return false; } - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -479,35 +478,35 @@ public com.google.pubsub.v1.UpdateTopicRequest buildPartial() { @java.lang.Override public Builder clone() { - return (Builder) super.clone(); + return super.clone(); } @java.lang.Override public Builder setField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.setField(field, value); + return super.setField(field, value); } @java.lang.Override public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) { - return (Builder) super.clearField(field); + return super.clearField(field); } @java.lang.Override public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) { - return (Builder) super.clearOneof(oneof); + return super.clearOneof(oneof); } @java.lang.Override public Builder setRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) { - return (Builder) super.setRepeatedField(field, index, value); + return super.setRepeatedField(field, index, value); } @java.lang.Override public Builder addRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.addRepeatedField(field, value); + return super.addRepeatedField(field, value); } @java.lang.Override @@ -557,7 +556,7 @@ public Builder mergeFrom( return this; } - private com.google.pubsub.v1.Topic topic_ = null; + private com.google.pubsub.v1.Topic topic_; private com.google.protobuf.SingleFieldBuilderV3< com.google.pubsub.v1.Topic, com.google.pubsub.v1.Topic.Builder, @@ -730,7 +729,7 @@ public com.google.pubsub.v1.TopicOrBuilder getTopicOrBuilder() { return topicBuilder_; } - private com.google.protobuf.FieldMask updateMask_ = null; + private com.google.protobuf.FieldMask updateMask_; private com.google.protobuf.SingleFieldBuilderV3< com.google.protobuf.FieldMask, com.google.protobuf.FieldMask.Builder, @@ -947,7 +946,7 @@ public com.google.protobuf.FieldMaskOrBuilder getUpdateMaskOrBuilder() { @java.lang.Override public final Builder setUnknownFields(final com.google.protobuf.UnknownFieldSet unknownFields) { - return super.setUnknownFieldsProto3(unknownFields); + return super.setUnknownFields(unknownFields); } @java.lang.Override diff --git a/google-cloud-clients/google-cloud-pubsub/synth.metadata b/google-cloud-clients/google-cloud-pubsub/synth.metadata index 0e87efc6b207..1261449337fb 100644 --- a/google-cloud-clients/google-cloud-pubsub/synth.metadata +++ b/google-cloud-clients/google-cloud-pubsub/synth.metadata @@ -1,19 +1,19 @@ { - "updateTime": "2019-03-28T07:51:12.284901Z", + "updateTime": "2019-03-30T07:50:27.552803Z", "sources": [ { "generator": { "name": "artman", - "version": "0.16.20", - "dockerImage": "googleapis/artman@sha256:e3c054a2fb85a12481c722af616c7fb6f1d02d862248385eecbec3e4240ebd1e" + "version": "0.16.21", + "dockerImage": "googleapis/artman@sha256:854131ec1af7b3a313253474c24748dc0acd217a58a0b74dbfb559f340a15d78" } }, { "git": { "name": "googleapis", "remote": "https://github.com/googleapis/googleapis.git", - "sha": "6a84b3267b0a95e922608b9891219075047eee29", - "internalRef": "240640999" + "sha": "fd67be4b51a8c809b97100ccf1c3cffd15b85d7b", + "internalRef": "241096997" } } ],