diff --git a/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/Action.java b/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/Action.java index f8be42019833..03d77cfb896c 100644 --- a/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/Action.java +++ b/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/Action.java @@ -122,7 +122,7 @@ private Action( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -231,7 +231,7 @@ private SaveFindings( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -325,13 +325,12 @@ public boolean equals(final java.lang.Object obj) { com.google.privacy.dlp.v2.Action.SaveFindings other = (com.google.privacy.dlp.v2.Action.SaveFindings) obj; - boolean result = true; - result = result && (hasOutputConfig() == other.hasOutputConfig()); + if (hasOutputConfig() != other.hasOutputConfig()) return false; if (hasOutputConfig()) { - result = result && getOutputConfig().equals(other.getOutputConfig()); + if (!getOutputConfig().equals(other.getOutputConfig())) return false; } - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -539,23 +538,23 @@ public com.google.privacy.dlp.v2.Action.SaveFindings 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 @@ -563,13 +562,13 @@ public Builder setRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) { - return (Builder) super.setRepeatedField(field, index, value); + return super.setRepeatedField(field, index, value); } @java.lang.Override public Builder addRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.addRepeatedField(field, value); + return super.addRepeatedField(field, value); } @java.lang.Override @@ -617,7 +616,7 @@ public Builder mergeFrom( return this; } - private com.google.privacy.dlp.v2.OutputStorageConfig outputConfig_ = null; + private com.google.privacy.dlp.v2.OutputStorageConfig outputConfig_; private com.google.protobuf.SingleFieldBuilderV3< com.google.privacy.dlp.v2.OutputStorageConfig, com.google.privacy.dlp.v2.OutputStorageConfig.Builder, @@ -730,7 +729,7 @@ public com.google.privacy.dlp.v2.OutputStorageConfigOrBuilder getOutputConfigOrB @java.lang.Override public final Builder setUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { - return super.setUnknownFieldsProto3(unknownFields); + return super.setUnknownFields(unknownFields); } @java.lang.Override @@ -868,7 +867,7 @@ private PublishToPubSub( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -994,10 +993,9 @@ public boolean equals(final java.lang.Object obj) { com.google.privacy.dlp.v2.Action.PublishToPubSub other = (com.google.privacy.dlp.v2.Action.PublishToPubSub) obj; - boolean result = true; - result = result && getTopic().equals(other.getTopic()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getTopic().equals(other.getTopic())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -1193,23 +1191,23 @@ public com.google.privacy.dlp.v2.Action.PublishToPubSub 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 @@ -1217,13 +1215,13 @@ public Builder setRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) { - return (Builder) super.setRepeatedField(field, index, value); + return super.setRepeatedField(field, index, value); } @java.lang.Override public Builder addRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.addRepeatedField(field, value); + return super.addRepeatedField(field, value); } @java.lang.Override @@ -1385,7 +1383,7 @@ public Builder setTopicBytes(com.google.protobuf.ByteString value) { @java.lang.Override public final Builder setUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { - return super.setUnknownFieldsProto3(unknownFields); + return super.setUnknownFields(unknownFields); } @java.lang.Override @@ -1493,7 +1491,7 @@ private PublishSummaryToCscc( break; default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -1564,9 +1562,8 @@ public boolean equals(final java.lang.Object obj) { com.google.privacy.dlp.v2.Action.PublishSummaryToCscc other = (com.google.privacy.dlp.v2.Action.PublishSummaryToCscc) obj; - boolean result = true; - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -1766,23 +1763,23 @@ public com.google.privacy.dlp.v2.Action.PublishSummaryToCscc 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 @@ -1790,13 +1787,13 @@ public Builder setRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) { - return (Builder) super.setRepeatedField(field, index, value); + return super.setRepeatedField(field, index, value); } @java.lang.Override public Builder addRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.addRepeatedField(field, value); + return super.addRepeatedField(field, value); } @java.lang.Override @@ -1845,7 +1842,7 @@ public Builder mergeFrom( @java.lang.Override public final Builder setUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { - return super.setUnknownFieldsProto3(unknownFields); + return super.setUnknownFields(unknownFields); } @java.lang.Override @@ -1945,7 +1942,7 @@ private JobNotificationEmails( break; default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -2016,9 +2013,8 @@ public boolean equals(final java.lang.Object obj) { com.google.privacy.dlp.v2.Action.JobNotificationEmails other = (com.google.privacy.dlp.v2.Action.JobNotificationEmails) obj; - boolean result = true; - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -2210,23 +2206,23 @@ public com.google.privacy.dlp.v2.Action.JobNotificationEmails 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 @@ -2234,13 +2230,13 @@ public Builder setRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) { - return (Builder) super.setRepeatedField(field, index, value); + return super.setRepeatedField(field, index, value); } @java.lang.Override public Builder addRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.addRepeatedField(field, value); + return super.addRepeatedField(field, value); } @java.lang.Override @@ -2289,7 +2285,7 @@ public Builder mergeFrom( @java.lang.Override public final Builder setUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { - return super.setUnknownFieldsProto3(unknownFields); + return super.setUnknownFields(unknownFields); } @java.lang.Override @@ -2522,7 +2518,7 @@ public com.google.privacy.dlp.v2.Action.PublishSummaryToCscc getPublishSummaryTo * * *
- * Enable email notification to project owners and editors on job‘s + * Enable email notification to project owners and editors on job's * completion/failure. ** @@ -2535,7 +2531,7 @@ public boolean hasJobNotificationEmails() { * * *
- * Enable email notification to project owners and editors on job‘s + * Enable email notification to project owners and editors on job's * completion/failure. ** @@ -2551,7 +2547,7 @@ public com.google.privacy.dlp.v2.Action.JobNotificationEmails getJobNotification * * *
- * Enable email notification to project owners and editors on job‘s + * Enable email notification to project owners and editors on job's * completion/failure. ** @@ -2635,27 +2631,25 @@ public boolean equals(final java.lang.Object obj) { } com.google.privacy.dlp.v2.Action other = (com.google.privacy.dlp.v2.Action) obj; - boolean result = true; - result = result && getActionCase().equals(other.getActionCase()); - if (!result) return false; + if (!getActionCase().equals(other.getActionCase())) return false; switch (actionCase_) { case 1: - result = result && getSaveFindings().equals(other.getSaveFindings()); + if (!getSaveFindings().equals(other.getSaveFindings())) return false; break; case 2: - result = result && getPubSub().equals(other.getPubSub()); + if (!getPubSub().equals(other.getPubSub())) return false; break; case 3: - result = result && getPublishSummaryToCscc().equals(other.getPublishSummaryToCscc()); + if (!getPublishSummaryToCscc().equals(other.getPublishSummaryToCscc())) return false; break; case 8: - result = result && getJobNotificationEmails().equals(other.getJobNotificationEmails()); + if (!getJobNotificationEmails().equals(other.getJobNotificationEmails())) 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 @@ -2893,35 +2887,35 @@ public com.google.privacy.dlp.v2.Action 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 @@ -3625,7 +3619,7 @@ public Builder clearPublishSummaryToCscc() { * * *
- * Enable email notification to project owners and editors on job‘s + * Enable email notification to project owners and editors on job's * completion/failure. ** @@ -3638,7 +3632,7 @@ public boolean hasJobNotificationEmails() { * * *
- * Enable email notification to project owners and editors on job‘s + * Enable email notification to project owners and editors on job's * completion/failure. ** @@ -3661,7 +3655,7 @@ public com.google.privacy.dlp.v2.Action.JobNotificationEmails getJobNotification * * *
- * Enable email notification to project owners and editors on job‘s + * Enable email notification to project owners and editors on job's * completion/failure. ** @@ -3685,7 +3679,7 @@ public Builder setJobNotificationEmails( * * *
- * Enable email notification to project owners and editors on job‘s + * Enable email notification to project owners and editors on job's * completion/failure. ** @@ -3706,7 +3700,7 @@ public Builder setJobNotificationEmails( * * *
- * Enable email notification to project owners and editors on job‘s + * Enable email notification to project owners and editors on job's * completion/failure. ** @@ -3740,7 +3734,7 @@ public Builder mergeJobNotificationEmails( * * *
- * Enable email notification to project owners and editors on job‘s + * Enable email notification to project owners and editors on job's * completion/failure. ** @@ -3766,7 +3760,7 @@ public Builder clearJobNotificationEmails() { * * *
- * Enable email notification to project owners and editors on job‘s + * Enable email notification to project owners and editors on job's * completion/failure. ** @@ -3780,7 +3774,7 @@ public Builder clearJobNotificationEmails() { * * *
- * Enable email notification to project owners and editors on job‘s + * Enable email notification to project owners and editors on job's * completion/failure. ** @@ -3801,7 +3795,7 @@ public Builder clearJobNotificationEmails() { * * *
- * Enable email notification to project owners and editors on job‘s + * Enable email notification to project owners and editors on job's * completion/failure. ** @@ -3834,7 +3828,7 @@ public Builder clearJobNotificationEmails() { @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-dlp-v2/src/main/java/com/google/privacy/dlp/v2/ActionOrBuilder.java b/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/ActionOrBuilder.java index f42a5a0f941e..5896a012ac00 100644 --- a/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/ActionOrBuilder.java +++ b/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/ActionOrBuilder.java @@ -105,7 +105,7 @@ public interface ActionOrBuilder * * *
- * Enable email notification to project owners and editors on job‘s + * Enable email notification to project owners and editors on job's * completion/failure. ** @@ -116,7 +116,7 @@ public interface ActionOrBuilder * * *
- * Enable email notification to project owners and editors on job‘s + * Enable email notification to project owners and editors on job's * completion/failure. ** @@ -127,7 +127,7 @@ public interface ActionOrBuilder * * *
- * Enable email notification to project owners and editors on job‘s + * Enable email notification to project owners and editors on job's * completion/failure. ** diff --git a/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/ActivateJobTriggerRequest.java b/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/ActivateJobTriggerRequest.java index 8c01e9fcf68c..3d51a9126a8e 100644 --- a/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/ActivateJobTriggerRequest.java +++ b/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/ActivateJobTriggerRequest.java @@ -59,7 +59,7 @@ private ActivateJobTriggerRequest( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -181,10 +181,9 @@ public boolean equals(final java.lang.Object obj) { com.google.privacy.dlp.v2.ActivateJobTriggerRequest other = (com.google.privacy.dlp.v2.ActivateJobTriggerRequest) obj; - boolean result = true; - result = result && getName().equals(other.getName()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getName().equals(other.getName())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -377,35 +376,35 @@ public com.google.privacy.dlp.v2.ActivateJobTriggerRequest 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-dlp-v2/src/main/java/com/google/privacy/dlp/v2/AnalyzeDataSourceRiskDetails.java b/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/AnalyzeDataSourceRiskDetails.java index e539bbc6b47b..47c6de2f1d8f 100644 --- a/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/AnalyzeDataSourceRiskDetails.java +++ b/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/AnalyzeDataSourceRiskDetails.java @@ -229,7 +229,7 @@ private AnalyzeDataSourceRiskDetails( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -464,7 +464,7 @@ private NumericalStatsResult( } case 34: { - if (!((mutable_bitField0_ & 0x00000004) == 0x00000004)) { + if (!((mutable_bitField0_ & 0x00000004) != 0)) { quantileValues_ = new java.util.ArrayList
* The template id can contain uppercase and lowercase letters, * numbers, and hyphens; that is, it must match the regular - * expression: `[a-zA-Z\\d-]+`. The maximum length is 100 + * expression: `[a-zA-Z\\d-_]+`. The maximum length is 100 * characters. Can be empty to allow the system to generate one. ** @@ -233,7 +233,7 @@ public java.lang.String getTemplateId() { *
* The template id can contain uppercase and lowercase letters, * numbers, and hyphens; that is, it must match the regular - * expression: `[a-zA-Z\\d-]+`. The maximum length is 100 + * expression: `[a-zA-Z\\d-_]+`. The maximum length is 100 * characters. Can be empty to allow the system to generate one. ** @@ -308,15 +308,14 @@ public boolean equals(final java.lang.Object obj) { com.google.privacy.dlp.v2.CreateDeidentifyTemplateRequest other = (com.google.privacy.dlp.v2.CreateDeidentifyTemplateRequest) obj; - boolean result = true; - result = result && getParent().equals(other.getParent()); - result = result && (hasDeidentifyTemplate() == other.hasDeidentifyTemplate()); + if (!getParent().equals(other.getParent())) return false; + if (hasDeidentifyTemplate() != other.hasDeidentifyTemplate()) return false; if (hasDeidentifyTemplate()) { - result = result && getDeidentifyTemplate().equals(other.getDeidentifyTemplate()); + if (!getDeidentifyTemplate().equals(other.getDeidentifyTemplate())) return false; } - result = result && getTemplateId().equals(other.getTemplateId()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getTemplateId().equals(other.getTemplateId())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -530,35 +529,35 @@ public com.google.privacy.dlp.v2.CreateDeidentifyTemplateRequest 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 @@ -714,7 +713,7 @@ public Builder setParentBytes(com.google.protobuf.ByteString value) { return this; } - private com.google.privacy.dlp.v2.DeidentifyTemplate deidentifyTemplate_ = null; + private com.google.privacy.dlp.v2.DeidentifyTemplate deidentifyTemplate_; private com.google.protobuf.SingleFieldBuilderV3< com.google.privacy.dlp.v2.DeidentifyTemplate, com.google.privacy.dlp.v2.DeidentifyTemplate.Builder, @@ -903,7 +902,7 @@ public com.google.privacy.dlp.v2.DeidentifyTemplateOrBuilder getDeidentifyTempla *
* The template id can contain uppercase and lowercase letters, * numbers, and hyphens; that is, it must match the regular - * expression: `[a-zA-Z\\d-]+`. The maximum length is 100 + * expression: `[a-zA-Z\\d-_]+`. The maximum length is 100 * characters. Can be empty to allow the system to generate one. ** @@ -926,7 +925,7 @@ public java.lang.String getTemplateId() { *
* The template id can contain uppercase and lowercase letters, * numbers, and hyphens; that is, it must match the regular - * expression: `[a-zA-Z\\d-]+`. The maximum length is 100 + * expression: `[a-zA-Z\\d-_]+`. The maximum length is 100 * characters. Can be empty to allow the system to generate one. ** @@ -949,7 +948,7 @@ public com.google.protobuf.ByteString getTemplateIdBytes() { *
* The template id can contain uppercase and lowercase letters, * numbers, and hyphens; that is, it must match the regular - * expression: `[a-zA-Z\\d-]+`. The maximum length is 100 + * expression: `[a-zA-Z\\d-_]+`. The maximum length is 100 * characters. Can be empty to allow the system to generate one. ** @@ -970,7 +969,7 @@ public Builder setTemplateId(java.lang.String value) { *
* The template id can contain uppercase and lowercase letters, * numbers, and hyphens; that is, it must match the regular - * expression: `[a-zA-Z\\d-]+`. The maximum length is 100 + * expression: `[a-zA-Z\\d-_]+`. The maximum length is 100 * characters. Can be empty to allow the system to generate one. ** @@ -988,7 +987,7 @@ public Builder clearTemplateId() { *
* The template id can contain uppercase and lowercase letters, * numbers, and hyphens; that is, it must match the regular - * expression: `[a-zA-Z\\d-]+`. The maximum length is 100 + * expression: `[a-zA-Z\\d-_]+`. The maximum length is 100 * characters. Can be empty to allow the system to generate one. ** @@ -1007,7 +1006,7 @@ public Builder setTemplateIdBytes(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-dlp-v2/src/main/java/com/google/privacy/dlp/v2/CreateDeidentifyTemplateRequestOrBuilder.java b/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/CreateDeidentifyTemplateRequestOrBuilder.java index 484643a335cf..d10bc0202974 100644 --- a/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/CreateDeidentifyTemplateRequestOrBuilder.java +++ b/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/CreateDeidentifyTemplateRequestOrBuilder.java @@ -68,7 +68,7 @@ public interface CreateDeidentifyTemplateRequestOrBuilder *
* The template id can contain uppercase and lowercase letters, * numbers, and hyphens; that is, it must match the regular - * expression: `[a-zA-Z\\d-]+`. The maximum length is 100 + * expression: `[a-zA-Z\\d-_]+`. The maximum length is 100 * characters. Can be empty to allow the system to generate one. ** @@ -81,7 +81,7 @@ public interface CreateDeidentifyTemplateRequestOrBuilder *
* The template id can contain uppercase and lowercase letters, * numbers, and hyphens; that is, it must match the regular - * expression: `[a-zA-Z\\d-]+`. The maximum length is 100 + * expression: `[a-zA-Z\\d-_]+`. The maximum length is 100 * characters. Can be empty to allow the system to generate one. ** diff --git a/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/CreateDlpJobRequest.java b/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/CreateDlpJobRequest.java index 9bd6dedc62bf..9d13e4fc0f94 100644 --- a/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/CreateDlpJobRequest.java +++ b/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/CreateDlpJobRequest.java @@ -101,7 +101,7 @@ private CreateDlpJobRequest( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -264,7 +264,7 @@ public com.google.privacy.dlp.v2.RiskAnalysisJobConfigOrBuilder getRiskJobOrBuil *
* The job id can contain uppercase and lowercase letters, * numbers, and hyphens; that is, it must match the regular - * expression: `[a-zA-Z\\d-]+`. The maximum length is 100 + * expression: `[a-zA-Z\\d-_]+`. The maximum length is 100 * characters. Can be empty to allow the system to generate one. ** @@ -287,7 +287,7 @@ public java.lang.String getJobId() { *
* The job id can contain uppercase and lowercase letters, * numbers, and hyphens; that is, it must match the regular - * expression: `[a-zA-Z\\d-]+`. The maximum length is 100 + * expression: `[a-zA-Z\\d-_]+`. The maximum length is 100 * characters. Can be empty to allow the system to generate one. ** @@ -372,23 +372,21 @@ public boolean equals(final java.lang.Object obj) { com.google.privacy.dlp.v2.CreateDlpJobRequest other = (com.google.privacy.dlp.v2.CreateDlpJobRequest) obj; - boolean result = true; - result = result && getParent().equals(other.getParent()); - result = result && getJobId().equals(other.getJobId()); - result = result && getJobCase().equals(other.getJobCase()); - if (!result) return false; + if (!getParent().equals(other.getParent())) return false; + if (!getJobId().equals(other.getJobId())) return false; + if (!getJobCase().equals(other.getJobCase())) return false; switch (jobCase_) { case 2: - result = result && getInspectJob().equals(other.getInspectJob()); + if (!getInspectJob().equals(other.getInspectJob())) return false; break; case 3: - result = result && getRiskJob().equals(other.getRiskJob()); + if (!getRiskJob().equals(other.getRiskJob())) 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 @@ -617,35 +615,35 @@ public com.google.privacy.dlp.v2.CreateDlpJobRequest 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 @@ -1088,7 +1086,7 @@ public com.google.privacy.dlp.v2.RiskAnalysisJobConfigOrBuilder getRiskJobOrBuil *
* The job id can contain uppercase and lowercase letters, * numbers, and hyphens; that is, it must match the regular - * expression: `[a-zA-Z\\d-]+`. The maximum length is 100 + * expression: `[a-zA-Z\\d-_]+`. The maximum length is 100 * characters. Can be empty to allow the system to generate one. ** @@ -1111,7 +1109,7 @@ public java.lang.String getJobId() { *
* The job id can contain uppercase and lowercase letters, * numbers, and hyphens; that is, it must match the regular - * expression: `[a-zA-Z\\d-]+`. The maximum length is 100 + * expression: `[a-zA-Z\\d-_]+`. The maximum length is 100 * characters. Can be empty to allow the system to generate one. ** @@ -1134,7 +1132,7 @@ public com.google.protobuf.ByteString getJobIdBytes() { *
* The job id can contain uppercase and lowercase letters, * numbers, and hyphens; that is, it must match the regular - * expression: `[a-zA-Z\\d-]+`. The maximum length is 100 + * expression: `[a-zA-Z\\d-_]+`. The maximum length is 100 * characters. Can be empty to allow the system to generate one. ** @@ -1155,7 +1153,7 @@ public Builder setJobId(java.lang.String value) { *
* The job id can contain uppercase and lowercase letters, * numbers, and hyphens; that is, it must match the regular - * expression: `[a-zA-Z\\d-]+`. The maximum length is 100 + * expression: `[a-zA-Z\\d-_]+`. The maximum length is 100 * characters. Can be empty to allow the system to generate one. ** @@ -1173,7 +1171,7 @@ public Builder clearJobId() { *
* The job id can contain uppercase and lowercase letters, * numbers, and hyphens; that is, it must match the regular - * expression: `[a-zA-Z\\d-]+`. The maximum length is 100 + * expression: `[a-zA-Z\\d-_]+`. The maximum length is 100 * characters. Can be empty to allow the system to generate one. ** @@ -1192,7 +1190,7 @@ public Builder setJobIdBytes(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-dlp-v2/src/main/java/com/google/privacy/dlp/v2/CreateDlpJobRequestOrBuilder.java b/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/CreateDlpJobRequestOrBuilder.java index 961b22f893af..b6e40966755c 100644 --- a/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/CreateDlpJobRequestOrBuilder.java +++ b/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/CreateDlpJobRequestOrBuilder.java @@ -49,7 +49,7 @@ public interface CreateDlpJobRequestOrBuilder *
* The job id can contain uppercase and lowercase letters, * numbers, and hyphens; that is, it must match the regular - * expression: `[a-zA-Z\\d-]+`. The maximum length is 100 + * expression: `[a-zA-Z\\d-_]+`. The maximum length is 100 * characters. Can be empty to allow the system to generate one. ** @@ -62,7 +62,7 @@ public interface CreateDlpJobRequestOrBuilder *
* The job id can contain uppercase and lowercase letters, * numbers, and hyphens; that is, it must match the regular - * expression: `[a-zA-Z\\d-]+`. The maximum length is 100 + * expression: `[a-zA-Z\\d-_]+`. The maximum length is 100 * characters. Can be empty to allow the system to generate one. ** diff --git a/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/CreateInspectTemplateRequest.java b/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/CreateInspectTemplateRequest.java index 96dac4b01e08..48e54dca49e7 100644 --- a/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/CreateInspectTemplateRequest.java +++ b/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/CreateInspectTemplateRequest.java @@ -83,7 +83,7 @@ private CreateInspectTemplateRequest( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -209,7 +209,7 @@ public com.google.privacy.dlp.v2.InspectTemplateOrBuilder getInspectTemplateOrBu *
* The template id can contain uppercase and lowercase letters, * numbers, and hyphens; that is, it must match the regular - * expression: `[a-zA-Z\\d-]+`. The maximum length is 100 + * expression: `[a-zA-Z\\d-_]+`. The maximum length is 100 * characters. Can be empty to allow the system to generate one. ** @@ -232,7 +232,7 @@ public java.lang.String getTemplateId() { *
* The template id can contain uppercase and lowercase letters, * numbers, and hyphens; that is, it must match the regular - * expression: `[a-zA-Z\\d-]+`. The maximum length is 100 + * expression: `[a-zA-Z\\d-_]+`. The maximum length is 100 * characters. Can be empty to allow the system to generate one. ** @@ -307,15 +307,14 @@ public boolean equals(final java.lang.Object obj) { com.google.privacy.dlp.v2.CreateInspectTemplateRequest other = (com.google.privacy.dlp.v2.CreateInspectTemplateRequest) obj; - boolean result = true; - result = result && getParent().equals(other.getParent()); - result = result && (hasInspectTemplate() == other.hasInspectTemplate()); + if (!getParent().equals(other.getParent())) return false; + if (hasInspectTemplate() != other.hasInspectTemplate()) return false; if (hasInspectTemplate()) { - result = result && getInspectTemplate().equals(other.getInspectTemplate()); + if (!getInspectTemplate().equals(other.getInspectTemplate())) return false; } - result = result && getTemplateId().equals(other.getTemplateId()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getTemplateId().equals(other.getTemplateId())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -529,35 +528,35 @@ public com.google.privacy.dlp.v2.CreateInspectTemplateRequest buildPartial() { @java.lang.Override public Builder clone() { - return (Builder) super.clone(); + return super.clone(); } @java.lang.Override public Builder setField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.setField(field, value); + return super.setField(field, value); } @java.lang.Override public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) { - return (Builder) super.clearField(field); + return super.clearField(field); } @java.lang.Override public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) { - return (Builder) super.clearOneof(oneof); + return super.clearOneof(oneof); } @java.lang.Override public Builder setRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) { - return (Builder) super.setRepeatedField(field, index, value); + return super.setRepeatedField(field, index, value); } @java.lang.Override public Builder addRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.addRepeatedField(field, value); + return super.addRepeatedField(field, value); } @java.lang.Override @@ -713,7 +712,7 @@ public Builder setParentBytes(com.google.protobuf.ByteString value) { return this; } - private com.google.privacy.dlp.v2.InspectTemplate inspectTemplate_ = null; + private com.google.privacy.dlp.v2.InspectTemplate inspectTemplate_; private com.google.protobuf.SingleFieldBuilderV3< com.google.privacy.dlp.v2.InspectTemplate, com.google.privacy.dlp.v2.InspectTemplate.Builder, @@ -902,7 +901,7 @@ public com.google.privacy.dlp.v2.InspectTemplateOrBuilder getInspectTemplateOrBu *
* The template id can contain uppercase and lowercase letters, * numbers, and hyphens; that is, it must match the regular - * expression: `[a-zA-Z\\d-]+`. The maximum length is 100 + * expression: `[a-zA-Z\\d-_]+`. The maximum length is 100 * characters. Can be empty to allow the system to generate one. ** @@ -925,7 +924,7 @@ public java.lang.String getTemplateId() { *
* The template id can contain uppercase and lowercase letters, * numbers, and hyphens; that is, it must match the regular - * expression: `[a-zA-Z\\d-]+`. The maximum length is 100 + * expression: `[a-zA-Z\\d-_]+`. The maximum length is 100 * characters. Can be empty to allow the system to generate one. ** @@ -948,7 +947,7 @@ public com.google.protobuf.ByteString getTemplateIdBytes() { *
* The template id can contain uppercase and lowercase letters, * numbers, and hyphens; that is, it must match the regular - * expression: `[a-zA-Z\\d-]+`. The maximum length is 100 + * expression: `[a-zA-Z\\d-_]+`. The maximum length is 100 * characters. Can be empty to allow the system to generate one. ** @@ -969,7 +968,7 @@ public Builder setTemplateId(java.lang.String value) { *
* The template id can contain uppercase and lowercase letters, * numbers, and hyphens; that is, it must match the regular - * expression: `[a-zA-Z\\d-]+`. The maximum length is 100 + * expression: `[a-zA-Z\\d-_]+`. The maximum length is 100 * characters. Can be empty to allow the system to generate one. ** @@ -987,7 +986,7 @@ public Builder clearTemplateId() { *
* The template id can contain uppercase and lowercase letters, * numbers, and hyphens; that is, it must match the regular - * expression: `[a-zA-Z\\d-]+`. The maximum length is 100 + * expression: `[a-zA-Z\\d-_]+`. The maximum length is 100 * characters. Can be empty to allow the system to generate one. ** @@ -1006,7 +1005,7 @@ public Builder setTemplateIdBytes(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-dlp-v2/src/main/java/com/google/privacy/dlp/v2/CreateInspectTemplateRequestOrBuilder.java b/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/CreateInspectTemplateRequestOrBuilder.java index 357f52e9d1a7..f8331cd34021 100644 --- a/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/CreateInspectTemplateRequestOrBuilder.java +++ b/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/CreateInspectTemplateRequestOrBuilder.java @@ -68,7 +68,7 @@ public interface CreateInspectTemplateRequestOrBuilder *
* The template id can contain uppercase and lowercase letters, * numbers, and hyphens; that is, it must match the regular - * expression: `[a-zA-Z\\d-]+`. The maximum length is 100 + * expression: `[a-zA-Z\\d-_]+`. The maximum length is 100 * characters. Can be empty to allow the system to generate one. ** @@ -81,7 +81,7 @@ public interface CreateInspectTemplateRequestOrBuilder *
* The template id can contain uppercase and lowercase letters, * numbers, and hyphens; that is, it must match the regular - * expression: `[a-zA-Z\\d-]+`. The maximum length is 100 + * expression: `[a-zA-Z\\d-_]+`. The maximum length is 100 * characters. Can be empty to allow the system to generate one. ** diff --git a/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/CreateJobTriggerRequest.java b/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/CreateJobTriggerRequest.java index 09d041810ec4..8ef8c0b73405 100644 --- a/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/CreateJobTriggerRequest.java +++ b/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/CreateJobTriggerRequest.java @@ -83,7 +83,7 @@ private CreateJobTriggerRequest( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -207,7 +207,7 @@ public com.google.privacy.dlp.v2.JobTriggerOrBuilder getJobTriggerOrBuilder() { *
* The trigger id can contain uppercase and lowercase letters, * numbers, and hyphens; that is, it must match the regular - * expression: `[a-zA-Z\\d-]+`. The maximum length is 100 + * expression: `[a-zA-Z\\d-_]+`. The maximum length is 100 * characters. Can be empty to allow the system to generate one. ** @@ -230,7 +230,7 @@ public java.lang.String getTriggerId() { *
* The trigger id can contain uppercase and lowercase letters, * numbers, and hyphens; that is, it must match the regular - * expression: `[a-zA-Z\\d-]+`. The maximum length is 100 + * expression: `[a-zA-Z\\d-_]+`. The maximum length is 100 * characters. Can be empty to allow the system to generate one. ** @@ -305,15 +305,14 @@ public boolean equals(final java.lang.Object obj) { com.google.privacy.dlp.v2.CreateJobTriggerRequest other = (com.google.privacy.dlp.v2.CreateJobTriggerRequest) obj; - boolean result = true; - result = result && getParent().equals(other.getParent()); - result = result && (hasJobTrigger() == other.hasJobTrigger()); + if (!getParent().equals(other.getParent())) return false; + if (hasJobTrigger() != other.hasJobTrigger()) return false; if (hasJobTrigger()) { - result = result && getJobTrigger().equals(other.getJobTrigger()); + if (!getJobTrigger().equals(other.getJobTrigger())) return false; } - result = result && getTriggerId().equals(other.getTriggerId()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getTriggerId().equals(other.getTriggerId())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -526,35 +525,35 @@ public com.google.privacy.dlp.v2.CreateJobTriggerRequest 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 @@ -705,7 +704,7 @@ public Builder setParentBytes(com.google.protobuf.ByteString value) { return this; } - private com.google.privacy.dlp.v2.JobTrigger jobTrigger_ = null; + private com.google.privacy.dlp.v2.JobTrigger jobTrigger_; private com.google.protobuf.SingleFieldBuilderV3< com.google.privacy.dlp.v2.JobTrigger, com.google.privacy.dlp.v2.JobTrigger.Builder, @@ -893,7 +892,7 @@ public com.google.privacy.dlp.v2.JobTriggerOrBuilder getJobTriggerOrBuilder() { *
* The trigger id can contain uppercase and lowercase letters, * numbers, and hyphens; that is, it must match the regular - * expression: `[a-zA-Z\\d-]+`. The maximum length is 100 + * expression: `[a-zA-Z\\d-_]+`. The maximum length is 100 * characters. Can be empty to allow the system to generate one. ** @@ -916,7 +915,7 @@ public java.lang.String getTriggerId() { *
* The trigger id can contain uppercase and lowercase letters, * numbers, and hyphens; that is, it must match the regular - * expression: `[a-zA-Z\\d-]+`. The maximum length is 100 + * expression: `[a-zA-Z\\d-_]+`. The maximum length is 100 * characters. Can be empty to allow the system to generate one. ** @@ -939,7 +938,7 @@ public com.google.protobuf.ByteString getTriggerIdBytes() { *
* The trigger id can contain uppercase and lowercase letters, * numbers, and hyphens; that is, it must match the regular - * expression: `[a-zA-Z\\d-]+`. The maximum length is 100 + * expression: `[a-zA-Z\\d-_]+`. The maximum length is 100 * characters. Can be empty to allow the system to generate one. ** @@ -960,7 +959,7 @@ public Builder setTriggerId(java.lang.String value) { *
* The trigger id can contain uppercase and lowercase letters, * numbers, and hyphens; that is, it must match the regular - * expression: `[a-zA-Z\\d-]+`. The maximum length is 100 + * expression: `[a-zA-Z\\d-_]+`. The maximum length is 100 * characters. Can be empty to allow the system to generate one. ** @@ -978,7 +977,7 @@ public Builder clearTriggerId() { *
* The trigger id can contain uppercase and lowercase letters, * numbers, and hyphens; that is, it must match the regular - * expression: `[a-zA-Z\\d-]+`. The maximum length is 100 + * expression: `[a-zA-Z\\d-_]+`. The maximum length is 100 * characters. Can be empty to allow the system to generate one. ** @@ -997,7 +996,7 @@ public Builder setTriggerIdBytes(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-dlp-v2/src/main/java/com/google/privacy/dlp/v2/CreateJobTriggerRequestOrBuilder.java b/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/CreateJobTriggerRequestOrBuilder.java index f95f1f9d5cea..ee7223682ea2 100644 --- a/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/CreateJobTriggerRequestOrBuilder.java +++ b/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/CreateJobTriggerRequestOrBuilder.java @@ -66,7 +66,7 @@ public interface CreateJobTriggerRequestOrBuilder *
* The trigger id can contain uppercase and lowercase letters, * numbers, and hyphens; that is, it must match the regular - * expression: `[a-zA-Z\\d-]+`. The maximum length is 100 + * expression: `[a-zA-Z\\d-_]+`. The maximum length is 100 * characters. Can be empty to allow the system to generate one. ** @@ -79,7 +79,7 @@ public interface CreateJobTriggerRequestOrBuilder *
* The trigger id can contain uppercase and lowercase letters, * numbers, and hyphens; that is, it must match the regular - * expression: `[a-zA-Z\\d-]+`. The maximum length is 100 + * expression: `[a-zA-Z\\d-_]+`. The maximum length is 100 * characters. Can be empty to allow the system to generate one. ** diff --git a/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/CreateStoredInfoTypeRequest.java b/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/CreateStoredInfoTypeRequest.java index e6e8abfd852d..22eb2c161642 100644 --- a/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/CreateStoredInfoTypeRequest.java +++ b/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/CreateStoredInfoTypeRequest.java @@ -83,7 +83,7 @@ private CreateStoredInfoTypeRequest( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -209,7 +209,7 @@ public com.google.privacy.dlp.v2.StoredInfoTypeConfigOrBuilder getConfigOrBuilde *
* The storedInfoType ID can contain uppercase and lowercase letters, * numbers, and hyphens; that is, it must match the regular - * expression: `[a-zA-Z\\d-]+`. The maximum length is 100 + * expression: `[a-zA-Z\\d-_]+`. The maximum length is 100 * characters. Can be empty to allow the system to generate one. ** @@ -232,7 +232,7 @@ public java.lang.String getStoredInfoTypeId() { *
* The storedInfoType ID can contain uppercase and lowercase letters, * numbers, and hyphens; that is, it must match the regular - * expression: `[a-zA-Z\\d-]+`. The maximum length is 100 + * expression: `[a-zA-Z\\d-_]+`. The maximum length is 100 * characters. Can be empty to allow the system to generate one. ** @@ -307,15 +307,14 @@ public boolean equals(final java.lang.Object obj) { com.google.privacy.dlp.v2.CreateStoredInfoTypeRequest other = (com.google.privacy.dlp.v2.CreateStoredInfoTypeRequest) obj; - boolean result = true; - result = result && getParent().equals(other.getParent()); - result = result && (hasConfig() == other.hasConfig()); + if (!getParent().equals(other.getParent())) return false; + if (hasConfig() != other.hasConfig()) return false; if (hasConfig()) { - result = result && getConfig().equals(other.getConfig()); + if (!getConfig().equals(other.getConfig())) return false; } - result = result && getStoredInfoTypeId().equals(other.getStoredInfoTypeId()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getStoredInfoTypeId().equals(other.getStoredInfoTypeId())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -529,35 +528,35 @@ public com.google.privacy.dlp.v2.CreateStoredInfoTypeRequest buildPartial() { @java.lang.Override public Builder clone() { - return (Builder) super.clone(); + return super.clone(); } @java.lang.Override public Builder setField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.setField(field, value); + return super.setField(field, value); } @java.lang.Override public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) { - return (Builder) super.clearField(field); + return super.clearField(field); } @java.lang.Override public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) { - return (Builder) super.clearOneof(oneof); + return super.clearOneof(oneof); } @java.lang.Override public Builder setRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) { - return (Builder) super.setRepeatedField(field, index, value); + return super.setRepeatedField(field, index, value); } @java.lang.Override public Builder addRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.addRepeatedField(field, value); + return super.addRepeatedField(field, value); } @java.lang.Override @@ -713,7 +712,7 @@ public Builder setParentBytes(com.google.protobuf.ByteString value) { return this; } - private com.google.privacy.dlp.v2.StoredInfoTypeConfig config_ = null; + private com.google.privacy.dlp.v2.StoredInfoTypeConfig config_; private com.google.protobuf.SingleFieldBuilderV3< com.google.privacy.dlp.v2.StoredInfoTypeConfig, com.google.privacy.dlp.v2.StoredInfoTypeConfig.Builder, @@ -902,7 +901,7 @@ public com.google.privacy.dlp.v2.StoredInfoTypeConfigOrBuilder getConfigOrBuilde *
* The storedInfoType ID can contain uppercase and lowercase letters, * numbers, and hyphens; that is, it must match the regular - * expression: `[a-zA-Z\\d-]+`. The maximum length is 100 + * expression: `[a-zA-Z\\d-_]+`. The maximum length is 100 * characters. Can be empty to allow the system to generate one. ** @@ -925,7 +924,7 @@ public java.lang.String getStoredInfoTypeId() { *
* The storedInfoType ID can contain uppercase and lowercase letters, * numbers, and hyphens; that is, it must match the regular - * expression: `[a-zA-Z\\d-]+`. The maximum length is 100 + * expression: `[a-zA-Z\\d-_]+`. The maximum length is 100 * characters. Can be empty to allow the system to generate one. ** @@ -948,7 +947,7 @@ public com.google.protobuf.ByteString getStoredInfoTypeIdBytes() { *
* The storedInfoType ID can contain uppercase and lowercase letters, * numbers, and hyphens; that is, it must match the regular - * expression: `[a-zA-Z\\d-]+`. The maximum length is 100 + * expression: `[a-zA-Z\\d-_]+`. The maximum length is 100 * characters. Can be empty to allow the system to generate one. ** @@ -969,7 +968,7 @@ public Builder setStoredInfoTypeId(java.lang.String value) { *
* The storedInfoType ID can contain uppercase and lowercase letters, * numbers, and hyphens; that is, it must match the regular - * expression: `[a-zA-Z\\d-]+`. The maximum length is 100 + * expression: `[a-zA-Z\\d-_]+`. The maximum length is 100 * characters. Can be empty to allow the system to generate one. ** @@ -987,7 +986,7 @@ public Builder clearStoredInfoTypeId() { *
* The storedInfoType ID can contain uppercase and lowercase letters, * numbers, and hyphens; that is, it must match the regular - * expression: `[a-zA-Z\\d-]+`. The maximum length is 100 + * expression: `[a-zA-Z\\d-_]+`. The maximum length is 100 * characters. Can be empty to allow the system to generate one. ** @@ -1006,7 +1005,7 @@ public Builder setStoredInfoTypeIdBytes(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-dlp-v2/src/main/java/com/google/privacy/dlp/v2/CreateStoredInfoTypeRequestOrBuilder.java b/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/CreateStoredInfoTypeRequestOrBuilder.java index 5c72b0cfaa55..80f40393b66b 100644 --- a/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/CreateStoredInfoTypeRequestOrBuilder.java +++ b/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/CreateStoredInfoTypeRequestOrBuilder.java @@ -68,7 +68,7 @@ public interface CreateStoredInfoTypeRequestOrBuilder *
* The storedInfoType ID can contain uppercase and lowercase letters, * numbers, and hyphens; that is, it must match the regular - * expression: `[a-zA-Z\\d-]+`. The maximum length is 100 + * expression: `[a-zA-Z\\d-_]+`. The maximum length is 100 * characters. Can be empty to allow the system to generate one. ** @@ -81,7 +81,7 @@ public interface CreateStoredInfoTypeRequestOrBuilder *
* The storedInfoType ID can contain uppercase and lowercase letters, * numbers, and hyphens; that is, it must match the regular - * expression: `[a-zA-Z\\d-]+`. The maximum length is 100 + * expression: `[a-zA-Z\\d-_]+`. The maximum length is 100 * characters. Can be empty to allow the system to generate one. ** diff --git a/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/CryptoDeterministicConfig.java b/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/CryptoDeterministicConfig.java new file mode 100644 index 000000000000..4acc8b25cc43 --- /dev/null +++ b/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/CryptoDeterministicConfig.java @@ -0,0 +1,1639 @@ +// Generated by the protocol buffer compiler. DO NOT EDIT! +// source: google/privacy/dlp/v2/dlp.proto + +package com.google.privacy.dlp.v2; + +/** + * + * + *
+ * Pseudonymization method that generates deterministic encryption for the given + * input. Outputs a base64 encoded representation of the encrypted output. + * Uses AES-SIV based on the RFC https://tools.ietf.org/html/rfc5297. + *+ * + * Protobuf type {@code google.privacy.dlp.v2.CryptoDeterministicConfig} + */ +public final class CryptoDeterministicConfig extends com.google.protobuf.GeneratedMessageV3 + implements + // @@protoc_insertion_point(message_implements:google.privacy.dlp.v2.CryptoDeterministicConfig) + CryptoDeterministicConfigOrBuilder { + private static final long serialVersionUID = 0L; + // Use CryptoDeterministicConfig.newBuilder() to construct. + private CryptoDeterministicConfig(com.google.protobuf.GeneratedMessageV3.Builder> builder) { + super(builder); + } + + private CryptoDeterministicConfig() {} + + @java.lang.Override + public final com.google.protobuf.UnknownFieldSet getUnknownFields() { + return this.unknownFields; + } + + private CryptoDeterministicConfig( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + this(); + if (extensionRegistry == null) { + throw new java.lang.NullPointerException(); + } + int mutable_bitField0_ = 0; + com.google.protobuf.UnknownFieldSet.Builder unknownFields = + com.google.protobuf.UnknownFieldSet.newBuilder(); + try { + boolean done = false; + while (!done) { + int tag = input.readTag(); + switch (tag) { + case 0: + done = true; + break; + case 10: + { + com.google.privacy.dlp.v2.CryptoKey.Builder subBuilder = null; + if (cryptoKey_ != null) { + subBuilder = cryptoKey_.toBuilder(); + } + cryptoKey_ = + input.readMessage( + com.google.privacy.dlp.v2.CryptoKey.parser(), extensionRegistry); + if (subBuilder != null) { + subBuilder.mergeFrom(cryptoKey_); + cryptoKey_ = subBuilder.buildPartial(); + } + + break; + } + case 18: + { + com.google.privacy.dlp.v2.InfoType.Builder subBuilder = null; + if (surrogateInfoType_ != null) { + subBuilder = surrogateInfoType_.toBuilder(); + } + surrogateInfoType_ = + input.readMessage(com.google.privacy.dlp.v2.InfoType.parser(), extensionRegistry); + if (subBuilder != null) { + subBuilder.mergeFrom(surrogateInfoType_); + surrogateInfoType_ = subBuilder.buildPartial(); + } + + break; + } + case 26: + { + com.google.privacy.dlp.v2.FieldId.Builder subBuilder = null; + if (context_ != null) { + subBuilder = context_.toBuilder(); + } + context_ = + input.readMessage(com.google.privacy.dlp.v2.FieldId.parser(), extensionRegistry); + if (subBuilder != null) { + subBuilder.mergeFrom(context_); + context_ = subBuilder.buildPartial(); + } + + break; + } + default: + { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { + done = true; + } + break; + } + } + } + } catch (com.google.protobuf.InvalidProtocolBufferException e) { + throw e.setUnfinishedMessage(this); + } catch (java.io.IOException e) { + throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this); + } finally { + this.unknownFields = unknownFields.build(); + makeExtensionsImmutable(); + } + } + + public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { + return com.google.privacy.dlp.v2.DlpProto + .internal_static_google_privacy_dlp_v2_CryptoDeterministicConfig_descriptor; + } + + @java.lang.Override + protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable + internalGetFieldAccessorTable() { + return com.google.privacy.dlp.v2.DlpProto + .internal_static_google_privacy_dlp_v2_CryptoDeterministicConfig_fieldAccessorTable + .ensureFieldAccessorsInitialized( + com.google.privacy.dlp.v2.CryptoDeterministicConfig.class, + com.google.privacy.dlp.v2.CryptoDeterministicConfig.Builder.class); + } + + public static final int CRYPTO_KEY_FIELD_NUMBER = 1; + private com.google.privacy.dlp.v2.CryptoKey cryptoKey_; + /** + * + * + *
+ * The key used by the encryption function. + *+ * + *
.google.privacy.dlp.v2.CryptoKey crypto_key = 1;
+ */
+ public boolean hasCryptoKey() {
+ return cryptoKey_ != null;
+ }
+ /**
+ *
+ *
+ * + * The key used by the encryption function. + *+ * + *
.google.privacy.dlp.v2.CryptoKey crypto_key = 1;
+ */
+ public com.google.privacy.dlp.v2.CryptoKey getCryptoKey() {
+ return cryptoKey_ == null
+ ? com.google.privacy.dlp.v2.CryptoKey.getDefaultInstance()
+ : cryptoKey_;
+ }
+ /**
+ *
+ *
+ * + * The key used by the encryption function. + *+ * + *
.google.privacy.dlp.v2.CryptoKey crypto_key = 1;
+ */
+ public com.google.privacy.dlp.v2.CryptoKeyOrBuilder getCryptoKeyOrBuilder() {
+ return getCryptoKey();
+ }
+
+ public static final int SURROGATE_INFO_TYPE_FIELD_NUMBER = 2;
+ private com.google.privacy.dlp.v2.InfoType surrogateInfoType_;
+ /**
+ *
+ *
+ * + * The custom info type to annotate the surrogate with. + * This annotation will be applied to the surrogate by prefixing it with + * the name of the custom info type followed by the number of + * characters comprising the surrogate. The following scheme defines the + * format: <info type name>(<surrogate character count>):<surrogate> + * For example, if the name of custom info type is 'MY_TOKEN_INFO_TYPE' and + * the surrogate is 'abc', the full replacement value + * will be: 'MY_TOKEN_INFO_TYPE(3):abc' + * This annotation identifies the surrogate when inspecting content using the + * custom info type 'Surrogate'. This facilitates reversal of the + * surrogate when it occurs in free text. + * In order for inspection to work properly, the name of this info type must + * not occur naturally anywhere in your data; otherwise, inspection may either + * - reverse a surrogate that does not correspond to an actual identifier + * - be unable to parse the surrogate and result in an error + * Therefore, choose your custom info type name carefully after considering + * what your data looks like. One way to select a name that has a high chance + * of yielding reliable detection is to include one or more unicode characters + * that are highly improbable to exist in your data. + * For example, assuming your data is entered from a regular ASCII keyboard, + * the symbol with the hex code point 29DD might be used like so: + * ⧝MY_TOKEN_TYPE + *+ * + *
.google.privacy.dlp.v2.InfoType surrogate_info_type = 2;
+ */
+ public boolean hasSurrogateInfoType() {
+ return surrogateInfoType_ != null;
+ }
+ /**
+ *
+ *
+ * + * The custom info type to annotate the surrogate with. + * This annotation will be applied to the surrogate by prefixing it with + * the name of the custom info type followed by the number of + * characters comprising the surrogate. The following scheme defines the + * format: <info type name>(<surrogate character count>):<surrogate> + * For example, if the name of custom info type is 'MY_TOKEN_INFO_TYPE' and + * the surrogate is 'abc', the full replacement value + * will be: 'MY_TOKEN_INFO_TYPE(3):abc' + * This annotation identifies the surrogate when inspecting content using the + * custom info type 'Surrogate'. This facilitates reversal of the + * surrogate when it occurs in free text. + * In order for inspection to work properly, the name of this info type must + * not occur naturally anywhere in your data; otherwise, inspection may either + * - reverse a surrogate that does not correspond to an actual identifier + * - be unable to parse the surrogate and result in an error + * Therefore, choose your custom info type name carefully after considering + * what your data looks like. One way to select a name that has a high chance + * of yielding reliable detection is to include one or more unicode characters + * that are highly improbable to exist in your data. + * For example, assuming your data is entered from a regular ASCII keyboard, + * the symbol with the hex code point 29DD might be used like so: + * ⧝MY_TOKEN_TYPE + *+ * + *
.google.privacy.dlp.v2.InfoType surrogate_info_type = 2;
+ */
+ public com.google.privacy.dlp.v2.InfoType getSurrogateInfoType() {
+ return surrogateInfoType_ == null
+ ? com.google.privacy.dlp.v2.InfoType.getDefaultInstance()
+ : surrogateInfoType_;
+ }
+ /**
+ *
+ *
+ * + * The custom info type to annotate the surrogate with. + * This annotation will be applied to the surrogate by prefixing it with + * the name of the custom info type followed by the number of + * characters comprising the surrogate. The following scheme defines the + * format: <info type name>(<surrogate character count>):<surrogate> + * For example, if the name of custom info type is 'MY_TOKEN_INFO_TYPE' and + * the surrogate is 'abc', the full replacement value + * will be: 'MY_TOKEN_INFO_TYPE(3):abc' + * This annotation identifies the surrogate when inspecting content using the + * custom info type 'Surrogate'. This facilitates reversal of the + * surrogate when it occurs in free text. + * In order for inspection to work properly, the name of this info type must + * not occur naturally anywhere in your data; otherwise, inspection may either + * - reverse a surrogate that does not correspond to an actual identifier + * - be unable to parse the surrogate and result in an error + * Therefore, choose your custom info type name carefully after considering + * what your data looks like. One way to select a name that has a high chance + * of yielding reliable detection is to include one or more unicode characters + * that are highly improbable to exist in your data. + * For example, assuming your data is entered from a regular ASCII keyboard, + * the symbol with the hex code point 29DD might be used like so: + * ⧝MY_TOKEN_TYPE + *+ * + *
.google.privacy.dlp.v2.InfoType surrogate_info_type = 2;
+ */
+ public com.google.privacy.dlp.v2.InfoTypeOrBuilder getSurrogateInfoTypeOrBuilder() {
+ return getSurrogateInfoType();
+ }
+
+ public static final int CONTEXT_FIELD_NUMBER = 3;
+ private com.google.privacy.dlp.v2.FieldId context_;
+ /**
+ *
+ *
+ * + * Optional. A context may be used for higher security and maintaining + * referential integrity such that the same identifier in two different + * contexts will be given a distinct surrogate. The context is appended to + * plaintext value being encrypted. On decryption the provided context is + * validated against the value used during encryption. If a context was + * provided during encryption, same context must be provided during decryption + * as well. + * If the context is not set, plaintext would be used as is for encryption. + * If the context is set but: + * 1. there is no record present when transforming a given value or + * 2. the field is not present when transforming a given value, + * plaintext would be used as is for encryption. + * Note that case (1) is expected when an `InfoTypeTransformation` is + * applied to both structured and non-structured `ContentItem`s. + *+ * + *
.google.privacy.dlp.v2.FieldId context = 3;
+ */
+ public boolean hasContext() {
+ return context_ != null;
+ }
+ /**
+ *
+ *
+ * + * Optional. A context may be used for higher security and maintaining + * referential integrity such that the same identifier in two different + * contexts will be given a distinct surrogate. The context is appended to + * plaintext value being encrypted. On decryption the provided context is + * validated against the value used during encryption. If a context was + * provided during encryption, same context must be provided during decryption + * as well. + * If the context is not set, plaintext would be used as is for encryption. + * If the context is set but: + * 1. there is no record present when transforming a given value or + * 2. the field is not present when transforming a given value, + * plaintext would be used as is for encryption. + * Note that case (1) is expected when an `InfoTypeTransformation` is + * applied to both structured and non-structured `ContentItem`s. + *+ * + *
.google.privacy.dlp.v2.FieldId context = 3;
+ */
+ public com.google.privacy.dlp.v2.FieldId getContext() {
+ return context_ == null ? com.google.privacy.dlp.v2.FieldId.getDefaultInstance() : context_;
+ }
+ /**
+ *
+ *
+ * + * Optional. A context may be used for higher security and maintaining + * referential integrity such that the same identifier in two different + * contexts will be given a distinct surrogate. The context is appended to + * plaintext value being encrypted. On decryption the provided context is + * validated against the value used during encryption. If a context was + * provided during encryption, same context must be provided during decryption + * as well. + * If the context is not set, plaintext would be used as is for encryption. + * If the context is set but: + * 1. there is no record present when transforming a given value or + * 2. the field is not present when transforming a given value, + * plaintext would be used as is for encryption. + * Note that case (1) is expected when an `InfoTypeTransformation` is + * applied to both structured and non-structured `ContentItem`s. + *+ * + *
.google.privacy.dlp.v2.FieldId context = 3;
+ */
+ public com.google.privacy.dlp.v2.FieldIdOrBuilder getContextOrBuilder() {
+ return getContext();
+ }
+
+ private byte memoizedIsInitialized = -1;
+
+ @java.lang.Override
+ public final boolean isInitialized() {
+ byte isInitialized = memoizedIsInitialized;
+ if (isInitialized == 1) return true;
+ if (isInitialized == 0) return false;
+
+ memoizedIsInitialized = 1;
+ return true;
+ }
+
+ @java.lang.Override
+ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException {
+ if (cryptoKey_ != null) {
+ output.writeMessage(1, getCryptoKey());
+ }
+ if (surrogateInfoType_ != null) {
+ output.writeMessage(2, getSurrogateInfoType());
+ }
+ if (context_ != null) {
+ output.writeMessage(3, getContext());
+ }
+ unknownFields.writeTo(output);
+ }
+
+ @java.lang.Override
+ public int getSerializedSize() {
+ int size = memoizedSize;
+ if (size != -1) return size;
+
+ size = 0;
+ if (cryptoKey_ != null) {
+ size += com.google.protobuf.CodedOutputStream.computeMessageSize(1, getCryptoKey());
+ }
+ if (surrogateInfoType_ != null) {
+ size += com.google.protobuf.CodedOutputStream.computeMessageSize(2, getSurrogateInfoType());
+ }
+ if (context_ != null) {
+ size += com.google.protobuf.CodedOutputStream.computeMessageSize(3, getContext());
+ }
+ size += unknownFields.getSerializedSize();
+ memoizedSize = size;
+ return size;
+ }
+
+ @java.lang.Override
+ public boolean equals(final java.lang.Object obj) {
+ if (obj == this) {
+ return true;
+ }
+ if (!(obj instanceof com.google.privacy.dlp.v2.CryptoDeterministicConfig)) {
+ return super.equals(obj);
+ }
+ com.google.privacy.dlp.v2.CryptoDeterministicConfig other =
+ (com.google.privacy.dlp.v2.CryptoDeterministicConfig) obj;
+
+ if (hasCryptoKey() != other.hasCryptoKey()) return false;
+ if (hasCryptoKey()) {
+ if (!getCryptoKey().equals(other.getCryptoKey())) return false;
+ }
+ if (hasSurrogateInfoType() != other.hasSurrogateInfoType()) return false;
+ if (hasSurrogateInfoType()) {
+ if (!getSurrogateInfoType().equals(other.getSurrogateInfoType())) return false;
+ }
+ if (hasContext() != other.hasContext()) return false;
+ if (hasContext()) {
+ if (!getContext().equals(other.getContext())) return false;
+ }
+ if (!unknownFields.equals(other.unknownFields)) return false;
+ return true;
+ }
+
+ @java.lang.Override
+ public int hashCode() {
+ if (memoizedHashCode != 0) {
+ return memoizedHashCode;
+ }
+ int hash = 41;
+ hash = (19 * hash) + getDescriptor().hashCode();
+ if (hasCryptoKey()) {
+ hash = (37 * hash) + CRYPTO_KEY_FIELD_NUMBER;
+ hash = (53 * hash) + getCryptoKey().hashCode();
+ }
+ if (hasSurrogateInfoType()) {
+ hash = (37 * hash) + SURROGATE_INFO_TYPE_FIELD_NUMBER;
+ hash = (53 * hash) + getSurrogateInfoType().hashCode();
+ }
+ if (hasContext()) {
+ hash = (37 * hash) + CONTEXT_FIELD_NUMBER;
+ hash = (53 * hash) + getContext().hashCode();
+ }
+ hash = (29 * hash) + unknownFields.hashCode();
+ memoizedHashCode = hash;
+ return hash;
+ }
+
+ public static com.google.privacy.dlp.v2.CryptoDeterministicConfig parseFrom(
+ java.nio.ByteBuffer data) throws com.google.protobuf.InvalidProtocolBufferException {
+ return PARSER.parseFrom(data);
+ }
+
+ public static com.google.privacy.dlp.v2.CryptoDeterministicConfig parseFrom(
+ java.nio.ByteBuffer data, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+ throws com.google.protobuf.InvalidProtocolBufferException {
+ return PARSER.parseFrom(data, extensionRegistry);
+ }
+
+ public static com.google.privacy.dlp.v2.CryptoDeterministicConfig parseFrom(
+ com.google.protobuf.ByteString data)
+ throws com.google.protobuf.InvalidProtocolBufferException {
+ return PARSER.parseFrom(data);
+ }
+
+ public static com.google.privacy.dlp.v2.CryptoDeterministicConfig parseFrom(
+ com.google.protobuf.ByteString data,
+ com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+ throws com.google.protobuf.InvalidProtocolBufferException {
+ return PARSER.parseFrom(data, extensionRegistry);
+ }
+
+ public static com.google.privacy.dlp.v2.CryptoDeterministicConfig parseFrom(byte[] data)
+ throws com.google.protobuf.InvalidProtocolBufferException {
+ return PARSER.parseFrom(data);
+ }
+
+ public static com.google.privacy.dlp.v2.CryptoDeterministicConfig parseFrom(
+ byte[] data, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+ throws com.google.protobuf.InvalidProtocolBufferException {
+ return PARSER.parseFrom(data, extensionRegistry);
+ }
+
+ public static com.google.privacy.dlp.v2.CryptoDeterministicConfig parseFrom(
+ java.io.InputStream input) throws java.io.IOException {
+ return com.google.protobuf.GeneratedMessageV3.parseWithIOException(PARSER, input);
+ }
+
+ public static com.google.privacy.dlp.v2.CryptoDeterministicConfig parseFrom(
+ java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+ throws java.io.IOException {
+ return com.google.protobuf.GeneratedMessageV3.parseWithIOException(
+ PARSER, input, extensionRegistry);
+ }
+
+ public static com.google.privacy.dlp.v2.CryptoDeterministicConfig parseDelimitedFrom(
+ java.io.InputStream input) throws java.io.IOException {
+ return com.google.protobuf.GeneratedMessageV3.parseDelimitedWithIOException(PARSER, input);
+ }
+
+ public static com.google.privacy.dlp.v2.CryptoDeterministicConfig parseDelimitedFrom(
+ java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+ throws java.io.IOException {
+ return com.google.protobuf.GeneratedMessageV3.parseDelimitedWithIOException(
+ PARSER, input, extensionRegistry);
+ }
+
+ public static com.google.privacy.dlp.v2.CryptoDeterministicConfig parseFrom(
+ com.google.protobuf.CodedInputStream input) throws java.io.IOException {
+ return com.google.protobuf.GeneratedMessageV3.parseWithIOException(PARSER, input);
+ }
+
+ public static com.google.privacy.dlp.v2.CryptoDeterministicConfig parseFrom(
+ com.google.protobuf.CodedInputStream input,
+ com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+ throws java.io.IOException {
+ return com.google.protobuf.GeneratedMessageV3.parseWithIOException(
+ PARSER, input, extensionRegistry);
+ }
+
+ @java.lang.Override
+ public Builder newBuilderForType() {
+ return newBuilder();
+ }
+
+ public static Builder newBuilder() {
+ return DEFAULT_INSTANCE.toBuilder();
+ }
+
+ public static Builder newBuilder(com.google.privacy.dlp.v2.CryptoDeterministicConfig prototype) {
+ return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
+ }
+
+ @java.lang.Override
+ public Builder toBuilder() {
+ return this == DEFAULT_INSTANCE ? new Builder() : new Builder().mergeFrom(this);
+ }
+
+ @java.lang.Override
+ protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+ Builder builder = new Builder(parent);
+ return builder;
+ }
+ /**
+ *
+ *
+ * + * Pseudonymization method that generates deterministic encryption for the given + * input. Outputs a base64 encoded representation of the encrypted output. + * Uses AES-SIV based on the RFC https://tools.ietf.org/html/rfc5297. + *+ * + * Protobuf type {@code google.privacy.dlp.v2.CryptoDeterministicConfig} + */ + public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder
+ * The key used by the encryption function. + *+ * + *
.google.privacy.dlp.v2.CryptoKey crypto_key = 1;
+ */
+ public boolean hasCryptoKey() {
+ return cryptoKeyBuilder_ != null || cryptoKey_ != null;
+ }
+ /**
+ *
+ *
+ * + * The key used by the encryption function. + *+ * + *
.google.privacy.dlp.v2.CryptoKey crypto_key = 1;
+ */
+ public com.google.privacy.dlp.v2.CryptoKey getCryptoKey() {
+ if (cryptoKeyBuilder_ == null) {
+ return cryptoKey_ == null
+ ? com.google.privacy.dlp.v2.CryptoKey.getDefaultInstance()
+ : cryptoKey_;
+ } else {
+ return cryptoKeyBuilder_.getMessage();
+ }
+ }
+ /**
+ *
+ *
+ * + * The key used by the encryption function. + *+ * + *
.google.privacy.dlp.v2.CryptoKey crypto_key = 1;
+ */
+ public Builder setCryptoKey(com.google.privacy.dlp.v2.CryptoKey value) {
+ if (cryptoKeyBuilder_ == null) {
+ if (value == null) {
+ throw new NullPointerException();
+ }
+ cryptoKey_ = value;
+ onChanged();
+ } else {
+ cryptoKeyBuilder_.setMessage(value);
+ }
+
+ return this;
+ }
+ /**
+ *
+ *
+ * + * The key used by the encryption function. + *+ * + *
.google.privacy.dlp.v2.CryptoKey crypto_key = 1;
+ */
+ public Builder setCryptoKey(com.google.privacy.dlp.v2.CryptoKey.Builder builderForValue) {
+ if (cryptoKeyBuilder_ == null) {
+ cryptoKey_ = builderForValue.build();
+ onChanged();
+ } else {
+ cryptoKeyBuilder_.setMessage(builderForValue.build());
+ }
+
+ return this;
+ }
+ /**
+ *
+ *
+ * + * The key used by the encryption function. + *+ * + *
.google.privacy.dlp.v2.CryptoKey crypto_key = 1;
+ */
+ public Builder mergeCryptoKey(com.google.privacy.dlp.v2.CryptoKey value) {
+ if (cryptoKeyBuilder_ == null) {
+ if (cryptoKey_ != null) {
+ cryptoKey_ =
+ com.google.privacy.dlp.v2.CryptoKey.newBuilder(cryptoKey_)
+ .mergeFrom(value)
+ .buildPartial();
+ } else {
+ cryptoKey_ = value;
+ }
+ onChanged();
+ } else {
+ cryptoKeyBuilder_.mergeFrom(value);
+ }
+
+ return this;
+ }
+ /**
+ *
+ *
+ * + * The key used by the encryption function. + *+ * + *
.google.privacy.dlp.v2.CryptoKey crypto_key = 1;
+ */
+ public Builder clearCryptoKey() {
+ if (cryptoKeyBuilder_ == null) {
+ cryptoKey_ = null;
+ onChanged();
+ } else {
+ cryptoKey_ = null;
+ cryptoKeyBuilder_ = null;
+ }
+
+ return this;
+ }
+ /**
+ *
+ *
+ * + * The key used by the encryption function. + *+ * + *
.google.privacy.dlp.v2.CryptoKey crypto_key = 1;
+ */
+ public com.google.privacy.dlp.v2.CryptoKey.Builder getCryptoKeyBuilder() {
+
+ onChanged();
+ return getCryptoKeyFieldBuilder().getBuilder();
+ }
+ /**
+ *
+ *
+ * + * The key used by the encryption function. + *+ * + *
.google.privacy.dlp.v2.CryptoKey crypto_key = 1;
+ */
+ public com.google.privacy.dlp.v2.CryptoKeyOrBuilder getCryptoKeyOrBuilder() {
+ if (cryptoKeyBuilder_ != null) {
+ return cryptoKeyBuilder_.getMessageOrBuilder();
+ } else {
+ return cryptoKey_ == null
+ ? com.google.privacy.dlp.v2.CryptoKey.getDefaultInstance()
+ : cryptoKey_;
+ }
+ }
+ /**
+ *
+ *
+ * + * The key used by the encryption function. + *+ * + *
.google.privacy.dlp.v2.CryptoKey crypto_key = 1;
+ */
+ private com.google.protobuf.SingleFieldBuilderV3<
+ com.google.privacy.dlp.v2.CryptoKey,
+ com.google.privacy.dlp.v2.CryptoKey.Builder,
+ com.google.privacy.dlp.v2.CryptoKeyOrBuilder>
+ getCryptoKeyFieldBuilder() {
+ if (cryptoKeyBuilder_ == null) {
+ cryptoKeyBuilder_ =
+ new com.google.protobuf.SingleFieldBuilderV3<
+ com.google.privacy.dlp.v2.CryptoKey,
+ com.google.privacy.dlp.v2.CryptoKey.Builder,
+ com.google.privacy.dlp.v2.CryptoKeyOrBuilder>(
+ getCryptoKey(), getParentForChildren(), isClean());
+ cryptoKey_ = null;
+ }
+ return cryptoKeyBuilder_;
+ }
+
+ private com.google.privacy.dlp.v2.InfoType surrogateInfoType_;
+ private com.google.protobuf.SingleFieldBuilderV3<
+ com.google.privacy.dlp.v2.InfoType,
+ com.google.privacy.dlp.v2.InfoType.Builder,
+ com.google.privacy.dlp.v2.InfoTypeOrBuilder>
+ surrogateInfoTypeBuilder_;
+ /**
+ *
+ *
+ * + * The custom info type to annotate the surrogate with. + * This annotation will be applied to the surrogate by prefixing it with + * the name of the custom info type followed by the number of + * characters comprising the surrogate. The following scheme defines the + * format: <info type name>(<surrogate character count>):<surrogate> + * For example, if the name of custom info type is 'MY_TOKEN_INFO_TYPE' and + * the surrogate is 'abc', the full replacement value + * will be: 'MY_TOKEN_INFO_TYPE(3):abc' + * This annotation identifies the surrogate when inspecting content using the + * custom info type 'Surrogate'. This facilitates reversal of the + * surrogate when it occurs in free text. + * In order for inspection to work properly, the name of this info type must + * not occur naturally anywhere in your data; otherwise, inspection may either + * - reverse a surrogate that does not correspond to an actual identifier + * - be unable to parse the surrogate and result in an error + * Therefore, choose your custom info type name carefully after considering + * what your data looks like. One way to select a name that has a high chance + * of yielding reliable detection is to include one or more unicode characters + * that are highly improbable to exist in your data. + * For example, assuming your data is entered from a regular ASCII keyboard, + * the symbol with the hex code point 29DD might be used like so: + * ⧝MY_TOKEN_TYPE + *+ * + *
.google.privacy.dlp.v2.InfoType surrogate_info_type = 2;
+ */
+ public boolean hasSurrogateInfoType() {
+ return surrogateInfoTypeBuilder_ != null || surrogateInfoType_ != null;
+ }
+ /**
+ *
+ *
+ * + * The custom info type to annotate the surrogate with. + * This annotation will be applied to the surrogate by prefixing it with + * the name of the custom info type followed by the number of + * characters comprising the surrogate. The following scheme defines the + * format: <info type name>(<surrogate character count>):<surrogate> + * For example, if the name of custom info type is 'MY_TOKEN_INFO_TYPE' and + * the surrogate is 'abc', the full replacement value + * will be: 'MY_TOKEN_INFO_TYPE(3):abc' + * This annotation identifies the surrogate when inspecting content using the + * custom info type 'Surrogate'. This facilitates reversal of the + * surrogate when it occurs in free text. + * In order for inspection to work properly, the name of this info type must + * not occur naturally anywhere in your data; otherwise, inspection may either + * - reverse a surrogate that does not correspond to an actual identifier + * - be unable to parse the surrogate and result in an error + * Therefore, choose your custom info type name carefully after considering + * what your data looks like. One way to select a name that has a high chance + * of yielding reliable detection is to include one or more unicode characters + * that are highly improbable to exist in your data. + * For example, assuming your data is entered from a regular ASCII keyboard, + * the symbol with the hex code point 29DD might be used like so: + * ⧝MY_TOKEN_TYPE + *+ * + *
.google.privacy.dlp.v2.InfoType surrogate_info_type = 2;
+ */
+ public com.google.privacy.dlp.v2.InfoType getSurrogateInfoType() {
+ if (surrogateInfoTypeBuilder_ == null) {
+ return surrogateInfoType_ == null
+ ? com.google.privacy.dlp.v2.InfoType.getDefaultInstance()
+ : surrogateInfoType_;
+ } else {
+ return surrogateInfoTypeBuilder_.getMessage();
+ }
+ }
+ /**
+ *
+ *
+ * + * The custom info type to annotate the surrogate with. + * This annotation will be applied to the surrogate by prefixing it with + * the name of the custom info type followed by the number of + * characters comprising the surrogate. The following scheme defines the + * format: <info type name>(<surrogate character count>):<surrogate> + * For example, if the name of custom info type is 'MY_TOKEN_INFO_TYPE' and + * the surrogate is 'abc', the full replacement value + * will be: 'MY_TOKEN_INFO_TYPE(3):abc' + * This annotation identifies the surrogate when inspecting content using the + * custom info type 'Surrogate'. This facilitates reversal of the + * surrogate when it occurs in free text. + * In order for inspection to work properly, the name of this info type must + * not occur naturally anywhere in your data; otherwise, inspection may either + * - reverse a surrogate that does not correspond to an actual identifier + * - be unable to parse the surrogate and result in an error + * Therefore, choose your custom info type name carefully after considering + * what your data looks like. One way to select a name that has a high chance + * of yielding reliable detection is to include one or more unicode characters + * that are highly improbable to exist in your data. + * For example, assuming your data is entered from a regular ASCII keyboard, + * the symbol with the hex code point 29DD might be used like so: + * ⧝MY_TOKEN_TYPE + *+ * + *
.google.privacy.dlp.v2.InfoType surrogate_info_type = 2;
+ */
+ public Builder setSurrogateInfoType(com.google.privacy.dlp.v2.InfoType value) {
+ if (surrogateInfoTypeBuilder_ == null) {
+ if (value == null) {
+ throw new NullPointerException();
+ }
+ surrogateInfoType_ = value;
+ onChanged();
+ } else {
+ surrogateInfoTypeBuilder_.setMessage(value);
+ }
+
+ return this;
+ }
+ /**
+ *
+ *
+ * + * The custom info type to annotate the surrogate with. + * This annotation will be applied to the surrogate by prefixing it with + * the name of the custom info type followed by the number of + * characters comprising the surrogate. The following scheme defines the + * format: <info type name>(<surrogate character count>):<surrogate> + * For example, if the name of custom info type is 'MY_TOKEN_INFO_TYPE' and + * the surrogate is 'abc', the full replacement value + * will be: 'MY_TOKEN_INFO_TYPE(3):abc' + * This annotation identifies the surrogate when inspecting content using the + * custom info type 'Surrogate'. This facilitates reversal of the + * surrogate when it occurs in free text. + * In order for inspection to work properly, the name of this info type must + * not occur naturally anywhere in your data; otherwise, inspection may either + * - reverse a surrogate that does not correspond to an actual identifier + * - be unable to parse the surrogate and result in an error + * Therefore, choose your custom info type name carefully after considering + * what your data looks like. One way to select a name that has a high chance + * of yielding reliable detection is to include one or more unicode characters + * that are highly improbable to exist in your data. + * For example, assuming your data is entered from a regular ASCII keyboard, + * the symbol with the hex code point 29DD might be used like so: + * ⧝MY_TOKEN_TYPE + *+ * + *
.google.privacy.dlp.v2.InfoType surrogate_info_type = 2;
+ */
+ public Builder setSurrogateInfoType(
+ com.google.privacy.dlp.v2.InfoType.Builder builderForValue) {
+ if (surrogateInfoTypeBuilder_ == null) {
+ surrogateInfoType_ = builderForValue.build();
+ onChanged();
+ } else {
+ surrogateInfoTypeBuilder_.setMessage(builderForValue.build());
+ }
+
+ return this;
+ }
+ /**
+ *
+ *
+ * + * The custom info type to annotate the surrogate with. + * This annotation will be applied to the surrogate by prefixing it with + * the name of the custom info type followed by the number of + * characters comprising the surrogate. The following scheme defines the + * format: <info type name>(<surrogate character count>):<surrogate> + * For example, if the name of custom info type is 'MY_TOKEN_INFO_TYPE' and + * the surrogate is 'abc', the full replacement value + * will be: 'MY_TOKEN_INFO_TYPE(3):abc' + * This annotation identifies the surrogate when inspecting content using the + * custom info type 'Surrogate'. This facilitates reversal of the + * surrogate when it occurs in free text. + * In order for inspection to work properly, the name of this info type must + * not occur naturally anywhere in your data; otherwise, inspection may either + * - reverse a surrogate that does not correspond to an actual identifier + * - be unable to parse the surrogate and result in an error + * Therefore, choose your custom info type name carefully after considering + * what your data looks like. One way to select a name that has a high chance + * of yielding reliable detection is to include one or more unicode characters + * that are highly improbable to exist in your data. + * For example, assuming your data is entered from a regular ASCII keyboard, + * the symbol with the hex code point 29DD might be used like so: + * ⧝MY_TOKEN_TYPE + *+ * + *
.google.privacy.dlp.v2.InfoType surrogate_info_type = 2;
+ */
+ public Builder mergeSurrogateInfoType(com.google.privacy.dlp.v2.InfoType value) {
+ if (surrogateInfoTypeBuilder_ == null) {
+ if (surrogateInfoType_ != null) {
+ surrogateInfoType_ =
+ com.google.privacy.dlp.v2.InfoType.newBuilder(surrogateInfoType_)
+ .mergeFrom(value)
+ .buildPartial();
+ } else {
+ surrogateInfoType_ = value;
+ }
+ onChanged();
+ } else {
+ surrogateInfoTypeBuilder_.mergeFrom(value);
+ }
+
+ return this;
+ }
+ /**
+ *
+ *
+ * + * The custom info type to annotate the surrogate with. + * This annotation will be applied to the surrogate by prefixing it with + * the name of the custom info type followed by the number of + * characters comprising the surrogate. The following scheme defines the + * format: <info type name>(<surrogate character count>):<surrogate> + * For example, if the name of custom info type is 'MY_TOKEN_INFO_TYPE' and + * the surrogate is 'abc', the full replacement value + * will be: 'MY_TOKEN_INFO_TYPE(3):abc' + * This annotation identifies the surrogate when inspecting content using the + * custom info type 'Surrogate'. This facilitates reversal of the + * surrogate when it occurs in free text. + * In order for inspection to work properly, the name of this info type must + * not occur naturally anywhere in your data; otherwise, inspection may either + * - reverse a surrogate that does not correspond to an actual identifier + * - be unable to parse the surrogate and result in an error + * Therefore, choose your custom info type name carefully after considering + * what your data looks like. One way to select a name that has a high chance + * of yielding reliable detection is to include one or more unicode characters + * that are highly improbable to exist in your data. + * For example, assuming your data is entered from a regular ASCII keyboard, + * the symbol with the hex code point 29DD might be used like so: + * ⧝MY_TOKEN_TYPE + *+ * + *
.google.privacy.dlp.v2.InfoType surrogate_info_type = 2;
+ */
+ public Builder clearSurrogateInfoType() {
+ if (surrogateInfoTypeBuilder_ == null) {
+ surrogateInfoType_ = null;
+ onChanged();
+ } else {
+ surrogateInfoType_ = null;
+ surrogateInfoTypeBuilder_ = null;
+ }
+
+ return this;
+ }
+ /**
+ *
+ *
+ * + * The custom info type to annotate the surrogate with. + * This annotation will be applied to the surrogate by prefixing it with + * the name of the custom info type followed by the number of + * characters comprising the surrogate. The following scheme defines the + * format: <info type name>(<surrogate character count>):<surrogate> + * For example, if the name of custom info type is 'MY_TOKEN_INFO_TYPE' and + * the surrogate is 'abc', the full replacement value + * will be: 'MY_TOKEN_INFO_TYPE(3):abc' + * This annotation identifies the surrogate when inspecting content using the + * custom info type 'Surrogate'. This facilitates reversal of the + * surrogate when it occurs in free text. + * In order for inspection to work properly, the name of this info type must + * not occur naturally anywhere in your data; otherwise, inspection may either + * - reverse a surrogate that does not correspond to an actual identifier + * - be unable to parse the surrogate and result in an error + * Therefore, choose your custom info type name carefully after considering + * what your data looks like. One way to select a name that has a high chance + * of yielding reliable detection is to include one or more unicode characters + * that are highly improbable to exist in your data. + * For example, assuming your data is entered from a regular ASCII keyboard, + * the symbol with the hex code point 29DD might be used like so: + * ⧝MY_TOKEN_TYPE + *+ * + *
.google.privacy.dlp.v2.InfoType surrogate_info_type = 2;
+ */
+ public com.google.privacy.dlp.v2.InfoType.Builder getSurrogateInfoTypeBuilder() {
+
+ onChanged();
+ return getSurrogateInfoTypeFieldBuilder().getBuilder();
+ }
+ /**
+ *
+ *
+ * + * The custom info type to annotate the surrogate with. + * This annotation will be applied to the surrogate by prefixing it with + * the name of the custom info type followed by the number of + * characters comprising the surrogate. The following scheme defines the + * format: <info type name>(<surrogate character count>):<surrogate> + * For example, if the name of custom info type is 'MY_TOKEN_INFO_TYPE' and + * the surrogate is 'abc', the full replacement value + * will be: 'MY_TOKEN_INFO_TYPE(3):abc' + * This annotation identifies the surrogate when inspecting content using the + * custom info type 'Surrogate'. This facilitates reversal of the + * surrogate when it occurs in free text. + * In order for inspection to work properly, the name of this info type must + * not occur naturally anywhere in your data; otherwise, inspection may either + * - reverse a surrogate that does not correspond to an actual identifier + * - be unable to parse the surrogate and result in an error + * Therefore, choose your custom info type name carefully after considering + * what your data looks like. One way to select a name that has a high chance + * of yielding reliable detection is to include one or more unicode characters + * that are highly improbable to exist in your data. + * For example, assuming your data is entered from a regular ASCII keyboard, + * the symbol with the hex code point 29DD might be used like so: + * ⧝MY_TOKEN_TYPE + *+ * + *
.google.privacy.dlp.v2.InfoType surrogate_info_type = 2;
+ */
+ public com.google.privacy.dlp.v2.InfoTypeOrBuilder getSurrogateInfoTypeOrBuilder() {
+ if (surrogateInfoTypeBuilder_ != null) {
+ return surrogateInfoTypeBuilder_.getMessageOrBuilder();
+ } else {
+ return surrogateInfoType_ == null
+ ? com.google.privacy.dlp.v2.InfoType.getDefaultInstance()
+ : surrogateInfoType_;
+ }
+ }
+ /**
+ *
+ *
+ * + * The custom info type to annotate the surrogate with. + * This annotation will be applied to the surrogate by prefixing it with + * the name of the custom info type followed by the number of + * characters comprising the surrogate. The following scheme defines the + * format: <info type name>(<surrogate character count>):<surrogate> + * For example, if the name of custom info type is 'MY_TOKEN_INFO_TYPE' and + * the surrogate is 'abc', the full replacement value + * will be: 'MY_TOKEN_INFO_TYPE(3):abc' + * This annotation identifies the surrogate when inspecting content using the + * custom info type 'Surrogate'. This facilitates reversal of the + * surrogate when it occurs in free text. + * In order for inspection to work properly, the name of this info type must + * not occur naturally anywhere in your data; otherwise, inspection may either + * - reverse a surrogate that does not correspond to an actual identifier + * - be unable to parse the surrogate and result in an error + * Therefore, choose your custom info type name carefully after considering + * what your data looks like. One way to select a name that has a high chance + * of yielding reliable detection is to include one or more unicode characters + * that are highly improbable to exist in your data. + * For example, assuming your data is entered from a regular ASCII keyboard, + * the symbol with the hex code point 29DD might be used like so: + * ⧝MY_TOKEN_TYPE + *+ * + *
.google.privacy.dlp.v2.InfoType surrogate_info_type = 2;
+ */
+ private com.google.protobuf.SingleFieldBuilderV3<
+ com.google.privacy.dlp.v2.InfoType,
+ com.google.privacy.dlp.v2.InfoType.Builder,
+ com.google.privacy.dlp.v2.InfoTypeOrBuilder>
+ getSurrogateInfoTypeFieldBuilder() {
+ if (surrogateInfoTypeBuilder_ == null) {
+ surrogateInfoTypeBuilder_ =
+ new com.google.protobuf.SingleFieldBuilderV3<
+ com.google.privacy.dlp.v2.InfoType,
+ com.google.privacy.dlp.v2.InfoType.Builder,
+ com.google.privacy.dlp.v2.InfoTypeOrBuilder>(
+ getSurrogateInfoType(), getParentForChildren(), isClean());
+ surrogateInfoType_ = null;
+ }
+ return surrogateInfoTypeBuilder_;
+ }
+
+ private com.google.privacy.dlp.v2.FieldId context_;
+ private com.google.protobuf.SingleFieldBuilderV3<
+ com.google.privacy.dlp.v2.FieldId,
+ com.google.privacy.dlp.v2.FieldId.Builder,
+ com.google.privacy.dlp.v2.FieldIdOrBuilder>
+ contextBuilder_;
+ /**
+ *
+ *
+ * + * Optional. A context may be used for higher security and maintaining + * referential integrity such that the same identifier in two different + * contexts will be given a distinct surrogate. The context is appended to + * plaintext value being encrypted. On decryption the provided context is + * validated against the value used during encryption. If a context was + * provided during encryption, same context must be provided during decryption + * as well. + * If the context is not set, plaintext would be used as is for encryption. + * If the context is set but: + * 1. there is no record present when transforming a given value or + * 2. the field is not present when transforming a given value, + * plaintext would be used as is for encryption. + * Note that case (1) is expected when an `InfoTypeTransformation` is + * applied to both structured and non-structured `ContentItem`s. + *+ * + *
.google.privacy.dlp.v2.FieldId context = 3;
+ */
+ public boolean hasContext() {
+ return contextBuilder_ != null || context_ != null;
+ }
+ /**
+ *
+ *
+ * + * Optional. A context may be used for higher security and maintaining + * referential integrity such that the same identifier in two different + * contexts will be given a distinct surrogate. The context is appended to + * plaintext value being encrypted. On decryption the provided context is + * validated against the value used during encryption. If a context was + * provided during encryption, same context must be provided during decryption + * as well. + * If the context is not set, plaintext would be used as is for encryption. + * If the context is set but: + * 1. there is no record present when transforming a given value or + * 2. the field is not present when transforming a given value, + * plaintext would be used as is for encryption. + * Note that case (1) is expected when an `InfoTypeTransformation` is + * applied to both structured and non-structured `ContentItem`s. + *+ * + *
.google.privacy.dlp.v2.FieldId context = 3;
+ */
+ public com.google.privacy.dlp.v2.FieldId getContext() {
+ if (contextBuilder_ == null) {
+ return context_ == null ? com.google.privacy.dlp.v2.FieldId.getDefaultInstance() : context_;
+ } else {
+ return contextBuilder_.getMessage();
+ }
+ }
+ /**
+ *
+ *
+ * + * Optional. A context may be used for higher security and maintaining + * referential integrity such that the same identifier in two different + * contexts will be given a distinct surrogate. The context is appended to + * plaintext value being encrypted. On decryption the provided context is + * validated against the value used during encryption. If a context was + * provided during encryption, same context must be provided during decryption + * as well. + * If the context is not set, plaintext would be used as is for encryption. + * If the context is set but: + * 1. there is no record present when transforming a given value or + * 2. the field is not present when transforming a given value, + * plaintext would be used as is for encryption. + * Note that case (1) is expected when an `InfoTypeTransformation` is + * applied to both structured and non-structured `ContentItem`s. + *+ * + *
.google.privacy.dlp.v2.FieldId context = 3;
+ */
+ public Builder setContext(com.google.privacy.dlp.v2.FieldId value) {
+ if (contextBuilder_ == null) {
+ if (value == null) {
+ throw new NullPointerException();
+ }
+ context_ = value;
+ onChanged();
+ } else {
+ contextBuilder_.setMessage(value);
+ }
+
+ return this;
+ }
+ /**
+ *
+ *
+ * + * Optional. A context may be used for higher security and maintaining + * referential integrity such that the same identifier in two different + * contexts will be given a distinct surrogate. The context is appended to + * plaintext value being encrypted. On decryption the provided context is + * validated against the value used during encryption. If a context was + * provided during encryption, same context must be provided during decryption + * as well. + * If the context is not set, plaintext would be used as is for encryption. + * If the context is set but: + * 1. there is no record present when transforming a given value or + * 2. the field is not present when transforming a given value, + * plaintext would be used as is for encryption. + * Note that case (1) is expected when an `InfoTypeTransformation` is + * applied to both structured and non-structured `ContentItem`s. + *+ * + *
.google.privacy.dlp.v2.FieldId context = 3;
+ */
+ public Builder setContext(com.google.privacy.dlp.v2.FieldId.Builder builderForValue) {
+ if (contextBuilder_ == null) {
+ context_ = builderForValue.build();
+ onChanged();
+ } else {
+ contextBuilder_.setMessage(builderForValue.build());
+ }
+
+ return this;
+ }
+ /**
+ *
+ *
+ * + * Optional. A context may be used for higher security and maintaining + * referential integrity such that the same identifier in two different + * contexts will be given a distinct surrogate. The context is appended to + * plaintext value being encrypted. On decryption the provided context is + * validated against the value used during encryption. If a context was + * provided during encryption, same context must be provided during decryption + * as well. + * If the context is not set, plaintext would be used as is for encryption. + * If the context is set but: + * 1. there is no record present when transforming a given value or + * 2. the field is not present when transforming a given value, + * plaintext would be used as is for encryption. + * Note that case (1) is expected when an `InfoTypeTransformation` is + * applied to both structured and non-structured `ContentItem`s. + *+ * + *
.google.privacy.dlp.v2.FieldId context = 3;
+ */
+ public Builder mergeContext(com.google.privacy.dlp.v2.FieldId value) {
+ if (contextBuilder_ == null) {
+ if (context_ != null) {
+ context_ =
+ com.google.privacy.dlp.v2.FieldId.newBuilder(context_)
+ .mergeFrom(value)
+ .buildPartial();
+ } else {
+ context_ = value;
+ }
+ onChanged();
+ } else {
+ contextBuilder_.mergeFrom(value);
+ }
+
+ return this;
+ }
+ /**
+ *
+ *
+ * + * Optional. A context may be used for higher security and maintaining + * referential integrity such that the same identifier in two different + * contexts will be given a distinct surrogate. The context is appended to + * plaintext value being encrypted. On decryption the provided context is + * validated against the value used during encryption. If a context was + * provided during encryption, same context must be provided during decryption + * as well. + * If the context is not set, plaintext would be used as is for encryption. + * If the context is set but: + * 1. there is no record present when transforming a given value or + * 2. the field is not present when transforming a given value, + * plaintext would be used as is for encryption. + * Note that case (1) is expected when an `InfoTypeTransformation` is + * applied to both structured and non-structured `ContentItem`s. + *+ * + *
.google.privacy.dlp.v2.FieldId context = 3;
+ */
+ public Builder clearContext() {
+ if (contextBuilder_ == null) {
+ context_ = null;
+ onChanged();
+ } else {
+ context_ = null;
+ contextBuilder_ = null;
+ }
+
+ return this;
+ }
+ /**
+ *
+ *
+ * + * Optional. A context may be used for higher security and maintaining + * referential integrity such that the same identifier in two different + * contexts will be given a distinct surrogate. The context is appended to + * plaintext value being encrypted. On decryption the provided context is + * validated against the value used during encryption. If a context was + * provided during encryption, same context must be provided during decryption + * as well. + * If the context is not set, plaintext would be used as is for encryption. + * If the context is set but: + * 1. there is no record present when transforming a given value or + * 2. the field is not present when transforming a given value, + * plaintext would be used as is for encryption. + * Note that case (1) is expected when an `InfoTypeTransformation` is + * applied to both structured and non-structured `ContentItem`s. + *+ * + *
.google.privacy.dlp.v2.FieldId context = 3;
+ */
+ public com.google.privacy.dlp.v2.FieldId.Builder getContextBuilder() {
+
+ onChanged();
+ return getContextFieldBuilder().getBuilder();
+ }
+ /**
+ *
+ *
+ * + * Optional. A context may be used for higher security and maintaining + * referential integrity such that the same identifier in two different + * contexts will be given a distinct surrogate. The context is appended to + * plaintext value being encrypted. On decryption the provided context is + * validated against the value used during encryption. If a context was + * provided during encryption, same context must be provided during decryption + * as well. + * If the context is not set, plaintext would be used as is for encryption. + * If the context is set but: + * 1. there is no record present when transforming a given value or + * 2. the field is not present when transforming a given value, + * plaintext would be used as is for encryption. + * Note that case (1) is expected when an `InfoTypeTransformation` is + * applied to both structured and non-structured `ContentItem`s. + *+ * + *
.google.privacy.dlp.v2.FieldId context = 3;
+ */
+ public com.google.privacy.dlp.v2.FieldIdOrBuilder getContextOrBuilder() {
+ if (contextBuilder_ != null) {
+ return contextBuilder_.getMessageOrBuilder();
+ } else {
+ return context_ == null ? com.google.privacy.dlp.v2.FieldId.getDefaultInstance() : context_;
+ }
+ }
+ /**
+ *
+ *
+ * + * Optional. A context may be used for higher security and maintaining + * referential integrity such that the same identifier in two different + * contexts will be given a distinct surrogate. The context is appended to + * plaintext value being encrypted. On decryption the provided context is + * validated against the value used during encryption. If a context was + * provided during encryption, same context must be provided during decryption + * as well. + * If the context is not set, plaintext would be used as is for encryption. + * If the context is set but: + * 1. there is no record present when transforming a given value or + * 2. the field is not present when transforming a given value, + * plaintext would be used as is for encryption. + * Note that case (1) is expected when an `InfoTypeTransformation` is + * applied to both structured and non-structured `ContentItem`s. + *+ * + *
.google.privacy.dlp.v2.FieldId context = 3;
+ */
+ private com.google.protobuf.SingleFieldBuilderV3<
+ com.google.privacy.dlp.v2.FieldId,
+ com.google.privacy.dlp.v2.FieldId.Builder,
+ com.google.privacy.dlp.v2.FieldIdOrBuilder>
+ getContextFieldBuilder() {
+ if (contextBuilder_ == null) {
+ contextBuilder_ =
+ new com.google.protobuf.SingleFieldBuilderV3<
+ com.google.privacy.dlp.v2.FieldId,
+ com.google.privacy.dlp.v2.FieldId.Builder,
+ com.google.privacy.dlp.v2.FieldIdOrBuilder>(
+ getContext(), getParentForChildren(), isClean());
+ context_ = null;
+ }
+ return contextBuilder_;
+ }
+
+ @java.lang.Override
+ public final Builder setUnknownFields(final com.google.protobuf.UnknownFieldSet unknownFields) {
+ return super.setUnknownFields(unknownFields);
+ }
+
+ @java.lang.Override
+ public final Builder mergeUnknownFields(
+ final com.google.protobuf.UnknownFieldSet unknownFields) {
+ return super.mergeUnknownFields(unknownFields);
+ }
+
+ // @@protoc_insertion_point(builder_scope:google.privacy.dlp.v2.CryptoDeterministicConfig)
+ }
+
+ // @@protoc_insertion_point(class_scope:google.privacy.dlp.v2.CryptoDeterministicConfig)
+ private static final com.google.privacy.dlp.v2.CryptoDeterministicConfig DEFAULT_INSTANCE;
+
+ static {
+ DEFAULT_INSTANCE = new com.google.privacy.dlp.v2.CryptoDeterministicConfig();
+ }
+
+ public static com.google.privacy.dlp.v2.CryptoDeterministicConfig getDefaultInstance() {
+ return DEFAULT_INSTANCE;
+ }
+
+ private static final com.google.protobuf.Parser+ * The key used by the encryption function. + *+ * + *
.google.privacy.dlp.v2.CryptoKey crypto_key = 1;
+ */
+ boolean hasCryptoKey();
+ /**
+ *
+ *
+ * + * The key used by the encryption function. + *+ * + *
.google.privacy.dlp.v2.CryptoKey crypto_key = 1;
+ */
+ com.google.privacy.dlp.v2.CryptoKey getCryptoKey();
+ /**
+ *
+ *
+ * + * The key used by the encryption function. + *+ * + *
.google.privacy.dlp.v2.CryptoKey crypto_key = 1;
+ */
+ com.google.privacy.dlp.v2.CryptoKeyOrBuilder getCryptoKeyOrBuilder();
+
+ /**
+ *
+ *
+ * + * The custom info type to annotate the surrogate with. + * This annotation will be applied to the surrogate by prefixing it with + * the name of the custom info type followed by the number of + * characters comprising the surrogate. The following scheme defines the + * format: <info type name>(<surrogate character count>):<surrogate> + * For example, if the name of custom info type is 'MY_TOKEN_INFO_TYPE' and + * the surrogate is 'abc', the full replacement value + * will be: 'MY_TOKEN_INFO_TYPE(3):abc' + * This annotation identifies the surrogate when inspecting content using the + * custom info type 'Surrogate'. This facilitates reversal of the + * surrogate when it occurs in free text. + * In order for inspection to work properly, the name of this info type must + * not occur naturally anywhere in your data; otherwise, inspection may either + * - reverse a surrogate that does not correspond to an actual identifier + * - be unable to parse the surrogate and result in an error + * Therefore, choose your custom info type name carefully after considering + * what your data looks like. One way to select a name that has a high chance + * of yielding reliable detection is to include one or more unicode characters + * that are highly improbable to exist in your data. + * For example, assuming your data is entered from a regular ASCII keyboard, + * the symbol with the hex code point 29DD might be used like so: + * ⧝MY_TOKEN_TYPE + *+ * + *
.google.privacy.dlp.v2.InfoType surrogate_info_type = 2;
+ */
+ boolean hasSurrogateInfoType();
+ /**
+ *
+ *
+ * + * The custom info type to annotate the surrogate with. + * This annotation will be applied to the surrogate by prefixing it with + * the name of the custom info type followed by the number of + * characters comprising the surrogate. The following scheme defines the + * format: <info type name>(<surrogate character count>):<surrogate> + * For example, if the name of custom info type is 'MY_TOKEN_INFO_TYPE' and + * the surrogate is 'abc', the full replacement value + * will be: 'MY_TOKEN_INFO_TYPE(3):abc' + * This annotation identifies the surrogate when inspecting content using the + * custom info type 'Surrogate'. This facilitates reversal of the + * surrogate when it occurs in free text. + * In order for inspection to work properly, the name of this info type must + * not occur naturally anywhere in your data; otherwise, inspection may either + * - reverse a surrogate that does not correspond to an actual identifier + * - be unable to parse the surrogate and result in an error + * Therefore, choose your custom info type name carefully after considering + * what your data looks like. One way to select a name that has a high chance + * of yielding reliable detection is to include one or more unicode characters + * that are highly improbable to exist in your data. + * For example, assuming your data is entered from a regular ASCII keyboard, + * the symbol with the hex code point 29DD might be used like so: + * ⧝MY_TOKEN_TYPE + *+ * + *
.google.privacy.dlp.v2.InfoType surrogate_info_type = 2;
+ */
+ com.google.privacy.dlp.v2.InfoType getSurrogateInfoType();
+ /**
+ *
+ *
+ * + * The custom info type to annotate the surrogate with. + * This annotation will be applied to the surrogate by prefixing it with + * the name of the custom info type followed by the number of + * characters comprising the surrogate. The following scheme defines the + * format: <info type name>(<surrogate character count>):<surrogate> + * For example, if the name of custom info type is 'MY_TOKEN_INFO_TYPE' and + * the surrogate is 'abc', the full replacement value + * will be: 'MY_TOKEN_INFO_TYPE(3):abc' + * This annotation identifies the surrogate when inspecting content using the + * custom info type 'Surrogate'. This facilitates reversal of the + * surrogate when it occurs in free text. + * In order for inspection to work properly, the name of this info type must + * not occur naturally anywhere in your data; otherwise, inspection may either + * - reverse a surrogate that does not correspond to an actual identifier + * - be unable to parse the surrogate and result in an error + * Therefore, choose your custom info type name carefully after considering + * what your data looks like. One way to select a name that has a high chance + * of yielding reliable detection is to include one or more unicode characters + * that are highly improbable to exist in your data. + * For example, assuming your data is entered from a regular ASCII keyboard, + * the symbol with the hex code point 29DD might be used like so: + * ⧝MY_TOKEN_TYPE + *+ * + *
.google.privacy.dlp.v2.InfoType surrogate_info_type = 2;
+ */
+ com.google.privacy.dlp.v2.InfoTypeOrBuilder getSurrogateInfoTypeOrBuilder();
+
+ /**
+ *
+ *
+ * + * Optional. A context may be used for higher security and maintaining + * referential integrity such that the same identifier in two different + * contexts will be given a distinct surrogate. The context is appended to + * plaintext value being encrypted. On decryption the provided context is + * validated against the value used during encryption. If a context was + * provided during encryption, same context must be provided during decryption + * as well. + * If the context is not set, plaintext would be used as is for encryption. + * If the context is set but: + * 1. there is no record present when transforming a given value or + * 2. the field is not present when transforming a given value, + * plaintext would be used as is for encryption. + * Note that case (1) is expected when an `InfoTypeTransformation` is + * applied to both structured and non-structured `ContentItem`s. + *+ * + *
.google.privacy.dlp.v2.FieldId context = 3;
+ */
+ boolean hasContext();
+ /**
+ *
+ *
+ * + * Optional. A context may be used for higher security and maintaining + * referential integrity such that the same identifier in two different + * contexts will be given a distinct surrogate. The context is appended to + * plaintext value being encrypted. On decryption the provided context is + * validated against the value used during encryption. If a context was + * provided during encryption, same context must be provided during decryption + * as well. + * If the context is not set, plaintext would be used as is for encryption. + * If the context is set but: + * 1. there is no record present when transforming a given value or + * 2. the field is not present when transforming a given value, + * plaintext would be used as is for encryption. + * Note that case (1) is expected when an `InfoTypeTransformation` is + * applied to both structured and non-structured `ContentItem`s. + *+ * + *
.google.privacy.dlp.v2.FieldId context = 3;
+ */
+ com.google.privacy.dlp.v2.FieldId getContext();
+ /**
+ *
+ *
+ * + * Optional. A context may be used for higher security and maintaining + * referential integrity such that the same identifier in two different + * contexts will be given a distinct surrogate. The context is appended to + * plaintext value being encrypted. On decryption the provided context is + * validated against the value used during encryption. If a context was + * provided during encryption, same context must be provided during decryption + * as well. + * If the context is not set, plaintext would be used as is for encryption. + * If the context is set but: + * 1. there is no record present when transforming a given value or + * 2. the field is not present when transforming a given value, + * plaintext would be used as is for encryption. + * Note that case (1) is expected when an `InfoTypeTransformation` is + * applied to both structured and non-structured `ContentItem`s. + *+ * + *
.google.privacy.dlp.v2.FieldId context = 3;
+ */
+ com.google.privacy.dlp.v2.FieldIdOrBuilder getContextOrBuilder();
+}
diff --git a/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/CryptoHashConfig.java b/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/CryptoHashConfig.java
index 632f83d53e7b..d00685058473 100644
--- a/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/CryptoHashConfig.java
+++ b/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/CryptoHashConfig.java
@@ -72,7 +72,7 @@ private CryptoHashConfig(
}
default:
{
- if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) {
+ if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
done = true;
}
break;
@@ -190,13 +190,12 @@ public boolean equals(final java.lang.Object obj) {
com.google.privacy.dlp.v2.CryptoHashConfig other =
(com.google.privacy.dlp.v2.CryptoHashConfig) 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 && unknownFields.equals(other.unknownFields);
- return result;
+ if (!unknownFields.equals(other.unknownFields)) return false;
+ return true;
}
@java.lang.Override
@@ -405,35 +404,35 @@ public com.google.privacy.dlp.v2.CryptoHashConfig 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
@@ -480,7 +479,7 @@ public Builder mergeFrom(
return this;
}
- private com.google.privacy.dlp.v2.CryptoKey cryptoKey_ = null;
+ private com.google.privacy.dlp.v2.CryptoKey cryptoKey_;
private com.google.protobuf.SingleFieldBuilderV3<
com.google.privacy.dlp.v2.CryptoKey,
com.google.privacy.dlp.v2.CryptoKey.Builder,
@@ -663,7 +662,7 @@ public com.google.privacy.dlp.v2.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-dlp-v2/src/main/java/com/google/privacy/dlp/v2/CryptoKey.java b/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/CryptoKey.java
index ccea2167cc7b..6be2a1a282ff 100644
--- a/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/CryptoKey.java
+++ b/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/CryptoKey.java
@@ -102,7 +102,7 @@ private CryptoKey(
}
default:
{
- if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) {
+ if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
done = true;
}
break;
@@ -299,24 +299,22 @@ public boolean equals(final java.lang.Object obj) {
}
com.google.privacy.dlp.v2.CryptoKey other = (com.google.privacy.dlp.v2.CryptoKey) obj;
- boolean result = true;
- result = result && getSourceCase().equals(other.getSourceCase());
- if (!result) return false;
+ if (!getSourceCase().equals(other.getSourceCase())) return false;
switch (sourceCase_) {
case 1:
- result = result && getTransient().equals(other.getTransient());
+ if (!getTransient().equals(other.getTransient())) return false;
break;
case 2:
- result = result && getUnwrapped().equals(other.getUnwrapped());
+ if (!getUnwrapped().equals(other.getUnwrapped())) return false;
break;
case 3:
- result = result && getKmsWrapped().equals(other.getKmsWrapped());
+ if (!getKmsWrapped().equals(other.getKmsWrapped())) 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
@@ -546,35 +544,35 @@ public com.google.privacy.dlp.v2.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
@@ -1045,7 +1043,7 @@ public com.google.privacy.dlp.v2.KmsWrappedCryptoKeyOrBuilder getKmsWrappedOrBui
@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-dlp-v2/src/main/java/com/google/privacy/dlp/v2/CryptoReplaceFfxFpeConfig.java b/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/CryptoReplaceFfxFpeConfig.java
index e5ffbff9c927..eaa3d9ed09c8 100644
--- a/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/CryptoReplaceFfxFpeConfig.java
+++ b/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/CryptoReplaceFfxFpeConfig.java
@@ -7,16 +7,18 @@
*
*
* - * Replaces an identifier with a surrogate using FPE with the FFX - * mode of operation; however when used in the `ReidentifyContent` API method, - * it serves the opposite function by reversing the surrogate back into - * the original identifier. - * The identifier must be encoded as ASCII. - * For a given crypto key and context, the same identifier will be - * replaced with the same surrogate. - * Identifiers must be at least two characters long. - * In the case that the identifier is the empty string, it will be skipped. - * See https://cloud.google.com/dlp/docs/pseudonymization to learn more. + * Replaces an identifier with a surrogate using Format Preserving Encryption + * (FPE) with the FFX mode of operation; however when used in the + * `ReidentifyContent` API method, it serves the opposite function by reversing + * the surrogate back into the original identifier. The identifier must be + * encoded as ASCII. For a given crypto key and context, the same identifier + * will be replaced with the same surrogate. Identifiers must be at least two + * characters long. In the case that the identifier is the empty string, it will + * be skipped. See https://cloud.google.com/dlp/docs/pseudonymization to learn + * more. + * Note: We recommend using CryptoDeterministicConfig for all use cases which + * do not require preserving the input alphabet space and size, plus warrant + * referential integrity. ** * Protobuf type {@code google.privacy.dlp.v2.CryptoReplaceFfxFpeConfig} @@ -125,7 +127,7 @@ private CryptoReplaceFfxFpeConfig( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -794,36 +796,34 @@ public boolean equals(final java.lang.Object obj) { com.google.privacy.dlp.v2.CryptoReplaceFfxFpeConfig other = (com.google.privacy.dlp.v2.CryptoReplaceFfxFpeConfig) 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 && (hasContext() == other.hasContext()); + if (hasContext() != other.hasContext()) return false; if (hasContext()) { - result = result && getContext().equals(other.getContext()); + if (!getContext().equals(other.getContext())) return false; } - result = result && (hasSurrogateInfoType() == other.hasSurrogateInfoType()); + if (hasSurrogateInfoType() != other.hasSurrogateInfoType()) return false; if (hasSurrogateInfoType()) { - result = result && getSurrogateInfoType().equals(other.getSurrogateInfoType()); + if (!getSurrogateInfoType().equals(other.getSurrogateInfoType())) return false; } - result = result && getAlphabetCase().equals(other.getAlphabetCase()); - if (!result) return false; + if (!getAlphabetCase().equals(other.getAlphabetCase())) return false; switch (alphabetCase_) { case 4: - result = result && getCommonAlphabetValue() == other.getCommonAlphabetValue(); + if (getCommonAlphabetValue() != other.getCommonAlphabetValue()) return false; break; case 5: - result = result && getCustomAlphabet().equals(other.getCustomAlphabet()); + if (!getCustomAlphabet().equals(other.getCustomAlphabet())) return false; break; case 6: - result = result && (getRadix() == other.getRadix()); + if (getRadix() != other.getRadix()) 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 @@ -965,16 +965,18 @@ protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.Build * * *
- * Replaces an identifier with a surrogate using FPE with the FFX - * mode of operation; however when used in the `ReidentifyContent` API method, - * it serves the opposite function by reversing the surrogate back into - * the original identifier. - * The identifier must be encoded as ASCII. - * For a given crypto key and context, the same identifier will be - * replaced with the same surrogate. - * Identifiers must be at least two characters long. - * In the case that the identifier is the empty string, it will be skipped. - * See https://cloud.google.com/dlp/docs/pseudonymization to learn more. + * Replaces an identifier with a surrogate using Format Preserving Encryption + * (FPE) with the FFX mode of operation; however when used in the + * `ReidentifyContent` API method, it serves the opposite function by reversing + * the surrogate back into the original identifier. The identifier must be + * encoded as ASCII. For a given crypto key and context, the same identifier + * will be replaced with the same surrogate. Identifiers must be at least two + * characters long. In the case that the identifier is the empty string, it will + * be skipped. See https://cloud.google.com/dlp/docs/pseudonymization to learn + * more. + * Note: We recommend using CryptoDeterministicConfig for all use cases which + * do not require preserving the input alphabet space and size, plus warrant + * referential integrity. ** * Protobuf type {@code google.privacy.dlp.v2.CryptoReplaceFfxFpeConfig} @@ -1093,35 +1095,35 @@ public com.google.privacy.dlp.v2.CryptoReplaceFfxFpeConfig 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 @@ -1213,7 +1215,7 @@ public Builder clearAlphabet() { return this; } - private com.google.privacy.dlp.v2.CryptoKey cryptoKey_ = null; + private com.google.privacy.dlp.v2.CryptoKey cryptoKey_; private com.google.protobuf.SingleFieldBuilderV3< com.google.privacy.dlp.v2.CryptoKey, com.google.privacy.dlp.v2.CryptoKey.Builder, @@ -1394,7 +1396,7 @@ public com.google.privacy.dlp.v2.CryptoKeyOrBuilder getCryptoKeyOrBuilder() { return cryptoKeyBuilder_; } - private com.google.privacy.dlp.v2.FieldId context_ = null; + private com.google.privacy.dlp.v2.FieldId context_; private com.google.protobuf.SingleFieldBuilderV3< com.google.privacy.dlp.v2.FieldId, com.google.privacy.dlp.v2.FieldId.Builder, @@ -1942,7 +1944,7 @@ public Builder clearRadix() { return this; } - private com.google.privacy.dlp.v2.InfoType surrogateInfoType_ = null; + private com.google.privacy.dlp.v2.InfoType surrogateInfoType_; private com.google.protobuf.SingleFieldBuilderV3< com.google.privacy.dlp.v2.InfoType, com.google.privacy.dlp.v2.InfoType.Builder, @@ -2315,7 +2317,7 @@ public com.google.privacy.dlp.v2.InfoTypeOrBuilder getSurrogateInfoTypeOrBuilder @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-dlp-v2/src/main/java/com/google/privacy/dlp/v2/CustomInfoType.java b/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/CustomInfoType.java index 06d9c7142d55..5c08d6971a2a 100644 --- a/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/CustomInfoType.java +++ b/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/CustomInfoType.java @@ -146,7 +146,7 @@ private CustomInfoType( } case 58: { - if (!((mutable_bitField0_ & 0x00000040) == 0x00000040)) { + if (!((mutable_bitField0_ & 0x00000040) != 0)) { detectionRules_ = new java.util.ArrayList< com.google.privacy.dlp.v2.CustomInfoType.DetectionRule>(); @@ -167,7 +167,7 @@ private CustomInfoType( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -179,7 +179,7 @@ private CustomInfoType( } catch (java.io.IOException e) { throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this); } finally { - if (((mutable_bitField0_ & 0x00000040) == 0x00000040)) { + if (((mutable_bitField0_ & 0x00000040) != 0)) { detectionRules_ = java.util.Collections.unmodifiableList(detectionRules_); } this.unknownFields = unknownFields.build(); @@ -495,7 +495,7 @@ private Dictionary( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -631,7 +631,7 @@ private WordList( case 10: { java.lang.String s = input.readStringRequireUtf8(); - if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) { + if (!((mutable_bitField0_ & 0x00000001) != 0)) { words_ = new com.google.protobuf.LazyStringArrayList(); mutable_bitField0_ |= 0x00000001; } @@ -640,7 +640,7 @@ private WordList( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -653,7 +653,7 @@ private WordList( throw new com.google.protobuf.InvalidProtocolBufferException(e) .setUnfinishedMessage(this); } finally { - if (((mutable_bitField0_ & 0x00000001) == 0x00000001)) { + if (((mutable_bitField0_ & 0x00000001) != 0)) { words_ = words_.getUnmodifiableView(); } this.unknownFields = unknownFields.build(); @@ -785,10 +785,9 @@ public boolean equals(final java.lang.Object obj) { com.google.privacy.dlp.v2.CustomInfoType.Dictionary.WordList other = (com.google.privacy.dlp.v2.CustomInfoType.Dictionary.WordList) obj; - boolean result = true; - result = result && getWordsList().equals(other.getWordsList()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getWordsList().equals(other.getWordsList())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -981,7 +980,7 @@ public com.google.privacy.dlp.v2.CustomInfoType.Dictionary.WordList buildPartial com.google.privacy.dlp.v2.CustomInfoType.Dictionary.WordList result = new com.google.privacy.dlp.v2.CustomInfoType.Dictionary.WordList(this); int from_bitField0_ = bitField0_; - if (((bitField0_ & 0x00000001) == 0x00000001)) { + if (((bitField0_ & 0x00000001) != 0)) { words_ = words_.getUnmodifiableView(); bitField0_ = (bitField0_ & ~0x00000001); } @@ -992,23 +991,23 @@ public com.google.privacy.dlp.v2.CustomInfoType.Dictionary.WordList 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 @@ -1016,13 +1015,13 @@ public Builder setRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) { - return (Builder) super.setRepeatedField(field, index, value); + return super.setRepeatedField(field, index, value); } @java.lang.Override public Builder addRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.addRepeatedField(field, value); + return super.addRepeatedField(field, value); } @java.lang.Override @@ -1087,7 +1086,7 @@ public Builder mergeFrom( com.google.protobuf.LazyStringArrayList.EMPTY; private void ensureWordsIsMutable() { - if (!((bitField0_ & 0x00000001) == 0x00000001)) { + if (!((bitField0_ & 0x00000001) != 0)) { words_ = new com.google.protobuf.LazyStringArrayList(words_); bitField0_ |= 0x00000001; } @@ -1247,7 +1246,7 @@ public Builder addWordsBytes(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 @@ -1487,21 +1486,19 @@ public boolean equals(final java.lang.Object obj) { com.google.privacy.dlp.v2.CustomInfoType.Dictionary other = (com.google.privacy.dlp.v2.CustomInfoType.Dictionary) obj; - boolean result = true; - result = result && getSourceCase().equals(other.getSourceCase()); - if (!result) return false; + if (!getSourceCase().equals(other.getSourceCase())) return false; switch (sourceCase_) { case 1: - result = result && getWordList().equals(other.getWordList()); + if (!getWordList().equals(other.getWordList())) return false; break; case 3: - result = result && getCloudStoragePath().equals(other.getCloudStoragePath()); + if (!getCloudStoragePath().equals(other.getCloudStoragePath())) 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 @@ -1741,23 +1738,23 @@ public com.google.privacy.dlp.v2.CustomInfoType.Dictionary 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 @@ -1765,13 +1762,13 @@ public Builder setRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) { - return (Builder) super.setRepeatedField(field, index, value); + return super.setRepeatedField(field, index, value); } @java.lang.Override public Builder addRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.addRepeatedField(field, value); + return super.addRepeatedField(field, value); } @java.lang.Override @@ -2270,7 +2267,7 @@ public com.google.privacy.dlp.v2.CloudStoragePathOrBuilder getCloudStoragePathOr @java.lang.Override public final Builder setUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { - return super.setUnknownFieldsProto3(unknownFields); + return super.setUnknownFields(unknownFields); } @java.lang.Override @@ -2404,7 +2401,7 @@ private Regex(com.google.protobuf.GeneratedMessageV3.Builder> builder) { private Regex() { pattern_ = ""; - groupIndexes_ = java.util.Collections.emptyList(); + groupIndexes_ = emptyIntList(); } @java.lang.Override @@ -2440,31 +2437,30 @@ private Regex( } case 16: { - if (!((mutable_bitField0_ & 0x00000002) == 0x00000002)) { - groupIndexes_ = new java.util.ArrayList
repeated int32 group_indexes = 2;
*/
public int getGroupIndexes(int index) {
- return groupIndexes_.get(index);
+ return groupIndexes_.getInt(index);
}
private int groupIndexesMemoizedSerializedSize = -1;
@@ -2614,7 +2610,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
output.writeUInt32NoTag(groupIndexesMemoizedSerializedSize);
}
for (int i = 0; i < groupIndexes_.size(); i++) {
- output.writeInt32NoTag(groupIndexes_.get(i));
+ output.writeInt32NoTag(groupIndexes_.getInt(i));
}
unknownFields.writeTo(output);
}
@@ -2632,7 +2628,7 @@ public int getSerializedSize() {
int dataSize = 0;
for (int i = 0; i < groupIndexes_.size(); i++) {
dataSize +=
- com.google.protobuf.CodedOutputStream.computeInt32SizeNoTag(groupIndexes_.get(i));
+ com.google.protobuf.CodedOutputStream.computeInt32SizeNoTag(groupIndexes_.getInt(i));
}
size += dataSize;
if (!getGroupIndexesList().isEmpty()) {
@@ -2657,11 +2653,10 @@ public boolean equals(final java.lang.Object obj) {
com.google.privacy.dlp.v2.CustomInfoType.Regex other =
(com.google.privacy.dlp.v2.CustomInfoType.Regex) obj;
- boolean result = true;
- result = result && getPattern().equals(other.getPattern());
- result = result && getGroupIndexesList().equals(other.getGroupIndexesList());
- result = result && unknownFields.equals(other.unknownFields);
- return result;
+ if (!getPattern().equals(other.getPattern())) return false;
+ if (!getGroupIndexesList().equals(other.getGroupIndexesList())) return false;
+ if (!unknownFields.equals(other.unknownFields)) return false;
+ return true;
}
@java.lang.Override
@@ -2826,7 +2821,7 @@ public Builder clear() {
super.clear();
pattern_ = "";
- groupIndexes_ = java.util.Collections.emptyList();
+ groupIndexes_ = emptyIntList();
bitField0_ = (bitField0_ & ~0x00000002);
return this;
}
@@ -2858,8 +2853,8 @@ public com.google.privacy.dlp.v2.CustomInfoType.Regex buildPartial() {
int from_bitField0_ = bitField0_;
int to_bitField0_ = 0;
result.pattern_ = pattern_;
- if (((bitField0_ & 0x00000002) == 0x00000002)) {
- groupIndexes_ = java.util.Collections.unmodifiableList(groupIndexes_);
+ if (((bitField0_ & 0x00000002) != 0)) {
+ groupIndexes_.makeImmutable();
bitField0_ = (bitField0_ & ~0x00000002);
}
result.groupIndexes_ = groupIndexes_;
@@ -2870,23 +2865,23 @@ public com.google.privacy.dlp.v2.CustomInfoType.Regex 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
@@ -2894,13 +2889,13 @@ public Builder setRepeatedField(
com.google.protobuf.Descriptors.FieldDescriptor field,
int index,
java.lang.Object value) {
- return (Builder) super.setRepeatedField(field, index, value);
+ return super.setRepeatedField(field, index, value);
}
@java.lang.Override
public Builder addRepeatedField(
com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
- return (Builder) super.addRepeatedField(field, value);
+ return super.addRepeatedField(field, value);
}
@java.lang.Override
@@ -3065,11 +3060,11 @@ public Builder setPatternBytes(com.google.protobuf.ByteString value) {
return this;
}
- private java.util.Listrepeated int32 group_indexes = 2;
*/
public java.util.Listrepeated int32 group_indexes = 2;
*/
public int getGroupIndexes(int index) {
- return groupIndexes_.get(index);
+ return groupIndexes_.getInt(index);
}
/**
*
@@ -3124,7 +3121,7 @@ public int getGroupIndexes(int index) {
*/
public Builder setGroupIndexes(int index, int value) {
ensureGroupIndexesIsMutable();
- groupIndexes_.set(index, value);
+ groupIndexes_.setInt(index, value);
onChanged();
return this;
}
@@ -3140,7 +3137,7 @@ public Builder setGroupIndexes(int index, int value) {
*/
public Builder addGroupIndexes(int value) {
ensureGroupIndexesIsMutable();
- groupIndexes_.add(value);
+ groupIndexes_.addInt(value);
onChanged();
return this;
}
@@ -3171,7 +3168,7 @@ public Builder addAllGroupIndexes(java.lang.Iterable extends java.lang.Integer
* repeated int32 group_indexes = 2;
*/
public Builder clearGroupIndexes() {
- groupIndexes_ = java.util.Collections.emptyList();
+ groupIndexes_ = emptyIntList();
bitField0_ = (bitField0_ & ~0x00000002);
onChanged();
return this;
@@ -3180,7 +3177,7 @@ public Builder clearGroupIndexes() {
@java.lang.Override
public final Builder setUnknownFields(
final com.google.protobuf.UnknownFieldSet unknownFields) {
- return super.setUnknownFieldsProto3(unknownFields);
+ return super.setUnknownFields(unknownFields);
}
@java.lang.Override
@@ -3286,7 +3283,7 @@ private SurrogateType(
break;
default:
{
- if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) {
+ if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
done = true;
}
break;
@@ -3357,9 +3354,8 @@ public boolean equals(final java.lang.Object obj) {
com.google.privacy.dlp.v2.CustomInfoType.SurrogateType other =
(com.google.privacy.dlp.v2.CustomInfoType.SurrogateType) obj;
- boolean result = true;
- result = result && unknownFields.equals(other.unknownFields);
- return result;
+ if (!unknownFields.equals(other.unknownFields)) return false;
+ return true;
}
@java.lang.Override
@@ -3557,23 +3553,23 @@ public com.google.privacy.dlp.v2.CustomInfoType.SurrogateType 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
@@ -3581,13 +3577,13 @@ public Builder setRepeatedField(
com.google.protobuf.Descriptors.FieldDescriptor field,
int index,
java.lang.Object value) {
- return (Builder) super.setRepeatedField(field, index, value);
+ return super.setRepeatedField(field, index, value);
}
@java.lang.Override
public Builder addRepeatedField(
com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
- return (Builder) super.addRepeatedField(field, value);
+ return super.addRepeatedField(field, value);
}
@java.lang.Override
@@ -3636,7 +3632,7 @@ public Builder mergeFrom(
@java.lang.Override
public final Builder setUnknownFields(
final com.google.protobuf.UnknownFieldSet unknownFields) {
- return super.setUnknownFieldsProto3(unknownFields);
+ return super.setUnknownFields(unknownFields);
}
@java.lang.Override
@@ -3797,7 +3793,7 @@ private DetectionRule(
}
default:
{
- if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) {
+ if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
done = true;
}
break;
@@ -3876,10 +3872,7 @@ private Proximity(com.google.protobuf.GeneratedMessageV3.Builder> builder) {
super(builder);
}
- private Proximity() {
- windowBefore_ = 0;
- windowAfter_ = 0;
- }
+ private Proximity() {}
@java.lang.Override
public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
@@ -3917,7 +3910,7 @@ private Proximity(
}
default:
{
- if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) {
+ if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
done = true;
}
break;
@@ -4031,11 +4024,10 @@ public boolean equals(final java.lang.Object obj) {
com.google.privacy.dlp.v2.CustomInfoType.DetectionRule.Proximity other =
(com.google.privacy.dlp.v2.CustomInfoType.DetectionRule.Proximity) obj;
- boolean result = true;
- result = result && (getWindowBefore() == other.getWindowBefore());
- result = result && (getWindowAfter() == other.getWindowAfter());
- result = result && unknownFields.equals(other.unknownFields);
- return result;
+ if (getWindowBefore() != other.getWindowBefore()) return false;
+ if (getWindowAfter() != other.getWindowAfter()) return false;
+ if (!unknownFields.equals(other.unknownFields)) return false;
+ return true;
}
@java.lang.Override
@@ -4242,23 +4234,23 @@ public com.google.privacy.dlp.v2.CustomInfoType.DetectionRule.Proximity buildPar
@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
@@ -4266,13 +4258,13 @@ public Builder setRepeatedField(
com.google.protobuf.Descriptors.FieldDescriptor field,
int index,
java.lang.Object value) {
- return (Builder) super.setRepeatedField(field, index, value);
+ return super.setRepeatedField(field, index, value);
}
@java.lang.Override
public Builder addRepeatedField(
com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
- return (Builder) super.addRepeatedField(field, value);
+ return super.addRepeatedField(field, value);
}
@java.lang.Override
@@ -4419,7 +4411,7 @@ public Builder clearWindowAfter() {
@java.lang.Override
public final Builder setUnknownFields(
final com.google.protobuf.UnknownFieldSet unknownFields) {
- return super.setUnknownFieldsProto3(unknownFields);
+ return super.setUnknownFields(unknownFields);
}
@java.lang.Override
@@ -4580,7 +4572,7 @@ private LikelihoodAdjustment(
}
default:
{
- if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) {
+ if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
done = true;
}
break;
@@ -4770,21 +4762,19 @@ public boolean equals(final java.lang.Object obj) {
com.google.privacy.dlp.v2.CustomInfoType.DetectionRule.LikelihoodAdjustment other =
(com.google.privacy.dlp.v2.CustomInfoType.DetectionRule.LikelihoodAdjustment) obj;
- boolean result = true;
- result = result && getAdjustmentCase().equals(other.getAdjustmentCase());
- if (!result) return false;
+ if (!getAdjustmentCase().equals(other.getAdjustmentCase())) return false;
switch (adjustmentCase_) {
case 1:
- result = result && getFixedLikelihoodValue() == other.getFixedLikelihoodValue();
+ if (getFixedLikelihoodValue() != other.getFixedLikelihoodValue()) return false;
break;
case 2:
- result = result && (getRelativeLikelihood() == other.getRelativeLikelihood());
+ if (getRelativeLikelihood() != other.getRelativeLikelihood()) 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
@@ -5012,23 +5002,23 @@ public com.google.privacy.dlp.v2.CustomInfoType.DetectionRule.LikelihoodAdjustme
@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
@@ -5036,13 +5026,13 @@ public Builder setRepeatedField(
com.google.protobuf.Descriptors.FieldDescriptor field,
int index,
java.lang.Object value) {
- return (Builder) super.setRepeatedField(field, index, value);
+ return super.setRepeatedField(field, index, value);
}
@java.lang.Override
public Builder addRepeatedField(
com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
- return (Builder) super.addRepeatedField(field, value);
+ return super.addRepeatedField(field, value);
}
@java.lang.Override
@@ -5282,7 +5272,7 @@ public Builder clearRelativeLikelihood() {
@java.lang.Override
public final Builder setUnknownFields(
final com.google.protobuf.UnknownFieldSet unknownFields) {
- return super.setUnknownFieldsProto3(unknownFields);
+ return super.setUnknownFields(unknownFields);
}
@java.lang.Override
@@ -5567,7 +5557,7 @@ private HotwordRule(
}
default:
{
- if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) {
+ if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
done = true;
}
break;
@@ -5814,21 +5804,20 @@ public boolean equals(final java.lang.Object obj) {
com.google.privacy.dlp.v2.CustomInfoType.DetectionRule.HotwordRule other =
(com.google.privacy.dlp.v2.CustomInfoType.DetectionRule.HotwordRule) obj;
- boolean result = true;
- result = result && (hasHotwordRegex() == other.hasHotwordRegex());
+ if (hasHotwordRegex() != other.hasHotwordRegex()) return false;
if (hasHotwordRegex()) {
- result = result && getHotwordRegex().equals(other.getHotwordRegex());
+ if (!getHotwordRegex().equals(other.getHotwordRegex())) return false;
}
- result = result && (hasProximity() == other.hasProximity());
+ if (hasProximity() != other.hasProximity()) return false;
if (hasProximity()) {
- result = result && getProximity().equals(other.getProximity());
+ if (!getProximity().equals(other.getProximity())) return false;
}
- result = result && (hasLikelihoodAdjustment() == other.hasLikelihoodAdjustment());
+ if (hasLikelihoodAdjustment() != other.hasLikelihoodAdjustment()) return false;
if (hasLikelihoodAdjustment()) {
- result = result && getLikelihoodAdjustment().equals(other.getLikelihoodAdjustment());
+ if (!getLikelihoodAdjustment().equals(other.getLikelihoodAdjustment())) return false;
}
- result = result && unknownFields.equals(other.unknownFields);
- return result;
+ if (!unknownFields.equals(other.unknownFields)) return false;
+ return true;
}
@java.lang.Override
@@ -6071,23 +6060,23 @@ public com.google.privacy.dlp.v2.CustomInfoType.DetectionRule.HotwordRule buildP
@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
@@ -6095,13 +6084,13 @@ public Builder setRepeatedField(
com.google.protobuf.Descriptors.FieldDescriptor field,
int index,
java.lang.Object value) {
- return (Builder) super.setRepeatedField(field, index, value);
+ return super.setRepeatedField(field, index, value);
}
@java.lang.Override
public Builder addRepeatedField(
com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
- return (Builder) super.addRepeatedField(field, value);
+ return super.addRepeatedField(field, value);
}
@java.lang.Override
@@ -6160,7 +6149,7 @@ public Builder mergeFrom(
return this;
}
- private com.google.privacy.dlp.v2.CustomInfoType.Regex hotwordRegex_ = null;
+ private com.google.privacy.dlp.v2.CustomInfoType.Regex hotwordRegex_;
private com.google.protobuf.SingleFieldBuilderV3<
com.google.privacy.dlp.v2.CustomInfoType.Regex,
com.google.privacy.dlp.v2.CustomInfoType.Regex.Builder,
@@ -6342,7 +6331,7 @@ public com.google.privacy.dlp.v2.CustomInfoType.RegexOrBuilder getHotwordRegexOr
return hotwordRegexBuilder_;
}
- private com.google.privacy.dlp.v2.CustomInfoType.DetectionRule.Proximity proximity_ = null;
+ private com.google.privacy.dlp.v2.CustomInfoType.DetectionRule.Proximity proximity_;
private com.google.protobuf.SingleFieldBuilderV3<
com.google.privacy.dlp.v2.CustomInfoType.DetectionRule.Proximity,
com.google.privacy.dlp.v2.CustomInfoType.DetectionRule.Proximity.Builder,
@@ -6596,7 +6585,7 @@ public Builder clearProximity() {
}
private com.google.privacy.dlp.v2.CustomInfoType.DetectionRule.LikelihoodAdjustment
- likelihoodAdjustment_ = null;
+ likelihoodAdjustment_;
private com.google.protobuf.SingleFieldBuilderV3<
com.google.privacy.dlp.v2.CustomInfoType.DetectionRule.LikelihoodAdjustment,
com.google.privacy.dlp.v2.CustomInfoType.DetectionRule.LikelihoodAdjustment.Builder,
@@ -6812,7 +6801,7 @@ public Builder clearLikelihoodAdjustment() {
@java.lang.Override
public final Builder setUnknownFields(
final com.google.protobuf.UnknownFieldSet unknownFields) {
- return super.setUnknownFieldsProto3(unknownFields);
+ return super.setUnknownFields(unknownFields);
}
@java.lang.Override
@@ -6999,18 +6988,16 @@ public boolean equals(final java.lang.Object obj) {
com.google.privacy.dlp.v2.CustomInfoType.DetectionRule other =
(com.google.privacy.dlp.v2.CustomInfoType.DetectionRule) obj;
- boolean result = true;
- result = result && getTypeCase().equals(other.getTypeCase());
- if (!result) return false;
+ if (!getTypeCase().equals(other.getTypeCase())) return false;
switch (typeCase_) {
case 1:
- result = result && getHotwordRule().equals(other.getHotwordRule());
+ if (!getHotwordRule().equals(other.getHotwordRule())) 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
@@ -7221,23 +7208,23 @@ public com.google.privacy.dlp.v2.CustomInfoType.DetectionRule 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
@@ -7245,13 +7232,13 @@ public Builder setRepeatedField(
com.google.protobuf.Descriptors.FieldDescriptor field,
int index,
java.lang.Object value) {
- return (Builder) super.setRepeatedField(field, index, value);
+ return super.setRepeatedField(field, index, value);
}
@java.lang.Override
public Builder addRepeatedField(
com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
- return (Builder) super.addRepeatedField(field, value);
+ return super.addRepeatedField(field, value);
}
@java.lang.Override
@@ -7548,7 +7535,7 @@ public Builder clearHotwordRule() {
@java.lang.Override
public final Builder setUnknownFields(
final com.google.protobuf.UnknownFieldSet unknownFields) {
- return super.setUnknownFieldsProto3(unknownFields);
+ return super.setUnknownFields(unknownFields);
}
@java.lang.Override
@@ -8123,34 +8110,32 @@ public boolean equals(final java.lang.Object obj) {
}
com.google.privacy.dlp.v2.CustomInfoType other = (com.google.privacy.dlp.v2.CustomInfoType) obj;
- boolean result = true;
- result = result && (hasInfoType() == other.hasInfoType());
+ if (hasInfoType() != other.hasInfoType()) return false;
if (hasInfoType()) {
- result = result && getInfoType().equals(other.getInfoType());
+ if (!getInfoType().equals(other.getInfoType())) return false;
}
- result = result && likelihood_ == other.likelihood_;
- result = result && getDetectionRulesList().equals(other.getDetectionRulesList());
- result = result && exclusionType_ == other.exclusionType_;
- result = result && getTypeCase().equals(other.getTypeCase());
- if (!result) return false;
+ if (likelihood_ != other.likelihood_) return false;
+ if (!getDetectionRulesList().equals(other.getDetectionRulesList())) return false;
+ if (exclusionType_ != other.exclusionType_) return false;
+ if (!getTypeCase().equals(other.getTypeCase())) return false;
switch (typeCase_) {
case 2:
- result = result && getDictionary().equals(other.getDictionary());
+ if (!getDictionary().equals(other.getDictionary())) return false;
break;
case 3:
- result = result && getRegex().equals(other.getRegex());
+ if (!getRegex().equals(other.getRegex())) return false;
break;
case 4:
- result = result && getSurrogateType().equals(other.getSurrogateType());
+ if (!getSurrogateType().equals(other.getSurrogateType())) return false;
break;
case 5:
- result = result && getStoredType().equals(other.getStoredType());
+ if (!getStoredType().equals(other.getStoredType())) 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
@@ -8422,7 +8407,7 @@ public com.google.privacy.dlp.v2.CustomInfoType buildPartial() {
}
}
if (detectionRulesBuilder_ == null) {
- if (((bitField0_ & 0x00000040) == 0x00000040)) {
+ if (((bitField0_ & 0x00000040) != 0)) {
detectionRules_ = java.util.Collections.unmodifiableList(detectionRules_);
bitField0_ = (bitField0_ & ~0x00000040);
}
@@ -8439,35 +8424,35 @@ public com.google.privacy.dlp.v2.CustomInfoType 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
@@ -8589,7 +8574,7 @@ public Builder clearType() {
private int bitField0_;
- private com.google.privacy.dlp.v2.InfoType infoType_ = null;
+ private com.google.privacy.dlp.v2.InfoType infoType_;
private com.google.protobuf.SingleFieldBuilderV3<
com.google.privacy.dlp.v2.InfoType,
com.google.privacy.dlp.v2.InfoType.Builder,
@@ -9731,7 +9716,7 @@ public com.google.privacy.dlp.v2.StoredTypeOrBuilder getStoredTypeOrBuilder() {
java.util.Collections.emptyList();
private void ensureDetectionRulesIsMutable() {
- if (!((bitField0_ & 0x00000040) == 0x00000040)) {
+ if (!((bitField0_ & 0x00000040) != 0)) {
detectionRules_ =
new java.util.ArrayList+ * All result fields mentioned below are updated while the job is processing. + *+ * + * Protobuf type {@code google.privacy.dlp.v2.InspectDataSourceDetails.Result} + */ public static final class Result extends com.google.protobuf.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:google.privacy.dlp.v2.InspectDataSourceDetails.Result) @@ -1147,8 +1154,6 @@ private Result(com.google.protobuf.GeneratedMessageV3.Builder> builder) { } private Result() { - processedBytes_ = 0L; - totalEstimatedBytes_ = 0L; infoTypeStats_ = java.util.Collections.emptyList(); } @@ -1188,7 +1193,7 @@ private Result( } case 26: { - if (!((mutable_bitField0_ & 0x00000004) == 0x00000004)) { + if (!((mutable_bitField0_ & 0x00000004) != 0)) { infoTypeStats_ = new java.util.ArrayList
+ * All result fields mentioned below are updated while the job is processing. + *+ * + * Protobuf type {@code google.privacy.dlp.v2.InspectDataSourceDetails.Result} + */ public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder
* Include to use an existing data crypto key wrapped by KMS. + * The wrapped key must be a 128/192/256 bit key. * Authorization requires the following IAM permissions when sending a request * to perform a crypto transformation using a kms-wrapped crypto key: * dlp.kms.encrypt @@ -68,7 +69,7 @@ private KmsWrappedCryptoKey( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -209,11 +210,10 @@ public boolean equals(final java.lang.Object obj) { com.google.privacy.dlp.v2.KmsWrappedCryptoKey other = (com.google.privacy.dlp.v2.KmsWrappedCryptoKey) obj; - boolean result = true; - result = result && getWrappedKey().equals(other.getWrappedKey()); - result = result && getCryptoKeyName().equals(other.getCryptoKeyName()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getWrappedKey().equals(other.getWrappedKey())) return false; + if (!getCryptoKeyName().equals(other.getCryptoKeyName())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -332,6 +332,7 @@ protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.Build * ** Include to use an existing data crypto key wrapped by KMS. + * The wrapped key must be a 128/192/256 bit key. * Authorization requires the following IAM permissions when sending a request * to perform a crypto transformation using a kms-wrapped crypto key: * dlp.kms.encrypt @@ -414,35 +415,35 @@ public com.google.privacy.dlp.v2.KmsWrappedCryptoKey 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 @@ -636,7 +637,7 @@ public Builder setCryptoKeyNameBytes(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-dlp-v2/src/main/java/com/google/privacy/dlp/v2/LargeCustomDictionaryConfig.java b/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/LargeCustomDictionaryConfig.java index 89389c97d623..86909068ff8a 100644 --- a/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/LargeCustomDictionaryConfig.java +++ b/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/LargeCustomDictionaryConfig.java @@ -103,7 +103,7 @@ private LargeCustomDictionaryConfig( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -374,25 +374,23 @@ public boolean equals(final java.lang.Object obj) { com.google.privacy.dlp.v2.LargeCustomDictionaryConfig other = (com.google.privacy.dlp.v2.LargeCustomDictionaryConfig) obj; - boolean result = true; - result = result && (hasOutputPath() == other.hasOutputPath()); + if (hasOutputPath() != other.hasOutputPath()) return false; if (hasOutputPath()) { - result = result && getOutputPath().equals(other.getOutputPath()); + if (!getOutputPath().equals(other.getOutputPath())) return false; } - result = result && getSourceCase().equals(other.getSourceCase()); - if (!result) return false; + if (!getSourceCase().equals(other.getSourceCase())) return false; switch (sourceCase_) { case 2: - result = result && getCloudStorageFileSet().equals(other.getCloudStorageFileSet()); + if (!getCloudStorageFileSet().equals(other.getCloudStorageFileSet())) return false; break; case 3: - result = result && getBigQueryField().equals(other.getBigQueryField()); + if (!getBigQueryField().equals(other.getBigQueryField())) 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 @@ -630,35 +628,35 @@ public com.google.privacy.dlp.v2.LargeCustomDictionaryConfig 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 @@ -737,7 +735,7 @@ public Builder clearSource() { return this; } - private com.google.privacy.dlp.v2.CloudStoragePath outputPath_ = null; + private com.google.privacy.dlp.v2.CloudStoragePath outputPath_; private com.google.protobuf.SingleFieldBuilderV3< com.google.privacy.dlp.v2.CloudStoragePath, com.google.privacy.dlp.v2.CloudStoragePath.Builder, @@ -1353,7 +1351,7 @@ public com.google.privacy.dlp.v2.BigQueryFieldOrBuilder getBigQueryFieldOrBuilde @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-dlp-v2/src/main/java/com/google/privacy/dlp/v2/ListDeidentifyTemplatesRequest.java b/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/ListDeidentifyTemplatesRequest.java index 3172dcf12616..74938cce465e 100644 --- a/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/ListDeidentifyTemplatesRequest.java +++ b/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/ListDeidentifyTemplatesRequest.java @@ -26,7 +26,6 @@ private ListDeidentifyTemplatesRequest( private ListDeidentifyTemplatesRequest() { parent_ = ""; pageToken_ = ""; - pageSize_ = 0; orderBy_ = ""; } @@ -82,7 +81,7 @@ private ListDeidentifyTemplatesRequest( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -344,13 +343,12 @@ public boolean equals(final java.lang.Object obj) { com.google.privacy.dlp.v2.ListDeidentifyTemplatesRequest other = (com.google.privacy.dlp.v2.ListDeidentifyTemplatesRequest) obj; - boolean result = true; - result = result && getParent().equals(other.getParent()); - result = result && getPageToken().equals(other.getPageToken()); - result = result && (getPageSize() == other.getPageSize()); - result = result && getOrderBy().equals(other.getOrderBy()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getParent().equals(other.getParent())) return false; + if (!getPageToken().equals(other.getPageToken())) return false; + if (getPageSize() != other.getPageSize()) return false; + if (!getOrderBy().equals(other.getOrderBy())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -559,35 +557,35 @@ public com.google.privacy.dlp.v2.ListDeidentifyTemplatesRequest 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 @@ -1034,7 +1032,7 @@ public Builder setOrderByBytes(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-dlp-v2/src/main/java/com/google/privacy/dlp/v2/ListDeidentifyTemplatesResponse.java b/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/ListDeidentifyTemplatesResponse.java index e1ab62b0f0fa..f6d8079ab793 100644 --- a/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/ListDeidentifyTemplatesResponse.java +++ b/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/ListDeidentifyTemplatesResponse.java @@ -54,7 +54,7 @@ private ListDeidentifyTemplatesResponse( break; case 10: { - if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) { + if (!((mutable_bitField0_ & 0x00000001) != 0)) { deidentifyTemplates_ = new java.util.ArrayList(); mutable_bitField0_ |= 0x00000001; @@ -73,7 +73,7 @@ private ListDeidentifyTemplatesResponse( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -85,7 +85,7 @@ private ListDeidentifyTemplatesResponse( } 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)) { deidentifyTemplates_ = java.util.Collections.unmodifiableList(deidentifyTemplates_); } this.unknownFields = unknownFields.build(); @@ -276,11 +276,10 @@ public boolean equals(final java.lang.Object obj) { com.google.privacy.dlp.v2.ListDeidentifyTemplatesResponse other = (com.google.privacy.dlp.v2.ListDeidentifyTemplatesResponse) obj; - boolean result = true; - result = result && getDeidentifyTemplatesList().equals(other.getDeidentifyTemplatesList()); - result = result && getNextPageToken().equals(other.getNextPageToken()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getDeidentifyTemplatesList().equals(other.getDeidentifyTemplatesList())) return false; + if (!getNextPageToken().equals(other.getNextPageToken())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -482,7 +481,7 @@ public com.google.privacy.dlp.v2.ListDeidentifyTemplatesResponse buildPartial() int from_bitField0_ = bitField0_; int to_bitField0_ = 0; if (deidentifyTemplatesBuilder_ == null) { - if (((bitField0_ & 0x00000001) == 0x00000001)) { + if (((bitField0_ & 0x00000001) != 0)) { deidentifyTemplates_ = java.util.Collections.unmodifiableList(deidentifyTemplates_); bitField0_ = (bitField0_ & ~0x00000001); } @@ -498,35 +497,35 @@ public com.google.privacy.dlp.v2.ListDeidentifyTemplatesResponse 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 @@ -609,7 +608,7 @@ public Builder mergeFrom( java.util.Collections.emptyList(); private void ensureDeidentifyTemplatesIsMutable() { - if (!((bitField0_ & 0x00000001) == 0x00000001)) { + if (!((bitField0_ & 0x00000001) != 0)) { deidentifyTemplates_ = new java.util.ArrayList ( deidentifyTemplates_); @@ -976,7 +975,7 @@ public com.google.privacy.dlp.v2.DeidentifyTemplate.Builder addDeidentifyTemplat com.google.privacy.dlp.v2.DeidentifyTemplate.Builder, com.google.privacy.dlp.v2.DeidentifyTemplateOrBuilder>( deidentifyTemplates_, - ((bitField0_ & 0x00000001) == 0x00000001), + ((bitField0_ & 0x00000001) != 0), getParentForChildren(), isClean()); deidentifyTemplates_ = null; @@ -1085,7 +1084,7 @@ public Builder setNextPageTokenBytes(com.google.protobuf.ByteString value) { @java.lang.Override public final Builder setUnknownFields(final com.google.protobuf.UnknownFieldSet unknownFields) { - return super.setUnknownFieldsProto3(unknownFields); + return super.setUnknownFields(unknownFields); } @java.lang.Override diff --git a/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/ListDlpJobsRequest.java b/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/ListDlpJobsRequest.java index 714c6920c448..1afce1d49ea2 100644 --- a/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/ListDlpJobsRequest.java +++ b/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/ListDlpJobsRequest.java @@ -25,7 +25,6 @@ private ListDlpJobsRequest(com.google.protobuf.GeneratedMessageV3.Builder> bui private ListDlpJobsRequest() { parent_ = ""; filter_ = ""; - pageSize_ = 0; pageToken_ = ""; type_ = 0; orderBy_ = ""; @@ -97,7 +96,7 @@ private ListDlpJobsRequest( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -473,15 +472,14 @@ public boolean equals(final java.lang.Object obj) { com.google.privacy.dlp.v2.ListDlpJobsRequest other = (com.google.privacy.dlp.v2.ListDlpJobsRequest) obj; - boolean result = true; - result = result && getParent().equals(other.getParent()); - result = result && getFilter().equals(other.getFilter()); - result = result && (getPageSize() == other.getPageSize()); - result = result && getPageToken().equals(other.getPageToken()); - result = result && type_ == other.type_; - result = result && getOrderBy().equals(other.getOrderBy()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getParent().equals(other.getParent())) return false; + if (!getFilter().equals(other.getFilter())) return false; + if (getPageSize() != other.getPageSize()) return false; + if (!getPageToken().equals(other.getPageToken())) return false; + if (type_ != other.type_) return false; + if (!getOrderBy().equals(other.getOrderBy())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -699,35 +697,35 @@ public com.google.privacy.dlp.v2.ListDlpJobsRequest 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 @@ -1421,7 +1419,7 @@ public Builder setOrderByBytes(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-dlp-v2/src/main/java/com/google/privacy/dlp/v2/ListDlpJobsResponse.java b/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/ListDlpJobsResponse.java index 00f8ff25761e..a7bda9b733f6 100644 --- a/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/ListDlpJobsResponse.java +++ b/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/ListDlpJobsResponse.java @@ -53,7 +53,7 @@ private ListDlpJobsResponse( break; case 10: { - if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) { + if (!((mutable_bitField0_ & 0x00000001) != 0)) { jobs_ = new java.util.ArrayList (); mutable_bitField0_ |= 0x00000001; } @@ -70,7 +70,7 @@ private ListDlpJobsResponse( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -82,7 +82,7 @@ private ListDlpJobsResponse( } 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)) { jobs_ = java.util.Collections.unmodifiableList(jobs_); } this.unknownFields = unknownFields.build(); @@ -264,11 +264,10 @@ public boolean equals(final java.lang.Object obj) { com.google.privacy.dlp.v2.ListDlpJobsResponse other = (com.google.privacy.dlp.v2.ListDlpJobsResponse) obj; - boolean result = true; - result = result && getJobsList().equals(other.getJobsList()); - result = result && getNextPageToken().equals(other.getNextPageToken()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getJobsList().equals(other.getJobsList())) return false; + if (!getNextPageToken().equals(other.getNextPageToken())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -469,7 +468,7 @@ public com.google.privacy.dlp.v2.ListDlpJobsResponse buildPartial() { int from_bitField0_ = bitField0_; int to_bitField0_ = 0; if (jobsBuilder_ == null) { - if (((bitField0_ & 0x00000001) == 0x00000001)) { + if (((bitField0_ & 0x00000001) != 0)) { jobs_ = java.util.Collections.unmodifiableList(jobs_); bitField0_ = (bitField0_ & ~0x00000001); } @@ -485,35 +484,35 @@ public com.google.privacy.dlp.v2.ListDlpJobsResponse 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 @@ -594,7 +593,7 @@ public Builder mergeFrom( java.util.Collections.emptyList(); private void ensureJobsIsMutable() { - if (!((bitField0_ & 0x00000001) == 0x00000001)) { + if (!((bitField0_ & 0x00000001) != 0)) { jobs_ = new java.util.ArrayList (jobs_); bitField0_ |= 0x00000001; } @@ -930,10 +929,7 @@ public java.util.List getJobsBuilderLi com.google.privacy.dlp.v2.DlpJob, com.google.privacy.dlp.v2.DlpJob.Builder, com.google.privacy.dlp.v2.DlpJobOrBuilder>( - jobs_, - ((bitField0_ & 0x00000001) == 0x00000001), - getParentForChildren(), - isClean()); + jobs_, ((bitField0_ & 0x00000001) != 0), getParentForChildren(), isClean()); jobs_ = null; } return jobsBuilder_; @@ -1035,7 +1031,7 @@ public Builder setNextPageTokenBytes(com.google.protobuf.ByteString value) { @java.lang.Override public final Builder setUnknownFields(final com.google.protobuf.UnknownFieldSet unknownFields) { - return super.setUnknownFieldsProto3(unknownFields); + return super.setUnknownFields(unknownFields); } @java.lang.Override diff --git a/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/ListInfoTypesRequest.java b/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/ListInfoTypesRequest.java index 2bf84726c25f..98cc4dc25af2 100644 --- a/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/ListInfoTypesRequest.java +++ b/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/ListInfoTypesRequest.java @@ -67,7 +67,7 @@ private ListInfoTypesRequest( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -242,11 +242,10 @@ public boolean equals(final java.lang.Object obj) { com.google.privacy.dlp.v2.ListInfoTypesRequest other = (com.google.privacy.dlp.v2.ListInfoTypesRequest) obj; - boolean result = true; - result = result && getLanguageCode().equals(other.getLanguageCode()); - result = result && getFilter().equals(other.getFilter()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getLanguageCode().equals(other.getLanguageCode())) return false; + if (!getFilter().equals(other.getFilter())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -444,35 +443,35 @@ public com.google.privacy.dlp.v2.ListInfoTypesRequest 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 @@ -729,7 +728,7 @@ public Builder setFilterBytes(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-dlp-v2/src/main/java/com/google/privacy/dlp/v2/ListInfoTypesResponse.java b/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/ListInfoTypesResponse.java index 9b17aa7a4525..e20066f872e3 100644 --- a/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/ListInfoTypesResponse.java +++ b/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/ListInfoTypesResponse.java @@ -52,7 +52,7 @@ private ListInfoTypesResponse( break; case 10: { - if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) { + if (!((mutable_bitField0_ & 0x00000001) != 0)) { infoTypes_ = new java.util.ArrayList (); mutable_bitField0_ |= 0x00000001; @@ -64,7 +64,7 @@ private ListInfoTypesResponse( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -76,7 +76,7 @@ private ListInfoTypesResponse( } 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)) { infoTypes_ = java.util.Collections.unmodifiableList(infoTypes_); } this.unknownFields = unknownFields.build(); @@ -208,10 +208,9 @@ public boolean equals(final java.lang.Object obj) { com.google.privacy.dlp.v2.ListInfoTypesResponse other = (com.google.privacy.dlp.v2.ListInfoTypesResponse) obj; - boolean result = true; - result = result && getInfoTypesList().equals(other.getInfoTypesList()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getInfoTypesList().equals(other.getInfoTypesList())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -407,7 +406,7 @@ public com.google.privacy.dlp.v2.ListInfoTypesResponse buildPartial() { new com.google.privacy.dlp.v2.ListInfoTypesResponse(this); int from_bitField0_ = bitField0_; if (infoTypesBuilder_ == null) { - if (((bitField0_ & 0x00000001) == 0x00000001)) { + if (((bitField0_ & 0x00000001) != 0)) { infoTypes_ = java.util.Collections.unmodifiableList(infoTypes_); bitField0_ = (bitField0_ & ~0x00000001); } @@ -421,35 +420,35 @@ public com.google.privacy.dlp.v2.ListInfoTypesResponse buildPartial() { @java.lang.Override public Builder clone() { - return (Builder) super.clone(); + return super.clone(); } @java.lang.Override public Builder setField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.setField(field, value); + return super.setField(field, value); } @java.lang.Override public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) { - return (Builder) super.clearField(field); + return super.clearField(field); } @java.lang.Override public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) { - return (Builder) super.clearOneof(oneof); + return super.clearOneof(oneof); } @java.lang.Override public Builder setRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) { - return (Builder) super.setRepeatedField(field, index, value); + return super.setRepeatedField(field, index, value); } @java.lang.Override public Builder addRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.addRepeatedField(field, value); + return super.addRepeatedField(field, value); } @java.lang.Override @@ -527,7 +526,7 @@ public Builder mergeFrom( java.util.Collections.emptyList(); private void ensureInfoTypesIsMutable() { - if (!((bitField0_ & 0x00000001) == 0x00000001)) { + if (!((bitField0_ & 0x00000001) != 0)) { infoTypes_ = new java.util.ArrayList (infoTypes_); bitField0_ |= 0x00000001; @@ -868,10 +867,7 @@ public com.google.privacy.dlp.v2.InfoTypeDescription.Builder addInfoTypesBuilder com.google.privacy.dlp.v2.InfoTypeDescription, com.google.privacy.dlp.v2.InfoTypeDescription.Builder, com.google.privacy.dlp.v2.InfoTypeDescriptionOrBuilder>( - infoTypes_, - ((bitField0_ & 0x00000001) == 0x00000001), - getParentForChildren(), - isClean()); + infoTypes_, ((bitField0_ & 0x00000001) != 0), getParentForChildren(), isClean()); infoTypes_ = null; } return infoTypesBuilder_; @@ -879,7 +875,7 @@ public com.google.privacy.dlp.v2.InfoTypeDescription.Builder addInfoTypesBuilder @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-dlp-v2/src/main/java/com/google/privacy/dlp/v2/ListInspectTemplatesRequest.java b/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/ListInspectTemplatesRequest.java index 7849a992bd9c..48033cb4b0e8 100644 --- a/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/ListInspectTemplatesRequest.java +++ b/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/ListInspectTemplatesRequest.java @@ -25,7 +25,6 @@ private ListInspectTemplatesRequest(com.google.protobuf.GeneratedMessageV3.Build private ListInspectTemplatesRequest() { parent_ = ""; pageToken_ = ""; - pageSize_ = 0; orderBy_ = ""; } @@ -81,7 +80,7 @@ private ListInspectTemplatesRequest( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -343,13 +342,12 @@ public boolean equals(final java.lang.Object obj) { com.google.privacy.dlp.v2.ListInspectTemplatesRequest other = (com.google.privacy.dlp.v2.ListInspectTemplatesRequest) obj; - boolean result = true; - result = result && getParent().equals(other.getParent()); - result = result && getPageToken().equals(other.getPageToken()); - result = result && (getPageSize() == other.getPageSize()); - result = result && getOrderBy().equals(other.getOrderBy()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getParent().equals(other.getParent())) return false; + if (!getPageToken().equals(other.getPageToken())) return false; + if (getPageSize() != other.getPageSize()) return false; + if (!getOrderBy().equals(other.getOrderBy())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -558,35 +556,35 @@ public com.google.privacy.dlp.v2.ListInspectTemplatesRequest 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 @@ -1033,7 +1031,7 @@ public Builder setOrderByBytes(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-dlp-v2/src/main/java/com/google/privacy/dlp/v2/ListInspectTemplatesResponse.java b/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/ListInspectTemplatesResponse.java index 3a1cd42aa178..0bf4d911c91e 100644 --- a/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/ListInspectTemplatesResponse.java +++ b/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/ListInspectTemplatesResponse.java @@ -53,7 +53,7 @@ private ListInspectTemplatesResponse( break; case 10: { - if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) { + if (!((mutable_bitField0_ & 0x00000001) != 0)) { inspectTemplates_ = new java.util.ArrayList (); mutable_bitField0_ |= 0x00000001; @@ -72,7 +72,7 @@ private ListInspectTemplatesResponse( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -84,7 +84,7 @@ private ListInspectTemplatesResponse( } 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)) { inspectTemplates_ = java.util.Collections.unmodifiableList(inspectTemplates_); } this.unknownFields = unknownFields.build(); @@ -269,11 +269,10 @@ public boolean equals(final java.lang.Object obj) { com.google.privacy.dlp.v2.ListInspectTemplatesResponse other = (com.google.privacy.dlp.v2.ListInspectTemplatesResponse) obj; - boolean result = true; - result = result && getInspectTemplatesList().equals(other.getInspectTemplatesList()); - result = result && getNextPageToken().equals(other.getNextPageToken()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getInspectTemplatesList().equals(other.getInspectTemplatesList())) return false; + if (!getNextPageToken().equals(other.getNextPageToken())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -475,7 +474,7 @@ public com.google.privacy.dlp.v2.ListInspectTemplatesResponse buildPartial() { int from_bitField0_ = bitField0_; int to_bitField0_ = 0; if (inspectTemplatesBuilder_ == null) { - if (((bitField0_ & 0x00000001) == 0x00000001)) { + if (((bitField0_ & 0x00000001) != 0)) { inspectTemplates_ = java.util.Collections.unmodifiableList(inspectTemplates_); bitField0_ = (bitField0_ & ~0x00000001); } @@ -491,35 +490,35 @@ public com.google.privacy.dlp.v2.ListInspectTemplatesResponse buildPartial() { @java.lang.Override public Builder clone() { - return (Builder) super.clone(); + return super.clone(); } @java.lang.Override public Builder setField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.setField(field, value); + return super.setField(field, value); } @java.lang.Override public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) { - return (Builder) super.clearField(field); + return super.clearField(field); } @java.lang.Override public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) { - return (Builder) super.clearOneof(oneof); + return super.clearOneof(oneof); } @java.lang.Override public Builder setRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) { - return (Builder) super.setRepeatedField(field, index, value); + return super.setRepeatedField(field, index, value); } @java.lang.Override public Builder addRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.addRepeatedField(field, value); + return super.addRepeatedField(field, value); } @java.lang.Override @@ -602,7 +601,7 @@ public Builder mergeFrom( java.util.Collections.emptyList(); private void ensureInspectTemplatesIsMutable() { - if (!((bitField0_ & 0x00000001) == 0x00000001)) { + if (!((bitField0_ & 0x00000001) != 0)) { inspectTemplates_ = new java.util.ArrayList (inspectTemplates_); bitField0_ |= 0x00000001; @@ -945,7 +944,7 @@ public com.google.privacy.dlp.v2.InspectTemplate.Builder addInspectTemplatesBuil com.google.privacy.dlp.v2.InspectTemplate.Builder, com.google.privacy.dlp.v2.InspectTemplateOrBuilder>( inspectTemplates_, - ((bitField0_ & 0x00000001) == 0x00000001), + ((bitField0_ & 0x00000001) != 0), getParentForChildren(), isClean()); inspectTemplates_ = null; @@ -1054,7 +1053,7 @@ public Builder setNextPageTokenBytes(com.google.protobuf.ByteString value) { @java.lang.Override public final Builder setUnknownFields(final com.google.protobuf.UnknownFieldSet unknownFields) { - return super.setUnknownFieldsProto3(unknownFields); + return super.setUnknownFields(unknownFields); } @java.lang.Override diff --git a/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/ListJobTriggersRequest.java b/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/ListJobTriggersRequest.java index 09c9058f91ab..a88f3aae6db0 100644 --- a/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/ListJobTriggersRequest.java +++ b/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/ListJobTriggersRequest.java @@ -25,7 +25,6 @@ private ListJobTriggersRequest(com.google.protobuf.GeneratedMessageV3.Builder> private ListJobTriggersRequest() { parent_ = ""; pageToken_ = ""; - pageSize_ = 0; orderBy_ = ""; filter_ = ""; } @@ -89,7 +88,7 @@ private ListJobTriggersRequest( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -439,14 +438,13 @@ public boolean equals(final java.lang.Object obj) { com.google.privacy.dlp.v2.ListJobTriggersRequest other = (com.google.privacy.dlp.v2.ListJobTriggersRequest) obj; - boolean result = true; - result = result && getParent().equals(other.getParent()); - result = result && getPageToken().equals(other.getPageToken()); - result = result && (getPageSize() == other.getPageSize()); - result = result && getOrderBy().equals(other.getOrderBy()); - result = result && getFilter().equals(other.getFilter()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getParent().equals(other.getParent())) return false; + if (!getPageToken().equals(other.getPageToken())) return false; + if (getPageSize() != other.getPageSize()) return false; + if (!getOrderBy().equals(other.getOrderBy())) return false; + if (!getFilter().equals(other.getFilter())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -659,35 +657,35 @@ public com.google.privacy.dlp.v2.ListJobTriggersRequest 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 @@ -1328,7 +1326,7 @@ public Builder setFilterBytes(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-dlp-v2/src/main/java/com/google/privacy/dlp/v2/ListJobTriggersResponse.java b/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/ListJobTriggersResponse.java index 27cda70d72f0..5b34bc90adc7 100644 --- a/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/ListJobTriggersResponse.java +++ b/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/ListJobTriggersResponse.java @@ -53,7 +53,7 @@ private ListJobTriggersResponse( break; case 10: { - if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) { + if (!((mutable_bitField0_ & 0x00000001) != 0)) { jobTriggers_ = new java.util.ArrayList (); mutable_bitField0_ |= 0x00000001; } @@ -71,7 +71,7 @@ private ListJobTriggersResponse( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -83,7 +83,7 @@ private ListJobTriggersResponse( } 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)) { jobTriggers_ = java.util.Collections.unmodifiableList(jobTriggers_); } this.unknownFields = unknownFields.build(); @@ -267,11 +267,10 @@ public boolean equals(final java.lang.Object obj) { com.google.privacy.dlp.v2.ListJobTriggersResponse other = (com.google.privacy.dlp.v2.ListJobTriggersResponse) obj; - boolean result = true; - result = result && getJobTriggersList().equals(other.getJobTriggersList()); - result = result && getNextPageToken().equals(other.getNextPageToken()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getJobTriggersList().equals(other.getJobTriggersList())) return false; + if (!getNextPageToken().equals(other.getNextPageToken())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -472,7 +471,7 @@ public com.google.privacy.dlp.v2.ListJobTriggersResponse buildPartial() { int from_bitField0_ = bitField0_; int to_bitField0_ = 0; if (jobTriggersBuilder_ == null) { - if (((bitField0_ & 0x00000001) == 0x00000001)) { + if (((bitField0_ & 0x00000001) != 0)) { jobTriggers_ = java.util.Collections.unmodifiableList(jobTriggers_); bitField0_ = (bitField0_ & ~0x00000001); } @@ -488,35 +487,35 @@ public com.google.privacy.dlp.v2.ListJobTriggersResponse 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 @@ -599,7 +598,7 @@ public Builder mergeFrom( java.util.Collections.emptyList(); private void ensureJobTriggersIsMutable() { - if (!((bitField0_ & 0x00000001) == 0x00000001)) { + if (!((bitField0_ & 0x00000001) != 0)) { jobTriggers_ = new java.util.ArrayList (jobTriggers_); bitField0_ |= 0x00000001; } @@ -938,10 +937,7 @@ public com.google.privacy.dlp.v2.JobTrigger.Builder addJobTriggersBuilder(int in com.google.privacy.dlp.v2.JobTrigger, com.google.privacy.dlp.v2.JobTrigger.Builder, com.google.privacy.dlp.v2.JobTriggerOrBuilder>( - jobTriggers_, - ((bitField0_ & 0x00000001) == 0x00000001), - getParentForChildren(), - isClean()); + jobTriggers_, ((bitField0_ & 0x00000001) != 0), getParentForChildren(), isClean()); jobTriggers_ = null; } return jobTriggersBuilder_; @@ -1048,7 +1044,7 @@ public Builder setNextPageTokenBytes(com.google.protobuf.ByteString value) { @java.lang.Override public final Builder setUnknownFields(final com.google.protobuf.UnknownFieldSet unknownFields) { - return super.setUnknownFieldsProto3(unknownFields); + return super.setUnknownFields(unknownFields); } @java.lang.Override diff --git a/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/ListStoredInfoTypesRequest.java b/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/ListStoredInfoTypesRequest.java index a6b781c69c5e..cc8cbce520da 100644 --- a/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/ListStoredInfoTypesRequest.java +++ b/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/ListStoredInfoTypesRequest.java @@ -25,7 +25,6 @@ private ListStoredInfoTypesRequest(com.google.protobuf.GeneratedMessageV3.Builde private ListStoredInfoTypesRequest() { parent_ = ""; pageToken_ = ""; - pageSize_ = 0; orderBy_ = ""; } @@ -81,7 +80,7 @@ private ListStoredInfoTypesRequest( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -345,13 +344,12 @@ public boolean equals(final java.lang.Object obj) { com.google.privacy.dlp.v2.ListStoredInfoTypesRequest other = (com.google.privacy.dlp.v2.ListStoredInfoTypesRequest) obj; - boolean result = true; - result = result && getParent().equals(other.getParent()); - result = result && getPageToken().equals(other.getPageToken()); - result = result && (getPageSize() == other.getPageSize()); - result = result && getOrderBy().equals(other.getOrderBy()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getParent().equals(other.getParent())) return false; + if (!getPageToken().equals(other.getPageToken())) return false; + if (getPageSize() != other.getPageSize()) return false; + if (!getOrderBy().equals(other.getOrderBy())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -559,35 +557,35 @@ public com.google.privacy.dlp.v2.ListStoredInfoTypesRequest 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 @@ -1039,7 +1037,7 @@ public Builder setOrderByBytes(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-dlp-v2/src/main/java/com/google/privacy/dlp/v2/ListStoredInfoTypesResponse.java b/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/ListStoredInfoTypesResponse.java index 2bedc5f4428b..f1965c48f8cf 100644 --- a/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/ListStoredInfoTypesResponse.java +++ b/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/ListStoredInfoTypesResponse.java @@ -53,7 +53,7 @@ private ListStoredInfoTypesResponse( break; case 10: { - if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) { + if (!((mutable_bitField0_ & 0x00000001) != 0)) { storedInfoTypes_ = new java.util.ArrayList (); mutable_bitField0_ |= 0x00000001; @@ -72,7 +72,7 @@ private ListStoredInfoTypesResponse( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -84,7 +84,7 @@ private ListStoredInfoTypesResponse( } 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)) { storedInfoTypes_ = java.util.Collections.unmodifiableList(storedInfoTypes_); } this.unknownFields = unknownFields.build(); @@ -268,11 +268,10 @@ public boolean equals(final java.lang.Object obj) { com.google.privacy.dlp.v2.ListStoredInfoTypesResponse other = (com.google.privacy.dlp.v2.ListStoredInfoTypesResponse) obj; - boolean result = true; - result = result && getStoredInfoTypesList().equals(other.getStoredInfoTypesList()); - result = result && getNextPageToken().equals(other.getNextPageToken()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getStoredInfoTypesList().equals(other.getStoredInfoTypesList())) return false; + if (!getNextPageToken().equals(other.getNextPageToken())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -474,7 +473,7 @@ public com.google.privacy.dlp.v2.ListStoredInfoTypesResponse buildPartial() { int from_bitField0_ = bitField0_; int to_bitField0_ = 0; if (storedInfoTypesBuilder_ == null) { - if (((bitField0_ & 0x00000001) == 0x00000001)) { + if (((bitField0_ & 0x00000001) != 0)) { storedInfoTypes_ = java.util.Collections.unmodifiableList(storedInfoTypes_); bitField0_ = (bitField0_ & ~0x00000001); } @@ -490,35 +489,35 @@ public com.google.privacy.dlp.v2.ListStoredInfoTypesResponse 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 @@ -601,7 +600,7 @@ public Builder mergeFrom( java.util.Collections.emptyList(); private void ensureStoredInfoTypesIsMutable() { - if (!((bitField0_ & 0x00000001) == 0x00000001)) { + if (!((bitField0_ & 0x00000001) != 0)) { storedInfoTypes_ = new java.util.ArrayList (storedInfoTypes_); bitField0_ |= 0x00000001; @@ -944,7 +943,7 @@ public com.google.privacy.dlp.v2.StoredInfoType.Builder addStoredInfoTypesBuilde com.google.privacy.dlp.v2.StoredInfoType.Builder, com.google.privacy.dlp.v2.StoredInfoTypeOrBuilder>( storedInfoTypes_, - ((bitField0_ & 0x00000001) == 0x00000001), + ((bitField0_ & 0x00000001) != 0), getParentForChildren(), isClean()); storedInfoTypes_ = null; @@ -1053,7 +1052,7 @@ public Builder setNextPageTokenBytes(com.google.protobuf.ByteString value) { @java.lang.Override public final Builder setUnknownFields(final com.google.protobuf.UnknownFieldSet unknownFields) { - return super.setUnknownFieldsProto3(unknownFields); + return super.setUnknownFields(unknownFields); } @java.lang.Override diff --git a/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/Location.java b/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/Location.java index a9a31cb011a9..a54b448690b9 100644 --- a/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/Location.java +++ b/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/Location.java @@ -82,7 +82,7 @@ private Location( } case 58: { - if (!((mutable_bitField0_ & 0x00000004) == 0x00000004)) { + if (!((mutable_bitField0_ & 0x00000004) != 0)) { contentLocations_ = new java.util.ArrayList (); mutable_bitField0_ |= 0x00000004; @@ -94,7 +94,7 @@ private Location( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -106,7 +106,7 @@ private Location( } catch (java.io.IOException e) { throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this); } finally { - if (((mutable_bitField0_ & 0x00000004) == 0x00000004)) { + if (((mutable_bitField0_ & 0x00000004) != 0)) { contentLocations_ = java.util.Collections.unmodifiableList(contentLocations_); } this.unknownFields = unknownFields.build(); @@ -354,18 +354,17 @@ public boolean equals(final java.lang.Object obj) { } com.google.privacy.dlp.v2.Location other = (com.google.privacy.dlp.v2.Location) obj; - boolean result = true; - result = result && (hasByteRange() == other.hasByteRange()); + if (hasByteRange() != other.hasByteRange()) return false; if (hasByteRange()) { - result = result && getByteRange().equals(other.getByteRange()); + if (!getByteRange().equals(other.getByteRange())) return false; } - result = result && (hasCodepointRange() == other.hasCodepointRange()); + if (hasCodepointRange() != other.hasCodepointRange()) return false; if (hasCodepointRange()) { - result = result && getCodepointRange().equals(other.getCodepointRange()); + if (!getCodepointRange().equals(other.getCodepointRange())) return false; } - result = result && getContentLocationsList().equals(other.getContentLocationsList()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getContentLocationsList().equals(other.getContentLocationsList())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -590,7 +589,7 @@ public com.google.privacy.dlp.v2.Location buildPartial() { result.codepointRange_ = codepointRangeBuilder_.build(); } if (contentLocationsBuilder_ == null) { - if (((bitField0_ & 0x00000004) == 0x00000004)) { + if (((bitField0_ & 0x00000004) != 0)) { contentLocations_ = java.util.Collections.unmodifiableList(contentLocations_); bitField0_ = (bitField0_ & ~0x00000004); } @@ -605,35 +604,35 @@ public com.google.privacy.dlp.v2.Location 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 @@ -712,7 +711,7 @@ public Builder mergeFrom( private int bitField0_; - private com.google.privacy.dlp.v2.Range byteRange_ = null; + private com.google.privacy.dlp.v2.Range byteRange_; private com.google.protobuf.SingleFieldBuilderV3< com.google.privacy.dlp.v2.Range, com.google.privacy.dlp.v2.Range.Builder, @@ -929,7 +928,7 @@ public com.google.privacy.dlp.v2.RangeOrBuilder getByteRangeOrBuilder() { return byteRangeBuilder_; } - private com.google.privacy.dlp.v2.Range codepointRange_ = null; + private com.google.privacy.dlp.v2.Range codepointRange_; private com.google.protobuf.SingleFieldBuilderV3< com.google.privacy.dlp.v2.Range, com.google.privacy.dlp.v2.Range.Builder, @@ -1132,7 +1131,7 @@ public com.google.privacy.dlp.v2.RangeOrBuilder getCodepointRangeOrBuilder() { java.util.Collections.emptyList(); private void ensureContentLocationsIsMutable() { - if (!((bitField0_ & 0x00000004) == 0x00000004)) { + if (!((bitField0_ & 0x00000004) != 0)) { contentLocations_ = new java.util.ArrayList (contentLocations_); bitField0_ |= 0x00000004; @@ -1493,7 +1492,7 @@ public com.google.privacy.dlp.v2.ContentLocation.Builder addContentLocationsBuil com.google.privacy.dlp.v2.ContentLocation.Builder, com.google.privacy.dlp.v2.ContentLocationOrBuilder>( contentLocations_, - ((bitField0_ & 0x00000004) == 0x00000004), + ((bitField0_ & 0x00000004) != 0), getParentForChildren(), isClean()); contentLocations_ = null; @@ -1503,7 +1502,7 @@ public com.google.privacy.dlp.v2.ContentLocation.Builder addContentLocationsBuil @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-dlp-v2/src/main/java/com/google/privacy/dlp/v2/OutputStorageConfig.java b/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/OutputStorageConfig.java index fc17d6ba0470..0ac722dc07fe 100644 --- a/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/OutputStorageConfig.java +++ b/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/OutputStorageConfig.java @@ -75,7 +75,7 @@ private OutputStorageConfig( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -521,19 +521,17 @@ public boolean equals(final java.lang.Object obj) { com.google.privacy.dlp.v2.OutputStorageConfig other = (com.google.privacy.dlp.v2.OutputStorageConfig) obj; - boolean result = true; - result = result && outputSchema_ == other.outputSchema_; - result = result && getTypeCase().equals(other.getTypeCase()); - if (!result) return false; + if (outputSchema_ != other.outputSchema_) return false; + if (!getTypeCase().equals(other.getTypeCase())) return false; switch (typeCase_) { case 1: - result = result && getTable().equals(other.getTable()); + if (!getTable().equals(other.getTable())) 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 @@ -744,35 +742,35 @@ public com.google.privacy.dlp.v2.OutputStorageConfig 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 @@ -1258,7 +1256,7 @@ public Builder clearOutputSchema() { @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-dlp-v2/src/main/java/com/google/privacy/dlp/v2/PartitionId.java b/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/PartitionId.java index 03806fbbb339..f71c7c0d87b1 100644 --- a/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/PartitionId.java +++ b/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/PartitionId.java @@ -71,7 +71,7 @@ private PartitionId( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -239,11 +239,10 @@ public boolean equals(final java.lang.Object obj) { } com.google.privacy.dlp.v2.PartitionId other = (com.google.privacy.dlp.v2.PartitionId) obj; - boolean result = true; - result = result && getProjectId().equals(other.getProjectId()); - result = result && getNamespaceId().equals(other.getNamespaceId()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getProjectId().equals(other.getProjectId())) return false; + if (!getNamespaceId().equals(other.getNamespaceId())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -444,35 +443,35 @@ public com.google.privacy.dlp.v2.PartitionId buildPartial() { @java.lang.Override public Builder clone() { - return (Builder) super.clone(); + return super.clone(); } @java.lang.Override public Builder setField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.setField(field, value); + return super.setField(field, value); } @java.lang.Override public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) { - return (Builder) super.clearField(field); + return super.clearField(field); } @java.lang.Override public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) { - return (Builder) super.clearOneof(oneof); + return super.clearOneof(oneof); } @java.lang.Override public Builder setRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) { - return (Builder) super.setRepeatedField(field, index, value); + return super.setRepeatedField(field, index, value); } @java.lang.Override public Builder addRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.addRepeatedField(field, value); + return super.addRepeatedField(field, value); } @java.lang.Override @@ -714,7 +713,7 @@ public Builder setNamespaceIdBytes(com.google.protobuf.ByteString value) { @java.lang.Override public final Builder setUnknownFields(final com.google.protobuf.UnknownFieldSet unknownFields) { - return super.setUnknownFieldsProto3(unknownFields); + return super.setUnknownFields(unknownFields); } @java.lang.Override diff --git a/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/PrimitiveTransformation.java b/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/PrimitiveTransformation.java index 0f956a9e85a7..2969ab29febc 100644 --- a/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/PrimitiveTransformation.java +++ b/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/PrimitiveTransformation.java @@ -228,9 +228,29 @@ private PrimitiveTransformation( transformationCase_ = 11; break; } + case 98: + { + com.google.privacy.dlp.v2.CryptoDeterministicConfig.Builder subBuilder = null; + if (transformationCase_ == 12) { + subBuilder = + ((com.google.privacy.dlp.v2.CryptoDeterministicConfig) transformation_) + .toBuilder(); + } + transformation_ = + input.readMessage( + com.google.privacy.dlp.v2.CryptoDeterministicConfig.parser(), + extensionRegistry); + if (subBuilder != null) { + subBuilder.mergeFrom( + (com.google.privacy.dlp.v2.CryptoDeterministicConfig) transformation_); + transformation_ = subBuilder.buildPartial(); + } + transformationCase_ = 12; + break; + } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -276,6 +296,7 @@ public enum TransformationCase implements com.google.protobuf.Internal.EnumLite TIME_PART_CONFIG(8), CRYPTO_HASH_CONFIG(9), DATE_SHIFT_CONFIG(11), + CRYPTO_DETERMINISTIC_CONFIG(12), TRANSFORMATION_NOT_SET(0); private final int value; @@ -310,6 +331,8 @@ public static TransformationCase forNumber(int value) { return CRYPTO_HASH_CONFIG; case 11: return DATE_SHIFT_CONFIG; + case 12: + return CRYPTO_DETERMINISTIC_CONFIG; case 0: return TRANSFORMATION_NOT_SET; default: @@ -553,6 +576,33 @@ public com.google.privacy.dlp.v2.DateShiftConfigOrBuilder getDateShiftConfigOrBu return com.google.privacy.dlp.v2.DateShiftConfig.getDefaultInstance(); } + public static final int CRYPTO_DETERMINISTIC_CONFIG_FIELD_NUMBER = 12; + /** + * .google.privacy.dlp.v2.CryptoDeterministicConfig crypto_deterministic_config = 12;
+ */ + public boolean hasCryptoDeterministicConfig() { + return transformationCase_ == 12; + } + /** + *.google.privacy.dlp.v2.CryptoDeterministicConfig crypto_deterministic_config = 12;
+ */ + public com.google.privacy.dlp.v2.CryptoDeterministicConfig getCryptoDeterministicConfig() { + if (transformationCase_ == 12) { + return (com.google.privacy.dlp.v2.CryptoDeterministicConfig) transformation_; + } + return com.google.privacy.dlp.v2.CryptoDeterministicConfig.getDefaultInstance(); + } + /** + *.google.privacy.dlp.v2.CryptoDeterministicConfig crypto_deterministic_config = 12;
+ */ + public com.google.privacy.dlp.v2.CryptoDeterministicConfigOrBuilder + getCryptoDeterministicConfigOrBuilder() { + if (transformationCase_ == 12) { + return (com.google.privacy.dlp.v2.CryptoDeterministicConfig) transformation_; + } + return com.google.privacy.dlp.v2.CryptoDeterministicConfig.getDefaultInstance(); + } + private byte memoizedIsInitialized = -1; @java.lang.Override @@ -597,6 +647,10 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io if (transformationCase_ == 11) { output.writeMessage(11, (com.google.privacy.dlp.v2.DateShiftConfig) transformation_); } + if (transformationCase_ == 12) { + output.writeMessage( + 12, (com.google.privacy.dlp.v2.CryptoDeterministicConfig) transformation_); + } unknownFields.writeTo(output); } @@ -656,6 +710,11 @@ public int getSerializedSize() { com.google.protobuf.CodedOutputStream.computeMessageSize( 11, (com.google.privacy.dlp.v2.DateShiftConfig) transformation_); } + if (transformationCase_ == 12) { + size += + com.google.protobuf.CodedOutputStream.computeMessageSize( + 12, (com.google.privacy.dlp.v2.CryptoDeterministicConfig) transformation_); + } size += unknownFields.getSerializedSize(); memoizedSize = size; return size; @@ -672,48 +731,50 @@ public boolean equals(final java.lang.Object obj) { com.google.privacy.dlp.v2.PrimitiveTransformation other = (com.google.privacy.dlp.v2.PrimitiveTransformation) obj; - boolean result = true; - result = result && getTransformationCase().equals(other.getTransformationCase()); - if (!result) return false; + if (!getTransformationCase().equals(other.getTransformationCase())) return false; switch (transformationCase_) { case 1: - result = result && getReplaceConfig().equals(other.getReplaceConfig()); + if (!getReplaceConfig().equals(other.getReplaceConfig())) return false; break; case 2: - result = result && getRedactConfig().equals(other.getRedactConfig()); + if (!getRedactConfig().equals(other.getRedactConfig())) return false; break; case 3: - result = result && getCharacterMaskConfig().equals(other.getCharacterMaskConfig()); + if (!getCharacterMaskConfig().equals(other.getCharacterMaskConfig())) return false; break; case 4: - result = - result && getCryptoReplaceFfxFpeConfig().equals(other.getCryptoReplaceFfxFpeConfig()); + if (!getCryptoReplaceFfxFpeConfig().equals(other.getCryptoReplaceFfxFpeConfig())) + return false; break; case 5: - result = - result && getFixedSizeBucketingConfig().equals(other.getFixedSizeBucketingConfig()); + if (!getFixedSizeBucketingConfig().equals(other.getFixedSizeBucketingConfig())) + return false; break; case 6: - result = result && getBucketingConfig().equals(other.getBucketingConfig()); + if (!getBucketingConfig().equals(other.getBucketingConfig())) return false; break; case 7: - result = - result && getReplaceWithInfoTypeConfig().equals(other.getReplaceWithInfoTypeConfig()); + if (!getReplaceWithInfoTypeConfig().equals(other.getReplaceWithInfoTypeConfig())) + return false; break; case 8: - result = result && getTimePartConfig().equals(other.getTimePartConfig()); + if (!getTimePartConfig().equals(other.getTimePartConfig())) return false; break; case 9: - result = result && getCryptoHashConfig().equals(other.getCryptoHashConfig()); + if (!getCryptoHashConfig().equals(other.getCryptoHashConfig())) return false; break; case 11: - result = result && getDateShiftConfig().equals(other.getDateShiftConfig()); + if (!getDateShiftConfig().equals(other.getDateShiftConfig())) return false; + break; + case 12: + if (!getCryptoDeterministicConfig().equals(other.getCryptoDeterministicConfig())) + 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 @@ -764,6 +825,10 @@ public int hashCode() { hash = (37 * hash) + DATE_SHIFT_CONFIG_FIELD_NUMBER; hash = (53 * hash) + getDateShiftConfig().hashCode(); break; + case 12: + hash = (37 * hash) + CRYPTO_DETERMINISTIC_CONFIG_FIELD_NUMBER; + hash = (53 * hash) + getCryptoDeterministicConfig().hashCode(); + break; case 0: default: } @@ -1011,6 +1076,13 @@ public com.google.privacy.dlp.v2.PrimitiveTransformation buildPartial() { result.transformation_ = dateShiftConfigBuilder_.build(); } } + if (transformationCase_ == 12) { + if (cryptoDeterministicConfigBuilder_ == null) { + result.transformation_ = transformation_; + } else { + result.transformation_ = cryptoDeterministicConfigBuilder_.build(); + } + } result.transformationCase_ = transformationCase_; onBuilt(); return result; @@ -1018,35 +1090,35 @@ public com.google.privacy.dlp.v2.PrimitiveTransformation 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 @@ -1113,6 +1185,11 @@ public Builder mergeFrom(com.google.privacy.dlp.v2.PrimitiveTransformation other mergeDateShiftConfig(other.getDateShiftConfig()); break; } + case CRYPTO_DETERMINISTIC_CONFIG: + { + mergeCryptoDeterministicConfig(other.getCryptoDeterministicConfig()); + break; + } case TRANSFORMATION_NOT_SET: { break; @@ -2553,9 +2630,172 @@ public com.google.privacy.dlp.v2.DateShiftConfigOrBuilder getDateShiftConfigOrBu return dateShiftConfigBuilder_; } + private com.google.protobuf.SingleFieldBuilderV3< + com.google.privacy.dlp.v2.CryptoDeterministicConfig, + com.google.privacy.dlp.v2.CryptoDeterministicConfig.Builder, + com.google.privacy.dlp.v2.CryptoDeterministicConfigOrBuilder> + cryptoDeterministicConfigBuilder_; + /** + *.google.privacy.dlp.v2.CryptoDeterministicConfig crypto_deterministic_config = 12; + *
+ */ + public boolean hasCryptoDeterministicConfig() { + return transformationCase_ == 12; + } + /** + *.google.privacy.dlp.v2.CryptoDeterministicConfig crypto_deterministic_config = 12; + *
+ */ + public com.google.privacy.dlp.v2.CryptoDeterministicConfig getCryptoDeterministicConfig() { + if (cryptoDeterministicConfigBuilder_ == null) { + if (transformationCase_ == 12) { + return (com.google.privacy.dlp.v2.CryptoDeterministicConfig) transformation_; + } + return com.google.privacy.dlp.v2.CryptoDeterministicConfig.getDefaultInstance(); + } else { + if (transformationCase_ == 12) { + return cryptoDeterministicConfigBuilder_.getMessage(); + } + return com.google.privacy.dlp.v2.CryptoDeterministicConfig.getDefaultInstance(); + } + } + /** + *.google.privacy.dlp.v2.CryptoDeterministicConfig crypto_deterministic_config = 12; + *
+ */ + public Builder setCryptoDeterministicConfig( + com.google.privacy.dlp.v2.CryptoDeterministicConfig value) { + if (cryptoDeterministicConfigBuilder_ == null) { + if (value == null) { + throw new NullPointerException(); + } + transformation_ = value; + onChanged(); + } else { + cryptoDeterministicConfigBuilder_.setMessage(value); + } + transformationCase_ = 12; + return this; + } + /** + *.google.privacy.dlp.v2.CryptoDeterministicConfig crypto_deterministic_config = 12; + *
+ */ + public Builder setCryptoDeterministicConfig( + com.google.privacy.dlp.v2.CryptoDeterministicConfig.Builder builderForValue) { + if (cryptoDeterministicConfigBuilder_ == null) { + transformation_ = builderForValue.build(); + onChanged(); + } else { + cryptoDeterministicConfigBuilder_.setMessage(builderForValue.build()); + } + transformationCase_ = 12; + return this; + } + /** + *.google.privacy.dlp.v2.CryptoDeterministicConfig crypto_deterministic_config = 12; + *
+ */ + public Builder mergeCryptoDeterministicConfig( + com.google.privacy.dlp.v2.CryptoDeterministicConfig value) { + if (cryptoDeterministicConfigBuilder_ == null) { + if (transformationCase_ == 12 + && transformation_ + != com.google.privacy.dlp.v2.CryptoDeterministicConfig.getDefaultInstance()) { + transformation_ = + com.google.privacy.dlp.v2.CryptoDeterministicConfig.newBuilder( + (com.google.privacy.dlp.v2.CryptoDeterministicConfig) transformation_) + .mergeFrom(value) + .buildPartial(); + } else { + transformation_ = value; + } + onChanged(); + } else { + if (transformationCase_ == 12) { + cryptoDeterministicConfigBuilder_.mergeFrom(value); + } + cryptoDeterministicConfigBuilder_.setMessage(value); + } + transformationCase_ = 12; + return this; + } + /** + *.google.privacy.dlp.v2.CryptoDeterministicConfig crypto_deterministic_config = 12; + *
+ */ + public Builder clearCryptoDeterministicConfig() { + if (cryptoDeterministicConfigBuilder_ == null) { + if (transformationCase_ == 12) { + transformationCase_ = 0; + transformation_ = null; + onChanged(); + } + } else { + if (transformationCase_ == 12) { + transformationCase_ = 0; + transformation_ = null; + } + cryptoDeterministicConfigBuilder_.clear(); + } + return this; + } + /** + *.google.privacy.dlp.v2.CryptoDeterministicConfig crypto_deterministic_config = 12; + *
+ */ + public com.google.privacy.dlp.v2.CryptoDeterministicConfig.Builder + getCryptoDeterministicConfigBuilder() { + return getCryptoDeterministicConfigFieldBuilder().getBuilder(); + } + /** + *.google.privacy.dlp.v2.CryptoDeterministicConfig crypto_deterministic_config = 12; + *
+ */ + public com.google.privacy.dlp.v2.CryptoDeterministicConfigOrBuilder + getCryptoDeterministicConfigOrBuilder() { + if ((transformationCase_ == 12) && (cryptoDeterministicConfigBuilder_ != null)) { + return cryptoDeterministicConfigBuilder_.getMessageOrBuilder(); + } else { + if (transformationCase_ == 12) { + return (com.google.privacy.dlp.v2.CryptoDeterministicConfig) transformation_; + } + return com.google.privacy.dlp.v2.CryptoDeterministicConfig.getDefaultInstance(); + } + } + /** + *.google.privacy.dlp.v2.CryptoDeterministicConfig crypto_deterministic_config = 12; + *
+ */ + private com.google.protobuf.SingleFieldBuilderV3< + com.google.privacy.dlp.v2.CryptoDeterministicConfig, + com.google.privacy.dlp.v2.CryptoDeterministicConfig.Builder, + com.google.privacy.dlp.v2.CryptoDeterministicConfigOrBuilder> + getCryptoDeterministicConfigFieldBuilder() { + if (cryptoDeterministicConfigBuilder_ == null) { + if (!(transformationCase_ == 12)) { + transformation_ = + com.google.privacy.dlp.v2.CryptoDeterministicConfig.getDefaultInstance(); + } + cryptoDeterministicConfigBuilder_ = + new com.google.protobuf.SingleFieldBuilderV3< + com.google.privacy.dlp.v2.CryptoDeterministicConfig, + com.google.privacy.dlp.v2.CryptoDeterministicConfig.Builder, + com.google.privacy.dlp.v2.CryptoDeterministicConfigOrBuilder>( + (com.google.privacy.dlp.v2.CryptoDeterministicConfig) transformation_, + getParentForChildren(), + isClean()); + transformation_ = null; + } + transformationCase_ = 12; + onChanged(); + ; + return cryptoDeterministicConfigBuilder_; + } + @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-dlp-v2/src/main/java/com/google/privacy/dlp/v2/PrimitiveTransformationOrBuilder.java b/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/PrimitiveTransformationOrBuilder.java index 858a54d5db20..4c32409b3d5f 100644 --- a/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/PrimitiveTransformationOrBuilder.java +++ b/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/PrimitiveTransformationOrBuilder.java @@ -105,6 +105,20 @@ public interface PrimitiveTransformationOrBuilder /**.google.privacy.dlp.v2.DateShiftConfig date_shift_config = 11;
*/ com.google.privacy.dlp.v2.DateShiftConfigOrBuilder getDateShiftConfigOrBuilder(); + /** + *.google.privacy.dlp.v2.CryptoDeterministicConfig crypto_deterministic_config = 12;
+ */ + boolean hasCryptoDeterministicConfig(); + /** + *.google.privacy.dlp.v2.CryptoDeterministicConfig crypto_deterministic_config = 12;
+ */ + com.google.privacy.dlp.v2.CryptoDeterministicConfig getCryptoDeterministicConfig(); + /** + *.google.privacy.dlp.v2.CryptoDeterministicConfig crypto_deterministic_config = 12;
+ */ + com.google.privacy.dlp.v2.CryptoDeterministicConfigOrBuilder + getCryptoDeterministicConfigOrBuilder(); + public com.google.privacy.dlp.v2.PrimitiveTransformation.TransformationCase getTransformationCase(); } diff --git a/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/PrivacyMetric.java b/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/PrivacyMetric.java index 67e25a519d48..b78d4c093380 100644 --- a/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/PrivacyMetric.java +++ b/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/PrivacyMetric.java @@ -173,7 +173,7 @@ private PrivacyMetric( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -308,7 +308,7 @@ private NumericalStatsConfig( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -427,13 +427,12 @@ public boolean equals(final java.lang.Object obj) { com.google.privacy.dlp.v2.PrivacyMetric.NumericalStatsConfig other = (com.google.privacy.dlp.v2.PrivacyMetric.NumericalStatsConfig) obj; - boolean result = true; - result = result && (hasField() == other.hasField()); + if (hasField() != other.hasField()) return false; if (hasField()) { - result = result && getField().equals(other.getField()); + if (!getField().equals(other.getField())) return false; } - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -641,23 +640,23 @@ public com.google.privacy.dlp.v2.PrivacyMetric.NumericalStatsConfig 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 @@ -665,13 +664,13 @@ public Builder setRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) { - return (Builder) super.setRepeatedField(field, index, value); + return super.setRepeatedField(field, index, value); } @java.lang.Override public Builder addRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.addRepeatedField(field, value); + return super.addRepeatedField(field, value); } @java.lang.Override @@ -722,7 +721,7 @@ public Builder mergeFrom( return this; } - private com.google.privacy.dlp.v2.FieldId field_ = null; + private com.google.privacy.dlp.v2.FieldId field_; private com.google.protobuf.SingleFieldBuilderV3< com.google.privacy.dlp.v2.FieldId, com.google.privacy.dlp.v2.FieldId.Builder, @@ -911,7 +910,7 @@ public com.google.privacy.dlp.v2.FieldIdOrBuilder getFieldOrBuilder() { @java.lang.Override public final Builder setUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { - return super.setUnknownFieldsProto3(unknownFields); + return super.setUnknownFields(unknownFields); } @java.lang.Override @@ -1072,7 +1071,7 @@ private CategoricalStatsConfig( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -1197,13 +1196,12 @@ public boolean equals(final java.lang.Object obj) { com.google.privacy.dlp.v2.PrivacyMetric.CategoricalStatsConfig other = (com.google.privacy.dlp.v2.PrivacyMetric.CategoricalStatsConfig) obj; - boolean result = true; - result = result && (hasField() == other.hasField()); + if (hasField() != other.hasField()) return false; if (hasField()) { - result = result && getField().equals(other.getField()); + if (!getField().equals(other.getField())) return false; } - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -1411,23 +1409,23 @@ public com.google.privacy.dlp.v2.PrivacyMetric.CategoricalStatsConfig buildParti @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 @@ -1435,13 +1433,13 @@ public Builder setRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) { - return (Builder) super.setRepeatedField(field, index, value); + return super.setRepeatedField(field, index, value); } @java.lang.Override public Builder addRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.addRepeatedField(field, value); + return super.addRepeatedField(field, value); } @java.lang.Override @@ -1493,7 +1491,7 @@ public Builder mergeFrom( return this; } - private com.google.privacy.dlp.v2.FieldId field_ = null; + private com.google.privacy.dlp.v2.FieldId field_; private com.google.protobuf.SingleFieldBuilderV3< com.google.privacy.dlp.v2.FieldId, com.google.privacy.dlp.v2.FieldId.Builder, @@ -1700,7 +1698,7 @@ public com.google.privacy.dlp.v2.FieldIdOrBuilder getFieldOrBuilder() { @java.lang.Override public final Builder setUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { - return super.setUnknownFieldsProto3(unknownFields); + return super.setUnknownFields(unknownFields); } @java.lang.Override @@ -1932,7 +1930,7 @@ private KAnonymityConfig( break; case 10: { - if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) { + if (!((mutable_bitField0_ & 0x00000001) != 0)) { quasiIds_ = new java.util.ArrayList(); mutable_bitField0_ |= 0x00000001; } @@ -1959,7 +1957,7 @@ private KAnonymityConfig( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -1971,7 +1969,7 @@ private KAnonymityConfig( } 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)) { quasiIds_ = java.util.Collections.unmodifiableList(quasiIds_); } this.unknownFields = unknownFields.build(); @@ -2195,14 +2193,13 @@ public boolean equals(final java.lang.Object obj) { com.google.privacy.dlp.v2.PrivacyMetric.KAnonymityConfig other = (com.google.privacy.dlp.v2.PrivacyMetric.KAnonymityConfig) obj; - boolean result = true; - result = result && getQuasiIdsList().equals(other.getQuasiIdsList()); - result = result && (hasEntityId() == other.hasEntityId()); + if (!getQuasiIdsList().equals(other.getQuasiIdsList())) return false; + if (hasEntityId() != other.hasEntityId()) return false; if (hasEntityId()) { - result = result && getEntityId().equals(other.getEntityId()); + if (!getEntityId().equals(other.getEntityId())) return false; } - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -2412,7 +2409,7 @@ public com.google.privacy.dlp.v2.PrivacyMetric.KAnonymityConfig buildPartial() { int from_bitField0_ = bitField0_; int to_bitField0_ = 0; if (quasiIdsBuilder_ == null) { - if (((bitField0_ & 0x00000001) == 0x00000001)) { + if (((bitField0_ & 0x00000001) != 0)) { quasiIds_ = java.util.Collections.unmodifiableList(quasiIds_); bitField0_ = (bitField0_ & ~0x00000001); } @@ -2432,23 +2429,23 @@ public com.google.privacy.dlp.v2.PrivacyMetric.KAnonymityConfig 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 @@ -2456,13 +2453,13 @@ public Builder setRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) { - return (Builder) super.setRepeatedField(field, index, value); + return super.setRepeatedField(field, index, value); } @java.lang.Override public Builder addRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.addRepeatedField(field, value); + return super.addRepeatedField(field, value); } @java.lang.Override @@ -2544,7 +2541,7 @@ public Builder mergeFrom( java.util.Collections.emptyList(); private void ensureQuasiIdsIsMutable() { - if (!((bitField0_ & 0x00000001) == 0x00000001)) { + if (!((bitField0_ & 0x00000001) != 0)) { quasiIds_ = new java.util.ArrayList (quasiIds_); bitField0_ |= 0x00000001; } @@ -2954,16 +2951,13 @@ public java.util.List getQuasiIdsBuil com.google.privacy.dlp.v2.FieldId, com.google.privacy.dlp.v2.FieldId.Builder, com.google.privacy.dlp.v2.FieldIdOrBuilder>( - quasiIds_, - ((bitField0_ & 0x00000001) == 0x00000001), - getParentForChildren(), - isClean()); + quasiIds_, ((bitField0_ & 0x00000001) != 0), getParentForChildren(), isClean()); quasiIds_ = null; } return quasiIdsBuilder_; } - private com.google.privacy.dlp.v2.EntityId entityId_ = null; + private com.google.privacy.dlp.v2.EntityId entityId_; private com.google.protobuf.SingleFieldBuilderV3< com.google.privacy.dlp.v2.EntityId, com.google.privacy.dlp.v2.EntityId.Builder, @@ -3219,7 +3213,7 @@ public com.google.privacy.dlp.v2.EntityIdOrBuilder getEntityIdOrBuilder() { @java.lang.Override public final Builder setUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { - return super.setUnknownFieldsProto3(unknownFields); + return super.setUnknownFields(unknownFields); } @java.lang.Override @@ -3414,7 +3408,7 @@ private LDiversityConfig( break; case 10: { - if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) { + if (!((mutable_bitField0_ & 0x00000001) != 0)) { quasiIds_ = new java.util.ArrayList (); mutable_bitField0_ |= 0x00000001; } @@ -3441,7 +3435,7 @@ private LDiversityConfig( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -3453,7 +3447,7 @@ private LDiversityConfig( } 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)) { quasiIds_ = java.util.Collections.unmodifiableList(quasiIds_); } this.unknownFields = unknownFields.build(); @@ -3644,14 +3638,13 @@ public boolean equals(final java.lang.Object obj) { com.google.privacy.dlp.v2.PrivacyMetric.LDiversityConfig other = (com.google.privacy.dlp.v2.PrivacyMetric.LDiversityConfig) obj; - boolean result = true; - result = result && getQuasiIdsList().equals(other.getQuasiIdsList()); - result = result && (hasSensitiveAttribute() == other.hasSensitiveAttribute()); + if (!getQuasiIdsList().equals(other.getQuasiIdsList())) return false; + if (hasSensitiveAttribute() != other.hasSensitiveAttribute()) return false; if (hasSensitiveAttribute()) { - result = result && getSensitiveAttribute().equals(other.getSensitiveAttribute()); + if (!getSensitiveAttribute().equals(other.getSensitiveAttribute())) return false; } - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -3861,7 +3854,7 @@ public com.google.privacy.dlp.v2.PrivacyMetric.LDiversityConfig buildPartial() { int from_bitField0_ = bitField0_; int to_bitField0_ = 0; if (quasiIdsBuilder_ == null) { - if (((bitField0_ & 0x00000001) == 0x00000001)) { + if (((bitField0_ & 0x00000001) != 0)) { quasiIds_ = java.util.Collections.unmodifiableList(quasiIds_); bitField0_ = (bitField0_ & ~0x00000001); } @@ -3881,23 +3874,23 @@ public com.google.privacy.dlp.v2.PrivacyMetric.LDiversityConfig 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 @@ -3905,13 +3898,13 @@ public Builder setRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) { - return (Builder) super.setRepeatedField(field, index, value); + return super.setRepeatedField(field, index, value); } @java.lang.Override public Builder addRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.addRepeatedField(field, value); + return super.addRepeatedField(field, value); } @java.lang.Override @@ -3993,7 +3986,7 @@ public Builder mergeFrom( java.util.Collections.emptyList(); private void ensureQuasiIdsIsMutable() { - if (!((bitField0_ & 0x00000001) == 0x00000001)) { + if (!((bitField0_ & 0x00000001) != 0)) { quasiIds_ = new java.util.ArrayList (quasiIds_); bitField0_ |= 0x00000001; } @@ -4367,16 +4360,13 @@ public java.util.List getQuasiIdsBuil com.google.privacy.dlp.v2.FieldId, com.google.privacy.dlp.v2.FieldId.Builder, com.google.privacy.dlp.v2.FieldIdOrBuilder>( - quasiIds_, - ((bitField0_ & 0x00000001) == 0x00000001), - getParentForChildren(), - isClean()); + quasiIds_, ((bitField0_ & 0x00000001) != 0), getParentForChildren(), isClean()); quasiIds_ = null; } return quasiIdsBuilder_; } - private com.google.privacy.dlp.v2.FieldId sensitiveAttribute_ = null; + private com.google.privacy.dlp.v2.FieldId sensitiveAttribute_; private com.google.protobuf.SingleFieldBuilderV3< com.google.privacy.dlp.v2.FieldId, com.google.privacy.dlp.v2.FieldId.Builder, @@ -4561,7 +4551,7 @@ public com.google.privacy.dlp.v2.FieldIdOrBuilder getSensitiveAttributeOrBuilder @java.lang.Override public final Builder setUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { - return super.setUnknownFieldsProto3(unknownFields); + return super.setUnknownFields(unknownFields); } @java.lang.Override @@ -4846,7 +4836,7 @@ private KMapEstimationConfig( break; case 10: { - if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) { + if (!((mutable_bitField0_ & 0x00000001) != 0)) { quasiIds_ = new java.util.ArrayList< com.google.privacy.dlp.v2.PrivacyMetric.KMapEstimationConfig @@ -4869,7 +4859,7 @@ private KMapEstimationConfig( } case 26: { - if (!((mutable_bitField0_ & 0x00000004) == 0x00000004)) { + if (!((mutable_bitField0_ & 0x00000004) != 0)) { auxiliaryTables_ = new java.util.ArrayList< com.google.privacy.dlp.v2.PrivacyMetric.KMapEstimationConfig @@ -4885,7 +4875,7 @@ private KMapEstimationConfig( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -4897,10 +4887,10 @@ private KMapEstimationConfig( } 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)) { quasiIds_ = java.util.Collections.unmodifiableList(quasiIds_); } - if (((mutable_bitField0_ & 0x00000004) == 0x00000004)) { + if (((mutable_bitField0_ & 0x00000004) != 0)) { auxiliaryTables_ = java.util.Collections.unmodifiableList(auxiliaryTables_); } this.unknownFields = unknownFields.build(); @@ -5158,7 +5148,7 @@ private TaggedField( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -5501,28 +5491,26 @@ public boolean equals(final java.lang.Object obj) { com.google.privacy.dlp.v2.PrivacyMetric.KMapEstimationConfig.TaggedField other = (com.google.privacy.dlp.v2.PrivacyMetric.KMapEstimationConfig.TaggedField) obj; - boolean result = true; - result = result && (hasField() == other.hasField()); + if (hasField() != other.hasField()) return false; if (hasField()) { - result = result && getField().equals(other.getField()); + if (!getField().equals(other.getField())) return false; } - result = result && getTagCase().equals(other.getTagCase()); - if (!result) return false; + if (!getTagCase().equals(other.getTagCase())) return false; switch (tagCase_) { case 2: - result = result && getInfoType().equals(other.getInfoType()); + if (!getInfoType().equals(other.getInfoType())) return false; break; case 3: - result = result && getCustomTag().equals(other.getCustomTag()); + if (!getCustomTag().equals(other.getCustomTag())) return false; break; case 4: - result = result && getInferred().equals(other.getInferred()); + if (!getInferred().equals(other.getInferred())) 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 @@ -5772,23 +5760,23 @@ public com.google.privacy.dlp.v2.PrivacyMetric.KMapEstimationConfig.TaggedField @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 @@ -5796,13 +5784,13 @@ public Builder setRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) { - return (Builder) super.setRepeatedField(field, index, value); + return super.setRepeatedField(field, index, value); } @java.lang.Override public Builder addRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.addRepeatedField(field, value); + return super.addRepeatedField(field, value); } @java.lang.Override @@ -5894,7 +5882,7 @@ public Builder clearTag() { return this; } - private com.google.privacy.dlp.v2.FieldId field_ = null; + private com.google.privacy.dlp.v2.FieldId field_; private com.google.protobuf.SingleFieldBuilderV3< com.google.privacy.dlp.v2.FieldId, com.google.privacy.dlp.v2.FieldId.Builder, @@ -6629,7 +6617,7 @@ public com.google.protobuf.EmptyOrBuilder getInferredOrBuilder() { @java.lang.Override public final Builder setUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { - return super.setUnknownFieldsProto3(unknownFields); + return super.setUnknownFields(unknownFields); } @java.lang.Override @@ -6881,7 +6869,7 @@ private AuxiliaryTable( break; case 10: { - if (!((mutable_bitField0_ & 0x00000002) == 0x00000002)) { + if (!((mutable_bitField0_ & 0x00000002) != 0)) { quasiIds_ = new java.util.ArrayList< com.google.privacy.dlp.v2.PrivacyMetric.KMapEstimationConfig @@ -6929,7 +6917,7 @@ private AuxiliaryTable( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -6942,7 +6930,7 @@ private AuxiliaryTable( throw new com.google.protobuf.InvalidProtocolBufferException(e) .setUnfinishedMessage(this); } finally { - if (((mutable_bitField0_ & 0x00000002) == 0x00000002)) { + if (((mutable_bitField0_ & 0x00000002) != 0)) { quasiIds_ = java.util.Collections.unmodifiableList(quasiIds_); } this.unknownFields = unknownFields.build(); @@ -7057,7 +7045,7 @@ private QuasiIdField( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -7192,14 +7180,13 @@ public boolean equals(final java.lang.Object obj) { .QuasiIdField) obj; - boolean result = true; - result = result && (hasField() == other.hasField()); + if (hasField() != other.hasField()) return false; if (hasField()) { - result = result && getField().equals(other.getField()); + if (!getField().equals(other.getField())) return false; } - result = result && getCustomTag().equals(other.getCustomTag()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getCustomTag().equals(other.getCustomTag())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -7449,23 +7436,23 @@ public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { @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 @@ -7473,13 +7460,13 @@ public Builder setRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) { - return (Builder) super.setRepeatedField(field, index, value); + return super.setRepeatedField(field, index, value); } @java.lang.Override public Builder addRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.addRepeatedField(field, value); + return super.addRepeatedField(field, value); } @java.lang.Override @@ -7545,7 +7532,7 @@ public Builder mergeFrom( return this; } - private com.google.privacy.dlp.v2.FieldId field_ = null; + private com.google.privacy.dlp.v2.FieldId field_; private com.google.protobuf.SingleFieldBuilderV3< com.google.privacy.dlp.v2.FieldId, com.google.privacy.dlp.v2.FieldId.Builder, @@ -7711,7 +7698,7 @@ public Builder setCustomTagBytes(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 @@ -8004,18 +7991,17 @@ public boolean equals(final java.lang.Object obj) { com.google.privacy.dlp.v2.PrivacyMetric.KMapEstimationConfig.AuxiliaryTable other = (com.google.privacy.dlp.v2.PrivacyMetric.KMapEstimationConfig.AuxiliaryTable) obj; - boolean result = true; - result = result && (hasTable() == other.hasTable()); + if (hasTable() != other.hasTable()) return false; if (hasTable()) { - result = result && getTable().equals(other.getTable()); + if (!getTable().equals(other.getTable())) return false; } - result = result && getQuasiIdsList().equals(other.getQuasiIdsList()); - result = result && (hasRelativeFrequency() == other.hasRelativeFrequency()); + if (!getQuasiIdsList().equals(other.getQuasiIdsList())) return false; + if (hasRelativeFrequency() != other.hasRelativeFrequency()) return false; if (hasRelativeFrequency()) { - result = result && getRelativeFrequency().equals(other.getRelativeFrequency()); + if (!getRelativeFrequency().equals(other.getRelativeFrequency())) return false; } - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -8261,7 +8247,7 @@ public com.google.privacy.dlp.v2.PrivacyMetric.KMapEstimationConfig.AuxiliaryTab result.table_ = tableBuilder_.build(); } if (quasiIdsBuilder_ == null) { - if (((bitField0_ & 0x00000002) == 0x00000002)) { + if (((bitField0_ & 0x00000002) != 0)) { quasiIds_ = java.util.Collections.unmodifiableList(quasiIds_); bitField0_ = (bitField0_ & ~0x00000002); } @@ -8281,23 +8267,23 @@ public com.google.privacy.dlp.v2.PrivacyMetric.KMapEstimationConfig.AuxiliaryTab @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 @@ -8305,13 +8291,13 @@ public Builder setRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) { - return (Builder) super.setRepeatedField(field, index, value); + return super.setRepeatedField(field, index, value); } @java.lang.Override public Builder addRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.addRepeatedField(field, value); + return super.addRepeatedField(field, value); } @java.lang.Override @@ -8400,7 +8386,7 @@ public Builder mergeFrom( private int bitField0_; - private com.google.privacy.dlp.v2.BigQueryTable table_ = null; + private com.google.privacy.dlp.v2.BigQueryTable table_; private com.google.protobuf.SingleFieldBuilderV3< com.google.privacy.dlp.v2.BigQueryTable, com.google.privacy.dlp.v2.BigQueryTable.Builder, @@ -8587,7 +8573,7 @@ public com.google.privacy.dlp.v2.BigQueryTableOrBuilder getTableOrBuilder() { quasiIds_ = java.util.Collections.emptyList(); private void ensureQuasiIdsIsMutable() { - if (!((bitField0_ & 0x00000002) == 0x00000002)) { + if (!((bitField0_ & 0x00000002) != 0)) { quasiIds_ = new java.util.ArrayList< com.google.privacy.dlp.v2.PrivacyMetric.KMapEstimationConfig.AuxiliaryTable @@ -9018,16 +9004,13 @@ public Builder removeQuasiIds(int index) { .QuasiIdField.Builder, com.google.privacy.dlp.v2.PrivacyMetric.KMapEstimationConfig.AuxiliaryTable .QuasiIdFieldOrBuilder>( - quasiIds_, - ((bitField0_ & 0x00000002) == 0x00000002), - getParentForChildren(), - isClean()); + quasiIds_, ((bitField0_ & 0x00000002) != 0), getParentForChildren(), isClean()); quasiIds_ = null; } return quasiIdsBuilder_; } - private com.google.privacy.dlp.v2.FieldId relativeFrequency_ = null; + private com.google.privacy.dlp.v2.FieldId relativeFrequency_; private com.google.protobuf.SingleFieldBuilderV3< com.google.privacy.dlp.v2.FieldId, com.google.privacy.dlp.v2.FieldId.Builder, @@ -9230,7 +9213,7 @@ public com.google.privacy.dlp.v2.FieldIdOrBuilder getRelativeFrequencyOrBuilder( @java.lang.Override public final Builder setUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { - return super.setUnknownFieldsProto3(unknownFields); + return super.setUnknownFields(unknownFields); } @java.lang.Override @@ -9568,12 +9551,11 @@ public boolean equals(final java.lang.Object obj) { com.google.privacy.dlp.v2.PrivacyMetric.KMapEstimationConfig other = (com.google.privacy.dlp.v2.PrivacyMetric.KMapEstimationConfig) obj; - boolean result = true; - result = result && getQuasiIdsList().equals(other.getQuasiIdsList()); - result = result && getRegionCode().equals(other.getRegionCode()); - result = result && getAuxiliaryTablesList().equals(other.getAuxiliaryTablesList()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getQuasiIdsList().equals(other.getQuasiIdsList())) return false; + if (!getRegionCode().equals(other.getRegionCode())) return false; + if (!getAuxiliaryTablesList().equals(other.getAuxiliaryTablesList())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -9795,7 +9777,7 @@ public com.google.privacy.dlp.v2.PrivacyMetric.KMapEstimationConfig buildPartial int from_bitField0_ = bitField0_; int to_bitField0_ = 0; if (quasiIdsBuilder_ == null) { - if (((bitField0_ & 0x00000001) == 0x00000001)) { + if (((bitField0_ & 0x00000001) != 0)) { quasiIds_ = java.util.Collections.unmodifiableList(quasiIds_); bitField0_ = (bitField0_ & ~0x00000001); } @@ -9805,7 +9787,7 @@ public com.google.privacy.dlp.v2.PrivacyMetric.KMapEstimationConfig buildPartial } result.regionCode_ = regionCode_; if (auxiliaryTablesBuilder_ == null) { - if (((bitField0_ & 0x00000004) == 0x00000004)) { + if (((bitField0_ & 0x00000004) != 0)) { auxiliaryTables_ = java.util.Collections.unmodifiableList(auxiliaryTables_); bitField0_ = (bitField0_ & ~0x00000004); } @@ -9820,23 +9802,23 @@ public com.google.privacy.dlp.v2.PrivacyMetric.KMapEstimationConfig 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 @@ -9844,13 +9826,13 @@ public Builder setRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) { - return (Builder) super.setRepeatedField(field, index, value); + return super.setRepeatedField(field, index, value); } @java.lang.Override public Builder addRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.addRepeatedField(field, value); + return super.addRepeatedField(field, value); } @java.lang.Override @@ -9963,7 +9945,7 @@ public Builder mergeFrom( quasiIds_ = java.util.Collections.emptyList(); private void ensureQuasiIdsIsMutable() { - if (!((bitField0_ & 0x00000001) == 0x00000001)) { + if (!((bitField0_ & 0x00000001) != 0)) { quasiIds_ = new java.util.ArrayList< com.google.privacy.dlp.v2.PrivacyMetric.KMapEstimationConfig.TaggedField>( @@ -10389,10 +10371,7 @@ public Builder removeQuasiIds(int index) { com.google.privacy.dlp.v2.PrivacyMetric.KMapEstimationConfig.TaggedField.Builder, com.google.privacy.dlp.v2.PrivacyMetric.KMapEstimationConfig .TaggedFieldOrBuilder>( - quasiIds_, - ((bitField0_ & 0x00000001) == 0x00000001), - getParentForChildren(), - isClean()); + quasiIds_, ((bitField0_ & 0x00000001) != 0), getParentForChildren(), isClean()); quasiIds_ = null; } return quasiIdsBuilder_; @@ -10507,7 +10486,7 @@ public Builder setRegionCodeBytes(com.google.protobuf.ByteString value) { auxiliaryTables_ = java.util.Collections.emptyList(); private void ensureAuxiliaryTablesIsMutable() { - if (!((bitField0_ & 0x00000004) == 0x00000004)) { + if (!((bitField0_ & 0x00000004) != 0)) { auxiliaryTables_ = new java.util.ArrayList< com.google.privacy.dlp.v2.PrivacyMetric.KMapEstimationConfig.AuxiliaryTable>( @@ -10954,7 +10933,7 @@ public Builder removeAuxiliaryTables(int index) { com.google.privacy.dlp.v2.PrivacyMetric.KMapEstimationConfig .AuxiliaryTableOrBuilder>( auxiliaryTables_, - ((bitField0_ & 0x00000004) == 0x00000004), + ((bitField0_ & 0x00000004) != 0), getParentForChildren(), isClean()); auxiliaryTables_ = null; @@ -10965,7 +10944,7 @@ public Builder removeAuxiliaryTables(int index) { @java.lang.Override public final Builder setUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { - return super.setUnknownFieldsProto3(unknownFields); + return super.setUnknownFields(unknownFields); } @java.lang.Override @@ -11221,7 +11200,7 @@ private DeltaPresenceEstimationConfig( break; case 10: { - if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) { + if (!((mutable_bitField0_ & 0x00000001) != 0)) { quasiIds_ = new java.util.ArrayList (); mutable_bitField0_ |= 0x00000001; } @@ -11239,7 +11218,7 @@ private DeltaPresenceEstimationConfig( } case 26: { - if (!((mutable_bitField0_ & 0x00000004) == 0x00000004)) { + if (!((mutable_bitField0_ & 0x00000004) != 0)) { auxiliaryTables_ = new java.util.ArrayList (); mutable_bitField0_ |= 0x00000004; @@ -11251,7 +11230,7 @@ private DeltaPresenceEstimationConfig( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -11263,10 +11242,10 @@ private DeltaPresenceEstimationConfig( } 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)) { quasiIds_ = java.util.Collections.unmodifiableList(quasiIds_); } - if (((mutable_bitField0_ & 0x00000004) == 0x00000004)) { + if (((mutable_bitField0_ & 0x00000004) != 0)) { auxiliaryTables_ = java.util.Collections.unmodifiableList(auxiliaryTables_); } this.unknownFields = unknownFields.build(); @@ -11539,12 +11518,11 @@ public boolean equals(final java.lang.Object obj) { com.google.privacy.dlp.v2.PrivacyMetric.DeltaPresenceEstimationConfig other = (com.google.privacy.dlp.v2.PrivacyMetric.DeltaPresenceEstimationConfig) obj; - boolean result = true; - result = result && getQuasiIdsList().equals(other.getQuasiIdsList()); - result = result && getRegionCode().equals(other.getRegionCode()); - result = result && getAuxiliaryTablesList().equals(other.getAuxiliaryTablesList()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getQuasiIdsList().equals(other.getQuasiIdsList())) return false; + if (!getRegionCode().equals(other.getRegionCode())) return false; + if (!getAuxiliaryTablesList().equals(other.getAuxiliaryTablesList())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -11768,7 +11746,7 @@ public com.google.privacy.dlp.v2.PrivacyMetric.DeltaPresenceEstimationConfig bui int from_bitField0_ = bitField0_; int to_bitField0_ = 0; if (quasiIdsBuilder_ == null) { - if (((bitField0_ & 0x00000001) == 0x00000001)) { + if (((bitField0_ & 0x00000001) != 0)) { quasiIds_ = java.util.Collections.unmodifiableList(quasiIds_); bitField0_ = (bitField0_ & ~0x00000001); } @@ -11778,7 +11756,7 @@ public com.google.privacy.dlp.v2.PrivacyMetric.DeltaPresenceEstimationConfig bui } result.regionCode_ = regionCode_; if (auxiliaryTablesBuilder_ == null) { - if (((bitField0_ & 0x00000004) == 0x00000004)) { + if (((bitField0_ & 0x00000004) != 0)) { auxiliaryTables_ = java.util.Collections.unmodifiableList(auxiliaryTables_); bitField0_ = (bitField0_ & ~0x00000004); } @@ -11793,23 +11771,23 @@ public com.google.privacy.dlp.v2.PrivacyMetric.DeltaPresenceEstimationConfig bui @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 @@ -11817,13 +11795,13 @@ public Builder setRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) { - return (Builder) super.setRepeatedField(field, index, value); + return super.setRepeatedField(field, index, value); } @java.lang.Override public Builder addRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.addRepeatedField(field, value); + return super.addRepeatedField(field, value); } @java.lang.Override @@ -11938,7 +11916,7 @@ public Builder mergeFrom( java.util.Collections.emptyList(); private void ensureQuasiIdsIsMutable() { - if (!((bitField0_ & 0x00000001) == 0x00000001)) { + if (!((bitField0_ & 0x00000001) != 0)) { quasiIds_ = new java.util.ArrayList (quasiIds_); bitField0_ |= 0x00000001; } @@ -12294,10 +12272,7 @@ public java.util.List getQuasiIdsBuil com.google.privacy.dlp.v2.QuasiId, com.google.privacy.dlp.v2.QuasiId.Builder, com.google.privacy.dlp.v2.QuasiIdOrBuilder>( - quasiIds_, - ((bitField0_ & 0x00000001) == 0x00000001), - getParentForChildren(), - isClean()); + quasiIds_, ((bitField0_ & 0x00000001) != 0), getParentForChildren(), isClean()); quasiIds_ = null; } return quasiIdsBuilder_; @@ -12411,7 +12386,7 @@ public Builder setRegionCodeBytes(com.google.protobuf.ByteString value) { java.util.Collections.emptyList(); private void ensureAuxiliaryTablesIsMutable() { - if (!((bitField0_ & 0x00000004) == 0x00000004)) { + if (!((bitField0_ & 0x00000004) != 0)) { auxiliaryTables_ = new java.util.ArrayList (auxiliaryTables_); bitField0_ |= 0x00000004; @@ -12794,7 +12769,7 @@ public com.google.privacy.dlp.v2.StatisticalTable.Builder addAuxiliaryTablesBuil com.google.privacy.dlp.v2.StatisticalTable.Builder, com.google.privacy.dlp.v2.StatisticalTableOrBuilder>( auxiliaryTables_, - ((bitField0_ & 0x00000004) == 0x00000004), + ((bitField0_ & 0x00000004) != 0), getParentForChildren(), isClean()); auxiliaryTables_ = null; @@ -12805,7 +12780,7 @@ public com.google.privacy.dlp.v2.StatisticalTable.Builder addAuxiliaryTablesBuil @java.lang.Override public final Builder setUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { - return super.setUnknownFieldsProto3(unknownFields); + return super.setUnknownFields(unknownFields); } @java.lang.Override @@ -13167,36 +13142,32 @@ public boolean equals(final java.lang.Object obj) { } com.google.privacy.dlp.v2.PrivacyMetric other = (com.google.privacy.dlp.v2.PrivacyMetric) obj; - boolean result = true; - result = result && getTypeCase().equals(other.getTypeCase()); - if (!result) return false; + if (!getTypeCase().equals(other.getTypeCase())) return false; switch (typeCase_) { case 1: - result = result && getNumericalStatsConfig().equals(other.getNumericalStatsConfig()); + if (!getNumericalStatsConfig().equals(other.getNumericalStatsConfig())) return false; break; case 2: - result = result && getCategoricalStatsConfig().equals(other.getCategoricalStatsConfig()); + if (!getCategoricalStatsConfig().equals(other.getCategoricalStatsConfig())) return false; break; case 3: - result = result && getKAnonymityConfig().equals(other.getKAnonymityConfig()); + if (!getKAnonymityConfig().equals(other.getKAnonymityConfig())) return false; break; case 4: - result = result && getLDiversityConfig().equals(other.getLDiversityConfig()); + if (!getLDiversityConfig().equals(other.getLDiversityConfig())) return false; break; case 5: - result = result && getKMapEstimationConfig().equals(other.getKMapEstimationConfig()); + if (!getKMapEstimationConfig().equals(other.getKMapEstimationConfig())) return false; break; case 6: - result = - result - && getDeltaPresenceEstimationConfig() - .equals(other.getDeltaPresenceEstimationConfig()); + if (!getDeltaPresenceEstimationConfig().equals(other.getDeltaPresenceEstimationConfig())) + 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 @@ -13457,35 +13428,35 @@ public com.google.privacy.dlp.v2.PrivacyMetric 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 @@ -14566,7 +14537,7 @@ public Builder clearDeltaPresenceEstimationConfig() { @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-dlp-v2/src/main/java/com/google/privacy/dlp/v2/QuasiId.java b/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/QuasiId.java index 37006140d014..1240aa8b8e37 100644 --- a/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/QuasiId.java +++ b/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/QuasiId.java @@ -101,7 +101,7 @@ private QuasiId( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -440,28 +440,26 @@ public boolean equals(final java.lang.Object obj) { } com.google.privacy.dlp.v2.QuasiId other = (com.google.privacy.dlp.v2.QuasiId) obj; - boolean result = true; - result = result && (hasField() == other.hasField()); + if (hasField() != other.hasField()) return false; if (hasField()) { - result = result && getField().equals(other.getField()); + if (!getField().equals(other.getField())) return false; } - result = result && getTagCase().equals(other.getTagCase()); - if (!result) return false; + if (!getTagCase().equals(other.getTagCase())) return false; switch (tagCase_) { case 2: - result = result && getInfoType().equals(other.getInfoType()); + if (!getInfoType().equals(other.getInfoType())) return false; break; case 3: - result = result && getCustomTag().equals(other.getCustomTag()); + if (!getCustomTag().equals(other.getCustomTag())) return false; break; case 4: - result = result && getInferred().equals(other.getInferred()); + if (!getInferred().equals(other.getInferred())) 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 @@ -698,35 +696,35 @@ public com.google.privacy.dlp.v2.QuasiId 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 @@ -810,7 +808,7 @@ public Builder clearTag() { return this; } - private com.google.privacy.dlp.v2.FieldId field_ = null; + private com.google.privacy.dlp.v2.FieldId field_; private com.google.protobuf.SingleFieldBuilderV3< com.google.privacy.dlp.v2.FieldId, com.google.privacy.dlp.v2.FieldId.Builder, @@ -1542,7 +1540,7 @@ public com.google.protobuf.EmptyOrBuilder getInferredOrBuilder() { @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-dlp-v2/src/main/java/com/google/privacy/dlp/v2/QuoteInfo.java b/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/QuoteInfo.java index 1686ad30c503..8223b4ecf0c9 100644 --- a/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/QuoteInfo.java +++ b/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/QuoteInfo.java @@ -65,7 +65,7 @@ private QuoteInfo( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -224,18 +224,16 @@ public boolean equals(final java.lang.Object obj) { } com.google.privacy.dlp.v2.QuoteInfo other = (com.google.privacy.dlp.v2.QuoteInfo) obj; - boolean result = true; - result = result && getParsedQuoteCase().equals(other.getParsedQuoteCase()); - if (!result) return false; + if (!getParsedQuoteCase().equals(other.getParsedQuoteCase())) return false; switch (parsedQuoteCase_) { case 2: - result = result && getDateTime().equals(other.getDateTime()); + if (!getDateTime().equals(other.getDateTime())) 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 @@ -439,35 +437,35 @@ public com.google.privacy.dlp.v2.QuoteInfo 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 +737,7 @@ public com.google.privacy.dlp.v2.DateTimeOrBuilder getDateTimeOrBuilder() { @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-dlp-v2/src/main/java/com/google/privacy/dlp/v2/Range.java b/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/Range.java index 8f3f1f49d3da..318a448cdd73 100644 --- a/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/Range.java +++ b/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/Range.java @@ -22,10 +22,7 @@ private Range(com.google.protobuf.GeneratedMessageV3.Builder> builder) { super(builder); } - private Range() { - start_ = 0L; - end_ = 0L; - } + private Range() {} @java.lang.Override public final com.google.protobuf.UnknownFieldSet getUnknownFields() { @@ -63,7 +60,7 @@ private Range( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -174,11 +171,10 @@ public boolean equals(final java.lang.Object obj) { } com.google.privacy.dlp.v2.Range other = (com.google.privacy.dlp.v2.Range) obj; - boolean result = true; - result = result && (getStart() == other.getStart()); - result = result && (getEnd() == other.getEnd()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (getStart() != other.getStart()) return false; + if (getEnd() != other.getEnd()) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -373,35 +369,35 @@ public com.google.privacy.dlp.v2.Range 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 @@ -541,7 +537,7 @@ public Builder clearEnd() { @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-dlp-v2/src/main/java/com/google/privacy/dlp/v2/RecordCondition.java b/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/RecordCondition.java index 983b008bb96b..bf3671ada620 100644 --- a/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/RecordCondition.java +++ b/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/RecordCondition.java @@ -68,7 +68,7 @@ private RecordCondition( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -291,7 +291,7 @@ private Condition( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -492,18 +492,17 @@ public boolean equals(final java.lang.Object obj) { com.google.privacy.dlp.v2.RecordCondition.Condition other = (com.google.privacy.dlp.v2.RecordCondition.Condition) obj; - boolean result = true; - result = result && (hasField() == other.hasField()); + if (hasField() != other.hasField()) return false; if (hasField()) { - result = result && getField().equals(other.getField()); + if (!getField().equals(other.getField())) return false; } - result = result && operator_ == other.operator_; - result = result && (hasValue() == other.hasValue()); + if (operator_ != other.operator_) return false; + if (hasValue() != other.hasValue()) return false; if (hasValue()) { - result = result && getValue().equals(other.getValue()); + if (!getValue().equals(other.getValue())) return false; } - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -745,23 +744,23 @@ public com.google.privacy.dlp.v2.RecordCondition.Condition 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 @@ -769,13 +768,13 @@ public Builder setRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) { - return (Builder) super.setRepeatedField(field, index, value); + return super.setRepeatedField(field, index, value); } @java.lang.Override public Builder addRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.addRepeatedField(field, value); + return super.addRepeatedField(field, value); } @java.lang.Override @@ -830,7 +829,7 @@ public Builder mergeFrom( return this; } - private com.google.privacy.dlp.v2.FieldId field_ = null; + private com.google.privacy.dlp.v2.FieldId field_; private com.google.protobuf.SingleFieldBuilderV3< com.google.privacy.dlp.v2.FieldId, com.google.privacy.dlp.v2.FieldId.Builder, @@ -1083,7 +1082,7 @@ public Builder clearOperator() { return this; } - private com.google.privacy.dlp.v2.Value value_ = null; + private com.google.privacy.dlp.v2.Value value_; private com.google.protobuf.SingleFieldBuilderV3< com.google.privacy.dlp.v2.Value, com.google.privacy.dlp.v2.Value.Builder, @@ -1261,7 +1260,7 @@ public com.google.privacy.dlp.v2.ValueOrBuilder getValueOrBuilder() { @java.lang.Override public final Builder setUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { - return super.setUnknownFieldsProto3(unknownFields); + return super.setUnknownFields(unknownFields); } @java.lang.Override @@ -1376,7 +1375,7 @@ private Conditions( break; case 10: { - if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) { + if (!((mutable_bitField0_ & 0x00000001) != 0)) { conditions_ = new java.util.ArrayList< com.google.privacy.dlp.v2.RecordCondition.Condition>(); @@ -1390,7 +1389,7 @@ private Conditions( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -1402,7 +1401,7 @@ private Conditions( } 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)) { conditions_ = java.util.Collections.unmodifiableList(conditions_); } this.unknownFields = unknownFields.build(); @@ -1495,10 +1494,9 @@ public boolean equals(final java.lang.Object obj) { com.google.privacy.dlp.v2.RecordCondition.Conditions other = (com.google.privacy.dlp.v2.RecordCondition.Conditions) obj; - boolean result = true; - result = result && getConditionsList().equals(other.getConditionsList()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getConditionsList().equals(other.getConditionsList())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -1697,7 +1695,7 @@ public com.google.privacy.dlp.v2.RecordCondition.Conditions buildPartial() { new com.google.privacy.dlp.v2.RecordCondition.Conditions(this); int from_bitField0_ = bitField0_; if (conditionsBuilder_ == null) { - if (((bitField0_ & 0x00000001) == 0x00000001)) { + if (((bitField0_ & 0x00000001) != 0)) { conditions_ = java.util.Collections.unmodifiableList(conditions_); bitField0_ = (bitField0_ & ~0x00000001); } @@ -1711,23 +1709,23 @@ public com.google.privacy.dlp.v2.RecordCondition.Conditions 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 @@ -1735,13 +1733,13 @@ public Builder setRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) { - return (Builder) super.setRepeatedField(field, index, value); + return super.setRepeatedField(field, index, value); } @java.lang.Override public Builder addRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.addRepeatedField(field, value); + return super.addRepeatedField(field, value); } @java.lang.Override @@ -1820,7 +1818,7 @@ public Builder mergeFrom( java.util.Collections.emptyList(); private void ensureConditionsIsMutable() { - if (!((bitField0_ & 0x00000001) == 0x00000001)) { + if (!((bitField0_ & 0x00000001) != 0)) { conditions_ = new java.util.ArrayList ( conditions_); @@ -2026,10 +2024,7 @@ public com.google.privacy.dlp.v2.RecordCondition.Condition.Builder addConditions com.google.privacy.dlp.v2.RecordCondition.Condition, com.google.privacy.dlp.v2.RecordCondition.Condition.Builder, com.google.privacy.dlp.v2.RecordCondition.ConditionOrBuilder>( - conditions_, - ((bitField0_ & 0x00000001) == 0x00000001), - getParentForChildren(), - isClean()); + conditions_, ((bitField0_ & 0x00000001) != 0), getParentForChildren(), isClean()); conditions_ = null; } return conditionsBuilder_; @@ -2038,7 +2033,7 @@ public com.google.privacy.dlp.v2.RecordCondition.Condition.Builder addConditions @java.lang.Override public final Builder setUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { - return super.setUnknownFieldsProto3(unknownFields); + return super.setUnknownFields(unknownFields); } @java.lang.Override @@ -2203,7 +2198,7 @@ private Expressions( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -2479,19 +2474,17 @@ public boolean equals(final java.lang.Object obj) { com.google.privacy.dlp.v2.RecordCondition.Expressions other = (com.google.privacy.dlp.v2.RecordCondition.Expressions) obj; - boolean result = true; - result = result && logicalOperator_ == other.logicalOperator_; - result = result && getTypeCase().equals(other.getTypeCase()); - if (!result) return false; + if (logicalOperator_ != other.logicalOperator_) return false; + if (!getTypeCase().equals(other.getTypeCase())) return false; switch (typeCase_) { case 3: - result = result && getConditions().equals(other.getConditions()); + if (!getConditions().equals(other.getConditions())) 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 @@ -2705,23 +2698,23 @@ public com.google.privacy.dlp.v2.RecordCondition.Expressions 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 @@ -2729,13 +2722,13 @@ public Builder setRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) { - return (Builder) super.setRepeatedField(field, index, value); + return super.setRepeatedField(field, index, value); } @java.lang.Override public Builder addRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.addRepeatedField(field, value); + return super.addRepeatedField(field, value); } @java.lang.Override @@ -3040,7 +3033,7 @@ public com.google.privacy.dlp.v2.RecordCondition.Conditions.Builder getCondition @java.lang.Override public final Builder setUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { - return super.setUnknownFieldsProto3(unknownFields); + return super.setUnknownFields(unknownFields); } @java.lang.Override @@ -3175,13 +3168,12 @@ public boolean equals(final java.lang.Object obj) { com.google.privacy.dlp.v2.RecordCondition other = (com.google.privacy.dlp.v2.RecordCondition) obj; - boolean result = true; - result = result && (hasExpressions() == other.hasExpressions()); + if (hasExpressions() != other.hasExpressions()) return false; if (hasExpressions()) { - result = result && getExpressions().equals(other.getExpressions()); + if (!getExpressions().equals(other.getExpressions())) return false; } - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -3385,35 +3377,35 @@ public com.google.privacy.dlp.v2.RecordCondition 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 @@ -3460,7 +3452,7 @@ public Builder mergeFrom( return this; } - private com.google.privacy.dlp.v2.RecordCondition.Expressions expressions_ = null; + private com.google.privacy.dlp.v2.RecordCondition.Expressions expressions_; private com.google.protobuf.SingleFieldBuilderV3< com.google.privacy.dlp.v2.RecordCondition.Expressions, com.google.privacy.dlp.v2.RecordCondition.Expressions.Builder, @@ -3645,7 +3637,7 @@ public com.google.privacy.dlp.v2.RecordCondition.Expressions.Builder getExpressi @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-dlp-v2/src/main/java/com/google/privacy/dlp/v2/RecordKey.java b/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/RecordKey.java index 438c109f24c4..1d33a046b19c 100644 --- a/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/RecordKey.java +++ b/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/RecordKey.java @@ -85,7 +85,7 @@ private RecordKey( case 42: { java.lang.String s = input.readStringRequireUtf8(); - if (!((mutable_bitField0_ & 0x00000004) == 0x00000004)) { + if (!((mutable_bitField0_ & 0x00000004) != 0)) { idValues_ = new com.google.protobuf.LazyStringArrayList(); mutable_bitField0_ |= 0x00000004; } @@ -94,7 +94,7 @@ private RecordKey( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -106,7 +106,7 @@ private RecordKey( } catch (java.io.IOException e) { throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this); } finally { - if (((mutable_bitField0_ & 0x00000004) == 0x00000004)) { + if (((mutable_bitField0_ & 0x00000004) != 0)) { idValues_ = idValues_.getUnmodifiableView(); } this.unknownFields = unknownFields.build(); @@ -330,22 +330,20 @@ public boolean equals(final java.lang.Object obj) { } com.google.privacy.dlp.v2.RecordKey other = (com.google.privacy.dlp.v2.RecordKey) obj; - boolean result = true; - result = result && getIdValuesList().equals(other.getIdValuesList()); - result = result && getTypeCase().equals(other.getTypeCase()); - if (!result) return false; + if (!getIdValuesList().equals(other.getIdValuesList())) return false; + if (!getTypeCase().equals(other.getTypeCase())) return false; switch (typeCase_) { case 2: - result = result && getDatastoreKey().equals(other.getDatastoreKey()); + if (!getDatastoreKey().equals(other.getDatastoreKey())) return false; break; case 3: - result = result && getBigQueryKey().equals(other.getBigQueryKey()); + if (!getBigQueryKey().equals(other.getBigQueryKey())) 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 @@ -561,7 +559,7 @@ public com.google.privacy.dlp.v2.RecordKey buildPartial() { result.type_ = bigQueryKeyBuilder_.build(); } } - if (((bitField0_ & 0x00000004) == 0x00000004)) { + if (((bitField0_ & 0x00000004) != 0)) { idValues_ = idValues_.getUnmodifiableView(); bitField0_ = (bitField0_ & ~0x00000004); } @@ -574,35 +572,35 @@ public com.google.privacy.dlp.v2.RecordKey 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 @@ -945,7 +943,7 @@ public com.google.privacy.dlp.v2.BigQueryKeyOrBuilder getBigQueryKeyOrBuilder() com.google.protobuf.LazyStringArrayList.EMPTY; private void ensureIdValuesIsMutable() { - if (!((bitField0_ & 0x00000004) == 0x00000004)) { + if (!((bitField0_ & 0x00000004) != 0)) { idValues_ = new com.google.protobuf.LazyStringArrayList(idValues_); bitField0_ |= 0x00000004; } @@ -1095,7 +1093,7 @@ public Builder addIdValuesBytes(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-dlp-v2/src/main/java/com/google/privacy/dlp/v2/RecordLocation.java b/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/RecordLocation.java index 5ba9ea66bd0a..efb9df824f15 100644 --- a/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/RecordLocation.java +++ b/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/RecordLocation.java @@ -97,7 +97,7 @@ private RecordLocation( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -306,21 +306,20 @@ public boolean equals(final java.lang.Object obj) { } com.google.privacy.dlp.v2.RecordLocation other = (com.google.privacy.dlp.v2.RecordLocation) obj; - boolean result = true; - result = result && (hasRecordKey() == other.hasRecordKey()); + if (hasRecordKey() != other.hasRecordKey()) return false; if (hasRecordKey()) { - result = result && getRecordKey().equals(other.getRecordKey()); + if (!getRecordKey().equals(other.getRecordKey())) return false; } - result = result && (hasFieldId() == other.hasFieldId()); + if (hasFieldId() != other.hasFieldId()) return false; if (hasFieldId()) { - result = result && getFieldId().equals(other.getFieldId()); + if (!getFieldId().equals(other.getFieldId())) return false; } - result = result && (hasTableLocation() == other.hasTableLocation()); + if (hasTableLocation() != other.hasTableLocation()) return false; if (hasTableLocation()) { - result = result && getTableLocation().equals(other.getTableLocation()); + if (!getTableLocation().equals(other.getTableLocation())) return false; } - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -553,35 +552,35 @@ public com.google.privacy.dlp.v2.RecordLocation 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 @@ -634,7 +633,7 @@ public Builder mergeFrom( return this; } - private com.google.privacy.dlp.v2.RecordKey recordKey_ = null; + private com.google.privacy.dlp.v2.RecordKey recordKey_; private com.google.protobuf.SingleFieldBuilderV3< com.google.privacy.dlp.v2.RecordKey, com.google.privacy.dlp.v2.RecordKey.Builder, @@ -815,7 +814,7 @@ public com.google.privacy.dlp.v2.RecordKeyOrBuilder getRecordKeyOrBuilder() { return recordKeyBuilder_; } - private com.google.privacy.dlp.v2.FieldId fieldId_ = null; + private com.google.privacy.dlp.v2.FieldId fieldId_; private com.google.protobuf.SingleFieldBuilderV3< com.google.privacy.dlp.v2.FieldId, com.google.privacy.dlp.v2.FieldId.Builder, @@ -992,7 +991,7 @@ public com.google.privacy.dlp.v2.FieldIdOrBuilder getFieldIdOrBuilder() { return fieldIdBuilder_; } - private com.google.privacy.dlp.v2.TableLocation tableLocation_ = null; + private com.google.privacy.dlp.v2.TableLocation tableLocation_; private com.google.protobuf.SingleFieldBuilderV3< com.google.privacy.dlp.v2.TableLocation, com.google.privacy.dlp.v2.TableLocation.Builder, @@ -1176,7 +1175,7 @@ public com.google.privacy.dlp.v2.TableLocationOrBuilder getTableLocationOrBuilde @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-dlp-v2/src/main/java/com/google/privacy/dlp/v2/RecordSuppression.java b/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/RecordSuppression.java index bcad8bce1276..7843d0d0a940 100644 --- a/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/RecordSuppression.java +++ b/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/RecordSuppression.java @@ -67,7 +67,7 @@ private RecordSuppression( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -188,13 +188,12 @@ public boolean equals(final java.lang.Object obj) { com.google.privacy.dlp.v2.RecordSuppression other = (com.google.privacy.dlp.v2.RecordSuppression) obj; - boolean result = true; - result = result && (hasCondition() == other.hasCondition()); + if (hasCondition() != other.hasCondition()) return false; if (hasCondition()) { - result = result && getCondition().equals(other.getCondition()); + if (!getCondition().equals(other.getCondition())) return false; } - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -398,35 +397,35 @@ public com.google.privacy.dlp.v2.RecordSuppression 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 mergeFrom( return this; } - private com.google.privacy.dlp.v2.RecordCondition condition_ = null; + private com.google.privacy.dlp.v2.RecordCondition condition_; private com.google.protobuf.SingleFieldBuilderV3< com.google.privacy.dlp.v2.RecordCondition, com.google.privacy.dlp.v2.RecordCondition.Builder, @@ -665,7 +664,7 @@ public com.google.privacy.dlp.v2.RecordConditionOrBuilder getConditionOrBuilder( @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-dlp-v2/src/main/java/com/google/privacy/dlp/v2/RecordTransformations.java b/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/RecordTransformations.java index f7d81f7bfca2..99775caca387 100644 --- a/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/RecordTransformations.java +++ b/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/RecordTransformations.java @@ -54,7 +54,7 @@ private RecordTransformations( break; case 10: { - if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) { + if (!((mutable_bitField0_ & 0x00000001) != 0)) { fieldTransformations_ = new java.util.ArrayList (); mutable_bitField0_ |= 0x00000001; @@ -66,7 +66,7 @@ private RecordTransformations( } case 18: { - if (!((mutable_bitField0_ & 0x00000002) == 0x00000002)) { + if (!((mutable_bitField0_ & 0x00000002) != 0)) { recordSuppressions_ = new java.util.ArrayList (); mutable_bitField0_ |= 0x00000002; @@ -78,7 +78,7 @@ private RecordTransformations( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -90,10 +90,10 @@ private RecordTransformations( } 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)) { fieldTransformations_ = java.util.Collections.unmodifiableList(fieldTransformations_); } - if (((mutable_bitField0_ & 0x00000002) == 0x00000002)) { + if (((mutable_bitField0_ & 0x00000002) != 0)) { recordSuppressions_ = java.util.Collections.unmodifiableList(recordSuppressions_); } this.unknownFields = unknownFields.build(); @@ -305,11 +305,10 @@ public boolean equals(final java.lang.Object obj) { com.google.privacy.dlp.v2.RecordTransformations other = (com.google.privacy.dlp.v2.RecordTransformations) obj; - boolean result = true; - result = result && getFieldTransformationsList().equals(other.getFieldTransformationsList()); - result = result && getRecordSuppressionsList().equals(other.getRecordSuppressionsList()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getFieldTransformationsList().equals(other.getFieldTransformationsList())) return false; + if (!getRecordSuppressionsList().equals(other.getRecordSuppressionsList())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -517,7 +516,7 @@ public com.google.privacy.dlp.v2.RecordTransformations buildPartial() { new com.google.privacy.dlp.v2.RecordTransformations(this); int from_bitField0_ = bitField0_; if (fieldTransformationsBuilder_ == null) { - if (((bitField0_ & 0x00000001) == 0x00000001)) { + if (((bitField0_ & 0x00000001) != 0)) { fieldTransformations_ = java.util.Collections.unmodifiableList(fieldTransformations_); bitField0_ = (bitField0_ & ~0x00000001); } @@ -526,7 +525,7 @@ public com.google.privacy.dlp.v2.RecordTransformations buildPartial() { result.fieldTransformations_ = fieldTransformationsBuilder_.build(); } if (recordSuppressionsBuilder_ == null) { - if (((bitField0_ & 0x00000002) == 0x00000002)) { + if (((bitField0_ & 0x00000002) != 0)) { recordSuppressions_ = java.util.Collections.unmodifiableList(recordSuppressions_); bitField0_ = (bitField0_ & ~0x00000002); } @@ -540,35 +539,35 @@ public com.google.privacy.dlp.v2.RecordTransformations 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 @@ -673,7 +672,7 @@ public Builder mergeFrom( java.util.Collections.emptyList(); private void ensureFieldTransformationsIsMutable() { - if (!((bitField0_ & 0x00000001) == 0x00000001)) { + if (!((bitField0_ & 0x00000001) != 0)) { fieldTransformations_ = new java.util.ArrayList ( fieldTransformations_); @@ -1022,7 +1021,7 @@ public com.google.privacy.dlp.v2.FieldTransformation.Builder addFieldTransformat com.google.privacy.dlp.v2.FieldTransformation.Builder, com.google.privacy.dlp.v2.FieldTransformationOrBuilder>( fieldTransformations_, - ((bitField0_ & 0x00000001) == 0x00000001), + ((bitField0_ & 0x00000001) != 0), getParentForChildren(), isClean()); fieldTransformations_ = null; @@ -1034,7 +1033,7 @@ public com.google.privacy.dlp.v2.FieldTransformation.Builder addFieldTransformat java.util.Collections.emptyList(); private void ensureRecordSuppressionsIsMutable() { - if (!((bitField0_ & 0x00000002) == 0x00000002)) { + if (!((bitField0_ & 0x00000002) != 0)) { recordSuppressions_ = new java.util.ArrayList ( recordSuppressions_); @@ -1400,7 +1399,7 @@ public com.google.privacy.dlp.v2.RecordSuppression.Builder addRecordSuppressions com.google.privacy.dlp.v2.RecordSuppression.Builder, com.google.privacy.dlp.v2.RecordSuppressionOrBuilder>( recordSuppressions_, - ((bitField0_ & 0x00000002) == 0x00000002), + ((bitField0_ & 0x00000002) != 0), getParentForChildren(), isClean()); recordSuppressions_ = null; @@ -1410,7 +1409,7 @@ public com.google.privacy.dlp.v2.RecordSuppression.Builder addRecordSuppressions @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-dlp-v2/src/main/java/com/google/privacy/dlp/v2/RedactConfig.java b/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/RedactConfig.java index 4ec25eb4dc92..ab47dba8c697 100644 --- a/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/RedactConfig.java +++ b/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/RedactConfig.java @@ -51,7 +51,7 @@ private RedactConfig( break; default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -121,9 +121,8 @@ public boolean equals(final java.lang.Object obj) { } com.google.privacy.dlp.v2.RedactConfig other = (com.google.privacy.dlp.v2.RedactConfig) obj; - boolean result = true; - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -313,35 +312,35 @@ public com.google.privacy.dlp.v2.RedactConfig buildPartial() { @java.lang.Override public Builder clone() { - return (Builder) super.clone(); + return super.clone(); } @java.lang.Override public Builder setField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.setField(field, value); + return super.setField(field, value); } @java.lang.Override public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) { - return (Builder) super.clearField(field); + return super.clearField(field); } @java.lang.Override public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) { - return (Builder) super.clearOneof(oneof); + return super.clearOneof(oneof); } @java.lang.Override public Builder setRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) { - return (Builder) super.setRepeatedField(field, index, value); + return super.setRepeatedField(field, index, value); } @java.lang.Override public Builder addRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.addRepeatedField(field, value); + return super.addRepeatedField(field, value); } @java.lang.Override @@ -387,7 +386,7 @@ public Builder mergeFrom( @java.lang.Override public final Builder setUnknownFields(final com.google.protobuf.UnknownFieldSet unknownFields) { - return super.setUnknownFieldsProto3(unknownFields); + return super.setUnknownFields(unknownFields); } @java.lang.Override diff --git a/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/RedactImageRequest.java b/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/RedactImageRequest.java index ab48d015fe06..b415784f9ca0 100644 --- a/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/RedactImageRequest.java +++ b/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/RedactImageRequest.java @@ -26,7 +26,6 @@ private RedactImageRequest(com.google.protobuf.GeneratedMessageV3.Builder> bui private RedactImageRequest() { parent_ = ""; imageRedactionConfigs_ = java.util.Collections.emptyList(); - includeFindings_ = false; } @java.lang.Override @@ -78,7 +77,7 @@ private RedactImageRequest( } case 42: { - if (!((mutable_bitField0_ & 0x00000004) == 0x00000004)) { + if (!((mutable_bitField0_ & 0x00000004) != 0)) { imageRedactionConfigs_ = new java.util.ArrayList< com.google.privacy.dlp.v2.RedactImageRequest.ImageRedactionConfig>(); @@ -113,7 +112,7 @@ private RedactImageRequest( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -125,7 +124,7 @@ private RedactImageRequest( } catch (java.io.IOException e) { throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this); } finally { - if (((mutable_bitField0_ & 0x00000004) == 0x00000004)) { + if (((mutable_bitField0_ & 0x00000004) != 0)) { imageRedactionConfigs_ = java.util.Collections.unmodifiableList(imageRedactionConfigs_); } this.unknownFields = unknownFields.build(); @@ -326,7 +325,7 @@ private ImageRedactionConfig( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -574,25 +573,23 @@ public boolean equals(final java.lang.Object obj) { com.google.privacy.dlp.v2.RedactImageRequest.ImageRedactionConfig other = (com.google.privacy.dlp.v2.RedactImageRequest.ImageRedactionConfig) obj; - boolean result = true; - result = result && (hasRedactionColor() == other.hasRedactionColor()); + if (hasRedactionColor() != other.hasRedactionColor()) return false; if (hasRedactionColor()) { - result = result && getRedactionColor().equals(other.getRedactionColor()); + if (!getRedactionColor().equals(other.getRedactionColor())) return false; } - result = result && getTargetCase().equals(other.getTargetCase()); - if (!result) return false; + if (!getTargetCase().equals(other.getTargetCase())) return false; switch (targetCase_) { case 1: - result = result && getInfoType().equals(other.getInfoType()); + if (!getInfoType().equals(other.getInfoType())) return false; break; case 2: - result = result && (getRedactAllText() == other.getRedactAllText()); + if (getRedactAllText() != other.getRedactAllText()) 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 @@ -827,23 +824,23 @@ public com.google.privacy.dlp.v2.RedactImageRequest.ImageRedactionConfig buildPa @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 @@ -851,13 +848,13 @@ public Builder setRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) { - return (Builder) super.setRepeatedField(field, index, value); + return super.setRepeatedField(field, index, value); } @java.lang.Override public Builder addRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.addRepeatedField(field, value); + return super.addRepeatedField(field, value); } @java.lang.Override @@ -1217,7 +1214,7 @@ public Builder clearRedactAllText() { return this; } - private com.google.privacy.dlp.v2.Color redactionColor_ = null; + private com.google.privacy.dlp.v2.Color redactionColor_; private com.google.protobuf.SingleFieldBuilderV3< com.google.privacy.dlp.v2.Color, com.google.privacy.dlp.v2.Color.Builder, @@ -1410,7 +1407,7 @@ public com.google.privacy.dlp.v2.ColorOrBuilder getRedactionColorOrBuilder() { @java.lang.Override public final Builder setUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { - return super.setUnknownFieldsProto3(unknownFields); + return super.setUnknownFields(unknownFields); } @java.lang.Override @@ -1754,20 +1751,19 @@ public boolean equals(final java.lang.Object obj) { com.google.privacy.dlp.v2.RedactImageRequest other = (com.google.privacy.dlp.v2.RedactImageRequest) obj; - boolean result = true; - result = result && getParent().equals(other.getParent()); - result = result && (hasInspectConfig() == other.hasInspectConfig()); + if (!getParent().equals(other.getParent())) return false; + if (hasInspectConfig() != other.hasInspectConfig()) return false; if (hasInspectConfig()) { - result = result && getInspectConfig().equals(other.getInspectConfig()); + if (!getInspectConfig().equals(other.getInspectConfig())) return false; } - result = result && getImageRedactionConfigsList().equals(other.getImageRedactionConfigsList()); - result = result && (getIncludeFindings() == other.getIncludeFindings()); - result = result && (hasByteItem() == other.hasByteItem()); + if (!getImageRedactionConfigsList().equals(other.getImageRedactionConfigsList())) return false; + if (getIncludeFindings() != other.getIncludeFindings()) return false; + if (hasByteItem() != other.hasByteItem()) return false; if (hasByteItem()) { - result = result && getByteItem().equals(other.getByteItem()); + if (!getByteItem().equals(other.getByteItem())) return false; } - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -1999,7 +1995,7 @@ public com.google.privacy.dlp.v2.RedactImageRequest buildPartial() { result.inspectConfig_ = inspectConfigBuilder_.build(); } if (imageRedactionConfigsBuilder_ == null) { - if (((bitField0_ & 0x00000004) == 0x00000004)) { + if (((bitField0_ & 0x00000004) != 0)) { imageRedactionConfigs_ = java.util.Collections.unmodifiableList(imageRedactionConfigs_); bitField0_ = (bitField0_ & ~0x00000004); } @@ -2020,35 +2016,35 @@ public com.google.privacy.dlp.v2.RedactImageRequest 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 @@ -2228,7 +2224,7 @@ public Builder setParentBytes(com.google.protobuf.ByteString value) { return this; } - private com.google.privacy.dlp.v2.InspectConfig inspectConfig_ = null; + private com.google.privacy.dlp.v2.InspectConfig inspectConfig_; private com.google.protobuf.SingleFieldBuilderV3< com.google.privacy.dlp.v2.InspectConfig, com.google.privacy.dlp.v2.InspectConfig.Builder, @@ -2414,7 +2410,7 @@ public com.google.privacy.dlp.v2.InspectConfigOrBuilder getInspectConfigOrBuilde imageRedactionConfigs_ = java.util.Collections.emptyList(); private void ensureImageRedactionConfigsIsMutable() { - if (!((bitField0_ & 0x00000004) == 0x00000004)) { + if (!((bitField0_ & 0x00000004) != 0)) { imageRedactionConfigs_ = new java.util.ArrayList< com.google.privacy.dlp.v2.RedactImageRequest.ImageRedactionConfig>( @@ -2813,7 +2809,7 @@ public Builder removeImageRedactionConfigs(int index) { com.google.privacy.dlp.v2.RedactImageRequest.ImageRedactionConfig.Builder, com.google.privacy.dlp.v2.RedactImageRequest.ImageRedactionConfigOrBuilder>( imageRedactionConfigs_, - ((bitField0_ & 0x00000004) == 0x00000004), + ((bitField0_ & 0x00000004) != 0), getParentForChildren(), isClean()); imageRedactionConfigs_ = null; @@ -2868,7 +2864,7 @@ public Builder clearIncludeFindings() { return this; } - private com.google.privacy.dlp.v2.ByteContentItem byteItem_ = null; + private com.google.privacy.dlp.v2.ByteContentItem byteItem_; private com.google.protobuf.SingleFieldBuilderV3< com.google.privacy.dlp.v2.ByteContentItem, com.google.privacy.dlp.v2.ByteContentItem.Builder, @@ -3051,7 +3047,7 @@ public com.google.privacy.dlp.v2.ByteContentItemOrBuilder getByteItemOrBuilder() @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-dlp-v2/src/main/java/com/google/privacy/dlp/v2/RedactImageResponse.java b/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/RedactImageResponse.java index 2a676524fd68..c7876876eae0 100644 --- a/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/RedactImageResponse.java +++ b/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/RedactImageResponse.java @@ -81,7 +81,7 @@ private RedactImageResponse( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -273,15 +273,14 @@ public boolean equals(final java.lang.Object obj) { com.google.privacy.dlp.v2.RedactImageResponse other = (com.google.privacy.dlp.v2.RedactImageResponse) obj; - boolean result = true; - result = result && getRedactedImage().equals(other.getRedactedImage()); - result = result && getExtractedText().equals(other.getExtractedText()); - result = result && (hasInspectResult() == other.hasInspectResult()); + if (!getRedactedImage().equals(other.getRedactedImage())) return false; + if (!getExtractedText().equals(other.getExtractedText())) return false; + if (hasInspectResult() != other.hasInspectResult()) return false; if (hasInspectResult()) { - result = result && getInspectResult().equals(other.getInspectResult()); + if (!getInspectResult().equals(other.getInspectResult())) return false; } - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -494,35 +493,35 @@ public com.google.privacy.dlp.v2.RedactImageResponse 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 @@ -727,7 +726,7 @@ public Builder setExtractedTextBytes(com.google.protobuf.ByteString value) { return this; } - private com.google.privacy.dlp.v2.InspectResult inspectResult_ = null; + private com.google.privacy.dlp.v2.InspectResult inspectResult_; private com.google.protobuf.SingleFieldBuilderV3< com.google.privacy.dlp.v2.InspectResult, com.google.privacy.dlp.v2.InspectResult.Builder, @@ -911,7 +910,7 @@ public com.google.privacy.dlp.v2.InspectResultOrBuilder getInspectResultOrBuilde @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-dlp-v2/src/main/java/com/google/privacy/dlp/v2/ReidentifyContentRequest.java b/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/ReidentifyContentRequest.java index dcb449b5283f..c3ec2dd9c801 100644 --- a/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/ReidentifyContentRequest.java +++ b/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/ReidentifyContentRequest.java @@ -123,7 +123,7 @@ private ReidentifyContentRequest( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -519,24 +519,23 @@ public boolean equals(final java.lang.Object obj) { com.google.privacy.dlp.v2.ReidentifyContentRequest other = (com.google.privacy.dlp.v2.ReidentifyContentRequest) obj; - boolean result = true; - result = result && getParent().equals(other.getParent()); - result = result && (hasReidentifyConfig() == other.hasReidentifyConfig()); + if (!getParent().equals(other.getParent())) return false; + if (hasReidentifyConfig() != other.hasReidentifyConfig()) return false; if (hasReidentifyConfig()) { - result = result && getReidentifyConfig().equals(other.getReidentifyConfig()); + if (!getReidentifyConfig().equals(other.getReidentifyConfig())) return false; } - result = result && (hasInspectConfig() == other.hasInspectConfig()); + if (hasInspectConfig() != other.hasInspectConfig()) return false; if (hasInspectConfig()) { - result = result && getInspectConfig().equals(other.getInspectConfig()); + if (!getInspectConfig().equals(other.getInspectConfig())) return false; } - result = result && (hasItem() == other.hasItem()); + if (hasItem() != other.hasItem()) return false; if (hasItem()) { - result = result && getItem().equals(other.getItem()); + if (!getItem().equals(other.getItem())) return false; } - result = result && getInspectTemplateName().equals(other.getInspectTemplateName()); - result = result && getReidentifyTemplateName().equals(other.getReidentifyTemplateName()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getInspectTemplateName().equals(other.getInspectTemplateName())) return false; + if (!getReidentifyTemplateName().equals(other.getReidentifyTemplateName())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -784,35 +783,35 @@ public com.google.privacy.dlp.v2.ReidentifyContentRequest 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 @@ -973,7 +972,7 @@ public Builder setParentBytes(com.google.protobuf.ByteString value) { return this; } - private com.google.privacy.dlp.v2.DeidentifyConfig reidentifyConfig_ = null; + private com.google.privacy.dlp.v2.DeidentifyConfig reidentifyConfig_; private com.google.protobuf.SingleFieldBuilderV3< com.google.privacy.dlp.v2.DeidentifyConfig, com.google.privacy.dlp.v2.DeidentifyConfig.Builder, @@ -1218,7 +1217,7 @@ public com.google.privacy.dlp.v2.DeidentifyConfigOrBuilder getReidentifyConfigOr return reidentifyConfigBuilder_; } - private com.google.privacy.dlp.v2.InspectConfig inspectConfig_ = null; + private com.google.privacy.dlp.v2.InspectConfig inspectConfig_; private com.google.protobuf.SingleFieldBuilderV3< com.google.privacy.dlp.v2.InspectConfig, com.google.privacy.dlp.v2.InspectConfig.Builder, @@ -1400,7 +1399,7 @@ public com.google.privacy.dlp.v2.InspectConfigOrBuilder getInspectConfigOrBuilde return inspectConfigBuilder_; } - private com.google.privacy.dlp.v2.ContentItem item_ = null; + private com.google.privacy.dlp.v2.ContentItem item_; private com.google.protobuf.SingleFieldBuilderV3< com.google.privacy.dlp.v2.ContentItem, com.google.privacy.dlp.v2.ContentItem.Builder, @@ -1812,7 +1811,7 @@ public Builder setReidentifyTemplateNameBytes(com.google.protobuf.ByteString val @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-dlp-v2/src/main/java/com/google/privacy/dlp/v2/ReidentifyContentResponse.java b/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/ReidentifyContentResponse.java index 6ce09397a7ca..a9ccc370952f 100644 --- a/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/ReidentifyContentResponse.java +++ b/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/ReidentifyContentResponse.java @@ -82,7 +82,7 @@ private ReidentifyContentResponse( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -245,17 +245,16 @@ public boolean equals(final java.lang.Object obj) { com.google.privacy.dlp.v2.ReidentifyContentResponse other = (com.google.privacy.dlp.v2.ReidentifyContentResponse) obj; - boolean result = true; - result = result && (hasItem() == other.hasItem()); + if (hasItem() != other.hasItem()) return false; if (hasItem()) { - result = result && getItem().equals(other.getItem()); + if (!getItem().equals(other.getItem())) return false; } - result = result && (hasOverview() == other.hasOverview()); + if (hasOverview() != other.hasOverview()) return false; if (hasOverview()) { - result = result && getOverview().equals(other.getOverview()); + if (!getOverview().equals(other.getOverview())) return false; } - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -473,35 +472,35 @@ public com.google.privacy.dlp.v2.ReidentifyContentResponse buildPartial() { @java.lang.Override public Builder clone() { - return (Builder) super.clone(); + return super.clone(); } @java.lang.Override public Builder setField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.setField(field, value); + return super.setField(field, value); } @java.lang.Override public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) { - return (Builder) super.clearField(field); + return super.clearField(field); } @java.lang.Override public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) { - return (Builder) super.clearOneof(oneof); + return super.clearOneof(oneof); } @java.lang.Override public Builder setRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) { - return (Builder) super.setRepeatedField(field, index, value); + return super.setRepeatedField(field, index, value); } @java.lang.Override public Builder addRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.addRepeatedField(field, value); + return super.addRepeatedField(field, value); } @java.lang.Override @@ -553,7 +552,7 @@ public Builder mergeFrom( return this; } - private com.google.privacy.dlp.v2.ContentItem item_ = null; + private com.google.privacy.dlp.v2.ContentItem item_; private com.google.protobuf.SingleFieldBuilderV3< com.google.privacy.dlp.v2.ContentItem, com.google.privacy.dlp.v2.ContentItem.Builder, @@ -730,7 +729,7 @@ public com.google.privacy.dlp.v2.ContentItemOrBuilder getItemOrBuilder() { return itemBuilder_; } - private com.google.privacy.dlp.v2.TransformationOverview overview_ = null; + private com.google.privacy.dlp.v2.TransformationOverview overview_; private com.google.protobuf.SingleFieldBuilderV3< com.google.privacy.dlp.v2.TransformationOverview, com.google.privacy.dlp.v2.TransformationOverview.Builder, @@ -914,7 +913,7 @@ public com.google.privacy.dlp.v2.TransformationOverviewOrBuilder getOverviewOrBu @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-dlp-v2/src/main/java/com/google/privacy/dlp/v2/ReplaceValueConfig.java b/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/ReplaceValueConfig.java index 58905bd7b441..60c667c5d328 100644 --- a/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/ReplaceValueConfig.java +++ b/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/ReplaceValueConfig.java @@ -65,7 +65,7 @@ private ReplaceValueConfig( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -181,13 +181,12 @@ public boolean equals(final java.lang.Object obj) { com.google.privacy.dlp.v2.ReplaceValueConfig other = (com.google.privacy.dlp.v2.ReplaceValueConfig) obj; - boolean result = true; - result = result && (hasNewValue() == other.hasNewValue()); + if (hasNewValue() != other.hasNewValue()) return false; if (hasNewValue()) { - result = result && getNewValue().equals(other.getNewValue()); + if (!getNewValue().equals(other.getNewValue())) return false; } - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -390,35 +389,35 @@ public com.google.privacy.dlp.v2.ReplaceValueConfig buildPartial() { @java.lang.Override public Builder clone() { - return (Builder) super.clone(); + return super.clone(); } @java.lang.Override public Builder setField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.setField(field, value); + return super.setField(field, value); } @java.lang.Override public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) { - return (Builder) super.clearField(field); + return super.clearField(field); } @java.lang.Override public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) { - return (Builder) super.clearOneof(oneof); + return super.clearOneof(oneof); } @java.lang.Override public Builder setRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) { - return (Builder) super.setRepeatedField(field, index, value); + return super.setRepeatedField(field, index, value); } @java.lang.Override public Builder addRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.addRepeatedField(field, value); + return super.addRepeatedField(field, value); } @java.lang.Override @@ -465,7 +464,7 @@ public Builder mergeFrom( return this; } - private com.google.privacy.dlp.v2.Value newValue_ = null; + private com.google.privacy.dlp.v2.Value newValue_; private com.google.protobuf.SingleFieldBuilderV3< com.google.privacy.dlp.v2.Value, com.google.privacy.dlp.v2.Value.Builder, @@ -642,7 +641,7 @@ public com.google.privacy.dlp.v2.ValueOrBuilder getNewValueOrBuilder() { @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-dlp-v2/src/main/java/com/google/privacy/dlp/v2/ReplaceWithInfoTypeConfig.java b/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/ReplaceWithInfoTypeConfig.java index 865f21e7cd14..0a5b66c86658 100644 --- a/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/ReplaceWithInfoTypeConfig.java +++ b/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/ReplaceWithInfoTypeConfig.java @@ -49,7 +49,7 @@ private ReplaceWithInfoTypeConfig( break; default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -120,9 +120,8 @@ public boolean equals(final java.lang.Object obj) { com.google.privacy.dlp.v2.ReplaceWithInfoTypeConfig other = (com.google.privacy.dlp.v2.ReplaceWithInfoTypeConfig) obj; - boolean result = true; - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -310,35 +309,35 @@ public com.google.privacy.dlp.v2.ReplaceWithInfoTypeConfig buildPartial() { @java.lang.Override public Builder clone() { - return (Builder) super.clone(); + return super.clone(); } @java.lang.Override public Builder setField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.setField(field, value); + return super.setField(field, value); } @java.lang.Override public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) { - return (Builder) super.clearField(field); + return super.clearField(field); } @java.lang.Override public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) { - return (Builder) super.clearOneof(oneof); + return super.clearOneof(oneof); } @java.lang.Override public Builder setRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) { - return (Builder) super.setRepeatedField(field, index, value); + return super.setRepeatedField(field, index, value); } @java.lang.Override public Builder addRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.addRepeatedField(field, value); + return super.addRepeatedField(field, value); } @java.lang.Override @@ -386,7 +385,7 @@ public Builder mergeFrom( @java.lang.Override public final Builder setUnknownFields(final com.google.protobuf.UnknownFieldSet unknownFields) { - return super.setUnknownFieldsProto3(unknownFields); + return super.setUnknownFields(unknownFields); } @java.lang.Override diff --git a/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/RiskAnalysisJobConfig.java b/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/RiskAnalysisJobConfig.java index fb009414346b..a577acfb2136 100644 --- a/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/RiskAnalysisJobConfig.java +++ b/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/RiskAnalysisJobConfig.java @@ -85,7 +85,7 @@ private RiskAnalysisJobConfig( } case 26: { - if (!((mutable_bitField0_ & 0x00000004) == 0x00000004)) { + if (!((mutable_bitField0_ & 0x00000004) != 0)) { actions_ = new java.util.ArrayList (); mutable_bitField0_ |= 0x00000004; } @@ -95,7 +95,7 @@ private RiskAnalysisJobConfig( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -107,7 +107,7 @@ private RiskAnalysisJobConfig( } catch (java.io.IOException e) { throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this); } finally { - if (((mutable_bitField0_ & 0x00000004) == 0x00000004)) { + if (((mutable_bitField0_ & 0x00000004) != 0)) { actions_ = java.util.Collections.unmodifiableList(actions_); } this.unknownFields = unknownFields.build(); @@ -339,18 +339,17 @@ public boolean equals(final java.lang.Object obj) { com.google.privacy.dlp.v2.RiskAnalysisJobConfig other = (com.google.privacy.dlp.v2.RiskAnalysisJobConfig) obj; - boolean result = true; - result = result && (hasPrivacyMetric() == other.hasPrivacyMetric()); + if (hasPrivacyMetric() != other.hasPrivacyMetric()) return false; if (hasPrivacyMetric()) { - result = result && getPrivacyMetric().equals(other.getPrivacyMetric()); + if (!getPrivacyMetric().equals(other.getPrivacyMetric())) return false; } - result = result && (hasSourceTable() == other.hasSourceTable()); + if (hasSourceTable() != other.hasSourceTable()) return false; if (hasSourceTable()) { - result = result && getSourceTable().equals(other.getSourceTable()); + if (!getSourceTable().equals(other.getSourceTable())) return false; } - result = result && getActionsList().equals(other.getActionsList()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getActionsList().equals(other.getActionsList())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -578,7 +577,7 @@ public com.google.privacy.dlp.v2.RiskAnalysisJobConfig buildPartial() { result.sourceTable_ = sourceTableBuilder_.build(); } if (actionsBuilder_ == null) { - if (((bitField0_ & 0x00000004) == 0x00000004)) { + if (((bitField0_ & 0x00000004) != 0)) { actions_ = java.util.Collections.unmodifiableList(actions_); bitField0_ = (bitField0_ & ~0x00000004); } @@ -593,35 +592,35 @@ public com.google.privacy.dlp.v2.RiskAnalysisJobConfig 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 @@ -701,7 +700,7 @@ public Builder mergeFrom( private int bitField0_; - private com.google.privacy.dlp.v2.PrivacyMetric privacyMetric_ = null; + private com.google.privacy.dlp.v2.PrivacyMetric privacyMetric_; private com.google.protobuf.SingleFieldBuilderV3< com.google.privacy.dlp.v2.PrivacyMetric, com.google.privacy.dlp.v2.PrivacyMetric.Builder, @@ -883,7 +882,7 @@ public com.google.privacy.dlp.v2.PrivacyMetricOrBuilder getPrivacyMetricOrBuilde return privacyMetricBuilder_; } - private com.google.privacy.dlp.v2.BigQueryTable sourceTable_ = null; + private com.google.privacy.dlp.v2.BigQueryTable sourceTable_; private com.google.protobuf.SingleFieldBuilderV3< com.google.privacy.dlp.v2.BigQueryTable, com.google.privacy.dlp.v2.BigQueryTable.Builder, @@ -1068,7 +1067,7 @@ public com.google.privacy.dlp.v2.BigQueryTableOrBuilder getSourceTableOrBuilder( java.util.Collections.emptyList(); private void ensureActionsIsMutable() { - if (!((bitField0_ & 0x00000004) == 0x00000004)) { + if (!((bitField0_ & 0x00000004) != 0)) { actions_ = new java.util.ArrayList (actions_); bitField0_ |= 0x00000004; } @@ -1422,10 +1421,7 @@ public java.util.List getActionsBuilde com.google.privacy.dlp.v2.Action, com.google.privacy.dlp.v2.Action.Builder, com.google.privacy.dlp.v2.ActionOrBuilder>( - actions_, - ((bitField0_ & 0x00000004) == 0x00000004), - getParentForChildren(), - isClean()); + actions_, ((bitField0_ & 0x00000004) != 0), getParentForChildren(), isClean()); actions_ = null; } return actionsBuilder_; @@ -1433,7 +1429,7 @@ public java.util.List getActionsBuilde @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-dlp-v2/src/main/java/com/google/privacy/dlp/v2/Schedule.java b/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/Schedule.java index ea465f6b4e6b..d60d827a4d61 100644 --- a/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/Schedule.java +++ b/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/Schedule.java @@ -64,7 +64,7 @@ private Schedule( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -238,19 +238,17 @@ public boolean equals(final java.lang.Object obj) { } com.google.privacy.dlp.v2.Schedule other = (com.google.privacy.dlp.v2.Schedule) obj; - boolean result = true; - result = result && getOptionCase().equals(other.getOptionCase()); - if (!result) return false; + if (!getOptionCase().equals(other.getOptionCase())) return false; switch (optionCase_) { case 1: - result = - result && getRecurrencePeriodDuration().equals(other.getRecurrencePeriodDuration()); + if (!getRecurrencePeriodDuration().equals(other.getRecurrencePeriodDuration())) + 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 @@ -454,35 +452,35 @@ public com.google.privacy.dlp.v2.Schedule 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 @@ -796,7 +794,7 @@ public com.google.protobuf.DurationOrBuilder getRecurrencePeriodDurationOrBuilde @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-dlp-v2/src/main/java/com/google/privacy/dlp/v2/StatisticalTable.java b/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/StatisticalTable.java index af1019695c61..cb8ec003686b 100644 --- a/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/StatisticalTable.java +++ b/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/StatisticalTable.java @@ -58,7 +58,7 @@ private StatisticalTable( break; case 10: { - if (!((mutable_bitField0_ & 0x00000002) == 0x00000002)) { + if (!((mutable_bitField0_ & 0x00000002) != 0)) { quasiIds_ = new java.util.ArrayList< com.google.privacy.dlp.v2.StatisticalTable.QuasiIdentifierField>(); @@ -103,7 +103,7 @@ private StatisticalTable( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -115,7 +115,7 @@ private StatisticalTable( } catch (java.io.IOException e) { throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this); } finally { - if (((mutable_bitField0_ & 0x00000002) == 0x00000002)) { + if (((mutable_bitField0_ & 0x00000002) != 0)) { quasiIds_ = java.util.Collections.unmodifiableList(quasiIds_); } this.unknownFields = unknownFields.build(); @@ -228,7 +228,7 @@ private QuasiIdentifierField( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -353,14 +353,13 @@ public boolean equals(final java.lang.Object obj) { com.google.privacy.dlp.v2.StatisticalTable.QuasiIdentifierField other = (com.google.privacy.dlp.v2.StatisticalTable.QuasiIdentifierField) obj; - boolean result = true; - result = result && (hasField() == other.hasField()); + if (hasField() != other.hasField()) return false; if (hasField()) { - result = result && getField().equals(other.getField()); + if (!getField().equals(other.getField())) return false; } - result = result && getCustomTag().equals(other.getCustomTag()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getCustomTag().equals(other.getCustomTag())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -575,23 +574,23 @@ public com.google.privacy.dlp.v2.StatisticalTable.QuasiIdentifierField buildPart @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 @@ -599,13 +598,13 @@ public Builder setRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) { - return (Builder) super.setRepeatedField(field, index, value); + return super.setRepeatedField(field, index, value); } @java.lang.Override public Builder addRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.addRepeatedField(field, value); + return super.addRepeatedField(field, value); } @java.lang.Override @@ -661,7 +660,7 @@ public Builder mergeFrom( return this; } - private com.google.privacy.dlp.v2.FieldId field_ = null; + private com.google.privacy.dlp.v2.FieldId field_; private com.google.protobuf.SingleFieldBuilderV3< com.google.privacy.dlp.v2.FieldId, com.google.privacy.dlp.v2.FieldId.Builder, @@ -823,7 +822,7 @@ public Builder setCustomTagBytes(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 @@ -1091,18 +1090,17 @@ public boolean equals(final java.lang.Object obj) { com.google.privacy.dlp.v2.StatisticalTable other = (com.google.privacy.dlp.v2.StatisticalTable) obj; - boolean result = true; - result = result && (hasTable() == other.hasTable()); + if (hasTable() != other.hasTable()) return false; if (hasTable()) { - result = result && getTable().equals(other.getTable()); + if (!getTable().equals(other.getTable())) return false; } - result = result && getQuasiIdsList().equals(other.getQuasiIdsList()); - result = result && (hasRelativeFrequency() == other.hasRelativeFrequency()); + if (!getQuasiIdsList().equals(other.getQuasiIdsList())) return false; + if (hasRelativeFrequency() != other.hasRelativeFrequency()) return false; if (hasRelativeFrequency()) { - result = result && getRelativeFrequency().equals(other.getRelativeFrequency()); + if (!getRelativeFrequency().equals(other.getRelativeFrequency())) return false; } - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -1330,7 +1328,7 @@ public com.google.privacy.dlp.v2.StatisticalTable buildPartial() { result.table_ = tableBuilder_.build(); } if (quasiIdsBuilder_ == null) { - if (((bitField0_ & 0x00000002) == 0x00000002)) { + if (((bitField0_ & 0x00000002) != 0)) { quasiIds_ = java.util.Collections.unmodifiableList(quasiIds_); bitField0_ = (bitField0_ & ~0x00000002); } @@ -1350,35 +1348,35 @@ public com.google.privacy.dlp.v2.StatisticalTable 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 @@ -1457,7 +1455,7 @@ public Builder mergeFrom( private int bitField0_; - private com.google.privacy.dlp.v2.BigQueryTable table_ = null; + private com.google.privacy.dlp.v2.BigQueryTable table_; private com.google.protobuf.SingleFieldBuilderV3< com.google.privacy.dlp.v2.BigQueryTable, com.google.privacy.dlp.v2.BigQueryTable.Builder, @@ -1642,7 +1640,7 @@ public com.google.privacy.dlp.v2.BigQueryTableOrBuilder getTableOrBuilder() { quasiIds_ = java.util.Collections.emptyList(); private void ensureQuasiIdsIsMutable() { - if (!((bitField0_ & 0x00000002) == 0x00000002)) { + if (!((bitField0_ & 0x00000002) != 0)) { quasiIds_ = new java.util.ArrayList< com.google.privacy.dlp.v2.StatisticalTable.QuasiIdentifierField>(quasiIds_); @@ -2018,16 +2016,13 @@ public Builder removeQuasiIds(int index) { com.google.privacy.dlp.v2.StatisticalTable.QuasiIdentifierField, com.google.privacy.dlp.v2.StatisticalTable.QuasiIdentifierField.Builder, com.google.privacy.dlp.v2.StatisticalTable.QuasiIdentifierFieldOrBuilder>( - quasiIds_, - ((bitField0_ & 0x00000002) == 0x00000002), - getParentForChildren(), - isClean()); + quasiIds_, ((bitField0_ & 0x00000002) != 0), getParentForChildren(), isClean()); quasiIds_ = null; } return quasiIdsBuilder_; } - private com.google.privacy.dlp.v2.FieldId relativeFrequency_ = null; + private com.google.privacy.dlp.v2.FieldId relativeFrequency_; private com.google.protobuf.SingleFieldBuilderV3< com.google.privacy.dlp.v2.FieldId, com.google.privacy.dlp.v2.FieldId.Builder, @@ -2228,7 +2223,7 @@ public com.google.privacy.dlp.v2.FieldIdOrBuilder getRelativeFrequencyOrBuilder( @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-dlp-v2/src/main/java/com/google/privacy/dlp/v2/StorageConfig.java b/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/StorageConfig.java index a061abccd74f..775d63685dca 100644 --- a/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/StorageConfig.java +++ b/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/StorageConfig.java @@ -115,7 +115,7 @@ private StorageConfig( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -306,9 +306,7 @@ private TimespanConfig(com.google.protobuf.GeneratedMessageV3.Builder> builder super(builder); } - private TimespanConfig() { - enableAutoPopulationOfTimespanConfig_ = false; - } + private TimespanConfig() {} @java.lang.Override public final com.google.protobuf.UnknownFieldSet getUnknownFields() { @@ -387,7 +385,7 @@ private TimespanConfig( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -648,25 +646,22 @@ public boolean equals(final java.lang.Object obj) { com.google.privacy.dlp.v2.StorageConfig.TimespanConfig other = (com.google.privacy.dlp.v2.StorageConfig.TimespanConfig) obj; - boolean result = true; - result = result && (hasStartTime() == other.hasStartTime()); + if (hasStartTime() != other.hasStartTime()) return false; if (hasStartTime()) { - result = result && getStartTime().equals(other.getStartTime()); + if (!getStartTime().equals(other.getStartTime())) return false; } - result = result && (hasEndTime() == other.hasEndTime()); + if (hasEndTime() != other.hasEndTime()) return false; if (hasEndTime()) { - result = result && getEndTime().equals(other.getEndTime()); + if (!getEndTime().equals(other.getEndTime())) return false; } - result = result && (hasTimestampField() == other.hasTimestampField()); + if (hasTimestampField() != other.hasTimestampField()) return false; if (hasTimestampField()) { - result = result && getTimestampField().equals(other.getTimestampField()); + if (!getTimestampField().equals(other.getTimestampField())) return false; } - result = - result - && (getEnableAutoPopulationOfTimespanConfig() - == other.getEnableAutoPopulationOfTimespanConfig()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (getEnableAutoPopulationOfTimespanConfig() + != other.getEnableAutoPopulationOfTimespanConfig()) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -910,23 +905,23 @@ public com.google.privacy.dlp.v2.StorageConfig.TimespanConfig 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 @@ -934,13 +929,13 @@ public Builder setRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) { - return (Builder) super.setRepeatedField(field, index, value); + return super.setRepeatedField(field, index, value); } @java.lang.Override public Builder addRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.addRepeatedField(field, value); + return super.addRepeatedField(field, value); } @java.lang.Override @@ -998,7 +993,7 @@ public Builder mergeFrom( return this; } - private com.google.protobuf.Timestamp startTime_ = null; + private com.google.protobuf.Timestamp startTime_; private com.google.protobuf.SingleFieldBuilderV3< com.google.protobuf.Timestamp, com.google.protobuf.Timestamp.Builder, @@ -1179,7 +1174,7 @@ public com.google.protobuf.TimestampOrBuilder getStartTimeOrBuilder() { return startTimeBuilder_; } - private com.google.protobuf.Timestamp endTime_ = null; + private com.google.protobuf.Timestamp endTime_; private com.google.protobuf.SingleFieldBuilderV3< com.google.protobuf.Timestamp, com.google.protobuf.Timestamp.Builder, @@ -1363,7 +1358,7 @@ public com.google.protobuf.TimestampOrBuilder getEndTimeOrBuilder() { return endTimeBuilder_; } - private com.google.privacy.dlp.v2.FieldId timestampField_ = null; + private com.google.privacy.dlp.v2.FieldId timestampField_; private com.google.protobuf.SingleFieldBuilderV3< com.google.privacy.dlp.v2.FieldId, com.google.privacy.dlp.v2.FieldId.Builder, @@ -1672,7 +1667,7 @@ public Builder clearEnableAutoPopulationOfTimespanConfig() { @java.lang.Override public final Builder setUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { - return super.setUnknownFieldsProto3(unknownFields); + return super.setUnknownFields(unknownFields); } @java.lang.Override @@ -1982,28 +1977,26 @@ public boolean equals(final java.lang.Object obj) { } com.google.privacy.dlp.v2.StorageConfig other = (com.google.privacy.dlp.v2.StorageConfig) obj; - boolean result = true; - result = result && (hasTimespanConfig() == other.hasTimespanConfig()); + if (hasTimespanConfig() != other.hasTimespanConfig()) return false; if (hasTimespanConfig()) { - result = result && getTimespanConfig().equals(other.getTimespanConfig()); + if (!getTimespanConfig().equals(other.getTimespanConfig())) return false; } - result = result && getTypeCase().equals(other.getTypeCase()); - if (!result) return false; + if (!getTypeCase().equals(other.getTypeCase())) return false; switch (typeCase_) { case 2: - result = result && getDatastoreOptions().equals(other.getDatastoreOptions()); + if (!getDatastoreOptions().equals(other.getDatastoreOptions())) return false; break; case 3: - result = result && getCloudStorageOptions().equals(other.getCloudStorageOptions()); + if (!getCloudStorageOptions().equals(other.getCloudStorageOptions())) return false; break; case 4: - result = result && getBigQueryOptions().equals(other.getBigQueryOptions()); + if (!getBigQueryOptions().equals(other.getBigQueryOptions())) 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 @@ -2246,35 +2239,35 @@ public com.google.privacy.dlp.v2.StorageConfig 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 @@ -2963,7 +2956,7 @@ public com.google.privacy.dlp.v2.BigQueryOptionsOrBuilder getBigQueryOptionsOrBu return bigQueryOptionsBuilder_; } - private com.google.privacy.dlp.v2.StorageConfig.TimespanConfig timespanConfig_ = null; + private com.google.privacy.dlp.v2.StorageConfig.TimespanConfig timespanConfig_; private com.google.protobuf.SingleFieldBuilderV3< com.google.privacy.dlp.v2.StorageConfig.TimespanConfig, com.google.privacy.dlp.v2.StorageConfig.TimespanConfig.Builder, @@ -3078,7 +3071,7 @@ public Builder clearTimespanConfig() { @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-dlp-v2/src/main/java/com/google/privacy/dlp/v2/StoredInfoType.java b/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/StoredInfoType.java index db6f8bdea401..3ee7e8faff50 100644 --- a/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/StoredInfoType.java +++ b/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/StoredInfoType.java @@ -77,7 +77,7 @@ private StoredInfoType( } case 26: { - if (!((mutable_bitField0_ & 0x00000004) == 0x00000004)) { + if (!((mutable_bitField0_ & 0x00000004) != 0)) { pendingVersions_ = new java.util.ArrayList (); mutable_bitField0_ |= 0x00000004; @@ -89,7 +89,7 @@ private StoredInfoType( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -101,7 +101,7 @@ private StoredInfoType( } catch (java.io.IOException e) { throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this); } finally { - if (((mutable_bitField0_ & 0x00000004) == 0x00000004)) { + if (((mutable_bitField0_ & 0x00000004) != 0)) { pendingVersions_ = java.util.Collections.unmodifiableList(pendingVersions_); } this.unknownFields = unknownFields.build(); @@ -335,15 +335,14 @@ public boolean equals(final java.lang.Object obj) { } com.google.privacy.dlp.v2.StoredInfoType other = (com.google.privacy.dlp.v2.StoredInfoType) obj; - boolean result = true; - result = result && getName().equals(other.getName()); - result = result && (hasCurrentVersion() == other.hasCurrentVersion()); + if (!getName().equals(other.getName())) return false; + if (hasCurrentVersion() != other.hasCurrentVersion()) return false; if (hasCurrentVersion()) { - result = result && getCurrentVersion().equals(other.getCurrentVersion()); + if (!getCurrentVersion().equals(other.getCurrentVersion())) return false; } - result = result && getPendingVersionsList().equals(other.getPendingVersionsList()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getPendingVersionsList().equals(other.getPendingVersionsList())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -561,7 +560,7 @@ public com.google.privacy.dlp.v2.StoredInfoType buildPartial() { result.currentVersion_ = currentVersionBuilder_.build(); } if (pendingVersionsBuilder_ == null) { - if (((bitField0_ & 0x00000004) == 0x00000004)) { + if (((bitField0_ & 0x00000004) != 0)) { pendingVersions_ = java.util.Collections.unmodifiableList(pendingVersions_); bitField0_ = (bitField0_ & ~0x00000004); } @@ -576,35 +575,35 @@ public com.google.privacy.dlp.v2.StoredInfoType 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 @@ -778,7 +777,7 @@ public Builder setNameBytes(com.google.protobuf.ByteString value) { return this; } - private com.google.privacy.dlp.v2.StoredInfoTypeVersion currentVersion_ = null; + private com.google.privacy.dlp.v2.StoredInfoTypeVersion currentVersion_; private com.google.protobuf.SingleFieldBuilderV3< com.google.privacy.dlp.v2.StoredInfoTypeVersion, com.google.privacy.dlp.v2.StoredInfoTypeVersion.Builder, @@ -964,7 +963,7 @@ public com.google.privacy.dlp.v2.StoredInfoTypeVersionOrBuilder getCurrentVersio java.util.Collections.emptyList(); private void ensurePendingVersionsIsMutable() { - if (!((bitField0_ & 0x00000004) == 0x00000004)) { + if (!((bitField0_ & 0x00000004) != 0)) { pendingVersions_ = new java.util.ArrayList ( pendingVersions_); @@ -1331,7 +1330,7 @@ public com.google.privacy.dlp.v2.StoredInfoTypeVersion.Builder addPendingVersion com.google.privacy.dlp.v2.StoredInfoTypeVersion.Builder, com.google.privacy.dlp.v2.StoredInfoTypeVersionOrBuilder>( pendingVersions_, - ((bitField0_ & 0x00000004) == 0x00000004), + ((bitField0_ & 0x00000004) != 0), getParentForChildren(), isClean()); pendingVersions_ = null; @@ -1341,7 +1340,7 @@ public com.google.privacy.dlp.v2.StoredInfoTypeVersion.Builder addPendingVersion @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-dlp-v2/src/main/java/com/google/privacy/dlp/v2/StoredInfoTypeConfig.java b/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/StoredInfoTypeConfig.java index 3b73e6e26668..0ec7810255f0 100644 --- a/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/StoredInfoTypeConfig.java +++ b/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/StoredInfoTypeConfig.java @@ -85,7 +85,7 @@ private StoredInfoTypeConfig( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -344,20 +344,18 @@ public boolean equals(final java.lang.Object obj) { com.google.privacy.dlp.v2.StoredInfoTypeConfig other = (com.google.privacy.dlp.v2.StoredInfoTypeConfig) obj; - boolean result = true; - result = result && getDisplayName().equals(other.getDisplayName()); - result = result && getDescription().equals(other.getDescription()); - result = result && getTypeCase().equals(other.getTypeCase()); - if (!result) return false; + if (!getDisplayName().equals(other.getDisplayName())) return false; + if (!getDescription().equals(other.getDescription())) return false; + if (!getTypeCase().equals(other.getTypeCase())) return false; switch (typeCase_) { case 3: - result = result && getLargeCustomDictionary().equals(other.getLargeCustomDictionary()); + if (!getLargeCustomDictionary().equals(other.getLargeCustomDictionary())) 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 @@ -573,35 +571,35 @@ public com.google.privacy.dlp.v2.StoredInfoTypeConfig 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 @@ -1075,7 +1073,7 @@ public Builder clearLargeCustomDictionary() { @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-dlp-v2/src/main/java/com/google/privacy/dlp/v2/StoredInfoTypeVersion.java b/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/StoredInfoTypeVersion.java index 412814a10d2e..ecb4496269c2 100644 --- a/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/StoredInfoTypeVersion.java +++ b/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/StoredInfoTypeVersion.java @@ -92,7 +92,7 @@ private StoredInfoTypeVersion( } case 34: { - if (!((mutable_bitField0_ & 0x00000008) == 0x00000008)) { + if (!((mutable_bitField0_ & 0x00000008) != 0)) { errors_ = new java.util.ArrayList (); mutable_bitField0_ |= 0x00000008; } @@ -102,7 +102,7 @@ private StoredInfoTypeVersion( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -114,7 +114,7 @@ private StoredInfoTypeVersion( } catch (java.io.IOException e) { throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this); } finally { - if (((mutable_bitField0_ & 0x00000008) == 0x00000008)) { + if (((mutable_bitField0_ & 0x00000008) != 0)) { errors_ = java.util.Collections.unmodifiableList(errors_); } this.unknownFields = unknownFields.build(); @@ -434,19 +434,18 @@ public boolean equals(final java.lang.Object obj) { com.google.privacy.dlp.v2.StoredInfoTypeVersion other = (com.google.privacy.dlp.v2.StoredInfoTypeVersion) obj; - boolean result = true; - result = result && (hasConfig() == other.hasConfig()); + if (hasConfig() != other.hasConfig()) return false; if (hasConfig()) { - result = result && getConfig().equals(other.getConfig()); + if (!getConfig().equals(other.getConfig())) 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 && state_ == other.state_; - result = result && getErrorsList().equals(other.getErrorsList()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (state_ != other.state_) return false; + if (!getErrorsList().equals(other.getErrorsList())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -679,7 +678,7 @@ public com.google.privacy.dlp.v2.StoredInfoTypeVersion buildPartial() { } result.state_ = state_; if (errorsBuilder_ == null) { - if (((bitField0_ & 0x00000008) == 0x00000008)) { + if (((bitField0_ & 0x00000008) != 0)) { errors_ = java.util.Collections.unmodifiableList(errors_); bitField0_ = (bitField0_ & ~0x00000008); } @@ -694,35 +693,35 @@ public com.google.privacy.dlp.v2.StoredInfoTypeVersion 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 @@ -805,7 +804,7 @@ public Builder mergeFrom( private int bitField0_; - private com.google.privacy.dlp.v2.StoredInfoTypeConfig config_ = null; + private com.google.privacy.dlp.v2.StoredInfoTypeConfig config_; private com.google.protobuf.SingleFieldBuilderV3< com.google.privacy.dlp.v2.StoredInfoTypeConfig, com.google.privacy.dlp.v2.StoredInfoTypeConfig.Builder, @@ -987,7 +986,7 @@ public com.google.privacy.dlp.v2.StoredInfoTypeConfigOrBuilder getConfigOrBuilde return configBuilder_; } - 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, @@ -1260,7 +1259,7 @@ public Builder clearState() { java.util.Collections.emptyList(); private void ensureErrorsIsMutable() { - if (!((bitField0_ & 0x00000008) == 0x00000008)) { + if (!((bitField0_ & 0x00000008) != 0)) { errors_ = new java.util.ArrayList (errors_); bitField0_ |= 0x00000008; } @@ -1776,10 +1775,7 @@ public java.util.List getErrorsBuilderL com.google.privacy.dlp.v2.Error, com.google.privacy.dlp.v2.Error.Builder, com.google.privacy.dlp.v2.ErrorOrBuilder>( - errors_, - ((bitField0_ & 0x00000008) == 0x00000008), - getParentForChildren(), - isClean()); + errors_, ((bitField0_ & 0x00000008) != 0), getParentForChildren(), isClean()); errors_ = null; } return errorsBuilder_; @@ -1787,7 +1783,7 @@ public java.util.List getErrorsBuilderL @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-dlp-v2/src/main/java/com/google/privacy/dlp/v2/StoredType.java b/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/StoredType.java index 8b94fb046713..9eb5d6c08755 100644 --- a/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/StoredType.java +++ b/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/StoredType.java @@ -74,7 +74,7 @@ private StoredType( } 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.privacy.dlp.v2.StoredType other = (com.google.privacy.dlp.v2.StoredType) 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.privacy.dlp.v2.StoredType 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-dlp-v2/src/main/java/com/google/privacy/dlp/v2/Table.java b/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/Table.java index 15f75a607411..b8c490f35bd2 100644 --- a/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/Table.java +++ b/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/Table.java @@ -55,7 +55,7 @@ private Table( break; case 10: { - if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) { + if (!((mutable_bitField0_ & 0x00000001) != 0)) { headers_ = new java.util.ArrayList (); mutable_bitField0_ |= 0x00000001; } @@ -65,7 +65,7 @@ private Table( } case 18: { - if (!((mutable_bitField0_ & 0x00000002) == 0x00000002)) { + if (!((mutable_bitField0_ & 0x00000002) != 0)) { rows_ = new java.util.ArrayList (); mutable_bitField0_ |= 0x00000002; } @@ -76,7 +76,7 @@ private Table( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -88,10 +88,10 @@ private Table( } 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)) { headers_ = java.util.Collections.unmodifiableList(headers_); } - if (((mutable_bitField0_ & 0x00000002) == 0x00000002)) { + if (((mutable_bitField0_ & 0x00000002) != 0)) { rows_ = java.util.Collections.unmodifiableList(rows_); } this.unknownFields = unknownFields.build(); @@ -170,7 +170,7 @@ private Row( break; case 10: { - if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) { + if (!((mutable_bitField0_ & 0x00000001) != 0)) { values_ = new java.util.ArrayList (); mutable_bitField0_ |= 0x00000001; } @@ -180,7 +180,7 @@ private Row( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -192,7 +192,7 @@ private Row( } catch (java.io.IOException e) { throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this); } finally { - if (((mutable_bitField0_ & 0x00000001) == 0x00000001)) { + if (((mutable_bitField0_ & 0x00000001) != 0)) { values_ = java.util.Collections.unmodifiableList(values_); } this.unknownFields = unknownFields.build(); @@ -283,10 +283,9 @@ public boolean equals(final java.lang.Object obj) { } com.google.privacy.dlp.v2.Table.Row other = (com.google.privacy.dlp.v2.Table.Row) obj; - boolean result = true; - result = result && getValuesList().equals(other.getValuesList()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getValuesList().equals(other.getValuesList())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -474,7 +473,7 @@ public com.google.privacy.dlp.v2.Table.Row buildPartial() { com.google.privacy.dlp.v2.Table.Row result = new com.google.privacy.dlp.v2.Table.Row(this); int from_bitField0_ = bitField0_; if (valuesBuilder_ == null) { - if (((bitField0_ & 0x00000001) == 0x00000001)) { + if (((bitField0_ & 0x00000001) != 0)) { values_ = java.util.Collections.unmodifiableList(values_); bitField0_ = (bitField0_ & ~0x00000001); } @@ -488,23 +487,23 @@ public com.google.privacy.dlp.v2.Table.Row 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 @@ -512,13 +511,13 @@ public Builder setRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) { - return (Builder) super.setRepeatedField(field, index, value); + return super.setRepeatedField(field, index, value); } @java.lang.Override public Builder addRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.addRepeatedField(field, value); + return super.addRepeatedField(field, value); } @java.lang.Override @@ -595,7 +594,7 @@ public Builder mergeFrom( java.util.Collections.emptyList(); private void ensureValuesIsMutable() { - if (!((bitField0_ & 0x00000001) == 0x00000001)) { + if (!((bitField0_ & 0x00000001) != 0)) { values_ = new java.util.ArrayList (values_); bitField0_ |= 0x00000001; } @@ -787,10 +786,7 @@ public java.util.List getValuesBuilderL com.google.privacy.dlp.v2.Value, com.google.privacy.dlp.v2.Value.Builder, com.google.privacy.dlp.v2.ValueOrBuilder>( - values_, - ((bitField0_ & 0x00000001) == 0x00000001), - getParentForChildren(), - isClean()); + values_, ((bitField0_ & 0x00000001) != 0), getParentForChildren(), isClean()); values_ = null; } return valuesBuilder_; @@ -799,7 +795,7 @@ public java.util.List getValuesBuilderL @java.lang.Override public final Builder setUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { - return super.setUnknownFieldsProto3(unknownFields); + return super.setUnknownFields(unknownFields); } @java.lang.Override @@ -946,11 +942,10 @@ public boolean equals(final java.lang.Object obj) { } com.google.privacy.dlp.v2.Table other = (com.google.privacy.dlp.v2.Table) obj; - boolean result = true; - result = result && getHeadersList().equals(other.getHeadersList()); - result = result && getRowsList().equals(other.getRowsList()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getHeadersList().equals(other.getHeadersList())) return false; + if (!getRowsList().equals(other.getRowsList())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -1156,7 +1151,7 @@ public com.google.privacy.dlp.v2.Table buildPartial() { com.google.privacy.dlp.v2.Table result = new com.google.privacy.dlp.v2.Table(this); int from_bitField0_ = bitField0_; if (headersBuilder_ == null) { - if (((bitField0_ & 0x00000001) == 0x00000001)) { + if (((bitField0_ & 0x00000001) != 0)) { headers_ = java.util.Collections.unmodifiableList(headers_); bitField0_ = (bitField0_ & ~0x00000001); } @@ -1165,7 +1160,7 @@ public com.google.privacy.dlp.v2.Table buildPartial() { result.headers_ = headersBuilder_.build(); } if (rowsBuilder_ == null) { - if (((bitField0_ & 0x00000002) == 0x00000002)) { + if (((bitField0_ & 0x00000002) != 0)) { rows_ = java.util.Collections.unmodifiableList(rows_); bitField0_ = (bitField0_ & ~0x00000002); } @@ -1179,35 +1174,35 @@ public com.google.privacy.dlp.v2.Table 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 @@ -1311,7 +1306,7 @@ public Builder mergeFrom( java.util.Collections.emptyList(); private void ensureHeadersIsMutable() { - if (!((bitField0_ & 0x00000001) == 0x00000001)) { + if (!((bitField0_ & 0x00000001) != 0)) { headers_ = new java.util.ArrayList (headers_); bitField0_ |= 0x00000001; } @@ -1505,10 +1500,7 @@ public java.util.List getHeadersBuild com.google.privacy.dlp.v2.FieldId, com.google.privacy.dlp.v2.FieldId.Builder, com.google.privacy.dlp.v2.FieldIdOrBuilder>( - headers_, - ((bitField0_ & 0x00000001) == 0x00000001), - getParentForChildren(), - isClean()); + headers_, ((bitField0_ & 0x00000001) != 0), getParentForChildren(), isClean()); headers_ = null; } return headersBuilder_; @@ -1518,7 +1510,7 @@ public java.util.List getHeadersBuild java.util.Collections.emptyList(); private void ensureRowsIsMutable() { - if (!((bitField0_ & 0x00000002) == 0x00000002)) { + if (!((bitField0_ & 0x00000002) != 0)) { rows_ = new java.util.ArrayList (rows_); bitField0_ |= 0x00000002; } @@ -1710,10 +1702,7 @@ public java.util.List getRowsBuilde com.google.privacy.dlp.v2.Table.Row, com.google.privacy.dlp.v2.Table.Row.Builder, com.google.privacy.dlp.v2.Table.RowOrBuilder>( - rows_, - ((bitField0_ & 0x00000002) == 0x00000002), - getParentForChildren(), - isClean()); + rows_, ((bitField0_ & 0x00000002) != 0), getParentForChildren(), isClean()); rows_ = null; } return rowsBuilder_; @@ -1721,7 +1710,7 @@ public java.util.List getRowsBuilde @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-dlp-v2/src/main/java/com/google/privacy/dlp/v2/TableLocation.java b/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/TableLocation.java index 372ef6f122b0..4eb785c2b82c 100644 --- a/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/TableLocation.java +++ b/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/TableLocation.java @@ -22,9 +22,7 @@ private TableLocation(com.google.protobuf.GeneratedMessageV3.Builder> builder) super(builder); } - private TableLocation() { - rowIndex_ = 0L; - } + private TableLocation() {} @java.lang.Override public final com.google.protobuf.UnknownFieldSet getUnknownFields() { @@ -57,7 +55,7 @@ private TableLocation( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -148,10 +146,9 @@ public boolean equals(final java.lang.Object obj) { } com.google.privacy.dlp.v2.TableLocation other = (com.google.privacy.dlp.v2.TableLocation) obj; - boolean result = true; - result = result && (getRowIndex() == other.getRowIndex()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (getRowIndex() != other.getRowIndex()) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -344,35 +341,35 @@ public com.google.privacy.dlp.v2.TableLocation buildPartial() { @java.lang.Override public Builder clone() { - return (Builder) super.clone(); + return super.clone(); } @java.lang.Override public Builder setField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.setField(field, value); + return super.setField(field, value); } @java.lang.Override public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) { - return (Builder) super.clearField(field); + return super.clearField(field); } @java.lang.Override public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) { - return (Builder) super.clearOneof(oneof); + return super.clearOneof(oneof); } @java.lang.Override public Builder setRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) { - return (Builder) super.setRepeatedField(field, index, value); + return super.setRepeatedField(field, index, value); } @java.lang.Override public Builder addRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.addRepeatedField(field, value); + return super.addRepeatedField(field, value); } @java.lang.Override @@ -465,7 +462,7 @@ public Builder clearRowIndex() { @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-dlp-v2/src/main/java/com/google/privacy/dlp/v2/TimePartConfig.java b/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/TimePartConfig.java index 0f7145abbc12..608f4b963422 100644 --- a/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/TimePartConfig.java +++ b/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/TimePartConfig.java @@ -60,7 +60,7 @@ private TimePartConfig( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -361,10 +361,9 @@ public boolean equals(final java.lang.Object obj) { } com.google.privacy.dlp.v2.TimePartConfig other = (com.google.privacy.dlp.v2.TimePartConfig) obj; - boolean result = true; - result = result && partToExtract_ == other.partToExtract_; - result = result && unknownFields.equals(other.unknownFields); - return result; + if (partToExtract_ != other.partToExtract_) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -558,35 +557,35 @@ public com.google.privacy.dlp.v2.TimePartConfig 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 @@ -673,7 +672,7 @@ public Builder clearPartToExtract() { @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-dlp-v2/src/main/java/com/google/privacy/dlp/v2/TransformationOverview.java b/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/TransformationOverview.java index 24a52482fa95..cb6b870cd72a 100644 --- a/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/TransformationOverview.java +++ b/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/TransformationOverview.java @@ -23,7 +23,6 @@ private TransformationOverview(com.google.protobuf.GeneratedMessageV3.Builder> } private TransformationOverview() { - transformedBytes_ = 0L; transformationSummaries_ = java.util.Collections.emptyList(); } @@ -58,7 +57,7 @@ private TransformationOverview( } case 26: { - if (!((mutable_bitField0_ & 0x00000002) == 0x00000002)) { + if (!((mutable_bitField0_ & 0x00000002) != 0)) { transformationSummaries_ = new java.util.ArrayList (); mutable_bitField0_ |= 0x00000002; @@ -70,7 +69,7 @@ private TransformationOverview( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -82,7 +81,7 @@ private TransformationOverview( } catch (java.io.IOException e) { throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this); } finally { - if (((mutable_bitField0_ & 0x00000002) == 0x00000002)) { + if (((mutable_bitField0_ & 0x00000002) != 0)) { transformationSummaries_ = java.util.Collections.unmodifiableList(transformationSummaries_); } this.unknownFields = unknownFields.build(); @@ -245,12 +244,11 @@ public boolean equals(final java.lang.Object obj) { com.google.privacy.dlp.v2.TransformationOverview other = (com.google.privacy.dlp.v2.TransformationOverview) obj; - boolean result = true; - result = result && (getTransformedBytes() == other.getTransformedBytes()); - result = - result && getTransformationSummariesList().equals(other.getTransformationSummariesList()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (getTransformedBytes() != other.getTransformedBytes()) return false; + if (!getTransformationSummariesList().equals(other.getTransformationSummariesList())) + return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -452,7 +450,7 @@ public com.google.privacy.dlp.v2.TransformationOverview buildPartial() { int to_bitField0_ = 0; result.transformedBytes_ = transformedBytes_; if (transformationSummariesBuilder_ == null) { - if (((bitField0_ & 0x00000002) == 0x00000002)) { + if (((bitField0_ & 0x00000002) != 0)) { transformationSummaries_ = java.util.Collections.unmodifiableList(transformationSummaries_); bitField0_ = (bitField0_ & ~0x00000002); @@ -468,35 +466,35 @@ public com.google.privacy.dlp.v2.TransformationOverview 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 @@ -621,7 +619,7 @@ public Builder clearTransformedBytes() { transformationSummaries_ = java.util.Collections.emptyList(); private void ensureTransformationSummariesIsMutable() { - if (!((bitField0_ & 0x00000002) == 0x00000002)) { + if (!((bitField0_ & 0x00000002) != 0)) { transformationSummaries_ = new java.util.ArrayList ( transformationSummaries_); @@ -990,7 +988,7 @@ public Builder removeTransformationSummaries(int index) { com.google.privacy.dlp.v2.TransformationSummary.Builder, com.google.privacy.dlp.v2.TransformationSummaryOrBuilder>( transformationSummaries_, - ((bitField0_ & 0x00000002) == 0x00000002), + ((bitField0_ & 0x00000002) != 0), getParentForChildren(), isClean()); transformationSummaries_ = null; @@ -1000,7 +998,7 @@ public Builder removeTransformationSummaries(int index) { @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-dlp-v2/src/main/java/com/google/privacy/dlp/v2/TransformationSummary.java b/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/TransformationSummary.java index 92cd1fe2d706..1129bf7ee100 100644 --- a/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/TransformationSummary.java +++ b/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/TransformationSummary.java @@ -7,7 +7,7 @@ * * * - * Summary of a single tranformation. + * Summary of a single transformation. * Only one of 'transformation', 'field_transformation', or 'record_suppress' * will be set. *@@ -27,7 +27,6 @@ private TransformationSummary(com.google.protobuf.GeneratedMessageV3.Builder> private TransformationSummary() { fieldTransformations_ = java.util.Collections.emptyList(); results_ = java.util.Collections.emptyList(); - transformedBytes_ = 0L; } @java.lang.Override @@ -103,7 +102,7 @@ private TransformationSummary( } case 34: { - if (!((mutable_bitField0_ & 0x00000020) == 0x00000020)) { + if (!((mutable_bitField0_ & 0x00000020) != 0)) { results_ = new java.util.ArrayList< com.google.privacy.dlp.v2.TransformationSummary.SummaryResult>(); @@ -117,7 +116,7 @@ private TransformationSummary( } case 42: { - if (!((mutable_bitField0_ & 0x00000008) == 0x00000008)) { + if (!((mutable_bitField0_ & 0x00000008) != 0)) { fieldTransformations_ = new java.util.ArrayList(); mutable_bitField0_ |= 0x00000008; @@ -150,7 +149,7 @@ private TransformationSummary( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -162,10 +161,10 @@ private TransformationSummary( } catch (java.io.IOException e) { throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this); } finally { - if (((mutable_bitField0_ & 0x00000020) == 0x00000020)) { + if (((mutable_bitField0_ & 0x00000020) != 0)) { results_ = java.util.Collections.unmodifiableList(results_); } - if (((mutable_bitField0_ & 0x00000008) == 0x00000008)) { + if (((mutable_bitField0_ & 0x00000008) != 0)) { fieldTransformations_ = java.util.Collections.unmodifiableList(fieldTransformations_); } this.unknownFields = unknownFields.build(); @@ -349,7 +348,6 @@ private SummaryResult(com.google.protobuf.GeneratedMessageV3.Builder> builder) } private SummaryResult() { - count_ = 0L; code_ = 0; details_ = ""; } @@ -399,7 +397,7 @@ private SummaryResult( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -566,12 +564,11 @@ public boolean equals(final java.lang.Object obj) { com.google.privacy.dlp.v2.TransformationSummary.SummaryResult other = (com.google.privacy.dlp.v2.TransformationSummary.SummaryResult) obj; - boolean result = true; - result = result && (getCount() == other.getCount()); - result = result && code_ == other.code_; - result = result && getDetails().equals(other.getDetails()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (getCount() != other.getCount()) return false; + if (code_ != other.code_) return false; + if (!getDetails().equals(other.getDetails())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -779,23 +776,23 @@ public com.google.privacy.dlp.v2.TransformationSummary.SummaryResult buildPartia @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 @@ -803,13 +800,13 @@ public Builder setRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) { - return (Builder) super.setRepeatedField(field, index, value); + return super.setRepeatedField(field, index, value); } @java.lang.Override public Builder addRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.addRepeatedField(field, value); + return super.addRepeatedField(field, value); } @java.lang.Override @@ -1044,7 +1041,7 @@ public Builder setDetailsBytes(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 @@ -1467,28 +1464,27 @@ public boolean equals(final java.lang.Object obj) { com.google.privacy.dlp.v2.TransformationSummary other = (com.google.privacy.dlp.v2.TransformationSummary) obj; - boolean result = true; - result = result && (hasInfoType() == other.hasInfoType()); + if (hasInfoType() != other.hasInfoType()) return false; if (hasInfoType()) { - result = result && getInfoType().equals(other.getInfoType()); + if (!getInfoType().equals(other.getInfoType())) return false; } - result = result && (hasField() == other.hasField()); + if (hasField() != other.hasField()) return false; if (hasField()) { - result = result && getField().equals(other.getField()); + if (!getField().equals(other.getField())) return false; } - result = result && (hasTransformation() == other.hasTransformation()); + if (hasTransformation() != other.hasTransformation()) return false; if (hasTransformation()) { - result = result && getTransformation().equals(other.getTransformation()); + if (!getTransformation().equals(other.getTransformation())) return false; } - result = result && getFieldTransformationsList().equals(other.getFieldTransformationsList()); - result = result && (hasRecordSuppress() == other.hasRecordSuppress()); + if (!getFieldTransformationsList().equals(other.getFieldTransformationsList())) return false; + if (hasRecordSuppress() != other.hasRecordSuppress()) return false; if (hasRecordSuppress()) { - result = result && getRecordSuppress().equals(other.getRecordSuppress()); + if (!getRecordSuppress().equals(other.getRecordSuppress())) return false; } - result = result && getResultsList().equals(other.getResultsList()); - result = result && (getTransformedBytes() == other.getTransformedBytes()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getResultsList().equals(other.getResultsList())) return false; + if (getTransformedBytes() != other.getTransformedBytes()) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -1628,7 +1624,7 @@ protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.Build * * * - * Summary of a single tranformation. + * Summary of a single transformation. * Only one of 'transformation', 'field_transformation', or 'record_suppress' * will be set. *@@ -1757,7 +1753,7 @@ public com.google.privacy.dlp.v2.TransformationSummary buildPartial() { result.transformation_ = transformationBuilder_.build(); } if (fieldTransformationsBuilder_ == null) { - if (((bitField0_ & 0x00000008) == 0x00000008)) { + if (((bitField0_ & 0x00000008) != 0)) { fieldTransformations_ = java.util.Collections.unmodifiableList(fieldTransformations_); bitField0_ = (bitField0_ & ~0x00000008); } @@ -1771,7 +1767,7 @@ public com.google.privacy.dlp.v2.TransformationSummary buildPartial() { result.recordSuppress_ = recordSuppressBuilder_.build(); } if (resultsBuilder_ == null) { - if (((bitField0_ & 0x00000020) == 0x00000020)) { + if (((bitField0_ & 0x00000020) != 0)) { results_ = java.util.Collections.unmodifiableList(results_); bitField0_ = (bitField0_ & ~0x00000020); } @@ -1787,35 +1783,35 @@ public com.google.privacy.dlp.v2.TransformationSummary 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 @@ -1931,7 +1927,7 @@ public Builder mergeFrom( private int bitField0_; - private com.google.privacy.dlp.v2.InfoType infoType_ = null; + private com.google.privacy.dlp.v2.InfoType infoType_; private com.google.protobuf.SingleFieldBuilderV3< com.google.privacy.dlp.v2.InfoType, com.google.privacy.dlp.v2.InfoType.Builder, @@ -2112,7 +2108,7 @@ public com.google.privacy.dlp.v2.InfoTypeOrBuilder getInfoTypeOrBuilder() { return infoTypeBuilder_; } - private com.google.privacy.dlp.v2.FieldId field_ = null; + private com.google.privacy.dlp.v2.FieldId field_; private com.google.protobuf.SingleFieldBuilderV3< com.google.privacy.dlp.v2.FieldId, com.google.privacy.dlp.v2.FieldId.Builder, @@ -2287,7 +2283,7 @@ public com.google.privacy.dlp.v2.FieldIdOrBuilder getFieldOrBuilder() { return fieldBuilder_; } - private com.google.privacy.dlp.v2.PrimitiveTransformation transformation_ = null; + private com.google.privacy.dlp.v2.PrimitiveTransformation transformation_; private com.google.protobuf.SingleFieldBuilderV3< com.google.privacy.dlp.v2.PrimitiveTransformation, com.google.privacy.dlp.v2.PrimitiveTransformation.Builder, @@ -2473,7 +2469,7 @@ public com.google.privacy.dlp.v2.PrimitiveTransformationOrBuilder getTransformat java.util.Collections.emptyList(); private void ensureFieldTransformationsIsMutable() { - if (!((bitField0_ & 0x00000008) == 0x00000008)) { + if (!((bitField0_ & 0x00000008) != 0)) { fieldTransformations_ = new java.util.ArrayList( fieldTransformations_); @@ -2858,7 +2854,7 @@ public com.google.privacy.dlp.v2.FieldTransformation.Builder addFieldTransformat com.google.privacy.dlp.v2.FieldTransformation.Builder, com.google.privacy.dlp.v2.FieldTransformationOrBuilder>( fieldTransformations_, - ((bitField0_ & 0x00000008) == 0x00000008), + ((bitField0_ & 0x00000008) != 0), getParentForChildren(), isClean()); fieldTransformations_ = null; @@ -2866,7 +2862,7 @@ public com.google.privacy.dlp.v2.FieldTransformation.Builder addFieldTransformat return fieldTransformationsBuilder_; } - private com.google.privacy.dlp.v2.RecordSuppression recordSuppress_ = null; + private com.google.privacy.dlp.v2.RecordSuppression recordSuppress_; private com.google.protobuf.SingleFieldBuilderV3< com.google.privacy.dlp.v2.RecordSuppression, com.google.privacy.dlp.v2.RecordSuppression.Builder, @@ -3052,7 +3048,7 @@ public com.google.privacy.dlp.v2.RecordSuppressionOrBuilder getRecordSuppressOrB java.util.Collections.emptyList(); private void ensureResultsIsMutable() { - if (!((bitField0_ & 0x00000020) == 0x00000020)) { + if (!((bitField0_ & 0x00000020) != 0)) { results_ = new java.util.ArrayList ( results_); @@ -3300,10 +3296,7 @@ public com.google.privacy.dlp.v2.TransformationSummary.SummaryResult.Builder add com.google.privacy.dlp.v2.TransformationSummary.SummaryResult, com.google.privacy.dlp.v2.TransformationSummary.SummaryResult.Builder, com.google.privacy.dlp.v2.TransformationSummary.SummaryResultOrBuilder>( - results_, - ((bitField0_ & 0x00000020) == 0x00000020), - getParentForChildren(), - isClean()); + results_, ((bitField0_ & 0x00000020) != 0), getParentForChildren(), isClean()); results_ = null; } return resultsBuilder_; @@ -3355,7 +3348,7 @@ public Builder clearTransformedBytes() { @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-dlp-v2/src/main/java/com/google/privacy/dlp/v2/TransientCryptoKey.java b/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/TransientCryptoKey.java index bed777ec4008..f98d3f9b6d8d 100644 --- a/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/TransientCryptoKey.java +++ b/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/TransientCryptoKey.java @@ -60,7 +60,7 @@ private TransientCryptoKey( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -190,10 +190,9 @@ public boolean equals(final java.lang.Object obj) { com.google.privacy.dlp.v2.TransientCryptoKey other = (com.google.privacy.dlp.v2.TransientCryptoKey) 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 @@ -387,35 +386,35 @@ public com.google.privacy.dlp.v2.TransientCryptoKey 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 @@ -584,7 +583,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-dlp-v2/src/main/java/com/google/privacy/dlp/v2/UnwrappedCryptoKey.java b/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/UnwrappedCryptoKey.java index 90a04840c6b1..d957caf13443 100644 --- a/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/UnwrappedCryptoKey.java +++ b/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/UnwrappedCryptoKey.java @@ -58,7 +58,7 @@ private UnwrappedCryptoKey( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -96,7 +96,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { * * * - * The AES 128/192/256 bit key. [required] + * A 128/192/256 bit key. [required] ** *bytes key = 1;
@@ -150,10 +150,9 @@ public boolean equals(final java.lang.Object obj) { com.google.privacy.dlp.v2.UnwrappedCryptoKey other = (com.google.privacy.dlp.v2.UnwrappedCryptoKey) obj; - boolean result = true; - result = result && getKey().equals(other.getKey()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getKey().equals(other.getKey())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -347,35 +346,35 @@ public com.google.privacy.dlp.v2.UnwrappedCryptoKey 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 @@ -427,7 +426,7 @@ public Builder mergeFrom( * * *- * The AES 128/192/256 bit key. [required] + * A 128/192/256 bit key. [required] ** *bytes key = 1;
@@ -439,7 +438,7 @@ public com.google.protobuf.ByteString getKey() { * * *- * The AES 128/192/256 bit key. [required] + * A 128/192/256 bit key. [required] ** *bytes key = 1;
@@ -457,7 +456,7 @@ public Builder setKey(com.google.protobuf.ByteString value) { * * *- * The AES 128/192/256 bit key. [required] + * A 128/192/256 bit key. [required] ** *bytes key = 1;
@@ -471,7 +470,7 @@ public Builder clearKey() { @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-dlp-v2/src/main/java/com/google/privacy/dlp/v2/UnwrappedCryptoKeyOrBuilder.java b/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/UnwrappedCryptoKeyOrBuilder.java index 54635aa96c4c..1810c1e0b73e 100644 --- a/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/UnwrappedCryptoKeyOrBuilder.java +++ b/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/UnwrappedCryptoKeyOrBuilder.java @@ -12,7 +12,7 @@ public interface UnwrappedCryptoKeyOrBuilder * * *- * The AES 128/192/256 bit key. [required] + * A 128/192/256 bit key. [required] ** *bytes key = 1;
diff --git a/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/UpdateDeidentifyTemplateRequest.java b/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/UpdateDeidentifyTemplateRequest.java index 8405aea9b3ed..26d1d193dcf4 100644 --- a/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/UpdateDeidentifyTemplateRequest.java +++ b/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/UpdateDeidentifyTemplateRequest.java @@ -91,7 +91,7 @@ private UpdateDeidentifyTemplateRequest( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -307,18 +307,17 @@ public boolean equals(final java.lang.Object obj) { com.google.privacy.dlp.v2.UpdateDeidentifyTemplateRequest other = (com.google.privacy.dlp.v2.UpdateDeidentifyTemplateRequest) obj; - boolean result = true; - result = result && getName().equals(other.getName()); - result = result && (hasDeidentifyTemplate() == other.hasDeidentifyTemplate()); + if (!getName().equals(other.getName())) return false; + if (hasDeidentifyTemplate() != other.hasDeidentifyTemplate()) return false; if (hasDeidentifyTemplate()) { - result = result && getDeidentifyTemplate().equals(other.getDeidentifyTemplate()); + if (!getDeidentifyTemplate().equals(other.getDeidentifyTemplate())) 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 @@ -542,35 +541,35 @@ public com.google.privacy.dlp.v2.UpdateDeidentifyTemplateRequest 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 setNameBytes(com.google.protobuf.ByteString value) { return this; } - private com.google.privacy.dlp.v2.DeidentifyTemplate deidentifyTemplate_ = null; + private com.google.privacy.dlp.v2.DeidentifyTemplate deidentifyTemplate_; private com.google.protobuf.SingleFieldBuilderV3< com.google.privacy.dlp.v2.DeidentifyTemplate, com.google.privacy.dlp.v2.DeidentifyTemplate.Builder, @@ -912,7 +911,7 @@ public com.google.privacy.dlp.v2.DeidentifyTemplateOrBuilder getDeidentifyTempla return deidentifyTemplateBuilder_; } - 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, @@ -1093,7 +1092,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-dlp-v2/src/main/java/com/google/privacy/dlp/v2/UpdateInspectTemplateRequest.java b/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/UpdateInspectTemplateRequest.java index 53da78a87208..aba5caff3ee6 100644 --- a/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/UpdateInspectTemplateRequest.java +++ b/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/UpdateInspectTemplateRequest.java @@ -90,7 +90,7 @@ private UpdateInspectTemplateRequest( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -306,18 +306,17 @@ public boolean equals(final java.lang.Object obj) { com.google.privacy.dlp.v2.UpdateInspectTemplateRequest other = (com.google.privacy.dlp.v2.UpdateInspectTemplateRequest) obj; - boolean result = true; - result = result && getName().equals(other.getName()); - result = result && (hasInspectTemplate() == other.hasInspectTemplate()); + if (!getName().equals(other.getName())) return false; + if (hasInspectTemplate() != other.hasInspectTemplate()) return false; if (hasInspectTemplate()) { - result = result && getInspectTemplate().equals(other.getInspectTemplate()); + if (!getInspectTemplate().equals(other.getInspectTemplate())) 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 @@ -541,35 +540,35 @@ public com.google.privacy.dlp.v2.UpdateInspectTemplateRequest 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 @@ -729,7 +728,7 @@ public Builder setNameBytes(com.google.protobuf.ByteString value) { return this; } - private com.google.privacy.dlp.v2.InspectTemplate inspectTemplate_ = null; + private com.google.privacy.dlp.v2.InspectTemplate inspectTemplate_; private com.google.protobuf.SingleFieldBuilderV3< com.google.privacy.dlp.v2.InspectTemplate, com.google.privacy.dlp.v2.InspectTemplate.Builder, @@ -911,7 +910,7 @@ public com.google.privacy.dlp.v2.InspectTemplateOrBuilder getInspectTemplateOrBu return inspectTemplateBuilder_; } - 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, @@ -1092,7 +1091,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-dlp-v2/src/main/java/com/google/privacy/dlp/v2/UpdateJobTriggerRequest.java b/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/UpdateJobTriggerRequest.java index f51571bc4246..d94ff1cc2c9e 100644 --- a/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/UpdateJobTriggerRequest.java +++ b/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/UpdateJobTriggerRequest.java @@ -90,7 +90,7 @@ private UpdateJobTriggerRequest( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -304,18 +304,17 @@ public boolean equals(final java.lang.Object obj) { com.google.privacy.dlp.v2.UpdateJobTriggerRequest other = (com.google.privacy.dlp.v2.UpdateJobTriggerRequest) obj; - boolean result = true; - result = result && getName().equals(other.getName()); - result = result && (hasJobTrigger() == other.hasJobTrigger()); + if (!getName().equals(other.getName())) return false; + if (hasJobTrigger() != other.hasJobTrigger()) return false; if (hasJobTrigger()) { - result = result && getJobTrigger().equals(other.getJobTrigger()); + if (!getJobTrigger().equals(other.getJobTrigger())) 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 @@ -538,35 +537,35 @@ public com.google.privacy.dlp.v2.UpdateJobTriggerRequest 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 @@ -721,7 +720,7 @@ public Builder setNameBytes(com.google.protobuf.ByteString value) { return this; } - private com.google.privacy.dlp.v2.JobTrigger jobTrigger_ = null; + private com.google.privacy.dlp.v2.JobTrigger jobTrigger_; private com.google.protobuf.SingleFieldBuilderV3< com.google.privacy.dlp.v2.JobTrigger, com.google.privacy.dlp.v2.JobTrigger.Builder, @@ -902,7 +901,7 @@ public com.google.privacy.dlp.v2.JobTriggerOrBuilder getJobTriggerOrBuilder() { return jobTriggerBuilder_; } - 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, @@ -1083,7 +1082,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-dlp-v2/src/main/java/com/google/privacy/dlp/v2/UpdateStoredInfoTypeRequest.java b/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/UpdateStoredInfoTypeRequest.java index 0762128939f1..5fe05505b512 100644 --- a/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/UpdateStoredInfoTypeRequest.java +++ b/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/UpdateStoredInfoTypeRequest.java @@ -90,7 +90,7 @@ private UpdateStoredInfoTypeRequest( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -312,18 +312,17 @@ public boolean equals(final java.lang.Object obj) { com.google.privacy.dlp.v2.UpdateStoredInfoTypeRequest other = (com.google.privacy.dlp.v2.UpdateStoredInfoTypeRequest) obj; - boolean result = true; - result = result && getName().equals(other.getName()); - result = result && (hasConfig() == other.hasConfig()); + if (!getName().equals(other.getName())) return false; + if (hasConfig() != other.hasConfig()) return false; if (hasConfig()) { - result = result && getConfig().equals(other.getConfig()); + if (!getConfig().equals(other.getConfig())) 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 @@ -547,35 +546,35 @@ public com.google.privacy.dlp.v2.UpdateStoredInfoTypeRequest buildPartial() { @java.lang.Override public Builder clone() { - return (Builder) super.clone(); + return super.clone(); } @java.lang.Override public Builder setField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.setField(field, value); + return super.setField(field, value); } @java.lang.Override public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) { - return (Builder) super.clearField(field); + return super.clearField(field); } @java.lang.Override public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) { - return (Builder) super.clearOneof(oneof); + return super.clearOneof(oneof); } @java.lang.Override public Builder setRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) { - return (Builder) super.setRepeatedField(field, index, value); + return super.setRepeatedField(field, index, value); } @java.lang.Override public Builder addRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.addRepeatedField(field, value); + return super.addRepeatedField(field, value); } @java.lang.Override @@ -735,7 +734,7 @@ public Builder setNameBytes(com.google.protobuf.ByteString value) { return this; } - private com.google.privacy.dlp.v2.StoredInfoTypeConfig config_ = null; + private com.google.privacy.dlp.v2.StoredInfoTypeConfig config_; private com.google.protobuf.SingleFieldBuilderV3< com.google.privacy.dlp.v2.StoredInfoTypeConfig, com.google.privacy.dlp.v2.StoredInfoTypeConfig.Builder, @@ -935,7 +934,7 @@ public com.google.privacy.dlp.v2.StoredInfoTypeConfigOrBuilder getConfigOrBuilde return configBuilder_; } - 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, @@ -1116,7 +1115,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-dlp-v2/src/main/java/com/google/privacy/dlp/v2/Value.java b/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/Value.java index dc798b10dd7c..97abebe130d9 100644 --- a/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/Value.java +++ b/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/Value.java @@ -129,7 +129,7 @@ private Value( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -457,42 +457,38 @@ public boolean equals(final java.lang.Object obj) { } com.google.privacy.dlp.v2.Value other = (com.google.privacy.dlp.v2.Value) obj; - boolean result = true; - result = result && getTypeCase().equals(other.getTypeCase()); - if (!result) return false; + if (!getTypeCase().equals(other.getTypeCase())) return false; switch (typeCase_) { case 1: - result = result && (getIntegerValue() == other.getIntegerValue()); + if (getIntegerValue() != other.getIntegerValue()) return false; break; case 2: - result = - result - && (java.lang.Double.doubleToLongBits(getFloatValue()) - == java.lang.Double.doubleToLongBits(other.getFloatValue())); + if (java.lang.Double.doubleToLongBits(getFloatValue()) + != java.lang.Double.doubleToLongBits(other.getFloatValue())) return false; break; case 3: - result = result && getStringValue().equals(other.getStringValue()); + if (!getStringValue().equals(other.getStringValue())) return false; break; case 4: - result = result && (getBooleanValue() == other.getBooleanValue()); + if (getBooleanValue() != other.getBooleanValue()) return false; break; case 5: - result = result && getTimestampValue().equals(other.getTimestampValue()); + if (!getTimestampValue().equals(other.getTimestampValue())) return false; break; case 6: - result = result && getTimeValue().equals(other.getTimeValue()); + if (!getTimeValue().equals(other.getTimeValue())) return false; break; case 7: - result = result && getDateValue().equals(other.getDateValue()); + if (!getDateValue().equals(other.getDateValue())) return false; break; case 8: - result = result && getDayOfWeekValueValue() == other.getDayOfWeekValueValue(); + if (getDayOfWeekValueValue() != other.getDayOfWeekValueValue()) 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 @@ -760,35 +756,35 @@ public com.google.privacy.dlp.v2.Value buildPartial() { @java.lang.Override public Builder clone() { - return (Builder) super.clone(); + return super.clone(); } @java.lang.Override public Builder setField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.setField(field, value); + return super.setField(field, value); } @java.lang.Override public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) { - return (Builder) super.clearField(field); + return super.clearField(field); } @java.lang.Override public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) { - return (Builder) super.clearOneof(oneof); + return super.clearOneof(oneof); } @java.lang.Override public Builder setRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) { - return (Builder) super.setRepeatedField(field, index, value); + return super.setRepeatedField(field, index, value); } @java.lang.Override public Builder addRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.addRepeatedField(field, value); + return super.addRepeatedField(field, value); } @java.lang.Override @@ -1446,7 +1442,7 @@ public Builder clearDayOfWeekValue() { @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-dlp-v2/src/main/java/com/google/privacy/dlp/v2/ValueFrequency.java b/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/ValueFrequency.java index 3b0ede4e4801..c1ffdfa7f2ca 100644 --- a/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/ValueFrequency.java +++ b/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/ValueFrequency.java @@ -22,9 +22,7 @@ private ValueFrequency(com.google.protobuf.GeneratedMessageV3.Builder> builder super(builder); } - private ValueFrequency() { - count_ = 0L; - } + private ValueFrequency() {} @java.lang.Override public final com.google.protobuf.UnknownFieldSet getUnknownFields() { @@ -72,7 +70,7 @@ private ValueFrequency( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -208,14 +206,13 @@ public boolean equals(final java.lang.Object obj) { } com.google.privacy.dlp.v2.ValueFrequency other = (com.google.privacy.dlp.v2.ValueFrequency) obj; - boolean result = true; - result = result && (hasValue() == other.hasValue()); + if (hasValue() != other.hasValue()) return false; if (hasValue()) { - result = result && getValue().equals(other.getValue()); + if (!getValue().equals(other.getValue())) return false; } - result = result && (getCount() == other.getCount()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (getCount() != other.getCount()) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -423,35 +420,35 @@ public com.google.privacy.dlp.v2.ValueFrequency 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 @@ -501,7 +498,7 @@ public Builder mergeFrom( return this; } - private com.google.privacy.dlp.v2.Value value_ = null; + private com.google.privacy.dlp.v2.Value value_; private com.google.protobuf.SingleFieldBuilderV3< com.google.privacy.dlp.v2.Value, com.google.privacy.dlp.v2.Value.Builder, @@ -722,7 +719,7 @@ public Builder clearCount() { @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-dlp-v2/src/main/proto/google/privacy/dlp/v2/dlp.proto b/google-api-grpc/proto-google-cloud-dlp-v2/src/main/proto/google/privacy/dlp/v2/dlp.proto index 70457842afae..3a5dde11ff70 100644 --- a/google-api-grpc/proto-google-cloud-dlp-v2/src/main/proto/google/privacy/dlp/v2/dlp.proto +++ b/google-api-grpc/proto-google-cloud-dlp-v2/src/main/proto/google/privacy/dlp/v2/dlp.proto @@ -1,4 +1,4 @@ -// Copyright 2018 Google LLC. +// Copyright 2019 Google LLC. // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -18,6 +18,7 @@ syntax = "proto3"; package google.privacy.dlp.v2; import "google/api/annotations.proto"; +import "google/api/resource.proto"; import "google/privacy/dlp/v2/storage.proto"; import "google/protobuf/duration.proto"; import "google/protobuf/empty.proto"; @@ -84,8 +85,7 @@ service DlpService { // When no InfoTypes or CustomInfoTypes are specified in this request, the // system will automatically choose what detectors to run. By default this may // be all types, but may change over time as detectors are updated. - rpc DeidentifyContent(DeidentifyContentRequest) - returns (DeidentifyContentResponse) { + rpc DeidentifyContent(DeidentifyContentRequest) returns (DeidentifyContentResponse) { option (google.api.http) = { post: "/v2/{parent=projects/*}/content:deidentify" body: "*" @@ -96,8 +96,7 @@ service DlpService { // See // https://cloud.google.com/dlp/docs/pseudonymization#re-identification_in_free_text_code_example // to learn more. - rpc ReidentifyContent(ReidentifyContentRequest) - returns (ReidentifyContentResponse) { + rpc ReidentifyContent(ReidentifyContentRequest) returns (ReidentifyContentResponse) { option (google.api.http) = { post: "/v2/{parent=projects/*}/content:reidentify" body: "*" @@ -116,8 +115,7 @@ service DlpService { // Creates an InspectTemplate for re-using frequently used configuration // for inspecting content, images, and storage. // See https://cloud.google.com/dlp/docs/creating-templates to learn more. - rpc CreateInspectTemplate(CreateInspectTemplateRequest) - returns (InspectTemplate) { + rpc CreateInspectTemplate(CreateInspectTemplateRequest) returns (InspectTemplate) { option (google.api.http) = { post: "/v2/{parent=organizations/*}/inspectTemplates" body: "*" @@ -130,8 +128,7 @@ service DlpService { // Updates the InspectTemplate. // See https://cloud.google.com/dlp/docs/creating-templates to learn more. - rpc UpdateInspectTemplate(UpdateInspectTemplateRequest) - returns (InspectTemplate) { + rpc UpdateInspectTemplate(UpdateInspectTemplateRequest) returns (InspectTemplate) { option (google.api.http) = { patch: "/v2/{name=organizations/*/inspectTemplates/*}" body: "*" @@ -147,27 +144,31 @@ service DlpService { rpc GetInspectTemplate(GetInspectTemplateRequest) returns (InspectTemplate) { option (google.api.http) = { get: "/v2/{name=organizations/*/inspectTemplates/*}" - additional_bindings { get: "/v2/{name=projects/*/inspectTemplates/*}" } + additional_bindings { + get: "/v2/{name=projects/*/inspectTemplates/*}" + } }; } // Lists InspectTemplates. // See https://cloud.google.com/dlp/docs/creating-templates to learn more. - rpc ListInspectTemplates(ListInspectTemplatesRequest) - returns (ListInspectTemplatesResponse) { + rpc ListInspectTemplates(ListInspectTemplatesRequest) returns (ListInspectTemplatesResponse) { option (google.api.http) = { get: "/v2/{parent=organizations/*}/inspectTemplates" - additional_bindings { get: "/v2/{parent=projects/*}/inspectTemplates" } + additional_bindings { + get: "/v2/{parent=projects/*}/inspectTemplates" + } }; } // Deletes an InspectTemplate. // See https://cloud.google.com/dlp/docs/creating-templates to learn more. - rpc DeleteInspectTemplate(DeleteInspectTemplateRequest) - returns (google.protobuf.Empty) { + rpc DeleteInspectTemplate(DeleteInspectTemplateRequest) returns (google.protobuf.Empty) { option (google.api.http) = { delete: "/v2/{name=organizations/*/inspectTemplates/*}" - additional_bindings { delete: "/v2/{name=projects/*/inspectTemplates/*}" } + additional_bindings { + delete: "/v2/{name=projects/*/inspectTemplates/*}" + } }; } @@ -175,8 +176,7 @@ service DlpService { // for de-identifying content, images, and storage. // See https://cloud.google.com/dlp/docs/creating-templates-deid to learn // more. - rpc CreateDeidentifyTemplate(CreateDeidentifyTemplateRequest) - returns (DeidentifyTemplate) { + rpc CreateDeidentifyTemplate(CreateDeidentifyTemplateRequest) returns (DeidentifyTemplate) { option (google.api.http) = { post: "/v2/{parent=organizations/*}/deidentifyTemplates" body: "*" @@ -190,8 +190,7 @@ service DlpService { // Updates the DeidentifyTemplate. // See https://cloud.google.com/dlp/docs/creating-templates-deid to learn // more. - rpc UpdateDeidentifyTemplate(UpdateDeidentifyTemplateRequest) - returns (DeidentifyTemplate) { + rpc UpdateDeidentifyTemplate(UpdateDeidentifyTemplateRequest) returns (DeidentifyTemplate) { option (google.api.http) = { patch: "/v2/{name=organizations/*/deidentifyTemplates/*}" body: "*" @@ -205,30 +204,31 @@ service DlpService { // Gets a DeidentifyTemplate. // See https://cloud.google.com/dlp/docs/creating-templates-deid to learn // more. - rpc GetDeidentifyTemplate(GetDeidentifyTemplateRequest) - returns (DeidentifyTemplate) { + rpc GetDeidentifyTemplate(GetDeidentifyTemplateRequest) returns (DeidentifyTemplate) { option (google.api.http) = { get: "/v2/{name=organizations/*/deidentifyTemplates/*}" - additional_bindings { get: "/v2/{name=projects/*/deidentifyTemplates/*}" } + additional_bindings { + get: "/v2/{name=projects/*/deidentifyTemplates/*}" + } }; } // Lists DeidentifyTemplates. // See https://cloud.google.com/dlp/docs/creating-templates-deid to learn // more. - rpc ListDeidentifyTemplates(ListDeidentifyTemplatesRequest) - returns (ListDeidentifyTemplatesResponse) { + rpc ListDeidentifyTemplates(ListDeidentifyTemplatesRequest) returns (ListDeidentifyTemplatesResponse) { option (google.api.http) = { get: "/v2/{parent=organizations/*}/deidentifyTemplates" - additional_bindings { get: "/v2/{parent=projects/*}/deidentifyTemplates" } + additional_bindings { + get: "/v2/{parent=projects/*}/deidentifyTemplates" + } }; } // Deletes a DeidentifyTemplate. // See https://cloud.google.com/dlp/docs/creating-templates-deid to learn // more. - rpc DeleteDeidentifyTemplate(DeleteDeidentifyTemplateRequest) - returns (google.protobuf.Empty) { + rpc DeleteDeidentifyTemplate(DeleteDeidentifyTemplateRequest) returns (google.protobuf.Empty) { option (google.api.http) = { delete: "/v2/{name=organizations/*/deidentifyTemplates/*}" additional_bindings { @@ -266,8 +266,7 @@ service DlpService { // Lists job triggers. // See https://cloud.google.com/dlp/docs/creating-job-triggers to learn more. - rpc ListJobTriggers(ListJobTriggersRequest) - returns (ListJobTriggersResponse) { + rpc ListJobTriggers(ListJobTriggersRequest) returns (ListJobTriggersResponse) { option (google.api.http) = { get: "/v2/{parent=projects/*}/jobTriggers" }; @@ -275,8 +274,7 @@ service DlpService { // Deletes a job trigger. // See https://cloud.google.com/dlp/docs/creating-job-triggers to learn more. - rpc DeleteJobTrigger(DeleteJobTriggerRequest) - returns (google.protobuf.Empty) { + rpc DeleteJobTrigger(DeleteJobTriggerRequest) returns (google.protobuf.Empty) { option (google.api.http) = { delete: "/v2/{name=projects/*/jobTriggers/*}" }; @@ -349,8 +347,7 @@ service DlpService { // Creates a pre-built stored infoType to be used for inspection. // See https://cloud.google.com/dlp/docs/creating-stored-infotypes to // learn more. - rpc CreateStoredInfoType(CreateStoredInfoTypeRequest) - returns (StoredInfoType) { + rpc CreateStoredInfoType(CreateStoredInfoTypeRequest) returns (StoredInfoType) { option (google.api.http) = { post: "/v2/{parent=organizations/*}/storedInfoTypes" body: "*" @@ -365,8 +362,7 @@ service DlpService { // will continue to be used until the new version is ready. // See https://cloud.google.com/dlp/docs/creating-stored-infotypes to // learn more. - rpc UpdateStoredInfoType(UpdateStoredInfoTypeRequest) - returns (StoredInfoType) { + rpc UpdateStoredInfoType(UpdateStoredInfoTypeRequest) returns (StoredInfoType) { option (google.api.http) = { patch: "/v2/{name=organizations/*/storedInfoTypes/*}" body: "*" @@ -383,29 +379,33 @@ service DlpService { rpc GetStoredInfoType(GetStoredInfoTypeRequest) returns (StoredInfoType) { option (google.api.http) = { get: "/v2/{name=organizations/*/storedInfoTypes/*}" - additional_bindings { get: "/v2/{name=projects/*/storedInfoTypes/*}" } + additional_bindings { + get: "/v2/{name=projects/*/storedInfoTypes/*}" + } }; } // Lists stored infoTypes. // See https://cloud.google.com/dlp/docs/creating-stored-infotypes to // learn more. - rpc ListStoredInfoTypes(ListStoredInfoTypesRequest) - returns (ListStoredInfoTypesResponse) { + rpc ListStoredInfoTypes(ListStoredInfoTypesRequest) returns (ListStoredInfoTypesResponse) { option (google.api.http) = { get: "/v2/{parent=organizations/*}/storedInfoTypes" - additional_bindings { get: "/v2/{parent=projects/*}/storedInfoTypes" } + additional_bindings { + get: "/v2/{parent=projects/*}/storedInfoTypes" + } }; } // Deletes a stored infoType. // See https://cloud.google.com/dlp/docs/creating-stored-infotypes to // learn more. - rpc DeleteStoredInfoType(DeleteStoredInfoTypeRequest) - returns (google.protobuf.Empty) { + rpc DeleteStoredInfoType(DeleteStoredInfoTypeRequest) returns (google.protobuf.Empty) { option (google.api.http) = { delete: "/v2/{name=organizations/*/storedInfoTypes/*}" - additional_bindings { delete: "/v2/{name=projects/*/storedInfoTypes/*}" } + additional_bindings { + delete: "/v2/{name=projects/*/storedInfoTypes/*}" + } }; } } @@ -423,6 +423,18 @@ message ExcludeInfoTypes { repeated InfoType info_types = 1; } +// Options describing which parts of the provided content should be scanned. +enum ContentOption { + // Includes entire content of a file or a data stream. + CONTENT_UNSPECIFIED = 0; + + // Text content within the data, excluding any metadata. + CONTENT_TEXT = 1; + + // Images found in the data. + CONTENT_IMAGE = 2; +} + // The rule that specifies conditions when findings of infoTypes specified in // `InspectionRuleSet` are removed from results. message ExclusionRule { @@ -441,18 +453,6 @@ message ExclusionRule { MatchingType matching_type = 4; } -// Options describing which parts of the provided content should be scanned. -enum ContentOption { - // Includes entire content of a file or a data stream. - CONTENT_UNSPECIFIED = 0; - - // Text content within the data, excluding any metadata. - CONTENT_TEXT = 1; - - // Images found in the data. - CONTENT_IMAGE = 2; -} - // A single inspection rule to be applied to infoTypes, specified in // `InspectionRuleSet`. message InspectionRule { @@ -1040,6 +1040,7 @@ message InspectDataSourceDetails { InspectJobConfig job_config = 3; } + // All result fields mentioned below are updated while the job is processing. message Result { // Total size in bytes that were processed. int64 processed_bytes = 1; @@ -1363,8 +1364,7 @@ message AnalyzeDataSourceRiskDetails { } // Histogram of value frequencies in the column. - repeated CategoricalStatsHistogramBucket value_frequency_histogram_buckets = - 5; + repeated CategoricalStatsHistogramBucket value_frequency_histogram_buckets = 5; } // Result of the k-anonymity computation. @@ -1442,8 +1442,7 @@ message AnalyzeDataSourceRiskDetails { } // Histogram of l-diversity equivalence class sensitive value frequencies. - repeated LDiversityHistogramBucket - sensitive_value_frequency_histogram_buckets = 5; + repeated LDiversityHistogramBucket sensitive_value_frequency_histogram_buckets = 5; } // Result of the reidentifiability analysis. Note that these results are an @@ -1549,8 +1548,7 @@ message AnalyzeDataSourceRiskDetails { // {min_probability: 0.3, max_probability: 0.4, frequency: 99} // mean that there are no record with an estimated probability in [0.1, 0.2) // nor larger or equal to 0.4. - repeated DeltaPresenceEstimationHistogramBucket - delta_presence_estimation_histogram = 1; + repeated DeltaPresenceEstimationHistogramBucket delta_presence_estimation_histogram = 1; } // Privacy metric to compute. @@ -1675,6 +1673,8 @@ message PrimitiveTransformation { CryptoHashConfig crypto_hash_config = 9; DateShiftConfig date_shift_config = 11; + + CryptoDeterministicConfig crypto_deterministic_config = 12; } } @@ -1718,6 +1718,63 @@ message CryptoHashConfig { CryptoKey crypto_key = 1; } +// Pseudonymization method that generates deterministic encryption for the given +// input. Outputs a base64 encoded representation of the encrypted output. +// Uses AES-SIV based on the RFC https://tools.ietf.org/html/rfc5297. +message CryptoDeterministicConfig { + // The key used by the encryption function. + CryptoKey crypto_key = 1; + + // The custom info type to annotate the surrogate with. + // This annotation will be applied to the surrogate by prefixing it with + // the name of the custom info type followed by the number of + // characters comprising the surrogate. The following scheme defines the + // format:( ): + // + // For example, if the name of custom info type is 'MY_TOKEN_INFO_TYPE' and + // the surrogate is 'abc', the full replacement value + // will be: 'MY_TOKEN_INFO_TYPE(3):abc' + // + // This annotation identifies the surrogate when inspecting content using the + // custom info type 'Surrogate'. This facilitates reversal of the + // surrogate when it occurs in free text. + // + // In order for inspection to work properly, the name of this info type must + // not occur naturally anywhere in your data; otherwise, inspection may either + // + // - reverse a surrogate that does not correspond to an actual identifier + // - be unable to parse the surrogate and result in an error + // + // Therefore, choose your custom info type name carefully after considering + // what your data looks like. One way to select a name that has a high chance + // of yielding reliable detection is to include one or more unicode characters + // that are highly improbable to exist in your data. + // For example, assuming your data is entered from a regular ASCII keyboard, + // the symbol with the hex code point 29DD might be used like so: + // ⧝MY_TOKEN_TYPE + InfoType surrogate_info_type = 2; + + // Optional. A context may be used for higher security and maintaining + // referential integrity such that the same identifier in two different + // contexts will be given a distinct surrogate. The context is appended to + // plaintext value being encrypted. On decryption the provided context is + // validated against the value used during encryption. If a context was + // provided during encryption, same context must be provided during decryption + // as well. + // + // If the context is not set, plaintext would be used as is for encryption. + // If the context is set but: + // + // 1. there is no record present when transforming a given value or + // 2. the field is not present when transforming a given value, + // + // plaintext would be used as is for encryption. + // + // Note that case (1) is expected when an `InfoTypeTransformation` is + // applied to both structured and non-structured `ContentItem`s. + FieldId context = 3; +} + // Replace each input value with a given `Value`. message ReplaceValueConfig { // Value to replace it with. @@ -1725,12 +1782,16 @@ message ReplaceValueConfig { } // Replace each matching finding with the name of the info_type. -message ReplaceWithInfoTypeConfig {} +message ReplaceWithInfoTypeConfig { + +} // Redact a given value. For example, if used with an `InfoTypeTransformation` // transforming PHONE_NUMBER, and input 'My phone number is 206-555-0123', the // output would be 'My phone number is '. -message RedactConfig {} +message RedactConfig { + +} // Characters to skip when doing deidentification of a value. These will be left // alone and skipped. @@ -1854,16 +1915,19 @@ message BucketingConfig { repeated Bucket buckets = 1; } -// Replaces an identifier with a surrogate using FPE with the FFX -// mode of operation; however when used in the `ReidentifyContent` API method, -// it serves the opposite function by reversing the surrogate back into -// the original identifier. -// The identifier must be encoded as ASCII. -// For a given crypto key and context, the same identifier will be -// replaced with the same surrogate. -// Identifiers must be at least two characters long. -// In the case that the identifier is the empty string, it will be skipped. -// See https://cloud.google.com/dlp/docs/pseudonymization to learn more. +// Replaces an identifier with a surrogate using Format Preserving Encryption +// (FPE) with the FFX mode of operation; however when used in the +// `ReidentifyContent` API method, it serves the opposite function by reversing +// the surrogate back into the original identifier. The identifier must be +// encoded as ASCII. For a given crypto key and context, the same identifier +// will be replaced with the same surrogate. Identifiers must be at least two +// characters long. In the case that the identifier is the empty string, it will +// be skipped. See https://cloud.google.com/dlp/docs/pseudonymization to learn +// more. +// +// Note: We recommend using CryptoDeterministicConfig for all use cases which +// do not require preserving the input alphabet space and size, plus warrant +// referential integrity. message CryptoReplaceFfxFpeConfig { // These are commonly used subsets of the alphabet that the FFX mode // natively supports. In the algorithm, the alphabet is selected using @@ -1980,13 +2044,6 @@ message TransientCryptoKey { string name = 1; } -// Using raw keys is prone to security risks due to accidentally -// leaking the key. Choose another type of key if possible. -message UnwrappedCryptoKey { - // The AES 128/192/256 bit key. [required] - bytes key = 1; -} - // Parts of the APIs which use certain infoTypes. enum InfoTypeSupportedBy { ENUM_TYPE_UNSPECIFIED = 0; @@ -1998,7 +2055,15 @@ enum InfoTypeSupportedBy { RISK_ANALYSIS = 2; } +// Using raw keys is prone to security risks due to accidentally +// leaking the key. Choose another type of key if possible. +message UnwrappedCryptoKey { + // A 128/192/256 bit key. [required] + bytes key = 1; +} + // Include to use an existing data crypto key wrapped by KMS. +// The wrapped key must be a 128/192/256 bit key. // Authorization requires the following IAM permissions when sending a request // to perform a crypto transformation using a kms-wrapped crypto key: // dlp.kms.encrypt @@ -2176,7 +2241,7 @@ message TransformationOverview { repeated TransformationSummary transformation_summaries = 3; } -// Summary of a single tranformation. +// Summary of a single transformation. // Only one of 'transformation', 'field_transformation', or 'record_suppress' // will be set. message TransformationSummary { @@ -2402,11 +2467,15 @@ message Action { // service-specific policy, see https://cloud.google.com/terms/service-terms // Only a single instance of this action can be specified. // Compatible with: Inspect - message PublishSummaryToCscc {} + message PublishSummaryToCscc { + + } // Enable email notification to project owners and editors on jobs's // completion/failure. - message JobNotificationEmails {} + message JobNotificationEmails { + + } oneof action { // Save resulting findings in a provided location. @@ -2418,7 +2487,7 @@ message Action { // Publish summary to Cloud Security Command Center (Alpha). PublishSummaryToCscc publish_summary_to_cscc = 3; - // Enable email notification to project owners and editors on job‘s + // Enable email notification to project owners and editors on job's // completion/failure. JobNotificationEmails job_notification_emails = 8; } @@ -2435,7 +2504,7 @@ message CreateInspectTemplateRequest { // The template id can contain uppercase and lowercase letters, // numbers, and hyphens; that is, it must match the regular - // expression: `[a-zA-Z\\d-]+`. The maximum length is 100 + // expression: `[a-zA-Z\\d-_]+`. The maximum length is 100 // characters. Can be empty to allow the system to generate one. string template_id = 3; } @@ -2520,7 +2589,7 @@ message CreateJobTriggerRequest { // The trigger id can contain uppercase and lowercase letters, // numbers, and hyphens; that is, it must match the regular - // expression: `[a-zA-Z\\d-]+`. The maximum length is 100 + // expression: `[a-zA-Z\\d-_]+`. The maximum length is 100 // characters. Can be empty to allow the system to generate one. string trigger_id = 3; } @@ -2568,7 +2637,7 @@ message CreateDlpJobRequest { // The job id can contain uppercase and lowercase letters, // numbers, and hyphens; that is, it must match the regular - // expression: `[a-zA-Z\\d-]+`. The maximum length is 100 + // expression: `[a-zA-Z\\d-_]+`. The maximum length is 100 // characters. Can be empty to allow the system to generate one. string job_id = 4; } @@ -2838,7 +2907,7 @@ message CreateDeidentifyTemplateRequest { // The template id can contain uppercase and lowercase letters, // numbers, and hyphens; that is, it must match the regular - // expression: `[a-zA-Z\\d-]+`. The maximum length is 100 + // expression: `[a-zA-Z\\d-_]+`. The maximum length is 100 // characters. Can be empty to allow the system to generate one. string template_id = 3; } @@ -3003,7 +3072,7 @@ message CreateStoredInfoTypeRequest { // The storedInfoType ID can contain uppercase and lowercase letters, // numbers, and hyphens; that is, it must match the regular - // expression: `[a-zA-Z\\d-]+`. The maximum length is 100 + // expression: `[a-zA-Z\\d-_]+`. The maximum length is 100 // characters. Can be empty to allow the system to generate one. string stored_info_type_id = 3; } diff --git a/google-api-grpc/proto-google-cloud-dlp-v2/src/main/proto/google/privacy/dlp/v2/storage.proto b/google-api-grpc/proto-google-cloud-dlp-v2/src/main/proto/google/privacy/dlp/v2/storage.proto index 9e03e070fe0e..12b428407f11 100644 --- a/google-api-grpc/proto-google-cloud-dlp-v2/src/main/proto/google/privacy/dlp/v2/storage.proto +++ b/google-api-grpc/proto-google-cloud-dlp-v2/src/main/proto/google/privacy/dlp/v2/storage.proto @@ -1,4 +1,4 @@ -// Copyright 2018 Google LLC. +// Copyright 2019 Google LLC. // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -18,6 +18,7 @@ syntax = "proto3"; package google.privacy.dlp.v2; import "google/api/annotations.proto"; +import "google/api/resource.proto"; import "google/protobuf/timestamp.proto"; option csharp_namespace = "Google.Cloud.Dlp.V2"; @@ -134,7 +135,9 @@ message CustomInfoType { // output. This should be used in conjunction with a field on the // transformation such as `surrogate_info_type`. This CustomInfoType does // not support the use of `detection_rules`. - message SurrogateType {} + message SurrogateType { + + } // Rule for modifying a CustomInfoType to alter behavior under certain // circumstances, depending on the specific details of the rule. Not supported diff --git a/google-cloud-clients/google-cloud-dlp/synth.metadata b/google-cloud-clients/google-cloud-dlp/synth.metadata index 5f0f1665ec0a..55c55fad67b3 100644 --- a/google-cloud-clients/google-cloud-dlp/synth.metadata +++ b/google-cloud-clients/google-cloud-dlp/synth.metadata @@ -1,19 +1,19 @@ { - "updateTime": "2019-03-28T07:43:32.034830Z", + "updateTime": "2019-03-30T07:43:02.518634Z", "sources": [ { "generator": { "name": "artman", - "version": "0.16.20", - "dockerImage": "googleapis/artman@sha256:e3c054a2fb85a12481c722af616c7fb6f1d02d862248385eecbec3e4240ebd1e" + "version": "0.16.21", + "dockerImage": "googleapis/artman@sha256:854131ec1af7b3a313253474c24748dc0acd217a58a0b74dbfb559f340a15d78" } }, { "git": { "name": "googleapis", "remote": "https://github.com/googleapis/googleapis.git", - "sha": "6a84b3267b0a95e922608b9891219075047eee29", - "internalRef": "240640999" + "sha": "fd67be4b51a8c809b97100ccf1c3cffd15b85d7b", + "internalRef": "241096997" } } ],