diff --git a/google-api-grpc/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/AllocateIdsRequest.java b/google-api-grpc/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/AllocateIdsRequest.java index 6ba0b49a3da2..537b64476310 100644 --- a/google-api-grpc/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/AllocateIdsRequest.java +++ b/google-api-grpc/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/AllocateIdsRequest.java @@ -54,7 +54,7 @@ private AllocateIdsRequest( break; case 10: { - if (!((mutable_bitField0_ & 0x00000002) == 0x00000002)) { + if (!((mutable_bitField0_ & 0x00000002) != 0)) { keys_ = new java.util.ArrayList(); mutable_bitField0_ |= 0x00000002; } @@ -70,7 +70,7 @@ private AllocateIdsRequest( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -82,7 +82,7 @@ private AllocateIdsRequest( } 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)) { keys_ = java.util.Collections.unmodifiableList(keys_); } this.unknownFields = unknownFields.build(); @@ -268,11 +268,10 @@ public boolean equals(final java.lang.Object obj) { com.google.datastore.v1.AllocateIdsRequest other = (com.google.datastore.v1.AllocateIdsRequest) obj; - boolean result = true; - result = result && getProjectId().equals(other.getProjectId()); - result = result && getKeysList().equals(other.getKeysList()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getProjectId().equals(other.getProjectId())) return false; + if (!getKeysList().equals(other.getKeysList())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -475,7 +474,7 @@ public com.google.datastore.v1.AllocateIdsRequest buildPartial() { int to_bitField0_ = 0; result.projectId_ = projectId_; if (keysBuilder_ == null) { - if (((bitField0_ & 0x00000002) == 0x00000002)) { + if (((bitField0_ & 0x00000002) != 0)) { keys_ = java.util.Collections.unmodifiableList(keys_); bitField0_ = (bitField0_ & ~0x00000002); } @@ -490,35 +489,35 @@ public com.google.datastore.v1.AllocateIdsRequest 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 @@ -692,7 +691,7 @@ public Builder setProjectIdBytes(com.google.protobuf.ByteString value) { private java.util.List keys_ = java.util.Collections.emptyList(); private void ensureKeysIsMutable() { - if (!((bitField0_ & 0x00000002) == 0x00000002)) { + if (!((bitField0_ & 0x00000002) != 0)) { keys_ = new java.util.ArrayList(keys_); bitField0_ |= 0x00000002; } @@ -1043,10 +1042,7 @@ public java.util.List getKeysBuilderList() com.google.datastore.v1.Key, com.google.datastore.v1.Key.Builder, com.google.datastore.v1.KeyOrBuilder>( - keys_, - ((bitField0_ & 0x00000002) == 0x00000002), - getParentForChildren(), - isClean()); + keys_, ((bitField0_ & 0x00000002) != 0), getParentForChildren(), isClean()); keys_ = null; } return keysBuilder_; @@ -1054,7 +1050,7 @@ public java.util.List getKeysBuilderList() @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-datastore-v1/src/main/java/com/google/datastore/v1/AllocateIdsResponse.java b/google-api-grpc/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/AllocateIdsResponse.java index 933c3ac6c127..d9bda56be312 100644 --- a/google-api-grpc/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/AllocateIdsResponse.java +++ b/google-api-grpc/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/AllocateIdsResponse.java @@ -53,7 +53,7 @@ private AllocateIdsResponse( break; case 10: { - if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) { + if (!((mutable_bitField0_ & 0x00000001) != 0)) { keys_ = new java.util.ArrayList(); mutable_bitField0_ |= 0x00000001; } @@ -62,7 +62,7 @@ private AllocateIdsResponse( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -74,7 +74,7 @@ private AllocateIdsResponse( } 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)) { keys_ = java.util.Collections.unmodifiableList(keys_); } this.unknownFields = unknownFields.build(); @@ -210,10 +210,9 @@ public boolean equals(final java.lang.Object obj) { com.google.datastore.v1.AllocateIdsResponse other = (com.google.datastore.v1.AllocateIdsResponse) obj; - boolean result = true; - result = result && getKeysList().equals(other.getKeysList()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getKeysList().equals(other.getKeysList())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -410,7 +409,7 @@ public com.google.datastore.v1.AllocateIdsResponse buildPartial() { new com.google.datastore.v1.AllocateIdsResponse(this); int from_bitField0_ = bitField0_; if (keysBuilder_ == null) { - if (((bitField0_ & 0x00000001) == 0x00000001)) { + if (((bitField0_ & 0x00000001) != 0)) { keys_ = java.util.Collections.unmodifiableList(keys_); bitField0_ = (bitField0_ & ~0x00000001); } @@ -424,35 +423,35 @@ public com.google.datastore.v1.AllocateIdsResponse 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 @@ -528,7 +527,7 @@ public Builder mergeFrom( private java.util.List keys_ = java.util.Collections.emptyList(); private void ensureKeysIsMutable() { - if (!((bitField0_ & 0x00000001) == 0x00000001)) { + if (!((bitField0_ & 0x00000001) != 0)) { keys_ = new java.util.ArrayList(keys_); bitField0_ |= 0x00000001; } @@ -879,10 +878,7 @@ public java.util.List getKeysBuilderList() com.google.datastore.v1.Key, com.google.datastore.v1.Key.Builder, com.google.datastore.v1.KeyOrBuilder>( - keys_, - ((bitField0_ & 0x00000001) == 0x00000001), - getParentForChildren(), - isClean()); + keys_, ((bitField0_ & 0x00000001) != 0), getParentForChildren(), isClean()); keys_ = null; } return keysBuilder_; @@ -890,7 +886,7 @@ public java.util.List getKeysBuilderList() @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-datastore-v1/src/main/java/com/google/datastore/v1/ArrayValue.java b/google-api-grpc/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ArrayValue.java index c340be35f518..f70566489e53 100644 --- a/google-api-grpc/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ArrayValue.java +++ b/google-api-grpc/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ArrayValue.java @@ -52,7 +52,7 @@ private ArrayValue( break; case 10: { - if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) { + if (!((mutable_bitField0_ & 0x00000001) != 0)) { values_ = new java.util.ArrayList(); mutable_bitField0_ |= 0x00000001; } @@ -62,7 +62,7 @@ private ArrayValue( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -74,7 +74,7 @@ private ArrayValue( } 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)) { values_ = java.util.Collections.unmodifiableList(values_); } this.unknownFields = unknownFields.build(); @@ -214,10 +214,9 @@ public boolean equals(final java.lang.Object obj) { } com.google.datastore.v1.ArrayValue other = (com.google.datastore.v1.ArrayValue) obj; - boolean result = true; - result = result && getValuesList().equals(other.getValuesList()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getValuesList().equals(other.getValuesList())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -411,7 +410,7 @@ public com.google.datastore.v1.ArrayValue buildPartial() { com.google.datastore.v1.ArrayValue result = new com.google.datastore.v1.ArrayValue(this); int from_bitField0_ = bitField0_; if (valuesBuilder_ == null) { - if (((bitField0_ & 0x00000001) == 0x00000001)) { + if (((bitField0_ & 0x00000001) != 0)) { values_ = java.util.Collections.unmodifiableList(values_); bitField0_ = (bitField0_ & ~0x00000001); } @@ -425,35 +424,35 @@ public com.google.datastore.v1.ArrayValue 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 @@ -530,7 +529,7 @@ public Builder mergeFrom( java.util.Collections.emptyList(); private void ensureValuesIsMutable() { - if (!((bitField0_ & 0x00000001) == 0x00000001)) { + if (!((bitField0_ & 0x00000001) != 0)) { values_ = new java.util.ArrayList(values_); bitField0_ |= 0x00000001; } @@ -901,10 +900,7 @@ public java.util.List getValuesBuilderLis com.google.datastore.v1.Value, com.google.datastore.v1.Value.Builder, com.google.datastore.v1.ValueOrBuilder>( - values_, - ((bitField0_ & 0x00000001) == 0x00000001), - getParentForChildren(), - isClean()); + values_, ((bitField0_ & 0x00000001) != 0), getParentForChildren(), isClean()); values_ = null; } return valuesBuilder_; @@ -912,7 +908,7 @@ public java.util.List getValuesBuilderLis @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-datastore-v1/src/main/java/com/google/datastore/v1/BeginTransactionRequest.java b/google-api-grpc/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/BeginTransactionRequest.java index d596b451c744..35427a4396af 100644 --- a/google-api-grpc/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/BeginTransactionRequest.java +++ b/google-api-grpc/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/BeginTransactionRequest.java @@ -76,7 +76,7 @@ private BeginTransactionRequest( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -243,14 +243,13 @@ public boolean equals(final java.lang.Object obj) { com.google.datastore.v1.BeginTransactionRequest other = (com.google.datastore.v1.BeginTransactionRequest) obj; - boolean result = true; - result = result && getProjectId().equals(other.getProjectId()); - result = result && (hasTransactionOptions() == other.hasTransactionOptions()); + if (!getProjectId().equals(other.getProjectId())) return false; + if (hasTransactionOptions() != other.hasTransactionOptions()) return false; if (hasTransactionOptions()) { - result = result && getTransactionOptions().equals(other.getTransactionOptions()); + if (!getTransactionOptions().equals(other.getTransactionOptions())) return false; } - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -459,35 +458,35 @@ public com.google.datastore.v1.BeginTransactionRequest 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 @@ -633,7 +632,7 @@ public Builder setProjectIdBytes(com.google.protobuf.ByteString value) { return this; } - private com.google.datastore.v1.TransactionOptions transactionOptions_ = null; + private com.google.datastore.v1.TransactionOptions transactionOptions_; private com.google.protobuf.SingleFieldBuilderV3< com.google.datastore.v1.TransactionOptions, com.google.datastore.v1.TransactionOptions.Builder, @@ -817,7 +816,7 @@ public com.google.datastore.v1.TransactionOptionsOrBuilder getTransactionOptions @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-datastore-v1/src/main/java/com/google/datastore/v1/BeginTransactionResponse.java b/google-api-grpc/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/BeginTransactionResponse.java index 02d816a3a1f4..f9492f917447 100644 --- a/google-api-grpc/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/BeginTransactionResponse.java +++ b/google-api-grpc/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/BeginTransactionResponse.java @@ -58,7 +58,7 @@ private BeginTransactionResponse( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -150,10 +150,9 @@ public boolean equals(final java.lang.Object obj) { com.google.datastore.v1.BeginTransactionResponse other = (com.google.datastore.v1.BeginTransactionResponse) obj; - boolean result = true; - result = result && getTransaction().equals(other.getTransaction()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getTransaction().equals(other.getTransaction())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -347,35 +346,35 @@ public com.google.datastore.v1.BeginTransactionResponse 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 @@ -472,7 +471,7 @@ public Builder clearTransaction() { @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-datastore-v1/src/main/java/com/google/datastore/v1/CommitRequest.java b/google-api-grpc/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/CommitRequest.java index 6dddb62a0048..dbaa7e77d9e5 100644 --- a/google-api-grpc/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/CommitRequest.java +++ b/google-api-grpc/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/CommitRequest.java @@ -67,7 +67,7 @@ private CommitRequest( } case 50: { - if (!((mutable_bitField0_ & 0x00000008) == 0x00000008)) { + if (!((mutable_bitField0_ & 0x00000008) != 0)) { mutations_ = new java.util.ArrayList(); mutable_bitField0_ |= 0x00000008; } @@ -84,7 +84,7 @@ private CommitRequest( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -96,7 +96,7 @@ private CommitRequest( } catch (java.io.IOException e) { throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this); } finally { - if (((mutable_bitField0_ & 0x00000008) == 0x00000008)) { + if (((mutable_bitField0_ & 0x00000008) != 0)) { mutations_ = java.util.Collections.unmodifiableList(mutations_); } this.unknownFields = unknownFields.build(); @@ -571,21 +571,19 @@ public boolean equals(final java.lang.Object obj) { } com.google.datastore.v1.CommitRequest other = (com.google.datastore.v1.CommitRequest) obj; - boolean result = true; - result = result && getProjectId().equals(other.getProjectId()); - result = result && mode_ == other.mode_; - result = result && getMutationsList().equals(other.getMutationsList()); - result = result && getTransactionSelectorCase().equals(other.getTransactionSelectorCase()); - if (!result) return false; + if (!getProjectId().equals(other.getProjectId())) return false; + if (mode_ != other.mode_) return false; + if (!getMutationsList().equals(other.getMutationsList())) return false; + if (!getTransactionSelectorCase().equals(other.getTransactionSelectorCase())) return false; switch (transactionSelectorCase_) { case 1: - result = result && getTransaction().equals(other.getTransaction()); + if (!getTransaction().equals(other.getTransaction())) 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 @@ -804,7 +802,7 @@ public com.google.datastore.v1.CommitRequest buildPartial() { result.transactionSelector_ = transactionSelector_; } if (mutationsBuilder_ == null) { - if (((bitField0_ & 0x00000008) == 0x00000008)) { + if (((bitField0_ & 0x00000008) != 0)) { mutations_ = java.util.Collections.unmodifiableList(mutations_); bitField0_ = (bitField0_ & ~0x00000008); } @@ -820,35 +818,35 @@ public com.google.datastore.v1.CommitRequest 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 @@ -1184,7 +1182,7 @@ public Builder clearTransaction() { java.util.Collections.emptyList(); private void ensureMutationsIsMutable() { - if (!((bitField0_ & 0x00000008) == 0x00000008)) { + if (!((bitField0_ & 0x00000008) != 0)) { mutations_ = new java.util.ArrayList(mutations_); bitField0_ |= 0x00000008; } @@ -1684,10 +1682,7 @@ public java.util.List getMutationsBuil com.google.datastore.v1.Mutation, com.google.datastore.v1.Mutation.Builder, com.google.datastore.v1.MutationOrBuilder>( - mutations_, - ((bitField0_ & 0x00000008) == 0x00000008), - getParentForChildren(), - isClean()); + mutations_, ((bitField0_ & 0x00000008) != 0), getParentForChildren(), isClean()); mutations_ = null; } return mutationsBuilder_; @@ -1695,7 +1690,7 @@ public java.util.List getMutationsBuil @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-datastore-v1/src/main/java/com/google/datastore/v1/CommitResponse.java b/google-api-grpc/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/CommitResponse.java index 192e1a8357b6..bf4d10f0e43a 100644 --- a/google-api-grpc/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/CommitResponse.java +++ b/google-api-grpc/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/CommitResponse.java @@ -24,7 +24,6 @@ private CommitResponse(com.google.protobuf.GeneratedMessageV3.Builder builder private CommitResponse() { mutationResults_ = java.util.Collections.emptyList(); - indexUpdates_ = 0; } @java.lang.Override @@ -53,7 +52,7 @@ private CommitResponse( break; case 26: { - if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) { + if (!((mutable_bitField0_ & 0x00000001) != 0)) { mutationResults_ = new java.util.ArrayList(); mutable_bitField0_ |= 0x00000001; @@ -70,7 +69,7 @@ private CommitResponse( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -82,7 +81,7 @@ private CommitResponse( } 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)) { mutationResults_ = java.util.Collections.unmodifiableList(mutationResults_); } this.unknownFields = unknownFields.build(); @@ -241,11 +240,10 @@ public boolean equals(final java.lang.Object obj) { } com.google.datastore.v1.CommitResponse other = (com.google.datastore.v1.CommitResponse) obj; - boolean result = true; - result = result && getMutationResultsList().equals(other.getMutationResultsList()); - result = result && (getIndexUpdates() == other.getIndexUpdates()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getMutationResultsList().equals(other.getMutationResultsList())) return false; + if (getIndexUpdates() != other.getIndexUpdates()) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -446,7 +444,7 @@ public com.google.datastore.v1.CommitResponse buildPartial() { int from_bitField0_ = bitField0_; int to_bitField0_ = 0; if (mutationResultsBuilder_ == null) { - if (((bitField0_ & 0x00000001) == 0x00000001)) { + if (((bitField0_ & 0x00000001) != 0)) { mutationResults_ = java.util.Collections.unmodifiableList(mutationResults_); bitField0_ = (bitField0_ & ~0x00000001); } @@ -462,35 +460,35 @@ public com.google.datastore.v1.CommitResponse 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 +568,7 @@ public Builder mergeFrom( java.util.Collections.emptyList(); private void ensureMutationResultsIsMutable() { - if (!((bitField0_ & 0x00000001) == 0x00000001)) { + if (!((bitField0_ & 0x00000001) != 0)) { mutationResults_ = new java.util.ArrayList(mutationResults_); bitField0_ |= 0x00000001; @@ -930,7 +928,7 @@ public com.google.datastore.v1.MutationResult.Builder addMutationResultsBuilder( com.google.datastore.v1.MutationResult.Builder, com.google.datastore.v1.MutationResultOrBuilder>( mutationResults_, - ((bitField0_ & 0x00000001) == 0x00000001), + ((bitField0_ & 0x00000001) != 0), getParentForChildren(), isClean()); mutationResults_ = null; @@ -987,7 +985,7 @@ public Builder clearIndexUpdates() { @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-datastore-v1/src/main/java/com/google/datastore/v1/CompositeFilter.java b/google-api-grpc/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/CompositeFilter.java index 54b712d3a9cc..cb5cbb5c486d 100644 --- a/google-api-grpc/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/CompositeFilter.java +++ b/google-api-grpc/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/CompositeFilter.java @@ -60,7 +60,7 @@ private CompositeFilter( } case 18: { - if (!((mutable_bitField0_ & 0x00000002) == 0x00000002)) { + if (!((mutable_bitField0_ & 0x00000002) != 0)) { filters_ = new java.util.ArrayList(); mutable_bitField0_ |= 0x00000002; } @@ -70,7 +70,7 @@ private CompositeFilter( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -82,7 +82,7 @@ private CompositeFilter( } 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)) { filters_ = java.util.Collections.unmodifiableList(filters_); } this.unknownFields = unknownFields.build(); @@ -378,11 +378,10 @@ public boolean equals(final java.lang.Object obj) { } com.google.datastore.v1.CompositeFilter other = (com.google.datastore.v1.CompositeFilter) obj; - boolean result = true; - result = result && op_ == other.op_; - result = result && getFiltersList().equals(other.getFiltersList()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (op_ != other.op_) return false; + if (!getFiltersList().equals(other.getFiltersList())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -584,7 +583,7 @@ public com.google.datastore.v1.CompositeFilter buildPartial() { int to_bitField0_ = 0; result.op_ = op_; if (filtersBuilder_ == null) { - if (((bitField0_ & 0x00000002) == 0x00000002)) { + if (((bitField0_ & 0x00000002) != 0)) { filters_ = java.util.Collections.unmodifiableList(filters_); bitField0_ = (bitField0_ & ~0x00000002); } @@ -599,35 +598,35 @@ public com.google.datastore.v1.CompositeFilter 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 @@ -785,7 +784,7 @@ public Builder clearOp() { java.util.Collections.emptyList(); private void ensureFiltersIsMutable() { - if (!((bitField0_ & 0x00000002) == 0x00000002)) { + if (!((bitField0_ & 0x00000002) != 0)) { filters_ = new java.util.ArrayList(filters_); bitField0_ |= 0x00000002; } @@ -1139,10 +1138,7 @@ public java.util.List getFiltersBuilderL com.google.datastore.v1.Filter, com.google.datastore.v1.Filter.Builder, com.google.datastore.v1.FilterOrBuilder>( - filters_, - ((bitField0_ & 0x00000002) == 0x00000002), - getParentForChildren(), - isClean()); + filters_, ((bitField0_ & 0x00000002) != 0), getParentForChildren(), isClean()); filters_ = null; } return filtersBuilder_; @@ -1150,7 +1146,7 @@ public java.util.List getFiltersBuilderL @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-datastore-v1/src/main/java/com/google/datastore/v1/Entity.java b/google-api-grpc/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/Entity.java index ae2de46a40af..9a7e70368e7b 100644 --- a/google-api-grpc/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/Entity.java +++ b/google-api-grpc/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/Entity.java @@ -67,7 +67,7 @@ private Entity( } case 26: { - if (!((mutable_bitField0_ & 0x00000002) == 0x00000002)) { + if (!((mutable_bitField0_ & 0x00000002) != 0)) { properties_ = com.google.protobuf.MapField.newMapField( PropertiesDefaultEntryHolder.defaultEntry); @@ -83,7 +83,7 @@ private Entity( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -352,14 +352,13 @@ public boolean equals(final java.lang.Object obj) { } com.google.datastore.v1.Entity other = (com.google.datastore.v1.Entity) obj; - boolean result = true; - result = result && (hasKey() == other.hasKey()); + if (hasKey() != other.hasKey()) return false; if (hasKey()) { - result = result && getKey().equals(other.getKey()); + if (!getKey().equals(other.getKey())) return false; } - result = result && internalGetProperties().equals(other.internalGetProperties()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!internalGetProperties().equals(other.internalGetProperties())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -592,35 +591,35 @@ public com.google.datastore.v1.Entity 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 @@ -670,7 +669,7 @@ public Builder mergeFrom( private int bitField0_; - private com.google.datastore.v1.Key key_ = null; + private com.google.datastore.v1.Key key_; private com.google.protobuf.SingleFieldBuilderV3< com.google.datastore.v1.Key, com.google.datastore.v1.Key.Builder, @@ -1075,7 +1074,7 @@ public Builder putAllProperties( @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-datastore-v1/src/main/java/com/google/datastore/v1/EntityResult.java b/google-api-grpc/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/EntityResult.java index de1e2b9658ea..3f31c2999c48 100644 --- a/google-api-grpc/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/EntityResult.java +++ b/google-api-grpc/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/EntityResult.java @@ -23,7 +23,6 @@ private EntityResult(com.google.protobuf.GeneratedMessageV3.Builder builder) } private EntityResult() { - version_ = 0L; cursor_ = com.google.protobuf.ByteString.EMPTY; } @@ -78,7 +77,7 @@ private EntityResult( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -413,15 +412,14 @@ public boolean equals(final java.lang.Object obj) { } com.google.datastore.v1.EntityResult other = (com.google.datastore.v1.EntityResult) obj; - boolean result = true; - result = result && (hasEntity() == other.hasEntity()); + if (hasEntity() != other.hasEntity()) return false; if (hasEntity()) { - result = result && getEntity().equals(other.getEntity()); + if (!getEntity().equals(other.getEntity())) return false; } - result = result && (getVersion() == other.getVersion()); - result = result && getCursor().equals(other.getCursor()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (getVersion() != other.getVersion()) return false; + if (!getCursor().equals(other.getCursor())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -632,35 +630,35 @@ public com.google.datastore.v1.EntityResult 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 @@ -713,7 +711,7 @@ public Builder mergeFrom( return this; } - private com.google.datastore.v1.Entity entity_ = null; + private com.google.datastore.v1.Entity entity_; private com.google.protobuf.SingleFieldBuilderV3< com.google.datastore.v1.Entity, com.google.datastore.v1.Entity.Builder, @@ -1002,7 +1000,7 @@ public Builder clearCursor() { @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-datastore-v1/src/main/java/com/google/datastore/v1/Filter.java b/google-api-grpc/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/Filter.java index 70d65bee4ae1..cab7dd71f4b3 100644 --- a/google-api-grpc/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/Filter.java +++ b/google-api-grpc/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/Filter.java @@ -82,7 +82,7 @@ private Filter( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -294,21 +294,19 @@ public boolean equals(final java.lang.Object obj) { } com.google.datastore.v1.Filter other = (com.google.datastore.v1.Filter) obj; - boolean result = true; - result = result && getFilterTypeCase().equals(other.getFilterTypeCase()); - if (!result) return false; + if (!getFilterTypeCase().equals(other.getFilterTypeCase())) return false; switch (filterTypeCase_) { case 1: - result = result && getCompositeFilter().equals(other.getCompositeFilter()); + if (!getCompositeFilter().equals(other.getCompositeFilter())) return false; break; case 2: - result = result && getPropertyFilter().equals(other.getPropertyFilter()); + if (!getPropertyFilter().equals(other.getPropertyFilter())) 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 @@ -522,35 +520,35 @@ public com.google.datastore.v1.Filter 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 @@ -1030,7 +1028,7 @@ public com.google.datastore.v1.PropertyFilterOrBuilder getPropertyFilterOrBuilde @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-datastore-v1/src/main/java/com/google/datastore/v1/GqlQuery.java b/google-api-grpc/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/GqlQuery.java index 22d4a2239b34..37a884fbe53a 100644 --- a/google-api-grpc/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/GqlQuery.java +++ b/google-api-grpc/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/GqlQuery.java @@ -25,7 +25,6 @@ private GqlQuery(com.google.protobuf.GeneratedMessageV3.Builder builder) { private GqlQuery() { queryString_ = ""; - allowLiterals_ = false; positionalBindings_ = java.util.Collections.emptyList(); } @@ -67,7 +66,7 @@ private GqlQuery( } case 34: { - if (!((mutable_bitField0_ & 0x00000008) == 0x00000008)) { + if (!((mutable_bitField0_ & 0x00000008) != 0)) { positionalBindings_ = new java.util.ArrayList(); mutable_bitField0_ |= 0x00000008; @@ -79,7 +78,7 @@ private GqlQuery( } case 42: { - if (!((mutable_bitField0_ & 0x00000004) == 0x00000004)) { + if (!((mutable_bitField0_ & 0x00000004) != 0)) { namedBindings_ = com.google.protobuf.MapField.newMapField( NamedBindingsDefaultEntryHolder.defaultEntry); @@ -98,7 +97,7 @@ private GqlQuery( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -110,7 +109,7 @@ private GqlQuery( } catch (java.io.IOException e) { throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this); } finally { - if (((mutable_bitField0_ & 0x00000008) == 0x00000008)) { + if (((mutable_bitField0_ & 0x00000008) != 0)) { positionalBindings_ = java.util.Collections.unmodifiableList(positionalBindings_); } this.unknownFields = unknownFields.build(); @@ -473,13 +472,12 @@ public boolean equals(final java.lang.Object obj) { } com.google.datastore.v1.GqlQuery other = (com.google.datastore.v1.GqlQuery) obj; - boolean result = true; - result = result && getQueryString().equals(other.getQueryString()); - result = result && (getAllowLiterals() == other.getAllowLiterals()); - result = result && internalGetNamedBindings().equals(other.internalGetNamedBindings()); - result = result && getPositionalBindingsList().equals(other.getPositionalBindingsList()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getQueryString().equals(other.getQueryString())) return false; + if (getAllowLiterals() != other.getAllowLiterals()) return false; + if (!internalGetNamedBindings().equals(other.internalGetNamedBindings())) return false; + if (!getPositionalBindingsList().equals(other.getPositionalBindingsList())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -712,7 +710,7 @@ public com.google.datastore.v1.GqlQuery buildPartial() { result.namedBindings_ = internalGetNamedBindings(); result.namedBindings_.makeImmutable(); if (positionalBindingsBuilder_ == null) { - if (((bitField0_ & 0x00000008) == 0x00000008)) { + if (((bitField0_ & 0x00000008) != 0)) { positionalBindings_ = java.util.Collections.unmodifiableList(positionalBindings_); bitField0_ = (bitField0_ & ~0x00000008); } @@ -727,35 +725,35 @@ public com.google.datastore.v1.GqlQuery 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 @@ -1179,7 +1177,7 @@ public Builder putAllNamedBindings( java.util.Collections.emptyList(); private void ensurePositionalBindingsIsMutable() { - if (!((bitField0_ & 0x00000008) == 0x00000008)) { + if (!((bitField0_ & 0x00000008) != 0)) { positionalBindings_ = new java.util.ArrayList(positionalBindings_); bitField0_ |= 0x00000008; @@ -1580,7 +1578,7 @@ public com.google.datastore.v1.GqlQueryParameter.Builder addPositionalBindingsBu com.google.datastore.v1.GqlQueryParameter.Builder, com.google.datastore.v1.GqlQueryParameterOrBuilder>( positionalBindings_, - ((bitField0_ & 0x00000008) == 0x00000008), + ((bitField0_ & 0x00000008) != 0), getParentForChildren(), isClean()); positionalBindings_ = null; @@ -1590,7 +1588,7 @@ public com.google.datastore.v1.GqlQueryParameter.Builder addPositionalBindingsBu @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-datastore-v1/src/main/java/com/google/datastore/v1/GqlQueryParameter.java b/google-api-grpc/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/GqlQueryParameter.java index 96c20a5d110c..7710d8bce569 100644 --- a/google-api-grpc/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/GqlQueryParameter.java +++ b/google-api-grpc/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/GqlQueryParameter.java @@ -71,7 +71,7 @@ private GqlQueryParameter( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -260,21 +260,19 @@ public boolean equals(final java.lang.Object obj) { com.google.datastore.v1.GqlQueryParameter other = (com.google.datastore.v1.GqlQueryParameter) obj; - boolean result = true; - result = result && getParameterTypeCase().equals(other.getParameterTypeCase()); - if (!result) return false; + if (!getParameterTypeCase().equals(other.getParameterTypeCase())) return false; switch (parameterTypeCase_) { case 2: - result = result && getValue().equals(other.getValue()); + if (!getValue().equals(other.getValue())) return false; break; case 3: - result = result && getCursor().equals(other.getCursor()); + if (!getCursor().equals(other.getCursor())) 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 @@ -487,35 +485,35 @@ public com.google.datastore.v1.GqlQueryParameter 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 @@ -844,7 +842,7 @@ public Builder clearCursor() { @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-datastore-v1/src/main/java/com/google/datastore/v1/Key.java b/google-api-grpc/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/Key.java index d66a8d787863..1584e7406b8d 100644 --- a/google-api-grpc/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/Key.java +++ b/google-api-grpc/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/Key.java @@ -71,7 +71,7 @@ private Key( } case 18: { - if (!((mutable_bitField0_ & 0x00000002) == 0x00000002)) { + if (!((mutable_bitField0_ & 0x00000002) != 0)) { path_ = new java.util.ArrayList(); mutable_bitField0_ |= 0x00000002; } @@ -82,7 +82,7 @@ private Key( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -94,7 +94,7 @@ private Key( } 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)) { path_ = java.util.Collections.unmodifiableList(path_); } this.unknownFields = unknownFields.build(); @@ -260,7 +260,7 @@ private PathElement( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -516,22 +516,20 @@ public boolean equals(final java.lang.Object obj) { } com.google.datastore.v1.Key.PathElement other = (com.google.datastore.v1.Key.PathElement) obj; - boolean result = true; - result = result && getKind().equals(other.getKind()); - result = result && getIdTypeCase().equals(other.getIdTypeCase()); - if (!result) return false; + if (!getKind().equals(other.getKind())) return false; + if (!getIdTypeCase().equals(other.getIdTypeCase())) return false; switch (idTypeCase_) { case 2: - result = result && (getId() == other.getId()); + if (getId() != other.getId()) return false; break; case 3: - result = result && getName().equals(other.getName()); + if (!getName().equals(other.getName())) 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 @@ -749,23 +747,23 @@ public com.google.datastore.v1.Key.PathElement 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 @@ -773,13 +771,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 @@ -1145,7 +1143,7 @@ public Builder setNameBytes(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 @@ -1421,14 +1419,13 @@ public boolean equals(final java.lang.Object obj) { } com.google.datastore.v1.Key other = (com.google.datastore.v1.Key) obj; - boolean result = true; - result = result && (hasPartitionId() == other.hasPartitionId()); + if (hasPartitionId() != other.hasPartitionId()) return false; if (hasPartitionId()) { - result = result && getPartitionId().equals(other.getPartitionId()); + if (!getPartitionId().equals(other.getPartitionId())) return false; } - result = result && getPathList().equals(other.getPathList()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getPathList().equals(other.getPathList())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -1638,7 +1635,7 @@ public com.google.datastore.v1.Key buildPartial() { result.partitionId_ = partitionIdBuilder_.build(); } if (pathBuilder_ == null) { - if (((bitField0_ & 0x00000002) == 0x00000002)) { + if (((bitField0_ & 0x00000002) != 0)) { path_ = java.util.Collections.unmodifiableList(path_); bitField0_ = (bitField0_ & ~0x00000002); } @@ -1653,35 +1650,35 @@ public com.google.datastore.v1.Key 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 @@ -1757,7 +1754,7 @@ public Builder mergeFrom( private int bitField0_; - private com.google.datastore.v1.PartitionId partitionId_ = null; + private com.google.datastore.v1.PartitionId partitionId_; private com.google.protobuf.SingleFieldBuilderV3< com.google.datastore.v1.PartitionId, com.google.datastore.v1.PartitionId.Builder, @@ -1960,7 +1957,7 @@ public com.google.datastore.v1.PartitionIdOrBuilder getPartitionIdOrBuilder() { java.util.Collections.emptyList(); private void ensurePathIsMutable() { - if (!((bitField0_ & 0x00000002) == 0x00000002)) { + if (!((bitField0_ & 0x00000002) != 0)) { path_ = new java.util.ArrayList(path_); bitField0_ |= 0x00000002; } @@ -2532,10 +2529,7 @@ public java.util.List getPathBu com.google.datastore.v1.Key.PathElement, com.google.datastore.v1.Key.PathElement.Builder, com.google.datastore.v1.Key.PathElementOrBuilder>( - path_, - ((bitField0_ & 0x00000002) == 0x00000002), - getParentForChildren(), - isClean()); + path_, ((bitField0_ & 0x00000002) != 0), getParentForChildren(), isClean()); path_ = null; } return pathBuilder_; @@ -2543,7 +2537,7 @@ public java.util.List getPathBu @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-datastore-v1/src/main/java/com/google/datastore/v1/KindExpression.java b/google-api-grpc/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/KindExpression.java index 3193475cfd47..24859abde128 100644 --- a/google-api-grpc/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/KindExpression.java +++ b/google-api-grpc/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/KindExpression.java @@ -59,7 +59,7 @@ private KindExpression( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -178,10 +178,9 @@ public boolean equals(final java.lang.Object obj) { } com.google.datastore.v1.KindExpression other = (com.google.datastore.v1.KindExpression) obj; - boolean result = true; - result = result && getName().equals(other.getName()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getName().equals(other.getName())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -374,35 +373,35 @@ public com.google.datastore.v1.KindExpression 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 @@ -546,7 +545,7 @@ public Builder setNameBytes(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-datastore-v1/src/main/java/com/google/datastore/v1/LookupRequest.java b/google-api-grpc/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/LookupRequest.java index 1ad0004e1d4e..a69b954098fc 100644 --- a/google-api-grpc/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/LookupRequest.java +++ b/google-api-grpc/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/LookupRequest.java @@ -69,7 +69,7 @@ private LookupRequest( } case 26: { - if (!((mutable_bitField0_ & 0x00000004) == 0x00000004)) { + if (!((mutable_bitField0_ & 0x00000004) != 0)) { keys_ = new java.util.ArrayList(); mutable_bitField0_ |= 0x00000004; } @@ -85,7 +85,7 @@ private LookupRequest( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -97,7 +97,7 @@ private LookupRequest( } catch (java.io.IOException e) { throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this); } finally { - if (((mutable_bitField0_ & 0x00000004) == 0x00000004)) { + if (((mutable_bitField0_ & 0x00000004) != 0)) { keys_ = java.util.Collections.unmodifiableList(keys_); } this.unknownFields = unknownFields.build(); @@ -324,15 +324,14 @@ public boolean equals(final java.lang.Object obj) { } com.google.datastore.v1.LookupRequest other = (com.google.datastore.v1.LookupRequest) obj; - boolean result = true; - result = result && getProjectId().equals(other.getProjectId()); - result = result && (hasReadOptions() == other.hasReadOptions()); + if (!getProjectId().equals(other.getProjectId())) return false; + if (hasReadOptions() != other.hasReadOptions()) return false; if (hasReadOptions()) { - result = result && getReadOptions().equals(other.getReadOptions()); + if (!getReadOptions().equals(other.getReadOptions())) return false; } - result = result && getKeysList().equals(other.getKeysList()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getKeysList().equals(other.getKeysList())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -548,7 +547,7 @@ public com.google.datastore.v1.LookupRequest buildPartial() { result.readOptions_ = readOptionsBuilder_.build(); } if (keysBuilder_ == null) { - if (((bitField0_ & 0x00000004) == 0x00000004)) { + if (((bitField0_ & 0x00000004) != 0)) { keys_ = java.util.Collections.unmodifiableList(keys_); bitField0_ = (bitField0_ & ~0x00000004); } @@ -563,35 +562,35 @@ public com.google.datastore.v1.LookupRequest 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 @@ -765,7 +764,7 @@ public Builder setProjectIdBytes(com.google.protobuf.ByteString value) { return this; } - private com.google.datastore.v1.ReadOptions readOptions_ = null; + private com.google.datastore.v1.ReadOptions readOptions_; private com.google.protobuf.SingleFieldBuilderV3< com.google.datastore.v1.ReadOptions, com.google.datastore.v1.ReadOptions.Builder, @@ -949,7 +948,7 @@ public com.google.datastore.v1.ReadOptionsOrBuilder getReadOptionsOrBuilder() { private java.util.List keys_ = java.util.Collections.emptyList(); private void ensureKeysIsMutable() { - if (!((bitField0_ & 0x00000004) == 0x00000004)) { + if (!((bitField0_ & 0x00000004) != 0)) { keys_ = new java.util.ArrayList(keys_); bitField0_ |= 0x00000004; } @@ -1282,10 +1281,7 @@ public java.util.List getKeysBuilderList() com.google.datastore.v1.Key, com.google.datastore.v1.Key.Builder, com.google.datastore.v1.KeyOrBuilder>( - keys_, - ((bitField0_ & 0x00000004) == 0x00000004), - getParentForChildren(), - isClean()); + keys_, ((bitField0_ & 0x00000004) != 0), getParentForChildren(), isClean()); keys_ = null; } return keysBuilder_; @@ -1293,7 +1289,7 @@ public java.util.List getKeysBuilderList() @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-datastore-v1/src/main/java/com/google/datastore/v1/LookupResponse.java b/google-api-grpc/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/LookupResponse.java index 585dd5b47739..56e920334ed7 100644 --- a/google-api-grpc/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/LookupResponse.java +++ b/google-api-grpc/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/LookupResponse.java @@ -54,7 +54,7 @@ private LookupResponse( break; case 10: { - if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) { + if (!((mutable_bitField0_ & 0x00000001) != 0)) { found_ = new java.util.ArrayList(); mutable_bitField0_ |= 0x00000001; } @@ -65,7 +65,7 @@ private LookupResponse( } case 18: { - if (!((mutable_bitField0_ & 0x00000002) == 0x00000002)) { + if (!((mutable_bitField0_ & 0x00000002) != 0)) { missing_ = new java.util.ArrayList(); mutable_bitField0_ |= 0x00000002; } @@ -76,7 +76,7 @@ private LookupResponse( } case 26: { - if (!((mutable_bitField0_ & 0x00000004) == 0x00000004)) { + if (!((mutable_bitField0_ & 0x00000004) != 0)) { deferred_ = new java.util.ArrayList(); mutable_bitField0_ |= 0x00000004; } @@ -86,7 +86,7 @@ private LookupResponse( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -98,13 +98,13 @@ private LookupResponse( } 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)) { found_ = java.util.Collections.unmodifiableList(found_); } - if (((mutable_bitField0_ & 0x00000002) == 0x00000002)) { + if (((mutable_bitField0_ & 0x00000002) != 0)) { missing_ = java.util.Collections.unmodifiableList(missing_); } - if (((mutable_bitField0_ & 0x00000004) == 0x00000004)) { + if (((mutable_bitField0_ & 0x00000004) != 0)) { deferred_ = java.util.Collections.unmodifiableList(deferred_); } this.unknownFields = unknownFields.build(); @@ -404,12 +404,11 @@ public boolean equals(final java.lang.Object obj) { } com.google.datastore.v1.LookupResponse other = (com.google.datastore.v1.LookupResponse) obj; - boolean result = true; - result = result && getFoundList().equals(other.getFoundList()); - result = result && getMissingList().equals(other.getMissingList()); - result = result && getDeferredList().equals(other.getDeferredList()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getFoundList().equals(other.getFoundList())) return false; + if (!getMissingList().equals(other.getMissingList())) return false; + if (!getDeferredList().equals(other.getDeferredList())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -627,7 +626,7 @@ public com.google.datastore.v1.LookupResponse buildPartial() { new com.google.datastore.v1.LookupResponse(this); int from_bitField0_ = bitField0_; if (foundBuilder_ == null) { - if (((bitField0_ & 0x00000001) == 0x00000001)) { + if (((bitField0_ & 0x00000001) != 0)) { found_ = java.util.Collections.unmodifiableList(found_); bitField0_ = (bitField0_ & ~0x00000001); } @@ -636,7 +635,7 @@ public com.google.datastore.v1.LookupResponse buildPartial() { result.found_ = foundBuilder_.build(); } if (missingBuilder_ == null) { - if (((bitField0_ & 0x00000002) == 0x00000002)) { + if (((bitField0_ & 0x00000002) != 0)) { missing_ = java.util.Collections.unmodifiableList(missing_); bitField0_ = (bitField0_ & ~0x00000002); } @@ -645,7 +644,7 @@ public com.google.datastore.v1.LookupResponse buildPartial() { result.missing_ = missingBuilder_.build(); } if (deferredBuilder_ == null) { - if (((bitField0_ & 0x00000004) == 0x00000004)) { + if (((bitField0_ & 0x00000004) != 0)) { deferred_ = java.util.Collections.unmodifiableList(deferred_); bitField0_ = (bitField0_ & ~0x00000004); } @@ -659,35 +658,35 @@ public com.google.datastore.v1.LookupResponse 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 @@ -818,7 +817,7 @@ public Builder mergeFrom( java.util.Collections.emptyList(); private void ensureFoundIsMutable() { - if (!((bitField0_ & 0x00000001) == 0x00000001)) { + if (!((bitField0_ & 0x00000001) != 0)) { found_ = new java.util.ArrayList(found_); bitField0_ |= 0x00000001; } @@ -1192,10 +1191,7 @@ public java.util.List getFoundBuil com.google.datastore.v1.EntityResult, com.google.datastore.v1.EntityResult.Builder, com.google.datastore.v1.EntityResultOrBuilder>( - found_, - ((bitField0_ & 0x00000001) == 0x00000001), - getParentForChildren(), - isClean()); + found_, ((bitField0_ & 0x00000001) != 0), getParentForChildren(), isClean()); found_ = null; } return foundBuilder_; @@ -1205,7 +1201,7 @@ public java.util.List getFoundBuil java.util.Collections.emptyList(); private void ensureMissingIsMutable() { - if (!((bitField0_ & 0x00000002) == 0x00000002)) { + if (!((bitField0_ & 0x00000002) != 0)) { missing_ = new java.util.ArrayList(missing_); bitField0_ |= 0x00000002; } @@ -1579,10 +1575,7 @@ public java.util.List getMissingBu com.google.datastore.v1.EntityResult, com.google.datastore.v1.EntityResult.Builder, com.google.datastore.v1.EntityResultOrBuilder>( - missing_, - ((bitField0_ & 0x00000002) == 0x00000002), - getParentForChildren(), - isClean()); + missing_, ((bitField0_ & 0x00000002) != 0), getParentForChildren(), isClean()); missing_ = null; } return missingBuilder_; @@ -1592,7 +1585,7 @@ public java.util.List getMissingBu java.util.Collections.emptyList(); private void ensureDeferredIsMutable() { - if (!((bitField0_ & 0x00000004) == 0x00000004)) { + if (!((bitField0_ & 0x00000004) != 0)) { deferred_ = new java.util.ArrayList(deferred_); bitField0_ |= 0x00000004; } @@ -1963,10 +1956,7 @@ public java.util.List getDeferredBuilderLis com.google.datastore.v1.Key, com.google.datastore.v1.Key.Builder, com.google.datastore.v1.KeyOrBuilder>( - deferred_, - ((bitField0_ & 0x00000004) == 0x00000004), - getParentForChildren(), - isClean()); + deferred_, ((bitField0_ & 0x00000004) != 0), getParentForChildren(), isClean()); deferred_ = null; } return deferredBuilder_; @@ -1974,7 +1964,7 @@ public java.util.List getDeferredBuilderLis @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-datastore-v1/src/main/java/com/google/datastore/v1/Mutation.java b/google-api-grpc/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/Mutation.java index 239c8cab5dbb..0554dd144194 100644 --- a/google-api-grpc/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/Mutation.java +++ b/google-api-grpc/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/Mutation.java @@ -116,7 +116,7 @@ private Mutation( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -514,38 +514,34 @@ public boolean equals(final java.lang.Object obj) { } com.google.datastore.v1.Mutation other = (com.google.datastore.v1.Mutation) obj; - boolean result = true; - result = result && getOperationCase().equals(other.getOperationCase()); - if (!result) return false; + if (!getOperationCase().equals(other.getOperationCase())) return false; switch (operationCase_) { case 4: - result = result && getInsert().equals(other.getInsert()); + if (!getInsert().equals(other.getInsert())) return false; break; case 5: - result = result && getUpdate().equals(other.getUpdate()); + if (!getUpdate().equals(other.getUpdate())) return false; break; case 6: - result = result && getUpsert().equals(other.getUpsert()); + if (!getUpsert().equals(other.getUpsert())) return false; break; case 7: - result = result && getDelete().equals(other.getDelete()); + if (!getDelete().equals(other.getDelete())) return false; break; case 0: default: } - result = - result - && getConflictDetectionStrategyCase().equals(other.getConflictDetectionStrategyCase()); - if (!result) return false; + if (!getConflictDetectionStrategyCase().equals(other.getConflictDetectionStrategyCase())) + return false; switch (conflictDetectionStrategyCase_) { case 8: - result = result && (getBaseVersion() == other.getBaseVersion()); + if (getBaseVersion() != other.getBaseVersion()) 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 @@ -796,35 +792,35 @@ public com.google.datastore.v1.Mutation 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 @@ -1813,7 +1809,7 @@ public Builder clearBaseVersion() { @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-datastore-v1/src/main/java/com/google/datastore/v1/MutationResult.java b/google-api-grpc/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/MutationResult.java index 0d900b6a048d..1a3e65baa640 100644 --- a/google-api-grpc/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/MutationResult.java +++ b/google-api-grpc/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/MutationResult.java @@ -22,10 +22,7 @@ private MutationResult(com.google.protobuf.GeneratedMessageV3.Builder builder super(builder); } - private MutationResult() { - version_ = 0L; - conflictDetected_ = false; - } + private MutationResult() {} @java.lang.Override public final com.google.protobuf.UnknownFieldSet getUnknownFields() { @@ -77,7 +74,7 @@ private MutationResult( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -242,15 +239,14 @@ public boolean equals(final java.lang.Object obj) { } com.google.datastore.v1.MutationResult other = (com.google.datastore.v1.MutationResult) obj; - boolean result = true; - result = result && (hasKey() == other.hasKey()); + if (hasKey() != other.hasKey()) return false; if (hasKey()) { - result = result && getKey().equals(other.getKey()); + if (!getKey().equals(other.getKey())) return false; } - result = result && (getVersion() == other.getVersion()); - result = result && (getConflictDetected() == other.getConflictDetected()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (getVersion() != other.getVersion()) return false; + if (getConflictDetected() != other.getConflictDetected()) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -463,35 +459,35 @@ public com.google.datastore.v1.MutationResult 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 @@ -544,7 +540,7 @@ public Builder mergeFrom( return this; } - private com.google.datastore.v1.Key key_ = null; + private com.google.datastore.v1.Key key_; private com.google.protobuf.SingleFieldBuilderV3< com.google.datastore.v1.Key, com.google.datastore.v1.Key.Builder, @@ -831,7 +827,7 @@ public Builder clearConflictDetected() { @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-datastore-v1/src/main/java/com/google/datastore/v1/PartitionId.java b/google-api-grpc/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PartitionId.java index 0c24f36cd56d..e9fbee3dfac2 100644 --- a/google-api-grpc/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PartitionId.java +++ b/google-api-grpc/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PartitionId.java @@ -82,7 +82,7 @@ private PartitionId( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -250,11 +250,10 @@ public boolean equals(final java.lang.Object obj) { } com.google.datastore.v1.PartitionId other = (com.google.datastore.v1.PartitionId) obj; - boolean result = true; - result = result && getProjectId().equals(other.getProjectId()); - result = result && getNamespaceId().equals(other.getNamespaceId()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getProjectId().equals(other.getProjectId())) return false; + if (!getNamespaceId().equals(other.getNamespaceId())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -465,35 +464,35 @@ public com.google.datastore.v1.PartitionId 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 @@ -735,7 +734,7 @@ public Builder setNamespaceIdBytes(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-datastore-v1/src/main/java/com/google/datastore/v1/Projection.java b/google-api-grpc/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/Projection.java index a0bfd00f6b5b..ff328cc37406 100644 --- a/google-api-grpc/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/Projection.java +++ b/google-api-grpc/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/Projection.java @@ -66,7 +66,7 @@ private Projection( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -183,13 +183,12 @@ public boolean equals(final java.lang.Object obj) { } com.google.datastore.v1.Projection other = (com.google.datastore.v1.Projection) obj; - boolean result = true; - result = result && (hasProperty() == other.hasProperty()); + if (hasProperty() != other.hasProperty()) return false; if (hasProperty()) { - result = result && getProperty().equals(other.getProperty()); + if (!getProperty().equals(other.getProperty())) return false; } - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -390,35 +389,35 @@ public com.google.datastore.v1.Projection 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 @@ -465,7 +464,7 @@ public Builder mergeFrom( return this; } - private com.google.datastore.v1.PropertyReference property_ = null; + private com.google.datastore.v1.PropertyReference property_; private com.google.protobuf.SingleFieldBuilderV3< com.google.datastore.v1.PropertyReference, com.google.datastore.v1.PropertyReference.Builder, @@ -648,7 +647,7 @@ public com.google.datastore.v1.PropertyReferenceOrBuilder getPropertyOrBuilder() @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-datastore-v1/src/main/java/com/google/datastore/v1/PropertyFilter.java b/google-api-grpc/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PropertyFilter.java index 157fec2847df..72ddb0a88f21 100644 --- a/google-api-grpc/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PropertyFilter.java +++ b/google-api-grpc/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PropertyFilter.java @@ -89,7 +89,7 @@ private PropertyFilter( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -520,18 +520,17 @@ public boolean equals(final java.lang.Object obj) { } com.google.datastore.v1.PropertyFilter other = (com.google.datastore.v1.PropertyFilter) obj; - boolean result = true; - result = result && (hasProperty() == other.hasProperty()); + if (hasProperty() != other.hasProperty()) return false; if (hasProperty()) { - result = result && getProperty().equals(other.getProperty()); + if (!getProperty().equals(other.getProperty())) return false; } - result = result && op_ == other.op_; - result = result && (hasValue() == other.hasValue()); + if (op_ != other.op_) return false; + if (hasValue() != other.hasValue()) return false; if (hasValue()) { - result = result && getValue().equals(other.getValue()); + if (!getValue().equals(other.getValue())) return false; } - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -754,35 +753,35 @@ public com.google.datastore.v1.PropertyFilter 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 @@ -835,7 +834,7 @@ public Builder mergeFrom( return this; } - private com.google.datastore.v1.PropertyReference property_ = null; + private com.google.datastore.v1.PropertyReference property_; private com.google.protobuf.SingleFieldBuilderV3< com.google.datastore.v1.PropertyReference, com.google.datastore.v1.PropertyReference.Builder, @@ -1092,7 +1091,7 @@ public Builder clearOp() { return this; } - private com.google.datastore.v1.Value value_ = null; + private com.google.datastore.v1.Value value_; private com.google.protobuf.SingleFieldBuilderV3< com.google.datastore.v1.Value, com.google.datastore.v1.Value.Builder, @@ -1268,7 +1267,7 @@ public com.google.datastore.v1.ValueOrBuilder getValueOrBuilder() { @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-datastore-v1/src/main/java/com/google/datastore/v1/PropertyOrder.java b/google-api-grpc/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PropertyOrder.java index ad1396a9317e..57a048443a5e 100644 --- a/google-api-grpc/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PropertyOrder.java +++ b/google-api-grpc/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PropertyOrder.java @@ -75,7 +75,7 @@ private PropertyOrder( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -375,14 +375,13 @@ public boolean equals(final java.lang.Object obj) { } com.google.datastore.v1.PropertyOrder other = (com.google.datastore.v1.PropertyOrder) obj; - boolean result = true; - result = result && (hasProperty() == other.hasProperty()); + if (hasProperty() != other.hasProperty()) return false; if (hasProperty()) { - result = result && getProperty().equals(other.getProperty()); + if (!getProperty().equals(other.getProperty())) return false; } - result = result && direction_ == other.direction_; - result = result && unknownFields.equals(other.unknownFields); - return result; + if (direction_ != other.direction_) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -589,35 +588,35 @@ public com.google.datastore.v1.PropertyOrder 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 @@ -667,7 +666,7 @@ public Builder mergeFrom( return this; } - private com.google.datastore.v1.PropertyReference property_ = null; + private com.google.datastore.v1.PropertyReference property_; private com.google.protobuf.SingleFieldBuilderV3< com.google.datastore.v1.PropertyReference, com.google.datastore.v1.PropertyReference.Builder, @@ -926,7 +925,7 @@ public Builder clearDirection() { @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-datastore-v1/src/main/java/com/google/datastore/v1/PropertyReference.java b/google-api-grpc/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PropertyReference.java index a540741a0dcc..5bcb1ca552f7 100644 --- a/google-api-grpc/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PropertyReference.java +++ b/google-api-grpc/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PropertyReference.java @@ -59,7 +59,7 @@ private PropertyReference( } 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.datastore.v1.PropertyReference other = (com.google.datastore.v1.PropertyReference) obj; - boolean result = true; - result = result && getName().equals(other.getName()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getName().equals(other.getName())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -377,35 +376,35 @@ public com.google.datastore.v1.PropertyReference 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 setNameBytes(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-datastore-v1/src/main/java/com/google/datastore/v1/Query.java b/google-api-grpc/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/Query.java index 356909095014..49177c094c77 100644 --- a/google-api-grpc/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/Query.java +++ b/google-api-grpc/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/Query.java @@ -29,7 +29,6 @@ private Query() { distinctOn_ = java.util.Collections.emptyList(); startCursor_ = com.google.protobuf.ByteString.EMPTY; endCursor_ = com.google.protobuf.ByteString.EMPTY; - offset_ = 0; } @java.lang.Override @@ -58,7 +57,7 @@ private Query( break; case 18: { - if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) { + if (!((mutable_bitField0_ & 0x00000001) != 0)) { projection_ = new java.util.ArrayList(); mutable_bitField0_ |= 0x00000001; } @@ -69,7 +68,7 @@ private Query( } case 26: { - if (!((mutable_bitField0_ & 0x00000002) == 0x00000002)) { + if (!((mutable_bitField0_ & 0x00000002) != 0)) { kind_ = new java.util.ArrayList(); mutable_bitField0_ |= 0x00000002; } @@ -95,7 +94,7 @@ private Query( } case 42: { - if (!((mutable_bitField0_ & 0x00000008) == 0x00000008)) { + if (!((mutable_bitField0_ & 0x00000008) != 0)) { order_ = new java.util.ArrayList(); mutable_bitField0_ |= 0x00000008; } @@ -106,7 +105,7 @@ private Query( } case 50: { - if (!((mutable_bitField0_ & 0x00000010) == 0x00000010)) { + if (!((mutable_bitField0_ & 0x00000010) != 0)) { distinctOn_ = new java.util.ArrayList(); mutable_bitField0_ |= 0x00000010; } @@ -147,7 +146,7 @@ private Query( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -159,16 +158,16 @@ private Query( } 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)) { projection_ = java.util.Collections.unmodifiableList(projection_); } - if (((mutable_bitField0_ & 0x00000002) == 0x00000002)) { + if (((mutable_bitField0_ & 0x00000002) != 0)) { kind_ = java.util.Collections.unmodifiableList(kind_); } - if (((mutable_bitField0_ & 0x00000008) == 0x00000008)) { + if (((mutable_bitField0_ & 0x00000008) != 0)) { order_ = java.util.Collections.unmodifiableList(order_); } - if (((mutable_bitField0_ & 0x00000010) == 0x00000010)) { + if (((mutable_bitField0_ & 0x00000010) != 0)) { distinctOn_ = java.util.Collections.unmodifiableList(distinctOn_); } this.unknownFields = unknownFields.build(); @@ -692,24 +691,23 @@ public boolean equals(final java.lang.Object obj) { } com.google.datastore.v1.Query other = (com.google.datastore.v1.Query) obj; - boolean result = true; - result = result && getProjectionList().equals(other.getProjectionList()); - result = result && getKindList().equals(other.getKindList()); - result = result && (hasFilter() == other.hasFilter()); + if (!getProjectionList().equals(other.getProjectionList())) return false; + if (!getKindList().equals(other.getKindList())) return false; + if (hasFilter() != other.hasFilter()) return false; if (hasFilter()) { - result = result && getFilter().equals(other.getFilter()); - } - result = result && getOrderList().equals(other.getOrderList()); - result = result && getDistinctOnList().equals(other.getDistinctOnList()); - result = result && getStartCursor().equals(other.getStartCursor()); - result = result && getEndCursor().equals(other.getEndCursor()); - result = result && (getOffset() == other.getOffset()); - result = result && (hasLimit() == other.hasLimit()); + if (!getFilter().equals(other.getFilter())) return false; + } + if (!getOrderList().equals(other.getOrderList())) return false; + if (!getDistinctOnList().equals(other.getDistinctOnList())) return false; + if (!getStartCursor().equals(other.getStartCursor())) return false; + if (!getEndCursor().equals(other.getEndCursor())) return false; + if (getOffset() != other.getOffset()) return false; + if (hasLimit() != other.hasLimit()) return false; if (hasLimit()) { - result = result && getLimit().equals(other.getLimit()); + if (!getLimit().equals(other.getLimit())) return false; } - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -968,7 +966,7 @@ public com.google.datastore.v1.Query buildPartial() { int from_bitField0_ = bitField0_; int to_bitField0_ = 0; if (projectionBuilder_ == null) { - if (((bitField0_ & 0x00000001) == 0x00000001)) { + if (((bitField0_ & 0x00000001) != 0)) { projection_ = java.util.Collections.unmodifiableList(projection_); bitField0_ = (bitField0_ & ~0x00000001); } @@ -977,7 +975,7 @@ public com.google.datastore.v1.Query buildPartial() { result.projection_ = projectionBuilder_.build(); } if (kindBuilder_ == null) { - if (((bitField0_ & 0x00000002) == 0x00000002)) { + if (((bitField0_ & 0x00000002) != 0)) { kind_ = java.util.Collections.unmodifiableList(kind_); bitField0_ = (bitField0_ & ~0x00000002); } @@ -991,7 +989,7 @@ public com.google.datastore.v1.Query buildPartial() { result.filter_ = filterBuilder_.build(); } if (orderBuilder_ == null) { - if (((bitField0_ & 0x00000008) == 0x00000008)) { + if (((bitField0_ & 0x00000008) != 0)) { order_ = java.util.Collections.unmodifiableList(order_); bitField0_ = (bitField0_ & ~0x00000008); } @@ -1000,7 +998,7 @@ public com.google.datastore.v1.Query buildPartial() { result.order_ = orderBuilder_.build(); } if (distinctOnBuilder_ == null) { - if (((bitField0_ & 0x00000010) == 0x00000010)) { + if (((bitField0_ & 0x00000010) != 0)) { distinctOn_ = java.util.Collections.unmodifiableList(distinctOn_); bitField0_ = (bitField0_ & ~0x00000010); } @@ -1023,35 +1021,35 @@ public com.google.datastore.v1.Query 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 @@ -1224,7 +1222,7 @@ public Builder mergeFrom( java.util.Collections.emptyList(); private void ensureProjectionIsMutable() { - if (!((bitField0_ & 0x00000001) == 0x00000001)) { + if (!((bitField0_ & 0x00000001) != 0)) { projection_ = new java.util.ArrayList(projection_); bitField0_ |= 0x00000001; } @@ -1562,10 +1560,7 @@ public java.util.List getProjectionB com.google.datastore.v1.Projection, com.google.datastore.v1.Projection.Builder, com.google.datastore.v1.ProjectionOrBuilder>( - projection_, - ((bitField0_ & 0x00000001) == 0x00000001), - getParentForChildren(), - isClean()); + projection_, ((bitField0_ & 0x00000001) != 0), getParentForChildren(), isClean()); projection_ = null; } return projectionBuilder_; @@ -1575,7 +1570,7 @@ public java.util.List getProjectionB java.util.Collections.emptyList(); private void ensureKindIsMutable() { - if (!((bitField0_ & 0x00000002) == 0x00000002)) { + if (!((bitField0_ & 0x00000002) != 0)) { kind_ = new java.util.ArrayList(kind_); bitField0_ |= 0x00000002; } @@ -1931,16 +1926,13 @@ public java.util.List getKindBui com.google.datastore.v1.KindExpression, com.google.datastore.v1.KindExpression.Builder, com.google.datastore.v1.KindExpressionOrBuilder>( - kind_, - ((bitField0_ & 0x00000002) == 0x00000002), - getParentForChildren(), - isClean()); + kind_, ((bitField0_ & 0x00000002) != 0), getParentForChildren(), isClean()); kind_ = null; } return kindBuilder_; } - private com.google.datastore.v1.Filter filter_ = null; + private com.google.datastore.v1.Filter filter_; private com.google.protobuf.SingleFieldBuilderV3< com.google.datastore.v1.Filter, com.google.datastore.v1.Filter.Builder, @@ -2119,7 +2111,7 @@ public com.google.datastore.v1.FilterOrBuilder getFilterOrBuilder() { java.util.Collections.emptyList(); private void ensureOrderIsMutable() { - if (!((bitField0_ & 0x00000008) == 0x00000008)) { + if (!((bitField0_ & 0x00000008) != 0)) { order_ = new java.util.ArrayList(order_); bitField0_ |= 0x00000008; } @@ -2457,10 +2449,7 @@ public java.util.List getOrderBui com.google.datastore.v1.PropertyOrder, com.google.datastore.v1.PropertyOrder.Builder, com.google.datastore.v1.PropertyOrderOrBuilder>( - order_, - ((bitField0_ & 0x00000008) == 0x00000008), - getParentForChildren(), - isClean()); + order_, ((bitField0_ & 0x00000008) != 0), getParentForChildren(), isClean()); order_ = null; } return orderBuilder_; @@ -2470,7 +2459,7 @@ public java.util.List getOrderBui java.util.Collections.emptyList(); private void ensureDistinctOnIsMutable() { - if (!((bitField0_ & 0x00000010) == 0x00000010)) { + if (!((bitField0_ & 0x00000010) != 0)) { distinctOn_ = new java.util.ArrayList(distinctOn_); bitField0_ |= 0x00000010; @@ -2847,10 +2836,7 @@ public com.google.datastore.v1.PropertyReference.Builder addDistinctOnBuilder(in com.google.datastore.v1.PropertyReference, com.google.datastore.v1.PropertyReference.Builder, com.google.datastore.v1.PropertyReferenceOrBuilder>( - distinctOn_, - ((bitField0_ & 0x00000010) == 0x00000010), - getParentForChildren(), - isClean()); + distinctOn_, ((bitField0_ & 0x00000010) != 0), getParentForChildren(), isClean()); distinctOn_ = null; } return distinctOnBuilder_; @@ -3015,7 +3001,7 @@ public Builder clearOffset() { return this; } - private com.google.protobuf.Int32Value limit_ = null; + private com.google.protobuf.Int32Value limit_; private com.google.protobuf.SingleFieldBuilderV3< com.google.protobuf.Int32Value, com.google.protobuf.Int32Value.Builder, @@ -3219,7 +3205,7 @@ public com.google.protobuf.Int32ValueOrBuilder getLimitOrBuilder() { @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-datastore-v1/src/main/java/com/google/datastore/v1/QueryResultBatch.java b/google-api-grpc/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/QueryResultBatch.java index 86a4d26ce810..f137a55af9fd 100644 --- a/google-api-grpc/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/QueryResultBatch.java +++ b/google-api-grpc/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/QueryResultBatch.java @@ -23,13 +23,11 @@ private QueryResultBatch(com.google.protobuf.GeneratedMessageV3.Builder build } private QueryResultBatch() { - skippedResults_ = 0; skippedCursor_ = com.google.protobuf.ByteString.EMPTY; entityResultType_ = 0; entityResults_ = java.util.Collections.emptyList(); endCursor_ = com.google.protobuf.ByteString.EMPTY; moreResults_ = 0; - snapshotVersion_ = 0L; } @java.lang.Override @@ -65,7 +63,7 @@ private QueryResultBatch( } case 18: { - if (!((mutable_bitField0_ & 0x00000008) == 0x00000008)) { + if (!((mutable_bitField0_ & 0x00000008) != 0)) { entityResults_ = new java.util.ArrayList(); mutable_bitField0_ |= 0x00000008; } @@ -103,7 +101,7 @@ private QueryResultBatch( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -115,7 +113,7 @@ private QueryResultBatch( } catch (java.io.IOException e) { throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this); } finally { - if (((mutable_bitField0_ & 0x00000008) == 0x00000008)) { + if (((mutable_bitField0_ & 0x00000008) != 0)) { entityResults_ = java.util.Collections.unmodifiableList(entityResults_); } this.unknownFields = unknownFields.build(); @@ -612,16 +610,15 @@ public boolean equals(final java.lang.Object obj) { } com.google.datastore.v1.QueryResultBatch other = (com.google.datastore.v1.QueryResultBatch) obj; - boolean result = true; - result = result && (getSkippedResults() == other.getSkippedResults()); - result = result && getSkippedCursor().equals(other.getSkippedCursor()); - result = result && entityResultType_ == other.entityResultType_; - result = result && getEntityResultsList().equals(other.getEntityResultsList()); - result = result && getEndCursor().equals(other.getEndCursor()); - result = result && moreResults_ == other.moreResults_; - result = result && (getSnapshotVersion() == other.getSnapshotVersion()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (getSkippedResults() != other.getSkippedResults()) return false; + if (!getSkippedCursor().equals(other.getSkippedCursor())) return false; + if (entityResultType_ != other.entityResultType_) return false; + if (!getEntityResultsList().equals(other.getEntityResultsList())) return false; + if (!getEndCursor().equals(other.getEndCursor())) return false; + if (moreResults_ != other.moreResults_) return false; + if (getSnapshotVersion() != other.getSnapshotVersion()) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -845,7 +842,7 @@ public com.google.datastore.v1.QueryResultBatch buildPartial() { result.skippedCursor_ = skippedCursor_; result.entityResultType_ = entityResultType_; if (entityResultsBuilder_ == null) { - if (((bitField0_ & 0x00000008) == 0x00000008)) { + if (((bitField0_ & 0x00000008) != 0)) { entityResults_ = java.util.Collections.unmodifiableList(entityResults_); bitField0_ = (bitField0_ & ~0x00000008); } @@ -863,35 +860,35 @@ public com.google.datastore.v1.QueryResultBatch 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 @@ -1156,7 +1153,7 @@ public Builder clearEntityResultType() { java.util.Collections.emptyList(); private void ensureEntityResultsIsMutable() { - if (!((bitField0_ & 0x00000008) == 0x00000008)) { + if (!((bitField0_ & 0x00000008) != 0)) { entityResults_ = new java.util.ArrayList(entityResults_); bitField0_ |= 0x00000008; @@ -1497,7 +1494,7 @@ public com.google.datastore.v1.EntityResult.Builder addEntityResultsBuilder(int com.google.datastore.v1.EntityResult.Builder, com.google.datastore.v1.EntityResultOrBuilder>( entityResults_, - ((bitField0_ & 0x00000008) == 0x00000008), + ((bitField0_ & 0x00000008) != 0), getParentForChildren(), isClean()); entityResults_ = null; @@ -1697,7 +1694,7 @@ public Builder clearSnapshotVersion() { @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-datastore-v1/src/main/java/com/google/datastore/v1/ReadOptions.java b/google-api-grpc/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ReadOptions.java index d5718235fd67..87131e76ae0f 100644 --- a/google-api-grpc/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ReadOptions.java +++ b/google-api-grpc/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ReadOptions.java @@ -63,7 +63,7 @@ private ReadOptions( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -395,21 +395,19 @@ public boolean equals(final java.lang.Object obj) { } com.google.datastore.v1.ReadOptions other = (com.google.datastore.v1.ReadOptions) obj; - boolean result = true; - result = result && getConsistencyTypeCase().equals(other.getConsistencyTypeCase()); - if (!result) return false; + if (!getConsistencyTypeCase().equals(other.getConsistencyTypeCase())) return false; switch (consistencyTypeCase_) { case 1: - result = result && getReadConsistencyValue() == other.getReadConsistencyValue(); + if (getReadConsistencyValue() != other.getReadConsistencyValue()) return false; break; case 2: - result = result && getTransaction().equals(other.getTransaction()); + if (!getTransaction().equals(other.getTransaction())) 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 @@ -616,35 +614,35 @@ public com.google.datastore.v1.ReadOptions 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 @@ -869,7 +867,7 @@ public Builder clearTransaction() { @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-datastore-v1/src/main/java/com/google/datastore/v1/ReserveIdsRequest.java b/google-api-grpc/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ReserveIdsRequest.java index a0a3a4ab6499..9b46c602fd0b 100644 --- a/google-api-grpc/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ReserveIdsRequest.java +++ b/google-api-grpc/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ReserveIdsRequest.java @@ -55,7 +55,7 @@ private ReserveIdsRequest( break; case 10: { - if (!((mutable_bitField0_ & 0x00000004) == 0x00000004)) { + if (!((mutable_bitField0_ & 0x00000004) != 0)) { keys_ = new java.util.ArrayList(); mutable_bitField0_ |= 0x00000004; } @@ -78,7 +78,7 @@ private ReserveIdsRequest( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -90,7 +90,7 @@ private ReserveIdsRequest( } catch (java.io.IOException e) { throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this); } finally { - if (((mutable_bitField0_ & 0x00000004) == 0x00000004)) { + if (((mutable_bitField0_ & 0x00000004) != 0)) { keys_ = java.util.Collections.unmodifiableList(keys_); } this.unknownFields = unknownFields.build(); @@ -325,12 +325,11 @@ public boolean equals(final java.lang.Object obj) { com.google.datastore.v1.ReserveIdsRequest other = (com.google.datastore.v1.ReserveIdsRequest) obj; - boolean result = true; - result = result && getProjectId().equals(other.getProjectId()); - result = result && getDatabaseId().equals(other.getDatabaseId()); - result = result && getKeysList().equals(other.getKeysList()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getProjectId().equals(other.getProjectId())) return false; + if (!getDatabaseId().equals(other.getDatabaseId())) return false; + if (!getKeysList().equals(other.getKeysList())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -538,7 +537,7 @@ public com.google.datastore.v1.ReserveIdsRequest buildPartial() { result.projectId_ = projectId_; result.databaseId_ = databaseId_; if (keysBuilder_ == null) { - if (((bitField0_ & 0x00000004) == 0x00000004)) { + if (((bitField0_ & 0x00000004) != 0)) { keys_ = java.util.Collections.unmodifiableList(keys_); bitField0_ = (bitField0_ & ~0x00000004); } @@ -553,35 +552,35 @@ public com.google.datastore.v1.ReserveIdsRequest 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 @@ -853,7 +852,7 @@ public Builder setDatabaseIdBytes(com.google.protobuf.ByteString value) { private java.util.List keys_ = java.util.Collections.emptyList(); private void ensureKeysIsMutable() { - if (!((bitField0_ & 0x00000004) == 0x00000004)) { + if (!((bitField0_ & 0x00000004) != 0)) { keys_ = new java.util.ArrayList(keys_); bitField0_ |= 0x00000004; } @@ -1204,10 +1203,7 @@ public java.util.List getKeysBuilderList() com.google.datastore.v1.Key, com.google.datastore.v1.Key.Builder, com.google.datastore.v1.KeyOrBuilder>( - keys_, - ((bitField0_ & 0x00000004) == 0x00000004), - getParentForChildren(), - isClean()); + keys_, ((bitField0_ & 0x00000004) != 0), getParentForChildren(), isClean()); keys_ = null; } return keysBuilder_; @@ -1215,7 +1211,7 @@ public java.util.List getKeysBuilderList() @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-datastore-v1/src/main/java/com/google/datastore/v1/ReserveIdsResponse.java b/google-api-grpc/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ReserveIdsResponse.java index 1cde2d6e7b87..9536829023f0 100644 --- a/google-api-grpc/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ReserveIdsResponse.java +++ b/google-api-grpc/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ReserveIdsResponse.java @@ -50,7 +50,7 @@ private ReserveIdsResponse( break; default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -121,9 +121,8 @@ public boolean equals(final java.lang.Object obj) { com.google.datastore.v1.ReserveIdsResponse other = (com.google.datastore.v1.ReserveIdsResponse) obj; - boolean result = true; - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -312,35 +311,35 @@ public com.google.datastore.v1.ReserveIdsResponse 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 @@ -386,7 +385,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-datastore-v1/src/main/java/com/google/datastore/v1/RollbackRequest.java b/google-api-grpc/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/RollbackRequest.java index 172d323a0ac5..23aaf3e34630 100644 --- a/google-api-grpc/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/RollbackRequest.java +++ b/google-api-grpc/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/RollbackRequest.java @@ -65,7 +65,7 @@ private RollbackRequest( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -206,11 +206,10 @@ public boolean equals(final java.lang.Object obj) { } com.google.datastore.v1.RollbackRequest other = (com.google.datastore.v1.RollbackRequest) obj; - boolean result = true; - result = result && getProjectId().equals(other.getProjectId()); - result = result && getTransaction().equals(other.getTransaction()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getProjectId().equals(other.getProjectId())) return false; + if (!getTransaction().equals(other.getTransaction())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -408,35 +407,35 @@ public com.google.datastore.v1.RollbackRequest 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 @@ -633,7 +632,7 @@ public Builder clearTransaction() { @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-datastore-v1/src/main/java/com/google/datastore/v1/RollbackResponse.java b/google-api-grpc/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/RollbackResponse.java index 8f1884d4765c..f478f7be062f 100644 --- a/google-api-grpc/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/RollbackResponse.java +++ b/google-api-grpc/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/RollbackResponse.java @@ -51,7 +51,7 @@ private RollbackResponse( break; default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -121,9 +121,8 @@ public boolean equals(final java.lang.Object obj) { } com.google.datastore.v1.RollbackResponse other = (com.google.datastore.v1.RollbackResponse) obj; - boolean result = true; - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -313,35 +312,35 @@ public com.google.datastore.v1.RollbackResponse 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 @@ -387,7 +386,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-datastore-v1/src/main/java/com/google/datastore/v1/RunQueryRequest.java b/google-api-grpc/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/RunQueryRequest.java index 38b7e01e1105..9320a551ebb4 100644 --- a/google-api-grpc/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/RunQueryRequest.java +++ b/google-api-grpc/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/RunQueryRequest.java @@ -121,7 +121,7 @@ private RunQueryRequest( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -487,30 +487,28 @@ public boolean equals(final java.lang.Object obj) { } com.google.datastore.v1.RunQueryRequest other = (com.google.datastore.v1.RunQueryRequest) obj; - boolean result = true; - result = result && getProjectId().equals(other.getProjectId()); - result = result && (hasPartitionId() == other.hasPartitionId()); + if (!getProjectId().equals(other.getProjectId())) return false; + if (hasPartitionId() != other.hasPartitionId()) return false; if (hasPartitionId()) { - result = result && getPartitionId().equals(other.getPartitionId()); + if (!getPartitionId().equals(other.getPartitionId())) return false; } - result = result && (hasReadOptions() == other.hasReadOptions()); + if (hasReadOptions() != other.hasReadOptions()) return false; if (hasReadOptions()) { - result = result && getReadOptions().equals(other.getReadOptions()); + if (!getReadOptions().equals(other.getReadOptions())) return false; } - result = result && getQueryTypeCase().equals(other.getQueryTypeCase()); - if (!result) return false; + if (!getQueryTypeCase().equals(other.getQueryTypeCase())) return false; switch (queryTypeCase_) { case 3: - result = result && getQuery().equals(other.getQuery()); + if (!getQuery().equals(other.getQuery())) return false; break; case 7: - result = result && getGqlQuery().equals(other.getGqlQuery()); + if (!getGqlQuery().equals(other.getGqlQuery())) 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 @@ -762,35 +760,35 @@ public com.google.datastore.v1.RunQueryRequest 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 @@ -968,7 +966,7 @@ public Builder setProjectIdBytes(com.google.protobuf.ByteString value) { return this; } - private com.google.datastore.v1.PartitionId partitionId_ = null; + private com.google.datastore.v1.PartitionId partitionId_; private com.google.protobuf.SingleFieldBuilderV3< com.google.datastore.v1.PartitionId, com.google.datastore.v1.PartitionId.Builder, @@ -1176,7 +1174,7 @@ public com.google.datastore.v1.PartitionIdOrBuilder getPartitionIdOrBuilder() { return partitionIdBuilder_; } - private com.google.datastore.v1.ReadOptions readOptions_ = null; + private com.google.datastore.v1.ReadOptions readOptions_; private com.google.protobuf.SingleFieldBuilderV3< com.google.datastore.v1.ReadOptions, com.google.datastore.v1.ReadOptions.Builder, @@ -1756,7 +1754,7 @@ public com.google.datastore.v1.GqlQueryOrBuilder getGqlQueryOrBuilder() { @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-datastore-v1/src/main/java/com/google/datastore/v1/RunQueryResponse.java b/google-api-grpc/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/RunQueryResponse.java index 72b3c109bbe1..824f1f04bc2e 100644 --- a/google-api-grpc/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/RunQueryResponse.java +++ b/google-api-grpc/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/RunQueryResponse.java @@ -81,7 +81,7 @@ private RunQueryResponse( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -241,17 +241,16 @@ public boolean equals(final java.lang.Object obj) { } com.google.datastore.v1.RunQueryResponse other = (com.google.datastore.v1.RunQueryResponse) obj; - boolean result = true; - result = result && (hasBatch() == other.hasBatch()); + if (hasBatch() != other.hasBatch()) return false; if (hasBatch()) { - result = result && getBatch().equals(other.getBatch()); + if (!getBatch().equals(other.getBatch())) return false; } - result = result && (hasQuery() == other.hasQuery()); + if (hasQuery() != other.hasQuery()) return false; if (hasQuery()) { - result = result && getQuery().equals(other.getQuery()); + if (!getQuery().equals(other.getQuery())) return false; } - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -470,35 +469,35 @@ public com.google.datastore.v1.RunQueryResponse 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 @@ -548,7 +547,7 @@ public Builder mergeFrom( return this; } - private com.google.datastore.v1.QueryResultBatch batch_ = null; + private com.google.datastore.v1.QueryResultBatch batch_; private com.google.protobuf.SingleFieldBuilderV3< com.google.datastore.v1.QueryResultBatch, com.google.datastore.v1.QueryResultBatch.Builder, @@ -729,7 +728,7 @@ public com.google.datastore.v1.QueryResultBatchOrBuilder getBatchOrBuilder() { return batchBuilder_; } - private com.google.datastore.v1.Query query_ = null; + private com.google.datastore.v1.Query query_; private com.google.protobuf.SingleFieldBuilderV3< com.google.datastore.v1.Query, com.google.datastore.v1.Query.Builder, @@ -905,7 +904,7 @@ public com.google.datastore.v1.QueryOrBuilder getQueryOrBuilder() { @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-datastore-v1/src/main/java/com/google/datastore/v1/TransactionOptions.java b/google-api-grpc/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/TransactionOptions.java index cf9b3f1b02f5..a941739a2bde 100644 --- a/google-api-grpc/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/TransactionOptions.java +++ b/google-api-grpc/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/TransactionOptions.java @@ -91,7 +91,7 @@ private TransactionOptions( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -193,7 +193,7 @@ private ReadWrite( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -285,10 +285,9 @@ public boolean equals(final java.lang.Object obj) { com.google.datastore.v1.TransactionOptions.ReadWrite other = (com.google.datastore.v1.TransactionOptions.ReadWrite) obj; - boolean result = true; - result = result && getPreviousTransaction().equals(other.getPreviousTransaction()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getPreviousTransaction().equals(other.getPreviousTransaction())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -484,23 +483,23 @@ public com.google.datastore.v1.TransactionOptions.ReadWrite 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 @@ -508,13 +507,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 @@ -614,7 +613,7 @@ public Builder clearPreviousTransaction() { @java.lang.Override public final Builder setUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { - return super.setUnknownFieldsProto3(unknownFields); + return super.setUnknownFields(unknownFields); } @java.lang.Override @@ -713,7 +712,7 @@ private ReadOnly( break; default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -784,9 +783,8 @@ public boolean equals(final java.lang.Object obj) { com.google.datastore.v1.TransactionOptions.ReadOnly other = (com.google.datastore.v1.TransactionOptions.ReadOnly) obj; - boolean result = true; - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -977,23 +975,23 @@ public com.google.datastore.v1.TransactionOptions.ReadOnly 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 @@ -1001,13 +999,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 @@ -1056,7 +1054,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 @@ -1288,21 +1286,19 @@ public boolean equals(final java.lang.Object obj) { com.google.datastore.v1.TransactionOptions other = (com.google.datastore.v1.TransactionOptions) obj; - boolean result = true; - result = result && getModeCase().equals(other.getModeCase()); - if (!result) return false; + if (!getModeCase().equals(other.getModeCase())) return false; switch (modeCase_) { case 1: - result = result && getReadWrite().equals(other.getReadWrite()); + if (!getReadWrite().equals(other.getReadWrite())) return false; break; case 2: - result = result && getReadOnly().equals(other.getReadOnly()); + if (!getReadOnly().equals(other.getReadOnly())) 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 @@ -1524,35 +1520,35 @@ public com.google.datastore.v1.TransactionOptions 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 @@ -2032,7 +2028,7 @@ public com.google.datastore.v1.TransactionOptions.ReadOnlyOrBuilder getReadOnlyO @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-datastore-v1/src/main/java/com/google/datastore/v1/Value.java b/google-api-grpc/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/Value.java index d6a96292bc73..e1daeb5dc5cb 100644 --- a/google-api-grpc/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/Value.java +++ b/google-api-grpc/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/Value.java @@ -23,10 +23,7 @@ private Value(com.google.protobuf.GeneratedMessageV3.Builder builder) { super(builder); } - private Value() { - meaning_ = 0; - excludeFromIndexes_ = false; - } + private Value() {} @java.lang.Override public final com.google.protobuf.UnknownFieldSet getUnknownFields() { @@ -176,7 +173,7 @@ private Value( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -846,53 +843,49 @@ public boolean equals(final java.lang.Object obj) { } com.google.datastore.v1.Value other = (com.google.datastore.v1.Value) obj; - boolean result = true; - result = result && (getMeaning() == other.getMeaning()); - result = result && (getExcludeFromIndexes() == other.getExcludeFromIndexes()); - result = result && getValueTypeCase().equals(other.getValueTypeCase()); - if (!result) return false; + if (getMeaning() != other.getMeaning()) return false; + if (getExcludeFromIndexes() != other.getExcludeFromIndexes()) return false; + if (!getValueTypeCase().equals(other.getValueTypeCase())) return false; switch (valueTypeCase_) { case 11: - result = result && getNullValueValue() == other.getNullValueValue(); + if (getNullValueValue() != other.getNullValueValue()) return false; break; case 1: - result = result && (getBooleanValue() == other.getBooleanValue()); + if (getBooleanValue() != other.getBooleanValue()) return false; break; case 2: - result = result && (getIntegerValue() == other.getIntegerValue()); + if (getIntegerValue() != other.getIntegerValue()) return false; break; case 3: - result = - result - && (java.lang.Double.doubleToLongBits(getDoubleValue()) - == java.lang.Double.doubleToLongBits(other.getDoubleValue())); + if (java.lang.Double.doubleToLongBits(getDoubleValue()) + != java.lang.Double.doubleToLongBits(other.getDoubleValue())) return false; break; case 10: - result = result && getTimestampValue().equals(other.getTimestampValue()); + if (!getTimestampValue().equals(other.getTimestampValue())) return false; break; case 5: - result = result && getKeyValue().equals(other.getKeyValue()); + if (!getKeyValue().equals(other.getKeyValue())) return false; break; case 17: - result = result && getStringValue().equals(other.getStringValue()); + if (!getStringValue().equals(other.getStringValue())) return false; break; case 18: - result = result && getBlobValue().equals(other.getBlobValue()); + if (!getBlobValue().equals(other.getBlobValue())) return false; break; case 8: - result = result && getGeoPointValue().equals(other.getGeoPointValue()); + if (!getGeoPointValue().equals(other.getGeoPointValue())) return false; break; case 6: - result = result && getEntityValue().equals(other.getEntityValue()); + if (!getEntityValue().equals(other.getEntityValue())) return false; break; case 9: - result = result && getArrayValue().equals(other.getArrayValue()); + if (!getArrayValue().equals(other.getArrayValue())) 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 @@ -1195,35 +1188,35 @@ public com.google.datastore.v1.Value 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 @@ -2903,7 +2896,7 @@ public Builder clearExcludeFromIndexes() { @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-datastore/synth.metadata b/google-cloud-clients/google-cloud-datastore/synth.metadata index a13b8f3a5a89..3cbb7394ce32 100644 --- a/google-cloud-clients/google-cloud-datastore/synth.metadata +++ b/google-cloud-clients/google-cloud-datastore/synth.metadata @@ -1,19 +1,19 @@ { - "updateTime": "2019-02-26T08:39:53.042326Z", + "updateTime": "2019-03-29T07:41:19.868162Z", "sources": [ { "generator": { "name": "artman", - "version": "0.16.14", - "dockerImage": "googleapis/artman@sha256:f3d61ae45abaeefb6be5f228cda22732c2f1b00fb687c79c4bd4f2c42bb1e1a7" + "version": "0.16.21", + "dockerImage": "googleapis/artman@sha256:854131ec1af7b3a313253474c24748dc0acd217a58a0b74dbfb559f340a15d78" } }, { "git": { "name": "googleapis", "remote": "https://github.com/googleapis/googleapis.git", - "sha": "29f098cb03a9983cc9cb15993de5da64419046f2", - "internalRef": "235621085" + "sha": "37386f1ebcaed51bcb7d15d00124d22c38606e45", + "internalRef": "240841842" } } ],