diff --git a/google-api-grpc/proto-google-cloud-kms-v1/src/main/java/com/google/cloud/kms/v1/AsymmetricDecryptRequest.java b/google-api-grpc/proto-google-cloud-kms-v1/src/main/java/com/google/cloud/kms/v1/AsymmetricDecryptRequest.java index a9e2d9849de9..8e9c799bdb1b 100644 --- a/google-api-grpc/proto-google-cloud-kms-v1/src/main/java/com/google/cloud/kms/v1/AsymmetricDecryptRequest.java +++ b/google-api-grpc/proto-google-cloud-kms-v1/src/main/java/com/google/cloud/kms/v1/AsymmetricDecryptRequest.java @@ -66,7 +66,7 @@ private AsymmetricDecryptRequest( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -213,11 +213,10 @@ public boolean equals(final java.lang.Object obj) { com.google.cloud.kms.v1.AsymmetricDecryptRequest other = (com.google.cloud.kms.v1.AsymmetricDecryptRequest) obj; - boolean result = true; - result = result && getName().equals(other.getName()); - result = result && getCiphertext().equals(other.getCiphertext()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getName().equals(other.getName())) return false; + if (!getCiphertext().equals(other.getCiphertext())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -416,35 +415,35 @@ public com.google.cloud.kms.v1.AsymmetricDecryptRequest 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 @@ -655,7 +654,7 @@ public Builder clearCiphertext() { @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-kms-v1/src/main/java/com/google/cloud/kms/v1/AsymmetricDecryptResponse.java b/google-api-grpc/proto-google-cloud-kms-v1/src/main/java/com/google/cloud/kms/v1/AsymmetricDecryptResponse.java index 51586312ce41..271a7b1fb1cb 100644 --- a/google-api-grpc/proto-google-cloud-kms-v1/src/main/java/com/google/cloud/kms/v1/AsymmetricDecryptResponse.java +++ b/google-api-grpc/proto-google-cloud-kms-v1/src/main/java/com/google/cloud/kms/v1/AsymmetricDecryptResponse.java @@ -58,7 +58,7 @@ private AsymmetricDecryptResponse( } 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.cloud.kms.v1.AsymmetricDecryptResponse other = (com.google.cloud.kms.v1.AsymmetricDecryptResponse) obj; - boolean result = true; - result = result && getPlaintext().equals(other.getPlaintext()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getPlaintext().equals(other.getPlaintext())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -347,35 +346,35 @@ public com.google.cloud.kms.v1.AsymmetricDecryptResponse 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 @@ -473,7 +472,7 @@ public Builder clearPlaintext() { @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-kms-v1/src/main/java/com/google/cloud/kms/v1/AsymmetricSignRequest.java b/google-api-grpc/proto-google-cloud-kms-v1/src/main/java/com/google/cloud/kms/v1/AsymmetricSignRequest.java index 074ca9c2393f..156f6f90e5b9 100644 --- a/google-api-grpc/proto-google-cloud-kms-v1/src/main/java/com/google/cloud/kms/v1/AsymmetricSignRequest.java +++ b/google-api-grpc/proto-google-cloud-kms-v1/src/main/java/com/google/cloud/kms/v1/AsymmetricSignRequest.java @@ -75,7 +75,7 @@ private AsymmetricSignRequest( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -250,14 +250,13 @@ public boolean equals(final java.lang.Object obj) { com.google.cloud.kms.v1.AsymmetricSignRequest other = (com.google.cloud.kms.v1.AsymmetricSignRequest) obj; - boolean result = true; - result = result && getName().equals(other.getName()); - result = result && (hasDigest() == other.hasDigest()); + if (!getName().equals(other.getName())) return false; + if (hasDigest() != other.hasDigest()) return false; if (hasDigest()) { - result = result && getDigest().equals(other.getDigest()); + if (!getDigest().equals(other.getDigest())) return false; } - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -466,35 +465,35 @@ public com.google.cloud.kms.v1.AsymmetricSignRequest 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 @@ -649,7 +648,7 @@ public Builder setNameBytes(com.google.protobuf.ByteString value) { return this; } - private com.google.cloud.kms.v1.Digest digest_ = null; + private com.google.cloud.kms.v1.Digest digest_; private com.google.protobuf.SingleFieldBuilderV3< com.google.cloud.kms.v1.Digest, com.google.cloud.kms.v1.Digest.Builder, @@ -844,7 +843,7 @@ public com.google.cloud.kms.v1.DigestOrBuilder getDigestOrBuilder() { @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-kms-v1/src/main/java/com/google/cloud/kms/v1/AsymmetricSignResponse.java b/google-api-grpc/proto-google-cloud-kms-v1/src/main/java/com/google/cloud/kms/v1/AsymmetricSignResponse.java index 61f958348f09..15a2caeae1a3 100644 --- a/google-api-grpc/proto-google-cloud-kms-v1/src/main/java/com/google/cloud/kms/v1/AsymmetricSignResponse.java +++ b/google-api-grpc/proto-google-cloud-kms-v1/src/main/java/com/google/cloud/kms/v1/AsymmetricSignResponse.java @@ -58,7 +58,7 @@ private AsymmetricSignResponse( } 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.cloud.kms.v1.AsymmetricSignResponse other = (com.google.cloud.kms.v1.AsymmetricSignResponse) obj; - boolean result = true; - result = result && getSignature().equals(other.getSignature()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getSignature().equals(other.getSignature())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -347,35 +346,35 @@ public com.google.cloud.kms.v1.AsymmetricSignResponse 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 @@ -471,7 +470,7 @@ public Builder clearSignature() { @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-kms-v1/src/main/java/com/google/cloud/kms/v1/CreateCryptoKeyRequest.java b/google-api-grpc/proto-google-cloud-kms-v1/src/main/java/com/google/cloud/kms/v1/CreateCryptoKeyRequest.java index 52fb86878a94..972417f0d4d3 100644 --- a/google-api-grpc/proto-google-cloud-kms-v1/src/main/java/com/google/cloud/kms/v1/CreateCryptoKeyRequest.java +++ b/google-api-grpc/proto-google-cloud-kms-v1/src/main/java/com/google/cloud/kms/v1/CreateCryptoKeyRequest.java @@ -83,7 +83,7 @@ private CreateCryptoKeyRequest( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -301,15 +301,14 @@ public boolean equals(final java.lang.Object obj) { com.google.cloud.kms.v1.CreateCryptoKeyRequest other = (com.google.cloud.kms.v1.CreateCryptoKeyRequest) obj; - boolean result = true; - result = result && getParent().equals(other.getParent()); - result = result && getCryptoKeyId().equals(other.getCryptoKeyId()); - result = result && (hasCryptoKey() == other.hasCryptoKey()); + if (!getParent().equals(other.getParent())) return false; + if (!getCryptoKeyId().equals(other.getCryptoKeyId())) return false; + if (hasCryptoKey() != other.hasCryptoKey()) return false; if (hasCryptoKey()) { - result = result && getCryptoKey().equals(other.getCryptoKey()); + if (!getCryptoKey().equals(other.getCryptoKey())) return false; } - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -523,35 +522,35 @@ public com.google.cloud.kms.v1.CreateCryptoKeyRequest 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 @@ -804,7 +803,7 @@ public Builder setCryptoKeyIdBytes(com.google.protobuf.ByteString value) { return this; } - private com.google.cloud.kms.v1.CryptoKey cryptoKey_ = null; + private com.google.cloud.kms.v1.CryptoKey cryptoKey_; private com.google.protobuf.SingleFieldBuilderV3< com.google.cloud.kms.v1.CryptoKey, com.google.cloud.kms.v1.CryptoKey.Builder, @@ -987,7 +986,7 @@ public com.google.cloud.kms.v1.CryptoKeyOrBuilder getCryptoKeyOrBuilder() { @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-kms-v1/src/main/java/com/google/cloud/kms/v1/CreateCryptoKeyVersionRequest.java b/google-api-grpc/proto-google-cloud-kms-v1/src/main/java/com/google/cloud/kms/v1/CreateCryptoKeyVersionRequest.java index 40b99634e543..34a9e673fdea 100644 --- a/google-api-grpc/proto-google-cloud-kms-v1/src/main/java/com/google/cloud/kms/v1/CreateCryptoKeyVersionRequest.java +++ b/google-api-grpc/proto-google-cloud-kms-v1/src/main/java/com/google/cloud/kms/v1/CreateCryptoKeyVersionRequest.java @@ -76,7 +76,7 @@ private CreateCryptoKeyVersionRequest( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -250,14 +250,13 @@ public boolean equals(final java.lang.Object obj) { com.google.cloud.kms.v1.CreateCryptoKeyVersionRequest other = (com.google.cloud.kms.v1.CreateCryptoKeyVersionRequest) obj; - boolean result = true; - result = result && getParent().equals(other.getParent()); - result = result && (hasCryptoKeyVersion() == other.hasCryptoKeyVersion()); + if (!getParent().equals(other.getParent())) return false; + if (hasCryptoKeyVersion() != other.hasCryptoKeyVersion()) return false; if (hasCryptoKeyVersion()) { - result = result && getCryptoKeyVersion().equals(other.getCryptoKeyVersion()); + if (!getCryptoKeyVersion().equals(other.getCryptoKeyVersion())) return false; } - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -467,35 +466,35 @@ public com.google.cloud.kms.v1.CreateCryptoKeyVersionRequest 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 @@ -652,7 +651,7 @@ public Builder setParentBytes(com.google.protobuf.ByteString value) { return this; } - private com.google.cloud.kms.v1.CryptoKeyVersion cryptoKeyVersion_ = null; + private com.google.cloud.kms.v1.CryptoKeyVersion cryptoKeyVersion_; private com.google.protobuf.SingleFieldBuilderV3< com.google.cloud.kms.v1.CryptoKeyVersion, com.google.cloud.kms.v1.CryptoKeyVersion.Builder, @@ -845,7 +844,7 @@ public com.google.cloud.kms.v1.CryptoKeyVersionOrBuilder getCryptoKeyVersionOrBu @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-kms-v1/src/main/java/com/google/cloud/kms/v1/CreateKeyRingRequest.java b/google-api-grpc/proto-google-cloud-kms-v1/src/main/java/com/google/cloud/kms/v1/CreateKeyRingRequest.java index 17a1acd3381a..d9a9b5f96d9a 100644 --- a/google-api-grpc/proto-google-cloud-kms-v1/src/main/java/com/google/cloud/kms/v1/CreateKeyRingRequest.java +++ b/google-api-grpc/proto-google-cloud-kms-v1/src/main/java/com/google/cloud/kms/v1/CreateKeyRingRequest.java @@ -83,7 +83,7 @@ private CreateKeyRingRequest( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -303,15 +303,14 @@ public boolean equals(final java.lang.Object obj) { com.google.cloud.kms.v1.CreateKeyRingRequest other = (com.google.cloud.kms.v1.CreateKeyRingRequest) obj; - boolean result = true; - result = result && getParent().equals(other.getParent()); - result = result && getKeyRingId().equals(other.getKeyRingId()); - result = result && (hasKeyRing() == other.hasKeyRing()); + if (!getParent().equals(other.getParent())) return false; + if (!getKeyRingId().equals(other.getKeyRingId())) return false; + if (hasKeyRing() != other.hasKeyRing()) return false; if (hasKeyRing()) { - result = result && getKeyRing().equals(other.getKeyRing()); + if (!getKeyRing().equals(other.getKeyRing())) return false; } - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -525,35 +524,35 @@ public com.google.cloud.kms.v1.CreateKeyRingRequest buildPartial() { @java.lang.Override public Builder clone() { - return (Builder) super.clone(); + return super.clone(); } @java.lang.Override public Builder setField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.setField(field, value); + return super.setField(field, value); } @java.lang.Override public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) { - return (Builder) super.clearField(field); + return super.clearField(field); } @java.lang.Override public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) { - return (Builder) super.clearOneof(oneof); + return super.clearOneof(oneof); } @java.lang.Override public Builder setRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) { - return (Builder) super.setRepeatedField(field, index, value); + return super.setRepeatedField(field, index, value); } @java.lang.Override public Builder addRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.addRepeatedField(field, value); + return super.addRepeatedField(field, value); } @java.lang.Override @@ -811,7 +810,7 @@ public Builder setKeyRingIdBytes(com.google.protobuf.ByteString value) { return this; } - private com.google.cloud.kms.v1.KeyRing keyRing_ = null; + private com.google.cloud.kms.v1.KeyRing keyRing_; private com.google.protobuf.SingleFieldBuilderV3< com.google.cloud.kms.v1.KeyRing, com.google.cloud.kms.v1.KeyRing.Builder, @@ -988,7 +987,7 @@ public com.google.cloud.kms.v1.KeyRingOrBuilder getKeyRingOrBuilder() { @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-kms-v1/src/main/java/com/google/cloud/kms/v1/CryptoKey.java b/google-api-grpc/proto-google-cloud-kms-v1/src/main/java/com/google/cloud/kms/v1/CryptoKey.java index e4eb8fe2d26f..70e759e511c2 100644 --- a/google-api-grpc/proto-google-cloud-kms-v1/src/main/java/com/google/cloud/kms/v1/CryptoKey.java +++ b/google-api-grpc/proto-google-cloud-kms-v1/src/main/java/com/google/cloud/kms/v1/CryptoKey.java @@ -132,7 +132,7 @@ private CryptoKey( } case 82: { - if (!((mutable_bitField0_ & 0x00000080) == 0x00000080)) { + if (!((mutable_bitField0_ & 0x00000080) != 0)) { labels_ = com.google.protobuf.MapField.newMapField(LabelsDefaultEntryHolder.defaultEntry); mutable_bitField0_ |= 0x00000080; @@ -161,7 +161,7 @@ private CryptoKey( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -1025,37 +1025,35 @@ public boolean equals(final java.lang.Object obj) { } com.google.cloud.kms.v1.CryptoKey other = (com.google.cloud.kms.v1.CryptoKey) obj; - boolean result = true; - result = result && getName().equals(other.getName()); - result = result && (hasPrimary() == other.hasPrimary()); + if (!getName().equals(other.getName())) return false; + if (hasPrimary() != other.hasPrimary()) return false; if (hasPrimary()) { - result = result && getPrimary().equals(other.getPrimary()); + if (!getPrimary().equals(other.getPrimary())) return false; } - result = result && purpose_ == other.purpose_; - result = result && (hasCreateTime() == other.hasCreateTime()); + if (purpose_ != other.purpose_) return false; + if (hasCreateTime() != other.hasCreateTime()) return false; if (hasCreateTime()) { - result = result && getCreateTime().equals(other.getCreateTime()); + if (!getCreateTime().equals(other.getCreateTime())) return false; } - result = result && (hasNextRotationTime() == other.hasNextRotationTime()); + if (hasNextRotationTime() != other.hasNextRotationTime()) return false; if (hasNextRotationTime()) { - result = result && getNextRotationTime().equals(other.getNextRotationTime()); + if (!getNextRotationTime().equals(other.getNextRotationTime())) return false; } - result = result && (hasVersionTemplate() == other.hasVersionTemplate()); + if (hasVersionTemplate() != other.hasVersionTemplate()) return false; if (hasVersionTemplate()) { - result = result && getVersionTemplate().equals(other.getVersionTemplate()); + if (!getVersionTemplate().equals(other.getVersionTemplate())) return false; } - result = result && internalGetLabels().equals(other.internalGetLabels()); - result = result && getRotationScheduleCase().equals(other.getRotationScheduleCase()); - if (!result) return false; + if (!internalGetLabels().equals(other.internalGetLabels())) return false; + if (!getRotationScheduleCase().equals(other.getRotationScheduleCase())) return false; switch (rotationScheduleCase_) { case 8: - result = result && getRotationPeriod().equals(other.getRotationPeriod()); + if (!getRotationPeriod().equals(other.getRotationPeriod())) 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 @@ -1363,35 +1361,35 @@ public com.google.cloud.kms.v1.CryptoKey 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 @@ -1586,7 +1584,7 @@ public Builder setNameBytes(com.google.protobuf.ByteString value) { return this; } - private com.google.cloud.kms.v1.CryptoKeyVersion primary_ = null; + private com.google.cloud.kms.v1.CryptoKeyVersion primary_; private com.google.protobuf.SingleFieldBuilderV3< com.google.cloud.kms.v1.CryptoKeyVersion, com.google.cloud.kms.v1.CryptoKeyVersion.Builder, @@ -1935,7 +1933,7 @@ public Builder clearPurpose() { return this; } - private com.google.protobuf.Timestamp createTime_ = null; + private com.google.protobuf.Timestamp createTime_; private com.google.protobuf.SingleFieldBuilderV3< com.google.protobuf.Timestamp, com.google.protobuf.Timestamp.Builder, @@ -2123,7 +2121,7 @@ public com.google.protobuf.TimestampOrBuilder getCreateTimeOrBuilder() { return createTimeBuilder_; } - private com.google.protobuf.Timestamp nextRotationTime_ = null; + private com.google.protobuf.Timestamp nextRotationTime_; private com.google.protobuf.SingleFieldBuilderV3< com.google.protobuf.Timestamp, com.google.protobuf.Timestamp.Builder, @@ -2694,7 +2692,7 @@ public com.google.protobuf.DurationOrBuilder getRotationPeriodOrBuilder() { return rotationPeriodBuilder_; } - private com.google.cloud.kms.v1.CryptoKeyVersionTemplate versionTemplate_ = null; + private com.google.cloud.kms.v1.CryptoKeyVersionTemplate versionTemplate_; private com.google.protobuf.SingleFieldBuilderV3< com.google.cloud.kms.v1.CryptoKeyVersionTemplate, com.google.cloud.kms.v1.CryptoKeyVersionTemplate.Builder, @@ -3082,7 +3080,7 @@ public Builder putAllLabels(java.util.Map va @java.lang.Override public final Builder setUnknownFields(final com.google.protobuf.UnknownFieldSet unknownFields) { - return super.setUnknownFieldsProto3(unknownFields); + return super.setUnknownFields(unknownFields); } @java.lang.Override diff --git a/google-api-grpc/proto-google-cloud-kms-v1/src/main/java/com/google/cloud/kms/v1/CryptoKeyVersion.java b/google-api-grpc/proto-google-cloud-kms-v1/src/main/java/com/google/cloud/kms/v1/CryptoKeyVersion.java index f90832c258a0..a41733bdb52f 100644 --- a/google-api-grpc/proto-google-cloud-kms-v1/src/main/java/com/google/cloud/kms/v1/CryptoKeyVersion.java +++ b/google-api-grpc/proto-google-cloud-kms-v1/src/main/java/com/google/cloud/kms/v1/CryptoKeyVersion.java @@ -167,7 +167,7 @@ private CryptoKeyVersion( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -1477,33 +1477,32 @@ public boolean equals(final java.lang.Object obj) { } com.google.cloud.kms.v1.CryptoKeyVersion other = (com.google.cloud.kms.v1.CryptoKeyVersion) obj; - boolean result = true; - result = result && getName().equals(other.getName()); - result = result && state_ == other.state_; - result = result && protectionLevel_ == other.protectionLevel_; - result = result && algorithm_ == other.algorithm_; - result = result && (hasAttestation() == other.hasAttestation()); + if (!getName().equals(other.getName())) return false; + if (state_ != other.state_) return false; + if (protectionLevel_ != other.protectionLevel_) return false; + if (algorithm_ != other.algorithm_) return false; + if (hasAttestation() != other.hasAttestation()) return false; if (hasAttestation()) { - result = result && getAttestation().equals(other.getAttestation()); + if (!getAttestation().equals(other.getAttestation())) return false; } - result = result && (hasCreateTime() == other.hasCreateTime()); + if (hasCreateTime() != other.hasCreateTime()) return false; if (hasCreateTime()) { - result = result && getCreateTime().equals(other.getCreateTime()); + if (!getCreateTime().equals(other.getCreateTime())) return false; } - result = result && (hasGenerateTime() == other.hasGenerateTime()); + if (hasGenerateTime() != other.hasGenerateTime()) return false; if (hasGenerateTime()) { - result = result && getGenerateTime().equals(other.getGenerateTime()); + if (!getGenerateTime().equals(other.getGenerateTime())) return false; } - result = result && (hasDestroyTime() == other.hasDestroyTime()); + if (hasDestroyTime() != other.hasDestroyTime()) return false; if (hasDestroyTime()) { - result = result && getDestroyTime().equals(other.getDestroyTime()); + if (!getDestroyTime().equals(other.getDestroyTime())) return false; } - result = result && (hasDestroyEventTime() == other.hasDestroyEventTime()); + if (hasDestroyEventTime() != other.hasDestroyEventTime()) return false; if (hasDestroyEventTime()) { - result = result && getDestroyEventTime().equals(other.getDestroyEventTime()); + if (!getDestroyEventTime().equals(other.getDestroyEventTime())) return false; } - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -1794,35 +1793,35 @@ public com.google.cloud.kms.v1.CryptoKeyVersion 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 @@ -2261,7 +2260,7 @@ public Builder clearAlgorithm() { return this; } - private com.google.cloud.kms.v1.KeyOperationAttestation attestation_ = null; + private com.google.cloud.kms.v1.KeyOperationAttestation attestation_; private com.google.protobuf.SingleFieldBuilderV3< com.google.cloud.kms.v1.KeyOperationAttestation, com.google.cloud.kms.v1.KeyOperationAttestation.Builder, @@ -2479,7 +2478,7 @@ public com.google.cloud.kms.v1.KeyOperationAttestationOrBuilder getAttestationOr return attestationBuilder_; } - private com.google.protobuf.Timestamp createTime_ = null; + private com.google.protobuf.Timestamp createTime_; private com.google.protobuf.SingleFieldBuilderV3< com.google.protobuf.Timestamp, com.google.protobuf.Timestamp.Builder, @@ -2667,7 +2666,7 @@ public com.google.protobuf.TimestampOrBuilder getCreateTimeOrBuilder() { return createTimeBuilder_; } - private com.google.protobuf.Timestamp generateTime_ = null; + private com.google.protobuf.Timestamp generateTime_; private com.google.protobuf.SingleFieldBuilderV3< com.google.protobuf.Timestamp, com.google.protobuf.Timestamp.Builder, @@ -2866,7 +2865,7 @@ public com.google.protobuf.TimestampOrBuilder getGenerateTimeOrBuilder() { return generateTimeBuilder_; } - private com.google.protobuf.Timestamp destroyTime_ = null; + private com.google.protobuf.Timestamp destroyTime_; private com.google.protobuf.SingleFieldBuilderV3< com.google.protobuf.Timestamp, com.google.protobuf.Timestamp.Builder, @@ -3083,7 +3082,7 @@ public com.google.protobuf.TimestampOrBuilder getDestroyTimeOrBuilder() { return destroyTimeBuilder_; } - private com.google.protobuf.Timestamp destroyEventTime_ = null; + private com.google.protobuf.Timestamp destroyEventTime_; private com.google.protobuf.SingleFieldBuilderV3< com.google.protobuf.Timestamp, com.google.protobuf.Timestamp.Builder, @@ -3293,7 +3292,7 @@ public com.google.protobuf.TimestampOrBuilder getDestroyEventTimeOrBuilder() { @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-kms-v1/src/main/java/com/google/cloud/kms/v1/CryptoKeyVersionTemplate.java b/google-api-grpc/proto-google-cloud-kms-v1/src/main/java/com/google/cloud/kms/v1/CryptoKeyVersionTemplate.java index d95873a75d21..7b34f2422d4f 100644 --- a/google-api-grpc/proto-google-cloud-kms-v1/src/main/java/com/google/cloud/kms/v1/CryptoKeyVersionTemplate.java +++ b/google-api-grpc/proto-google-cloud-kms-v1/src/main/java/com/google/cloud/kms/v1/CryptoKeyVersionTemplate.java @@ -72,7 +72,7 @@ private CryptoKeyVersionTemplate( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -247,11 +247,10 @@ public boolean equals(final java.lang.Object obj) { com.google.cloud.kms.v1.CryptoKeyVersionTemplate other = (com.google.cloud.kms.v1.CryptoKeyVersionTemplate) obj; - boolean result = true; - result = result && protectionLevel_ == other.protectionLevel_; - result = result && algorithm_ == other.algorithm_; - result = result && unknownFields.equals(other.unknownFields); - return result; + if (protectionLevel_ != other.protectionLevel_) return false; + if (algorithm_ != other.algorithm_) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -454,35 +453,35 @@ public com.google.cloud.kms.v1.CryptoKeyVersionTemplate 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 @@ -745,7 +744,7 @@ public Builder clearAlgorithm() { @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-kms-v1/src/main/java/com/google/cloud/kms/v1/DecryptRequest.java b/google-api-grpc/proto-google-cloud-kms-v1/src/main/java/com/google/cloud/kms/v1/DecryptRequest.java index b2f5fa66cb5a..ae7d6529ee4e 100644 --- a/google-api-grpc/proto-google-cloud-kms-v1/src/main/java/com/google/cloud/kms/v1/DecryptRequest.java +++ b/google-api-grpc/proto-google-cloud-kms-v1/src/main/java/com/google/cloud/kms/v1/DecryptRequest.java @@ -72,7 +72,7 @@ private DecryptRequest( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -240,13 +240,12 @@ public boolean equals(final java.lang.Object obj) { } com.google.cloud.kms.v1.DecryptRequest other = (com.google.cloud.kms.v1.DecryptRequest) obj; - boolean result = true; - result = result && getName().equals(other.getName()); - result = result && getCiphertext().equals(other.getCiphertext()); - result = - result && getAdditionalAuthenticatedData().equals(other.getAdditionalAuthenticatedData()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getName().equals(other.getName())) return false; + if (!getCiphertext().equals(other.getCiphertext())) return false; + if (!getAdditionalAuthenticatedData().equals(other.getAdditionalAuthenticatedData())) + return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -450,35 +449,35 @@ public com.google.cloud.kms.v1.DecryptRequest 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 @@ -739,7 +738,7 @@ public Builder clearAdditionalAuthenticatedData() { @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-kms-v1/src/main/java/com/google/cloud/kms/v1/DecryptResponse.java b/google-api-grpc/proto-google-cloud-kms-v1/src/main/java/com/google/cloud/kms/v1/DecryptResponse.java index c1b3251d9a42..9660cb063c08 100644 --- a/google-api-grpc/proto-google-cloud-kms-v1/src/main/java/com/google/cloud/kms/v1/DecryptResponse.java +++ b/google-api-grpc/proto-google-cloud-kms-v1/src/main/java/com/google/cloud/kms/v1/DecryptResponse.java @@ -58,7 +58,7 @@ private DecryptResponse( } 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.cloud.kms.v1.DecryptResponse other = (com.google.cloud.kms.v1.DecryptResponse) obj; - boolean result = true; - result = result && getPlaintext().equals(other.getPlaintext()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getPlaintext().equals(other.getPlaintext())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -347,35 +346,35 @@ public com.google.cloud.kms.v1.DecryptResponse 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 @@ -474,7 +473,7 @@ public Builder clearPlaintext() { @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-kms-v1/src/main/java/com/google/cloud/kms/v1/DestroyCryptoKeyVersionRequest.java b/google-api-grpc/proto-google-cloud-kms-v1/src/main/java/com/google/cloud/kms/v1/DestroyCryptoKeyVersionRequest.java index cdbabd028342..17eec69b9ac0 100644 --- a/google-api-grpc/proto-google-cloud-kms-v1/src/main/java/com/google/cloud/kms/v1/DestroyCryptoKeyVersionRequest.java +++ b/google-api-grpc/proto-google-cloud-kms-v1/src/main/java/com/google/cloud/kms/v1/DestroyCryptoKeyVersionRequest.java @@ -61,7 +61,7 @@ private DestroyCryptoKeyVersionRequest( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -183,10 +183,9 @@ public boolean equals(final java.lang.Object obj) { com.google.cloud.kms.v1.DestroyCryptoKeyVersionRequest other = (com.google.cloud.kms.v1.DestroyCryptoKeyVersionRequest) 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 @@ -381,35 +380,35 @@ public com.google.cloud.kms.v1.DestroyCryptoKeyVersionRequest buildPartial() { @java.lang.Override public Builder clone() { - return (Builder) super.clone(); + return super.clone(); } @java.lang.Override public Builder setField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.setField(field, value); + return super.setField(field, value); } @java.lang.Override public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) { - return (Builder) super.clearField(field); + return super.clearField(field); } @java.lang.Override public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) { - return (Builder) super.clearOneof(oneof); + return super.clearOneof(oneof); } @java.lang.Override public Builder setRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) { - return (Builder) super.setRepeatedField(field, index, value); + return super.setRepeatedField(field, index, value); } @java.lang.Override public Builder addRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.addRepeatedField(field, value); + return super.addRepeatedField(field, value); } @java.lang.Override @@ -560,7 +559,7 @@ public Builder 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-kms-v1/src/main/java/com/google/cloud/kms/v1/Digest.java b/google-api-grpc/proto-google-cloud-kms-v1/src/main/java/com/google/cloud/kms/v1/Digest.java index 73bbaae4dffd..d26d0ba92eb2 100644 --- a/google-api-grpc/proto-google-cloud-kms-v1/src/main/java/com/google/cloud/kms/v1/Digest.java +++ b/google-api-grpc/proto-google-cloud-kms-v1/src/main/java/com/google/cloud/kms/v1/Digest.java @@ -68,7 +68,7 @@ private Digest( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -254,24 +254,22 @@ public boolean equals(final java.lang.Object obj) { } com.google.cloud.kms.v1.Digest other = (com.google.cloud.kms.v1.Digest) obj; - boolean result = true; - result = result && getDigestCase().equals(other.getDigestCase()); - if (!result) return false; + if (!getDigestCase().equals(other.getDigestCase())) return false; switch (digestCase_) { case 1: - result = result && getSha256().equals(other.getSha256()); + if (!getSha256().equals(other.getSha256())) return false; break; case 2: - result = result && getSha384().equals(other.getSha384()); + if (!getSha384().equals(other.getSha384())) return false; break; case 3: - result = result && getSha512().equals(other.getSha512()); + if (!getSha512().equals(other.getSha512())) 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 @@ -482,35 +480,35 @@ public com.google.cloud.kms.v1.Digest 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 @@ -744,7 +742,7 @@ public Builder clearSha512() { @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-kms-v1/src/main/java/com/google/cloud/kms/v1/EncryptRequest.java b/google-api-grpc/proto-google-cloud-kms-v1/src/main/java/com/google/cloud/kms/v1/EncryptRequest.java index 50ab202cb5aa..4aa88435ff96 100644 --- a/google-api-grpc/proto-google-cloud-kms-v1/src/main/java/com/google/cloud/kms/v1/EncryptRequest.java +++ b/google-api-grpc/proto-google-cloud-kms-v1/src/main/java/com/google/cloud/kms/v1/EncryptRequest.java @@ -72,7 +72,7 @@ private EncryptRequest( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -260,13 +260,12 @@ public boolean equals(final java.lang.Object obj) { } com.google.cloud.kms.v1.EncryptRequest other = (com.google.cloud.kms.v1.EncryptRequest) obj; - boolean result = true; - result = result && getName().equals(other.getName()); - result = result && getPlaintext().equals(other.getPlaintext()); - result = - result && getAdditionalAuthenticatedData().equals(other.getAdditionalAuthenticatedData()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getName().equals(other.getName())) return false; + if (!getPlaintext().equals(other.getPlaintext())) return false; + if (!getAdditionalAuthenticatedData().equals(other.getAdditionalAuthenticatedData())) + return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -470,35 +469,35 @@ public com.google.cloud.kms.v1.EncryptRequest 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 @@ -816,7 +815,7 @@ public Builder clearAdditionalAuthenticatedData() { @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-kms-v1/src/main/java/com/google/cloud/kms/v1/EncryptResponse.java b/google-api-grpc/proto-google-cloud-kms-v1/src/main/java/com/google/cloud/kms/v1/EncryptResponse.java index 01ded7dd8b9a..a73326ce3633 100644 --- a/google-api-grpc/proto-google-cloud-kms-v1/src/main/java/com/google/cloud/kms/v1/EncryptResponse.java +++ b/google-api-grpc/proto-google-cloud-kms-v1/src/main/java/com/google/cloud/kms/v1/EncryptResponse.java @@ -66,7 +66,7 @@ private EncryptResponse( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -210,11 +210,10 @@ public boolean equals(final java.lang.Object obj) { } com.google.cloud.kms.v1.EncryptResponse other = (com.google.cloud.kms.v1.EncryptResponse) obj; - boolean result = true; - result = result && getName().equals(other.getName()); - result = result && getCiphertext().equals(other.getCiphertext()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getName().equals(other.getName())) return false; + if (!getCiphertext().equals(other.getCiphertext())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -413,35 +412,35 @@ public com.google.cloud.kms.v1.EncryptResponse 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 @@ -645,7 +644,7 @@ public Builder clearCiphertext() { @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-kms-v1/src/main/java/com/google/cloud/kms/v1/GetCryptoKeyRequest.java b/google-api-grpc/proto-google-cloud-kms-v1/src/main/java/com/google/cloud/kms/v1/GetCryptoKeyRequest.java index d84e927158dc..f476c949ab7f 100644 --- a/google-api-grpc/proto-google-cloud-kms-v1/src/main/java/com/google/cloud/kms/v1/GetCryptoKeyRequest.java +++ b/google-api-grpc/proto-google-cloud-kms-v1/src/main/java/com/google/cloud/kms/v1/GetCryptoKeyRequest.java @@ -60,7 +60,7 @@ private GetCryptoKeyRequest( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -182,10 +182,9 @@ public boolean equals(final java.lang.Object obj) { com.google.cloud.kms.v1.GetCryptoKeyRequest other = (com.google.cloud.kms.v1.GetCryptoKeyRequest) 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 @@ -379,35 +378,35 @@ public com.google.cloud.kms.v1.GetCryptoKeyRequest buildPartial() { @java.lang.Override public Builder clone() { - return (Builder) super.clone(); + return super.clone(); } @java.lang.Override public Builder setField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.setField(field, value); + return super.setField(field, value); } @java.lang.Override public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) { - return (Builder) super.clearField(field); + return super.clearField(field); } @java.lang.Override public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) { - return (Builder) super.clearOneof(oneof); + return super.clearOneof(oneof); } @java.lang.Override public Builder setRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) { - return (Builder) super.setRepeatedField(field, index, value); + return super.setRepeatedField(field, index, value); } @java.lang.Override public Builder addRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.addRepeatedField(field, value); + return super.addRepeatedField(field, value); } @java.lang.Override @@ -556,7 +555,7 @@ public Builder 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-kms-v1/src/main/java/com/google/cloud/kms/v1/GetCryptoKeyVersionRequest.java b/google-api-grpc/proto-google-cloud-kms-v1/src/main/java/com/google/cloud/kms/v1/GetCryptoKeyVersionRequest.java index 3e7ca57dc3f8..999068855657 100644 --- a/google-api-grpc/proto-google-cloud-kms-v1/src/main/java/com/google/cloud/kms/v1/GetCryptoKeyVersionRequest.java +++ b/google-api-grpc/proto-google-cloud-kms-v1/src/main/java/com/google/cloud/kms/v1/GetCryptoKeyVersionRequest.java @@ -60,7 +60,7 @@ private GetCryptoKeyVersionRequest( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -182,10 +182,9 @@ public boolean equals(final java.lang.Object obj) { com.google.cloud.kms.v1.GetCryptoKeyVersionRequest other = (com.google.cloud.kms.v1.GetCryptoKeyVersionRequest) 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 @@ -379,35 +378,35 @@ public com.google.cloud.kms.v1.GetCryptoKeyVersionRequest 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 @@ -558,7 +557,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-kms-v1/src/main/java/com/google/cloud/kms/v1/GetKeyRingRequest.java b/google-api-grpc/proto-google-cloud-kms-v1/src/main/java/com/google/cloud/kms/v1/GetKeyRingRequest.java index 801ed49e7eea..d3d97b371fbd 100644 --- a/google-api-grpc/proto-google-cloud-kms-v1/src/main/java/com/google/cloud/kms/v1/GetKeyRingRequest.java +++ b/google-api-grpc/proto-google-cloud-kms-v1/src/main/java/com/google/cloud/kms/v1/GetKeyRingRequest.java @@ -60,7 +60,7 @@ private GetKeyRingRequest( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -182,10 +182,9 @@ public boolean equals(final java.lang.Object obj) { com.google.cloud.kms.v1.GetKeyRingRequest other = (com.google.cloud.kms.v1.GetKeyRingRequest) 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 @@ -379,35 +378,35 @@ public com.google.cloud.kms.v1.GetKeyRingRequest buildPartial() { @java.lang.Override public Builder clone() { - return (Builder) super.clone(); + return super.clone(); } @java.lang.Override public Builder setField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.setField(field, value); + return super.setField(field, value); } @java.lang.Override public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) { - return (Builder) super.clearField(field); + return super.clearField(field); } @java.lang.Override public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) { - return (Builder) super.clearOneof(oneof); + return super.clearOneof(oneof); } @java.lang.Override public Builder setRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) { - return (Builder) super.setRepeatedField(field, index, value); + return super.setRepeatedField(field, index, value); } @java.lang.Override public Builder addRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.addRepeatedField(field, value); + return super.addRepeatedField(field, value); } @java.lang.Override @@ -556,7 +555,7 @@ public Builder 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-kms-v1/src/main/java/com/google/cloud/kms/v1/GetPublicKeyRequest.java b/google-api-grpc/proto-google-cloud-kms-v1/src/main/java/com/google/cloud/kms/v1/GetPublicKeyRequest.java index e62811f33f1f..fb14c7a3d7f4 100644 --- a/google-api-grpc/proto-google-cloud-kms-v1/src/main/java/com/google/cloud/kms/v1/GetPublicKeyRequest.java +++ b/google-api-grpc/proto-google-cloud-kms-v1/src/main/java/com/google/cloud/kms/v1/GetPublicKeyRequest.java @@ -60,7 +60,7 @@ private GetPublicKeyRequest( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -182,10 +182,9 @@ public boolean equals(final java.lang.Object obj) { com.google.cloud.kms.v1.GetPublicKeyRequest other = (com.google.cloud.kms.v1.GetPublicKeyRequest) 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 @@ -379,35 +378,35 @@ public com.google.cloud.kms.v1.GetPublicKeyRequest buildPartial() { @java.lang.Override public Builder clone() { - return (Builder) super.clone(); + return super.clone(); } @java.lang.Override public Builder setField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.setField(field, value); + return super.setField(field, value); } @java.lang.Override public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) { - return (Builder) super.clearField(field); + return super.clearField(field); } @java.lang.Override public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) { - return (Builder) super.clearOneof(oneof); + return super.clearOneof(oneof); } @java.lang.Override public Builder setRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) { - return (Builder) super.setRepeatedField(field, index, value); + return super.setRepeatedField(field, index, value); } @java.lang.Override public Builder addRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.addRepeatedField(field, value); + return super.addRepeatedField(field, value); } @java.lang.Override @@ -556,7 +555,7 @@ public Builder 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-kms-v1/src/main/java/com/google/cloud/kms/v1/KeyOperationAttestation.java b/google-api-grpc/proto-google-cloud-kms-v1/src/main/java/com/google/cloud/kms/v1/KeyOperationAttestation.java index a2f9179d1cd5..fb7d79bc99a8 100644 --- a/google-api-grpc/proto-google-cloud-kms-v1/src/main/java/com/google/cloud/kms/v1/KeyOperationAttestation.java +++ b/google-api-grpc/proto-google-cloud-kms-v1/src/main/java/com/google/cloud/kms/v1/KeyOperationAttestation.java @@ -65,7 +65,7 @@ private KeyOperationAttestation( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -338,11 +338,10 @@ public boolean equals(final java.lang.Object obj) { com.google.cloud.kms.v1.KeyOperationAttestation other = (com.google.cloud.kms.v1.KeyOperationAttestation) obj; - boolean result = true; - result = result && format_ == other.format_; - result = result && getContent().equals(other.getContent()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (format_ != other.format_) return false; + if (!getContent().equals(other.getContent())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -540,35 +539,35 @@ public com.google.cloud.kms.v1.KeyOperationAttestation 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 @@ -750,7 +749,7 @@ public Builder clearContent() { @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-kms-v1/src/main/java/com/google/cloud/kms/v1/KeyRing.java b/google-api-grpc/proto-google-cloud-kms-v1/src/main/java/com/google/cloud/kms/v1/KeyRing.java index 06ca54117410..85766fe00bdb 100644 --- a/google-api-grpc/proto-google-cloud-kms-v1/src/main/java/com/google/cloud/kms/v1/KeyRing.java +++ b/google-api-grpc/proto-google-cloud-kms-v1/src/main/java/com/google/cloud/kms/v1/KeyRing.java @@ -75,7 +75,7 @@ private KeyRing( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -245,14 +245,13 @@ public boolean equals(final java.lang.Object obj) { } com.google.cloud.kms.v1.KeyRing other = (com.google.cloud.kms.v1.KeyRing) obj; - boolean result = true; - result = result && getName().equals(other.getName()); - result = result && (hasCreateTime() == other.hasCreateTime()); + if (!getName().equals(other.getName())) return false; + if (hasCreateTime() != other.hasCreateTime()) return false; if (hasCreateTime()) { - result = result && getCreateTime().equals(other.getCreateTime()); + if (!getCreateTime().equals(other.getCreateTime())) return false; } - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -458,35 +457,35 @@ public com.google.cloud.kms.v1.KeyRing 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 @@ -641,7 +640,7 @@ public Builder setNameBytes(com.google.protobuf.ByteString value) { return this; } - private com.google.protobuf.Timestamp createTime_ = null; + private com.google.protobuf.Timestamp createTime_; private com.google.protobuf.SingleFieldBuilderV3< com.google.protobuf.Timestamp, com.google.protobuf.Timestamp.Builder, @@ -831,7 +830,7 @@ public com.google.protobuf.TimestampOrBuilder getCreateTimeOrBuilder() { @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-kms-v1/src/main/java/com/google/cloud/kms/v1/ListCryptoKeyVersionsRequest.java b/google-api-grpc/proto-google-cloud-kms-v1/src/main/java/com/google/cloud/kms/v1/ListCryptoKeyVersionsRequest.java index 705dbc8f8546..199f7b355327 100644 --- a/google-api-grpc/proto-google-cloud-kms-v1/src/main/java/com/google/cloud/kms/v1/ListCryptoKeyVersionsRequest.java +++ b/google-api-grpc/proto-google-cloud-kms-v1/src/main/java/com/google/cloud/kms/v1/ListCryptoKeyVersionsRequest.java @@ -25,7 +25,6 @@ private ListCryptoKeyVersionsRequest(com.google.protobuf.GeneratedMessageV3.Buil private ListCryptoKeyVersionsRequest() { parent_ = ""; - pageSize_ = 0; pageToken_ = ""; view_ = 0; } @@ -82,7 +81,7 @@ private ListCryptoKeyVersionsRequest( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -328,13 +327,12 @@ public boolean equals(final java.lang.Object obj) { com.google.cloud.kms.v1.ListCryptoKeyVersionsRequest other = (com.google.cloud.kms.v1.ListCryptoKeyVersionsRequest) obj; - boolean result = true; - result = result && getParent().equals(other.getParent()); - result = result && (getPageSize() == other.getPageSize()); - result = result && getPageToken().equals(other.getPageToken()); - result = result && view_ == other.view_; - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getParent().equals(other.getParent())) return false; + if (getPageSize() != other.getPageSize()) return false; + if (!getPageToken().equals(other.getPageToken())) return false; + if (view_ != other.view_) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -543,35 +541,35 @@ public com.google.cloud.kms.v1.ListCryptoKeyVersionsRequest 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 @@ -976,7 +974,7 @@ public Builder clearView() { @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-kms-v1/src/main/java/com/google/cloud/kms/v1/ListCryptoKeyVersionsResponse.java b/google-api-grpc/proto-google-cloud-kms-v1/src/main/java/com/google/cloud/kms/v1/ListCryptoKeyVersionsResponse.java index 0c76b76243dd..9a470e6e8696 100644 --- a/google-api-grpc/proto-google-cloud-kms-v1/src/main/java/com/google/cloud/kms/v1/ListCryptoKeyVersionsResponse.java +++ b/google-api-grpc/proto-google-cloud-kms-v1/src/main/java/com/google/cloud/kms/v1/ListCryptoKeyVersionsResponse.java @@ -26,7 +26,6 @@ private ListCryptoKeyVersionsResponse(com.google.protobuf.GeneratedMessageV3.Bui private ListCryptoKeyVersionsResponse() { cryptoKeyVersions_ = java.util.Collections.emptyList(); nextPageToken_ = ""; - totalSize_ = 0; } @java.lang.Override @@ -55,7 +54,7 @@ private ListCryptoKeyVersionsResponse( break; case 10: { - if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) { + if (!((mutable_bitField0_ & 0x00000001) != 0)) { cryptoKeyVersions_ = new java.util.ArrayList(); mutable_bitField0_ |= 0x00000001; @@ -79,7 +78,7 @@ private ListCryptoKeyVersionsResponse( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -91,7 +90,7 @@ private ListCryptoKeyVersionsResponse( } 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)) { cryptoKeyVersions_ = java.util.Collections.unmodifiableList(cryptoKeyVersions_); } this.unknownFields = unknownFields.build(); @@ -302,12 +301,11 @@ public boolean equals(final java.lang.Object obj) { com.google.cloud.kms.v1.ListCryptoKeyVersionsResponse other = (com.google.cloud.kms.v1.ListCryptoKeyVersionsResponse) obj; - boolean result = true; - result = result && getCryptoKeyVersionsList().equals(other.getCryptoKeyVersionsList()); - result = result && getNextPageToken().equals(other.getNextPageToken()); - result = result && (getTotalSize() == other.getTotalSize()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getCryptoKeyVersionsList().equals(other.getCryptoKeyVersionsList())) return false; + if (!getNextPageToken().equals(other.getNextPageToken())) return false; + if (getTotalSize() != other.getTotalSize()) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -514,7 +512,7 @@ public com.google.cloud.kms.v1.ListCryptoKeyVersionsResponse buildPartial() { int from_bitField0_ = bitField0_; int to_bitField0_ = 0; if (cryptoKeyVersionsBuilder_ == null) { - if (((bitField0_ & 0x00000001) == 0x00000001)) { + if (((bitField0_ & 0x00000001) != 0)) { cryptoKeyVersions_ = java.util.Collections.unmodifiableList(cryptoKeyVersions_); bitField0_ = (bitField0_ & ~0x00000001); } @@ -531,35 +529,35 @@ public com.google.cloud.kms.v1.ListCryptoKeyVersionsResponse 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 @@ -645,7 +643,7 @@ public Builder mergeFrom( java.util.Collections.emptyList(); private void ensureCryptoKeyVersionsIsMutable() { - if (!((bitField0_ & 0x00000001) == 0x00000001)) { + if (!((bitField0_ & 0x00000001) != 0)) { cryptoKeyVersions_ = new java.util.ArrayList(cryptoKeyVersions_); bitField0_ |= 0x00000001; @@ -988,7 +986,7 @@ public com.google.cloud.kms.v1.CryptoKeyVersion.Builder addCryptoKeyVersionsBuil com.google.cloud.kms.v1.CryptoKeyVersion.Builder, com.google.cloud.kms.v1.CryptoKeyVersionOrBuilder>( cryptoKeyVersions_, - ((bitField0_ & 0x00000001) == 0x00000001), + ((bitField0_ & 0x00000001) != 0), getParentForChildren(), isClean()); cryptoKeyVersions_ = null; @@ -1152,7 +1150,7 @@ public Builder clearTotalSize() { @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-kms-v1/src/main/java/com/google/cloud/kms/v1/ListCryptoKeysRequest.java b/google-api-grpc/proto-google-cloud-kms-v1/src/main/java/com/google/cloud/kms/v1/ListCryptoKeysRequest.java index c29381b5a6ef..8b25ecd3ffce 100644 --- a/google-api-grpc/proto-google-cloud-kms-v1/src/main/java/com/google/cloud/kms/v1/ListCryptoKeysRequest.java +++ b/google-api-grpc/proto-google-cloud-kms-v1/src/main/java/com/google/cloud/kms/v1/ListCryptoKeysRequest.java @@ -25,7 +25,6 @@ private ListCryptoKeysRequest(com.google.protobuf.GeneratedMessageV3.Builder private ListCryptoKeysRequest() { parent_ = ""; - pageSize_ = 0; pageToken_ = ""; versionView_ = 0; } @@ -82,7 +81,7 @@ private ListCryptoKeysRequest( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -326,13 +325,12 @@ public boolean equals(final java.lang.Object obj) { com.google.cloud.kms.v1.ListCryptoKeysRequest other = (com.google.cloud.kms.v1.ListCryptoKeysRequest) obj; - boolean result = true; - result = result && getParent().equals(other.getParent()); - result = result && (getPageSize() == other.getPageSize()); - result = result && getPageToken().equals(other.getPageToken()); - result = result && versionView_ == other.versionView_; - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getParent().equals(other.getParent())) return false; + if (getPageSize() != other.getPageSize()) return false; + if (!getPageToken().equals(other.getPageToken())) return false; + if (versionView_ != other.versionView_) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -541,35 +539,35 @@ public com.google.cloud.kms.v1.ListCryptoKeysRequest 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 clearVersionView() { @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-kms-v1/src/main/java/com/google/cloud/kms/v1/ListCryptoKeysResponse.java b/google-api-grpc/proto-google-cloud-kms-v1/src/main/java/com/google/cloud/kms/v1/ListCryptoKeysResponse.java index 53432fff40ac..7280320102bc 100644 --- a/google-api-grpc/proto-google-cloud-kms-v1/src/main/java/com/google/cloud/kms/v1/ListCryptoKeysResponse.java +++ b/google-api-grpc/proto-google-cloud-kms-v1/src/main/java/com/google/cloud/kms/v1/ListCryptoKeysResponse.java @@ -26,7 +26,6 @@ private ListCryptoKeysResponse(com.google.protobuf.GeneratedMessageV3.Builder private ListCryptoKeysResponse() { cryptoKeys_ = java.util.Collections.emptyList(); nextPageToken_ = ""; - totalSize_ = 0; } @java.lang.Override @@ -55,7 +54,7 @@ private ListCryptoKeysResponse( break; case 10: { - if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) { + if (!((mutable_bitField0_ & 0x00000001) != 0)) { cryptoKeys_ = new java.util.ArrayList(); mutable_bitField0_ |= 0x00000001; } @@ -77,7 +76,7 @@ private ListCryptoKeysResponse( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -89,7 +88,7 @@ private ListCryptoKeysResponse( } 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)) { cryptoKeys_ = java.util.Collections.unmodifiableList(cryptoKeys_); } this.unknownFields = unknownFields.build(); @@ -297,12 +296,11 @@ public boolean equals(final java.lang.Object obj) { com.google.cloud.kms.v1.ListCryptoKeysResponse other = (com.google.cloud.kms.v1.ListCryptoKeysResponse) obj; - boolean result = true; - result = result && getCryptoKeysList().equals(other.getCryptoKeysList()); - result = result && getNextPageToken().equals(other.getNextPageToken()); - result = result && (getTotalSize() == other.getTotalSize()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getCryptoKeysList().equals(other.getCryptoKeysList())) return false; + if (!getNextPageToken().equals(other.getNextPageToken())) return false; + if (getTotalSize() != other.getTotalSize()) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -508,7 +506,7 @@ public com.google.cloud.kms.v1.ListCryptoKeysResponse buildPartial() { int from_bitField0_ = bitField0_; int to_bitField0_ = 0; if (cryptoKeysBuilder_ == null) { - if (((bitField0_ & 0x00000001) == 0x00000001)) { + if (((bitField0_ & 0x00000001) != 0)) { cryptoKeys_ = java.util.Collections.unmodifiableList(cryptoKeys_); bitField0_ = (bitField0_ & ~0x00000001); } @@ -525,35 +523,35 @@ public com.google.cloud.kms.v1.ListCryptoKeysResponse 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 @@ -637,7 +635,7 @@ public Builder mergeFrom( java.util.Collections.emptyList(); private void ensureCryptoKeysIsMutable() { - if (!((bitField0_ & 0x00000001) == 0x00000001)) { + if (!((bitField0_ & 0x00000001) != 0)) { cryptoKeys_ = new java.util.ArrayList(cryptoKeys_); bitField0_ |= 0x00000001; } @@ -975,10 +973,7 @@ public java.util.List getCryptoKeysBu com.google.cloud.kms.v1.CryptoKey, com.google.cloud.kms.v1.CryptoKey.Builder, com.google.cloud.kms.v1.CryptoKeyOrBuilder>( - cryptoKeys_, - ((bitField0_ & 0x00000001) == 0x00000001), - getParentForChildren(), - isClean()); + cryptoKeys_, ((bitField0_ & 0x00000001) != 0), getParentForChildren(), isClean()); cryptoKeys_ = null; } return cryptoKeysBuilder_; @@ -1137,7 +1132,7 @@ public Builder clearTotalSize() { @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-kms-v1/src/main/java/com/google/cloud/kms/v1/ListKeyRingsRequest.java b/google-api-grpc/proto-google-cloud-kms-v1/src/main/java/com/google/cloud/kms/v1/ListKeyRingsRequest.java index 7c0f94db4b22..aead4d368145 100644 --- a/google-api-grpc/proto-google-cloud-kms-v1/src/main/java/com/google/cloud/kms/v1/ListKeyRingsRequest.java +++ b/google-api-grpc/proto-google-cloud-kms-v1/src/main/java/com/google/cloud/kms/v1/ListKeyRingsRequest.java @@ -25,7 +25,6 @@ private ListKeyRingsRequest(com.google.protobuf.GeneratedMessageV3.Builder bu private ListKeyRingsRequest() { parent_ = ""; - pageSize_ = 0; pageToken_ = ""; } @@ -74,7 +73,7 @@ private ListKeyRingsRequest( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -275,12 +274,11 @@ public boolean equals(final java.lang.Object obj) { com.google.cloud.kms.v1.ListKeyRingsRequest other = (com.google.cloud.kms.v1.ListKeyRingsRequest) obj; - boolean result = true; - result = result && getParent().equals(other.getParent()); - result = result && (getPageSize() == other.getPageSize()); - result = result && getPageToken().equals(other.getPageToken()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getParent().equals(other.getParent())) return false; + if (getPageSize() != other.getPageSize()) return false; + if (!getPageToken().equals(other.getPageToken())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -484,35 +482,35 @@ public com.google.cloud.kms.v1.ListKeyRingsRequest 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 @@ -831,7 +829,7 @@ public Builder setPageTokenBytes(com.google.protobuf.ByteString value) { @java.lang.Override public final Builder setUnknownFields(final com.google.protobuf.UnknownFieldSet unknownFields) { - return super.setUnknownFieldsProto3(unknownFields); + return super.setUnknownFields(unknownFields); } @java.lang.Override diff --git a/google-api-grpc/proto-google-cloud-kms-v1/src/main/java/com/google/cloud/kms/v1/ListKeyRingsResponse.java b/google-api-grpc/proto-google-cloud-kms-v1/src/main/java/com/google/cloud/kms/v1/ListKeyRingsResponse.java index 8e138ac6f935..44f64bd0ee9c 100644 --- a/google-api-grpc/proto-google-cloud-kms-v1/src/main/java/com/google/cloud/kms/v1/ListKeyRingsResponse.java +++ b/google-api-grpc/proto-google-cloud-kms-v1/src/main/java/com/google/cloud/kms/v1/ListKeyRingsResponse.java @@ -26,7 +26,6 @@ private ListKeyRingsResponse(com.google.protobuf.GeneratedMessageV3.Builder b private ListKeyRingsResponse() { keyRings_ = java.util.Collections.emptyList(); nextPageToken_ = ""; - totalSize_ = 0; } @java.lang.Override @@ -55,7 +54,7 @@ private ListKeyRingsResponse( break; case 10: { - if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) { + if (!((mutable_bitField0_ & 0x00000001) != 0)) { keyRings_ = new java.util.ArrayList(); mutable_bitField0_ |= 0x00000001; } @@ -77,7 +76,7 @@ private ListKeyRingsResponse( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -89,7 +88,7 @@ private ListKeyRingsResponse( } 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)) { keyRings_ = java.util.Collections.unmodifiableList(keyRings_); } this.unknownFields = unknownFields.build(); @@ -297,12 +296,11 @@ public boolean equals(final java.lang.Object obj) { com.google.cloud.kms.v1.ListKeyRingsResponse other = (com.google.cloud.kms.v1.ListKeyRingsResponse) obj; - boolean result = true; - result = result && getKeyRingsList().equals(other.getKeyRingsList()); - result = result && getNextPageToken().equals(other.getNextPageToken()); - result = result && (getTotalSize() == other.getTotalSize()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getKeyRingsList().equals(other.getKeyRingsList())) return false; + if (!getNextPageToken().equals(other.getNextPageToken())) return false; + if (getTotalSize() != other.getTotalSize()) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -508,7 +506,7 @@ public com.google.cloud.kms.v1.ListKeyRingsResponse buildPartial() { int from_bitField0_ = bitField0_; int to_bitField0_ = 0; if (keyRingsBuilder_ == null) { - if (((bitField0_ & 0x00000001) == 0x00000001)) { + if (((bitField0_ & 0x00000001) != 0)) { keyRings_ = java.util.Collections.unmodifiableList(keyRings_); bitField0_ = (bitField0_ & ~0x00000001); } @@ -525,35 +523,35 @@ public com.google.cloud.kms.v1.ListKeyRingsResponse 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 @@ -637,7 +635,7 @@ public Builder mergeFrom( java.util.Collections.emptyList(); private void ensureKeyRingsIsMutable() { - if (!((bitField0_ & 0x00000001) == 0x00000001)) { + if (!((bitField0_ & 0x00000001) != 0)) { keyRings_ = new java.util.ArrayList(keyRings_); bitField0_ |= 0x00000001; } @@ -973,10 +971,7 @@ public java.util.List getKeyRingsBuilde com.google.cloud.kms.v1.KeyRing, com.google.cloud.kms.v1.KeyRing.Builder, com.google.cloud.kms.v1.KeyRingOrBuilder>( - keyRings_, - ((bitField0_ & 0x00000001) == 0x00000001), - getParentForChildren(), - isClean()); + keyRings_, ((bitField0_ & 0x00000001) != 0), getParentForChildren(), isClean()); keyRings_ = null; } return keyRingsBuilder_; @@ -1135,7 +1130,7 @@ public Builder clearTotalSize() { @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-kms-v1/src/main/java/com/google/cloud/kms/v1/LocationMetadata.java b/google-api-grpc/proto-google-cloud-kms-v1/src/main/java/com/google/cloud/kms/v1/LocationMetadata.java index 3d485926dc1b..b9be8f0d1894 100644 --- a/google-api-grpc/proto-google-cloud-kms-v1/src/main/java/com/google/cloud/kms/v1/LocationMetadata.java +++ b/google-api-grpc/proto-google-cloud-kms-v1/src/main/java/com/google/cloud/kms/v1/LocationMetadata.java @@ -23,9 +23,7 @@ private LocationMetadata(com.google.protobuf.GeneratedMessageV3.Builder build super(builder); } - private LocationMetadata() { - hsmAvailable_ = false; - } + private LocationMetadata() {} @java.lang.Override public final com.google.protobuf.UnknownFieldSet getUnknownFields() { @@ -58,7 +56,7 @@ private LocationMetadata( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -152,10 +150,9 @@ public boolean equals(final java.lang.Object obj) { } com.google.cloud.kms.v1.LocationMetadata other = (com.google.cloud.kms.v1.LocationMetadata) obj; - boolean result = true; - result = result && (getHsmAvailable() == other.getHsmAvailable()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (getHsmAvailable() != other.getHsmAvailable()) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -349,35 +346,35 @@ public com.google.cloud.kms.v1.LocationMetadata buildPartial() { @java.lang.Override public Builder clone() { - return (Builder) super.clone(); + return super.clone(); } @java.lang.Override public Builder setField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.setField(field, value); + return super.setField(field, value); } @java.lang.Override public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) { - return (Builder) super.clearField(field); + return super.clearField(field); } @java.lang.Override public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) { - return (Builder) super.clearOneof(oneof); + return super.clearOneof(oneof); } @java.lang.Override public Builder setRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) { - return (Builder) super.setRepeatedField(field, index, value); + return super.setRepeatedField(field, index, value); } @java.lang.Override public Builder addRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.addRepeatedField(field, value); + return super.addRepeatedField(field, value); } @java.lang.Override @@ -479,7 +476,7 @@ public Builder clearHsmAvailable() { @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-kms-v1/src/main/java/com/google/cloud/kms/v1/PublicKey.java b/google-api-grpc/proto-google-cloud-kms-v1/src/main/java/com/google/cloud/kms/v1/PublicKey.java index 1d2d17e0974a..04471e5f4648 100644 --- a/google-api-grpc/proto-google-cloud-kms-v1/src/main/java/com/google/cloud/kms/v1/PublicKey.java +++ b/google-api-grpc/proto-google-cloud-kms-v1/src/main/java/com/google/cloud/kms/v1/PublicKey.java @@ -69,7 +69,7 @@ private PublicKey( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -244,11 +244,10 @@ public boolean equals(final java.lang.Object obj) { } com.google.cloud.kms.v1.PublicKey other = (com.google.cloud.kms.v1.PublicKey) obj; - boolean result = true; - result = result && getPem().equals(other.getPem()); - result = result && algorithm_ == other.algorithm_; - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getPem().equals(other.getPem())) return false; + if (algorithm_ != other.algorithm_) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -446,35 +445,35 @@ public com.google.cloud.kms.v1.PublicKey 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 @@ -730,7 +729,7 @@ public Builder clearAlgorithm() { @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-kms-v1/src/main/java/com/google/cloud/kms/v1/RestoreCryptoKeyVersionRequest.java b/google-api-grpc/proto-google-cloud-kms-v1/src/main/java/com/google/cloud/kms/v1/RestoreCryptoKeyVersionRequest.java index 4b10ab99f227..8d941c920b90 100644 --- a/google-api-grpc/proto-google-cloud-kms-v1/src/main/java/com/google/cloud/kms/v1/RestoreCryptoKeyVersionRequest.java +++ b/google-api-grpc/proto-google-cloud-kms-v1/src/main/java/com/google/cloud/kms/v1/RestoreCryptoKeyVersionRequest.java @@ -61,7 +61,7 @@ private RestoreCryptoKeyVersionRequest( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -183,10 +183,9 @@ public boolean equals(final java.lang.Object obj) { com.google.cloud.kms.v1.RestoreCryptoKeyVersionRequest other = (com.google.cloud.kms.v1.RestoreCryptoKeyVersionRequest) 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 @@ -381,35 +380,35 @@ public com.google.cloud.kms.v1.RestoreCryptoKeyVersionRequest buildPartial() { @java.lang.Override public Builder clone() { - return (Builder) super.clone(); + return super.clone(); } @java.lang.Override public Builder setField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.setField(field, value); + return super.setField(field, value); } @java.lang.Override public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) { - return (Builder) super.clearField(field); + return super.clearField(field); } @java.lang.Override public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) { - return (Builder) super.clearOneof(oneof); + return super.clearOneof(oneof); } @java.lang.Override public Builder setRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) { - return (Builder) super.setRepeatedField(field, index, value); + return super.setRepeatedField(field, index, value); } @java.lang.Override public Builder addRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.addRepeatedField(field, value); + return super.addRepeatedField(field, value); } @java.lang.Override @@ -560,7 +559,7 @@ public Builder 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-kms-v1/src/main/java/com/google/cloud/kms/v1/UpdateCryptoKeyPrimaryVersionRequest.java b/google-api-grpc/proto-google-cloud-kms-v1/src/main/java/com/google/cloud/kms/v1/UpdateCryptoKeyPrimaryVersionRequest.java index c6e571b0df17..2d527bdf0faf 100644 --- a/google-api-grpc/proto-google-cloud-kms-v1/src/main/java/com/google/cloud/kms/v1/UpdateCryptoKeyPrimaryVersionRequest.java +++ b/google-api-grpc/proto-google-cloud-kms-v1/src/main/java/com/google/cloud/kms/v1/UpdateCryptoKeyPrimaryVersionRequest.java @@ -70,7 +70,7 @@ private UpdateCryptoKeyPrimaryVersionRequest( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -243,11 +243,10 @@ public boolean equals(final java.lang.Object obj) { com.google.cloud.kms.v1.UpdateCryptoKeyPrimaryVersionRequest other = (com.google.cloud.kms.v1.UpdateCryptoKeyPrimaryVersionRequest) obj; - boolean result = true; - result = result && getName().equals(other.getName()); - result = result && getCryptoKeyVersionId().equals(other.getCryptoKeyVersionId()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getName().equals(other.getName())) return false; + if (!getCryptoKeyVersionId().equals(other.getCryptoKeyVersionId())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -448,35 +447,35 @@ public com.google.cloud.kms.v1.UpdateCryptoKeyPrimaryVersionRequest 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 @@ -731,7 +730,7 @@ public Builder setCryptoKeyVersionIdBytes(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-kms-v1/src/main/java/com/google/cloud/kms/v1/UpdateCryptoKeyRequest.java b/google-api-grpc/proto-google-cloud-kms-v1/src/main/java/com/google/cloud/kms/v1/UpdateCryptoKeyRequest.java index 4561ec3c97a1..68b0b22a8f61 100644 --- a/google-api-grpc/proto-google-cloud-kms-v1/src/main/java/com/google/cloud/kms/v1/UpdateCryptoKeyRequest.java +++ b/google-api-grpc/proto-google-cloud-kms-v1/src/main/java/com/google/cloud/kms/v1/UpdateCryptoKeyRequest.java @@ -81,7 +81,7 @@ private UpdateCryptoKeyRequest( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -242,17 +242,16 @@ public boolean equals(final java.lang.Object obj) { com.google.cloud.kms.v1.UpdateCryptoKeyRequest other = (com.google.cloud.kms.v1.UpdateCryptoKeyRequest) obj; - boolean result = true; - result = result && (hasCryptoKey() == other.hasCryptoKey()); + if (hasCryptoKey() != other.hasCryptoKey()) return false; if (hasCryptoKey()) { - result = result && getCryptoKey().equals(other.getCryptoKey()); + if (!getCryptoKey().equals(other.getCryptoKey())) return false; } - result = result && (hasUpdateMask() == other.hasUpdateMask()); + if (hasUpdateMask() != other.hasUpdateMask()) return false; if (hasUpdateMask()) { - result = result && getUpdateMask().equals(other.getUpdateMask()); + if (!getUpdateMask().equals(other.getUpdateMask())) return false; } - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -471,35 +470,35 @@ public com.google.cloud.kms.v1.UpdateCryptoKeyRequest 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 @@ -549,7 +548,7 @@ public Builder mergeFrom( return this; } - private com.google.cloud.kms.v1.CryptoKey cryptoKey_ = null; + private com.google.cloud.kms.v1.CryptoKey cryptoKey_; private com.google.protobuf.SingleFieldBuilderV3< com.google.cloud.kms.v1.CryptoKey, com.google.cloud.kms.v1.CryptoKey.Builder, @@ -730,7 +729,7 @@ public com.google.cloud.kms.v1.CryptoKeyOrBuilder getCryptoKeyOrBuilder() { return cryptoKeyBuilder_; } - private com.google.protobuf.FieldMask updateMask_ = null; + private com.google.protobuf.FieldMask updateMask_; private com.google.protobuf.SingleFieldBuilderV3< com.google.protobuf.FieldMask, com.google.protobuf.FieldMask.Builder, @@ -911,7 +910,7 @@ public com.google.protobuf.FieldMaskOrBuilder getUpdateMaskOrBuilder() { @java.lang.Override public final Builder setUnknownFields(final com.google.protobuf.UnknownFieldSet unknownFields) { - return super.setUnknownFieldsProto3(unknownFields); + return super.setUnknownFields(unknownFields); } @java.lang.Override diff --git a/google-api-grpc/proto-google-cloud-kms-v1/src/main/java/com/google/cloud/kms/v1/UpdateCryptoKeyVersionRequest.java b/google-api-grpc/proto-google-cloud-kms-v1/src/main/java/com/google/cloud/kms/v1/UpdateCryptoKeyVersionRequest.java index 795e9bb7ca62..b92ebc511a87 100644 --- a/google-api-grpc/proto-google-cloud-kms-v1/src/main/java/com/google/cloud/kms/v1/UpdateCryptoKeyVersionRequest.java +++ b/google-api-grpc/proto-google-cloud-kms-v1/src/main/java/com/google/cloud/kms/v1/UpdateCryptoKeyVersionRequest.java @@ -82,7 +82,7 @@ private UpdateCryptoKeyVersionRequest( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -248,17 +248,16 @@ public boolean equals(final java.lang.Object obj) { com.google.cloud.kms.v1.UpdateCryptoKeyVersionRequest other = (com.google.cloud.kms.v1.UpdateCryptoKeyVersionRequest) obj; - boolean result = true; - result = result && (hasCryptoKeyVersion() == other.hasCryptoKeyVersion()); + if (hasCryptoKeyVersion() != other.hasCryptoKeyVersion()) return false; if (hasCryptoKeyVersion()) { - result = result && getCryptoKeyVersion().equals(other.getCryptoKeyVersion()); + if (!getCryptoKeyVersion().equals(other.getCryptoKeyVersion())) return false; } - result = result && (hasUpdateMask() == other.hasUpdateMask()); + if (hasUpdateMask() != other.hasUpdateMask()) return false; if (hasUpdateMask()) { - result = result && getUpdateMask().equals(other.getUpdateMask()); + if (!getUpdateMask().equals(other.getUpdateMask())) return false; } - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -478,35 +477,35 @@ public com.google.cloud.kms.v1.UpdateCryptoKeyVersionRequest 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 @@ -558,7 +557,7 @@ public Builder mergeFrom( return this; } - private com.google.cloud.kms.v1.CryptoKeyVersion cryptoKeyVersion_ = null; + private com.google.cloud.kms.v1.CryptoKeyVersion cryptoKeyVersion_; private com.google.protobuf.SingleFieldBuilderV3< com.google.cloud.kms.v1.CryptoKeyVersion, com.google.cloud.kms.v1.CryptoKeyVersion.Builder, @@ -749,7 +748,7 @@ public com.google.cloud.kms.v1.CryptoKeyVersionOrBuilder getCryptoKeyVersionOrBu return cryptoKeyVersionBuilder_; } - private com.google.protobuf.FieldMask updateMask_ = null; + private com.google.protobuf.FieldMask updateMask_; private com.google.protobuf.SingleFieldBuilderV3< com.google.protobuf.FieldMask, com.google.protobuf.FieldMask.Builder, @@ -930,7 +929,7 @@ public com.google.protobuf.FieldMaskOrBuilder getUpdateMaskOrBuilder() { @java.lang.Override public final Builder setUnknownFields(final com.google.protobuf.UnknownFieldSet unknownFields) { - return super.setUnknownFieldsProto3(unknownFields); + return super.setUnknownFields(unknownFields); } @java.lang.Override diff --git a/google-cloud-clients/google-cloud-kms/synth.metadata b/google-cloud-clients/google-cloud-kms/synth.metadata index 96f7ab195f8d..710e9017355d 100644 --- a/google-cloud-clients/google-cloud-kms/synth.metadata +++ b/google-cloud-clients/google-cloud-kms/synth.metadata @@ -1,19 +1,19 @@ { - "updateTime": "2019-03-06T08:45:42.757794Z", + "updateTime": "2019-03-29T07:48:05.434501Z", "sources": [ { "generator": { "name": "artman", - "version": "0.16.15", - "dockerImage": "googleapis/artman@sha256:9caadfa59d48224cba5f3217eb9d61a155b78ccf31e628abef385bc5b7ed3bd2" + "version": "0.16.21", + "dockerImage": "googleapis/artman@sha256:854131ec1af7b3a313253474c24748dc0acd217a58a0b74dbfb559f340a15d78" } }, { "git": { "name": "googleapis", "remote": "https://github.com/googleapis/googleapis.git", - "sha": "856117505ff9075b3e9c0b5674113667b6cf9e00", - "internalRef": "236931378" + "sha": "37386f1ebcaed51bcb7d15d00124d22c38606e45", + "internalRef": "240841842" } } ],