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(); mutable_bitField0_ |= 0x00000004; } @@ -474,7 +474,7 @@ private NumericalStatsResult( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -486,7 +486,7 @@ private NumericalStatsResult( } 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)) { quantileValues_ = java.util.Collections.unmodifiableList(quantileValues_); } this.unknownFields = unknownFields.build(); @@ -716,18 +716,17 @@ public boolean equals(final java.lang.Object obj) { com.google.privacy.dlp.v2.AnalyzeDataSourceRiskDetails.NumericalStatsResult other = (com.google.privacy.dlp.v2.AnalyzeDataSourceRiskDetails.NumericalStatsResult) obj; - boolean result = true; - result = result && (hasMinValue() == other.hasMinValue()); + if (hasMinValue() != other.hasMinValue()) return false; if (hasMinValue()) { - result = result && getMinValue().equals(other.getMinValue()); + if (!getMinValue().equals(other.getMinValue())) return false; } - result = result && (hasMaxValue() == other.hasMaxValue()); + if (hasMaxValue() != other.hasMaxValue()) return false; if (hasMaxValue()) { - result = result && getMaxValue().equals(other.getMaxValue()); + if (!getMaxValue().equals(other.getMaxValue())) return false; } - result = result && getQuantileValuesList().equals(other.getQuantileValuesList()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getQuantileValuesList().equals(other.getQuantileValuesList())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -969,7 +968,7 @@ public com.google.privacy.dlp.v2.AnalyzeDataSourceRiskDetails.NumericalStatsResu result.maxValue_ = maxValueBuilder_.build(); } if (quantileValuesBuilder_ == null) { - if (((bitField0_ & 0x00000004) == 0x00000004)) { + if (((bitField0_ & 0x00000004) != 0)) { quantileValues_ = java.util.Collections.unmodifiableList(quantileValues_); bitField0_ = (bitField0_ & ~0x00000004); } @@ -984,23 +983,23 @@ public com.google.privacy.dlp.v2.AnalyzeDataSourceRiskDetails.NumericalStatsResu @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 @@ -1008,13 +1007,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 @@ -1102,7 +1101,7 @@ public Builder mergeFrom( private int bitField0_; - private com.google.privacy.dlp.v2.Value minValue_ = null; + private com.google.privacy.dlp.v2.Value minValue_; private com.google.protobuf.SingleFieldBuilderV3< com.google.privacy.dlp.v2.Value, com.google.privacy.dlp.v2.Value.Builder, @@ -1283,7 +1282,7 @@ public com.google.privacy.dlp.v2.ValueOrBuilder getMinValueOrBuilder() { return minValueBuilder_; } - private com.google.privacy.dlp.v2.Value maxValue_ = null; + private com.google.privacy.dlp.v2.Value maxValue_; private com.google.protobuf.SingleFieldBuilderV3< com.google.privacy.dlp.v2.Value, com.google.privacy.dlp.v2.Value.Builder, @@ -1468,7 +1467,7 @@ public com.google.privacy.dlp.v2.ValueOrBuilder getMaxValueOrBuilder() { java.util.Collections.emptyList(); private void ensureQuantileValuesIsMutable() { - if (!((bitField0_ & 0x00000004) == 0x00000004)) { + if (!((bitField0_ & 0x00000004) != 0)) { quantileValues_ = new java.util.ArrayList(quantileValues_); bitField0_ |= 0x00000004; @@ -1827,7 +1826,7 @@ public com.google.privacy.dlp.v2.Value.Builder addQuantileValuesBuilder(int inde com.google.privacy.dlp.v2.Value.Builder, com.google.privacy.dlp.v2.ValueOrBuilder>( quantileValues_, - ((bitField0_ & 0x00000004) == 0x00000004), + ((bitField0_ & 0x00000004) != 0), getParentForChildren(), isClean()); quantileValues_ = null; @@ -1838,7 +1837,7 @@ public com.google.privacy.dlp.v2.Value.Builder addQuantileValuesBuilder(int inde @java.lang.Override public final Builder setUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { - return super.setUnknownFieldsProto3(unknownFields); + return super.setUnknownFields(unknownFields); } @java.lang.Override @@ -2017,7 +2016,7 @@ private CategoricalStatsResult( break; case 42: { - if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) { + if (!((mutable_bitField0_ & 0x00000001) != 0)) { valueFrequencyHistogramBuckets_ = new java.util.ArrayList< com.google.privacy.dlp.v2.AnalyzeDataSourceRiskDetails @@ -2033,7 +2032,7 @@ private CategoricalStatsResult( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -2045,7 +2044,7 @@ private CategoricalStatsResult( } 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)) { valueFrequencyHistogramBuckets_ = java.util.Collections.unmodifiableList(valueFrequencyHistogramBuckets_); } @@ -2193,11 +2192,7 @@ private CategoricalStatsHistogramBucket( } private CategoricalStatsHistogramBucket() { - valueFrequencyLowerBound_ = 0L; - valueFrequencyUpperBound_ = 0L; - bucketSize_ = 0L; bucketValues_ = java.util.Collections.emptyList(); - bucketValueCount_ = 0L; } @java.lang.Override @@ -2241,7 +2236,7 @@ private CategoricalStatsHistogramBucket( } case 34: { - if (!((mutable_bitField0_ & 0x00000008) == 0x00000008)) { + if (!((mutable_bitField0_ & 0x00000008) != 0)) { bucketValues_ = new java.util.ArrayList(); mutable_bitField0_ |= 0x00000008; @@ -2258,7 +2253,7 @@ private CategoricalStatsHistogramBucket( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -2271,7 +2266,7 @@ private CategoricalStatsHistogramBucket( throw new com.google.protobuf.InvalidProtocolBufferException(e) .setUnfinishedMessage(this); } finally { - if (((mutable_bitField0_ & 0x00000008) == 0x00000008)) { + if (((mutable_bitField0_ & 0x00000008) != 0)) { bucketValues_ = java.util.Collections.unmodifiableList(bucketValues_); } this.unknownFields = unknownFields.build(); @@ -2504,14 +2499,13 @@ public boolean equals(final java.lang.Object obj) { .CategoricalStatsHistogramBucket) obj; - boolean result = true; - result = result && (getValueFrequencyLowerBound() == other.getValueFrequencyLowerBound()); - result = result && (getValueFrequencyUpperBound() == other.getValueFrequencyUpperBound()); - result = result && (getBucketSize() == other.getBucketSize()); - result = result && getBucketValuesList().equals(other.getBucketValuesList()); - result = result && (getBucketValueCount() == other.getBucketValueCount()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (getValueFrequencyLowerBound() != other.getValueFrequencyLowerBound()) return false; + if (getValueFrequencyUpperBound() != other.getValueFrequencyUpperBound()) return false; + if (getBucketSize() != other.getBucketSize()) return false; + if (!getBucketValuesList().equals(other.getBucketValuesList())) return false; + if (getBucketValueCount() != other.getBucketValueCount()) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -2763,7 +2757,7 @@ public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { result.valueFrequencyUpperBound_ = valueFrequencyUpperBound_; result.bucketSize_ = bucketSize_; if (bucketValuesBuilder_ == null) { - if (((bitField0_ & 0x00000008) == 0x00000008)) { + if (((bitField0_ & 0x00000008) != 0)) { bucketValues_ = java.util.Collections.unmodifiableList(bucketValues_); bitField0_ = (bitField0_ & ~0x00000008); } @@ -2779,23 +2773,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 @@ -2803,13 +2797,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 @@ -3046,7 +3040,7 @@ public Builder clearBucketSize() { java.util.Collections.emptyList(); private void ensureBucketValuesIsMutable() { - if (!((bitField0_ & 0x00000008) == 0x00000008)) { + if (!((bitField0_ & 0x00000008) != 0)) { bucketValues_ = new java.util.ArrayList(bucketValues_); bitField0_ |= 0x00000008; @@ -3407,7 +3401,7 @@ public com.google.privacy.dlp.v2.ValueFrequency.Builder addBucketValuesBuilder(i com.google.privacy.dlp.v2.ValueFrequency.Builder, com.google.privacy.dlp.v2.ValueFrequencyOrBuilder>( bucketValues_, - ((bitField0_ & 0x00000008) == 0x00000008), + ((bitField0_ & 0x00000008) != 0), getParentForChildren(), isClean()); bucketValues_ = null; @@ -3462,7 +3456,7 @@ public Builder clearBucketValueCount() { @java.lang.Override public final Builder setUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { - return super.setUnknownFieldsProto3(unknownFields); + return super.setUnknownFields(unknownFields); } @java.lang.Override @@ -3655,13 +3649,10 @@ public boolean equals(final java.lang.Object obj) { com.google.privacy.dlp.v2.AnalyzeDataSourceRiskDetails.CategoricalStatsResult other = (com.google.privacy.dlp.v2.AnalyzeDataSourceRiskDetails.CategoricalStatsResult) obj; - boolean result = true; - result = - result - && getValueFrequencyHistogramBucketsList() - .equals(other.getValueFrequencyHistogramBucketsList()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getValueFrequencyHistogramBucketsList() + .equals(other.getValueFrequencyHistogramBucketsList())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -3873,7 +3864,7 @@ public com.google.privacy.dlp.v2.AnalyzeDataSourceRiskDetails.CategoricalStatsRe new com.google.privacy.dlp.v2.AnalyzeDataSourceRiskDetails.CategoricalStatsResult(this); int from_bitField0_ = bitField0_; if (valueFrequencyHistogramBucketsBuilder_ == null) { - if (((bitField0_ & 0x00000001) == 0x00000001)) { + if (((bitField0_ & 0x00000001) != 0)) { valueFrequencyHistogramBuckets_ = java.util.Collections.unmodifiableList(valueFrequencyHistogramBuckets_); bitField0_ = (bitField0_ & ~0x00000001); @@ -3888,23 +3879,23 @@ public com.google.privacy.dlp.v2.AnalyzeDataSourceRiskDetails.CategoricalStatsRe @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 @@ -3912,13 +3903,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 @@ -4008,7 +3999,7 @@ public Builder mergeFrom( valueFrequencyHistogramBuckets_ = java.util.Collections.emptyList(); private void ensureValueFrequencyHistogramBucketsIsMutable() { - if (!((bitField0_ & 0x00000001) == 0x00000001)) { + if (!((bitField0_ & 0x00000001) != 0)) { valueFrequencyHistogramBuckets_ = new java.util.ArrayList< com.google.privacy.dlp.v2.AnalyzeDataSourceRiskDetails.CategoricalStatsResult @@ -4444,7 +4435,7 @@ public Builder removeValueFrequencyHistogramBuckets(int index) { com.google.privacy.dlp.v2.AnalyzeDataSourceRiskDetails.CategoricalStatsResult .CategoricalStatsHistogramBucketOrBuilder>( valueFrequencyHistogramBuckets_, - ((bitField0_ & 0x00000001) == 0x00000001), + ((bitField0_ & 0x00000001) != 0), getParentForChildren(), isClean()); valueFrequencyHistogramBuckets_ = null; @@ -4455,7 +4446,7 @@ public Builder removeValueFrequencyHistogramBuckets(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 @@ -4635,7 +4626,7 @@ private KAnonymityResult( break; case 42: { - if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) { + if (!((mutable_bitField0_ & 0x00000001) != 0)) { equivalenceClassHistogramBuckets_ = new java.util.ArrayList< com.google.privacy.dlp.v2.AnalyzeDataSourceRiskDetails.KAnonymityResult @@ -4651,7 +4642,7 @@ private KAnonymityResult( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -4663,7 +4654,7 @@ private KAnonymityResult( } 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)) { equivalenceClassHistogramBuckets_ = java.util.Collections.unmodifiableList(equivalenceClassHistogramBuckets_); } @@ -4791,7 +4782,6 @@ private KAnonymityEquivalenceClass( private KAnonymityEquivalenceClass() { quasiIdsValues_ = java.util.Collections.emptyList(); - equivalenceClassSize_ = 0L; } @java.lang.Override @@ -4820,7 +4810,7 @@ private KAnonymityEquivalenceClass( break; case 10: { - if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) { + if (!((mutable_bitField0_ & 0x00000001) != 0)) { quasiIdsValues_ = new java.util.ArrayList(); mutable_bitField0_ |= 0x00000001; } @@ -4836,7 +4826,7 @@ private KAnonymityEquivalenceClass( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -4849,7 +4839,7 @@ private KAnonymityEquivalenceClass( throw new com.google.protobuf.InvalidProtocolBufferException(e) .setUnfinishedMessage(this); } finally { - if (((mutable_bitField0_ & 0x00000001) == 0x00000001)) { + if (((mutable_bitField0_ & 0x00000001) != 0)) { quasiIdsValues_ = java.util.Collections.unmodifiableList(quasiIdsValues_); } this.unknownFields = unknownFields.build(); @@ -5024,11 +5014,10 @@ public boolean equals(final java.lang.Object obj) { .KAnonymityEquivalenceClass) obj; - boolean result = true; - result = result && getQuasiIdsValuesList().equals(other.getQuasiIdsValuesList()); - result = result && (getEquivalenceClassSize() == other.getEquivalenceClassSize()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getQuasiIdsValuesList().equals(other.getQuasiIdsValuesList())) return false; + if (getEquivalenceClassSize() != other.getEquivalenceClassSize()) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -5271,7 +5260,7 @@ public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { int from_bitField0_ = bitField0_; int to_bitField0_ = 0; if (quasiIdsValuesBuilder_ == null) { - if (((bitField0_ & 0x00000001) == 0x00000001)) { + if (((bitField0_ & 0x00000001) != 0)) { quasiIdsValues_ = java.util.Collections.unmodifiableList(quasiIdsValues_); bitField0_ = (bitField0_ & ~0x00000001); } @@ -5287,23 +5276,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 @@ -5311,13 +5300,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 @@ -5413,7 +5402,7 @@ public Builder mergeFrom( java.util.Collections.emptyList(); private void ensureQuasiIdsValuesIsMutable() { - if (!((bitField0_ & 0x00000001) == 0x00000001)) { + if (!((bitField0_ & 0x00000001) != 0)) { quasiIdsValues_ = new java.util.ArrayList(quasiIdsValues_); bitField0_ |= 0x00000001; @@ -5790,7 +5779,7 @@ public com.google.privacy.dlp.v2.Value.Builder addQuasiIdsValuesBuilder(int inde com.google.privacy.dlp.v2.Value.Builder, com.google.privacy.dlp.v2.ValueOrBuilder>( quasiIdsValues_, - ((bitField0_ & 0x00000001) == 0x00000001), + ((bitField0_ & 0x00000001) != 0), getParentForChildren(), isClean()); quasiIdsValues_ = null; @@ -5848,7 +5837,7 @@ public Builder clearEquivalenceClassSize() { @java.lang.Override public final Builder setUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { - return super.setUnknownFieldsProto3(unknownFields); + return super.setUnknownFields(unknownFields); } @java.lang.Override @@ -6047,11 +6036,7 @@ private KAnonymityHistogramBucket(com.google.protobuf.GeneratedMessageV3.Builder } private KAnonymityHistogramBucket() { - equivalenceClassSizeLowerBound_ = 0L; - equivalenceClassSizeUpperBound_ = 0L; - bucketSize_ = 0L; bucketValues_ = java.util.Collections.emptyList(); - bucketValueCount_ = 0L; } @java.lang.Override @@ -6095,7 +6080,7 @@ private KAnonymityHistogramBucket( } case 34: { - if (!((mutable_bitField0_ & 0x00000008) == 0x00000008)) { + if (!((mutable_bitField0_ & 0x00000008) != 0)) { bucketValues_ = new java.util.ArrayList< com.google.privacy.dlp.v2.AnalyzeDataSourceRiskDetails.KAnonymityResult @@ -6116,7 +6101,7 @@ private KAnonymityHistogramBucket( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -6129,7 +6114,7 @@ private KAnonymityHistogramBucket( throw new com.google.protobuf.InvalidProtocolBufferException(e) .setUnfinishedMessage(this); } finally { - if (((mutable_bitField0_ & 0x00000008) == 0x00000008)) { + if (((mutable_bitField0_ & 0x00000008) != 0)) { bucketValues_ = java.util.Collections.unmodifiableList(bucketValues_); } this.unknownFields = unknownFields.build(); @@ -6387,20 +6372,15 @@ public boolean equals(final java.lang.Object obj) { .KAnonymityHistogramBucket) obj; - boolean result = true; - result = - result - && (getEquivalenceClassSizeLowerBound() - == other.getEquivalenceClassSizeLowerBound()); - result = - result - && (getEquivalenceClassSizeUpperBound() - == other.getEquivalenceClassSizeUpperBound()); - result = result && (getBucketSize() == other.getBucketSize()); - result = result && getBucketValuesList().equals(other.getBucketValuesList()); - result = result && (getBucketValueCount() == other.getBucketValueCount()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (getEquivalenceClassSizeLowerBound() != other.getEquivalenceClassSizeLowerBound()) + return false; + if (getEquivalenceClassSizeUpperBound() != other.getEquivalenceClassSizeUpperBound()) + return false; + if (getBucketSize() != other.getBucketSize()) return false; + if (!getBucketValuesList().equals(other.getBucketValuesList())) return false; + if (getBucketValueCount() != other.getBucketValueCount()) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -6656,7 +6636,7 @@ public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { result.equivalenceClassSizeUpperBound_ = equivalenceClassSizeUpperBound_; result.bucketSize_ = bucketSize_; if (bucketValuesBuilder_ == null) { - if (((bitField0_ & 0x00000008) == 0x00000008)) { + if (((bitField0_ & 0x00000008) != 0)) { bucketValues_ = java.util.Collections.unmodifiableList(bucketValues_); bitField0_ = (bitField0_ & ~0x00000008); } @@ -6672,23 +6652,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 @@ -6696,13 +6676,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 @@ -6941,7 +6921,7 @@ public Builder clearBucketSize() { bucketValues_ = java.util.Collections.emptyList(); private void ensureBucketValuesIsMutable() { - if (!((bitField0_ & 0x00000008) == 0x00000008)) { + if (!((bitField0_ & 0x00000008) != 0)) { bucketValues_ = new java.util.ArrayList< com.google.privacy.dlp.v2.AnalyzeDataSourceRiskDetails.KAnonymityResult @@ -7394,7 +7374,7 @@ public Builder removeBucketValues(int index) { com.google.privacy.dlp.v2.AnalyzeDataSourceRiskDetails.KAnonymityResult .KAnonymityEquivalenceClassOrBuilder>( bucketValues_, - ((bitField0_ & 0x00000008) == 0x00000008), + ((bitField0_ & 0x00000008) != 0), getParentForChildren(), isClean()); bucketValues_ = null; @@ -7449,7 +7429,7 @@ public Builder clearBucketValueCount() { @java.lang.Override public final Builder setUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { - return super.setUnknownFieldsProto3(unknownFields); + return super.setUnknownFields(unknownFields); } @java.lang.Override @@ -7641,13 +7621,10 @@ public boolean equals(final java.lang.Object obj) { com.google.privacy.dlp.v2.AnalyzeDataSourceRiskDetails.KAnonymityResult other = (com.google.privacy.dlp.v2.AnalyzeDataSourceRiskDetails.KAnonymityResult) obj; - boolean result = true; - result = - result - && getEquivalenceClassHistogramBucketsList() - .equals(other.getEquivalenceClassHistogramBucketsList()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getEquivalenceClassHistogramBucketsList() + .equals(other.getEquivalenceClassHistogramBucketsList())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -7853,7 +7830,7 @@ public com.google.privacy.dlp.v2.AnalyzeDataSourceRiskDetails.KAnonymityResult b new com.google.privacy.dlp.v2.AnalyzeDataSourceRiskDetails.KAnonymityResult(this); int from_bitField0_ = bitField0_; if (equivalenceClassHistogramBucketsBuilder_ == null) { - if (((bitField0_ & 0x00000001) == 0x00000001)) { + if (((bitField0_ & 0x00000001) != 0)) { equivalenceClassHistogramBuckets_ = java.util.Collections.unmodifiableList(equivalenceClassHistogramBuckets_); bitField0_ = (bitField0_ & ~0x00000001); @@ -7869,23 +7846,23 @@ public com.google.privacy.dlp.v2.AnalyzeDataSourceRiskDetails.KAnonymityResult b @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 @@ -7893,13 +7870,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 @@ -7987,7 +7964,7 @@ public Builder mergeFrom( equivalenceClassHistogramBuckets_ = java.util.Collections.emptyList(); private void ensureEquivalenceClassHistogramBucketsIsMutable() { - if (!((bitField0_ & 0x00000001) == 0x00000001)) { + if (!((bitField0_ & 0x00000001) != 0)) { equivalenceClassHistogramBuckets_ = new java.util.ArrayList< com.google.privacy.dlp.v2.AnalyzeDataSourceRiskDetails.KAnonymityResult @@ -8423,7 +8400,7 @@ public Builder removeEquivalenceClassHistogramBuckets(int index) { com.google.privacy.dlp.v2.AnalyzeDataSourceRiskDetails.KAnonymityResult .KAnonymityHistogramBucketOrBuilder>( equivalenceClassHistogramBuckets_, - ((bitField0_ & 0x00000001) == 0x00000001), + ((bitField0_ & 0x00000001) != 0), getParentForChildren(), isClean()); equivalenceClassHistogramBuckets_ = null; @@ -8434,7 +8411,7 @@ public Builder removeEquivalenceClassHistogramBuckets(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 @@ -8613,7 +8590,7 @@ private LDiversityResult( break; case 42: { - if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) { + if (!((mutable_bitField0_ & 0x00000001) != 0)) { sensitiveValueFrequencyHistogramBuckets_ = new java.util.ArrayList< com.google.privacy.dlp.v2.AnalyzeDataSourceRiskDetails.LDiversityResult @@ -8629,7 +8606,7 @@ private LDiversityResult( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -8641,7 +8618,7 @@ private LDiversityResult( } 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)) { sensitiveValueFrequencyHistogramBuckets_ = java.util.Collections.unmodifiableList(sensitiveValueFrequencyHistogramBuckets_); } @@ -8826,8 +8803,6 @@ private LDiversityEquivalenceClass( private LDiversityEquivalenceClass() { quasiIdsValues_ = java.util.Collections.emptyList(); - equivalenceClassSize_ = 0L; - numDistinctSensitiveValues_ = 0L; topSensitiveValues_ = java.util.Collections.emptyList(); } @@ -8857,7 +8832,7 @@ private LDiversityEquivalenceClass( break; case 10: { - if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) { + if (!((mutable_bitField0_ & 0x00000001) != 0)) { quasiIdsValues_ = new java.util.ArrayList(); mutable_bitField0_ |= 0x00000001; } @@ -8878,7 +8853,7 @@ private LDiversityEquivalenceClass( } case 34: { - if (!((mutable_bitField0_ & 0x00000008) == 0x00000008)) { + if (!((mutable_bitField0_ & 0x00000008) != 0)) { topSensitiveValues_ = new java.util.ArrayList(); mutable_bitField0_ |= 0x00000008; @@ -8890,7 +8865,7 @@ private LDiversityEquivalenceClass( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -8903,10 +8878,10 @@ private LDiversityEquivalenceClass( throw new com.google.protobuf.InvalidProtocolBufferException(e) .setUnfinishedMessage(this); } finally { - if (((mutable_bitField0_ & 0x00000001) == 0x00000001)) { + if (((mutable_bitField0_ & 0x00000001) != 0)) { quasiIdsValues_ = java.util.Collections.unmodifiableList(quasiIdsValues_); } - if (((mutable_bitField0_ & 0x00000008) == 0x00000008)) { + if (((mutable_bitField0_ & 0x00000008) != 0)) { topSensitiveValues_ = java.util.Collections.unmodifiableList(topSensitiveValues_); } this.unknownFields = unknownFields.build(); @@ -9171,14 +9146,12 @@ public boolean equals(final java.lang.Object obj) { .LDiversityEquivalenceClass) obj; - boolean result = true; - result = result && getQuasiIdsValuesList().equals(other.getQuasiIdsValuesList()); - result = result && (getEquivalenceClassSize() == other.getEquivalenceClassSize()); - result = - result && (getNumDistinctSensitiveValues() == other.getNumDistinctSensitiveValues()); - result = result && getTopSensitiveValuesList().equals(other.getTopSensitiveValuesList()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getQuasiIdsValuesList().equals(other.getQuasiIdsValuesList())) return false; + if (getEquivalenceClassSize() != other.getEquivalenceClassSize()) return false; + if (getNumDistinctSensitiveValues() != other.getNumDistinctSensitiveValues()) return false; + if (!getTopSensitiveValuesList().equals(other.getTopSensitiveValuesList())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -9436,7 +9409,7 @@ public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { int from_bitField0_ = bitField0_; int to_bitField0_ = 0; if (quasiIdsValuesBuilder_ == null) { - if (((bitField0_ & 0x00000001) == 0x00000001)) { + if (((bitField0_ & 0x00000001) != 0)) { quasiIdsValues_ = java.util.Collections.unmodifiableList(quasiIdsValues_); bitField0_ = (bitField0_ & ~0x00000001); } @@ -9447,7 +9420,7 @@ public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { result.equivalenceClassSize_ = equivalenceClassSize_; result.numDistinctSensitiveValues_ = numDistinctSensitiveValues_; if (topSensitiveValuesBuilder_ == null) { - if (((bitField0_ & 0x00000008) == 0x00000008)) { + if (((bitField0_ & 0x00000008) != 0)) { topSensitiveValues_ = java.util.Collections.unmodifiableList(topSensitiveValues_); bitField0_ = (bitField0_ & ~0x00000008); } @@ -9462,23 +9435,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 @@ -9486,13 +9459,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 @@ -9618,7 +9591,7 @@ public Builder mergeFrom( java.util.Collections.emptyList(); private void ensureQuasiIdsValuesIsMutable() { - if (!((bitField0_ & 0x00000001) == 0x00000001)) { + if (!((bitField0_ & 0x00000001) != 0)) { quasiIdsValues_ = new java.util.ArrayList(quasiIdsValues_); bitField0_ |= 0x00000001; @@ -9977,7 +9950,7 @@ public com.google.privacy.dlp.v2.Value.Builder addQuasiIdsValuesBuilder(int inde com.google.privacy.dlp.v2.Value.Builder, com.google.privacy.dlp.v2.ValueOrBuilder>( quasiIdsValues_, - ((bitField0_ & 0x00000001) == 0x00000001), + ((bitField0_ & 0x00000001) != 0), getParentForChildren(), isClean()); quasiIdsValues_ = null; @@ -10077,7 +10050,7 @@ public Builder clearNumDistinctSensitiveValues() { java.util.Collections.emptyList(); private void ensureTopSensitiveValuesIsMutable() { - if (!((bitField0_ & 0x00000008) == 0x00000008)) { + if (!((bitField0_ & 0x00000008) != 0)) { topSensitiveValues_ = new java.util.ArrayList( topSensitiveValues_); @@ -10426,7 +10399,7 @@ public com.google.privacy.dlp.v2.ValueFrequency.Builder addTopSensitiveValuesBui com.google.privacy.dlp.v2.ValueFrequency.Builder, com.google.privacy.dlp.v2.ValueFrequencyOrBuilder>( topSensitiveValues_, - ((bitField0_ & 0x00000008) == 0x00000008), + ((bitField0_ & 0x00000008) != 0), getParentForChildren(), isClean()); topSensitiveValues_ = null; @@ -10437,7 +10410,7 @@ public com.google.privacy.dlp.v2.ValueFrequency.Builder addTopSensitiveValuesBui @java.lang.Override public final Builder setUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { - return super.setUnknownFieldsProto3(unknownFields); + return super.setUnknownFields(unknownFields); } @java.lang.Override @@ -10638,11 +10611,7 @@ private LDiversityHistogramBucket(com.google.protobuf.GeneratedMessageV3.Builder } private LDiversityHistogramBucket() { - sensitiveValueFrequencyLowerBound_ = 0L; - sensitiveValueFrequencyUpperBound_ = 0L; - bucketSize_ = 0L; bucketValues_ = java.util.Collections.emptyList(); - bucketValueCount_ = 0L; } @java.lang.Override @@ -10686,7 +10655,7 @@ private LDiversityHistogramBucket( } case 34: { - if (!((mutable_bitField0_ & 0x00000008) == 0x00000008)) { + if (!((mutable_bitField0_ & 0x00000008) != 0)) { bucketValues_ = new java.util.ArrayList< com.google.privacy.dlp.v2.AnalyzeDataSourceRiskDetails.LDiversityResult @@ -10707,7 +10676,7 @@ private LDiversityHistogramBucket( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -10720,7 +10689,7 @@ private LDiversityHistogramBucket( throw new com.google.protobuf.InvalidProtocolBufferException(e) .setUnfinishedMessage(this); } finally { - if (((mutable_bitField0_ & 0x00000008) == 0x00000008)) { + if (((mutable_bitField0_ & 0x00000008) != 0)) { bucketValues_ = java.util.Collections.unmodifiableList(bucketValues_); } this.unknownFields = unknownFields.build(); @@ -10980,20 +10949,15 @@ public boolean equals(final java.lang.Object obj) { .LDiversityHistogramBucket) obj; - boolean result = true; - result = - result - && (getSensitiveValueFrequencyLowerBound() - == other.getSensitiveValueFrequencyLowerBound()); - result = - result - && (getSensitiveValueFrequencyUpperBound() - == other.getSensitiveValueFrequencyUpperBound()); - result = result && (getBucketSize() == other.getBucketSize()); - result = result && getBucketValuesList().equals(other.getBucketValuesList()); - result = result && (getBucketValueCount() == other.getBucketValueCount()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (getSensitiveValueFrequencyLowerBound() != other.getSensitiveValueFrequencyLowerBound()) + return false; + if (getSensitiveValueFrequencyUpperBound() != other.getSensitiveValueFrequencyUpperBound()) + return false; + if (getBucketSize() != other.getBucketSize()) return false; + if (!getBucketValuesList().equals(other.getBucketValuesList())) return false; + if (getBucketValueCount() != other.getBucketValueCount()) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -11249,7 +11213,7 @@ public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { result.sensitiveValueFrequencyUpperBound_ = sensitiveValueFrequencyUpperBound_; result.bucketSize_ = bucketSize_; if (bucketValuesBuilder_ == null) { - if (((bitField0_ & 0x00000008) == 0x00000008)) { + if (((bitField0_ & 0x00000008) != 0)) { bucketValues_ = java.util.Collections.unmodifiableList(bucketValues_); bitField0_ = (bitField0_ & ~0x00000008); } @@ -11265,23 +11229,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 @@ -11289,13 +11253,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 @@ -11540,7 +11504,7 @@ public Builder clearBucketSize() { bucketValues_ = java.util.Collections.emptyList(); private void ensureBucketValuesIsMutable() { - if (!((bitField0_ & 0x00000008) == 0x00000008)) { + if (!((bitField0_ & 0x00000008) != 0)) { bucketValues_ = new java.util.ArrayList< com.google.privacy.dlp.v2.AnalyzeDataSourceRiskDetails.LDiversityResult @@ -11993,7 +11957,7 @@ public Builder removeBucketValues(int index) { com.google.privacy.dlp.v2.AnalyzeDataSourceRiskDetails.LDiversityResult .LDiversityEquivalenceClassOrBuilder>( bucketValues_, - ((bitField0_ & 0x00000008) == 0x00000008), + ((bitField0_ & 0x00000008) != 0), getParentForChildren(), isClean()); bucketValues_ = null; @@ -12048,7 +12012,7 @@ public Builder clearBucketValueCount() { @java.lang.Override public final Builder setUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { - return super.setUnknownFieldsProto3(unknownFields); + return super.setUnknownFields(unknownFields); } @java.lang.Override @@ -12240,13 +12204,10 @@ public boolean equals(final java.lang.Object obj) { com.google.privacy.dlp.v2.AnalyzeDataSourceRiskDetails.LDiversityResult other = (com.google.privacy.dlp.v2.AnalyzeDataSourceRiskDetails.LDiversityResult) obj; - boolean result = true; - result = - result - && getSensitiveValueFrequencyHistogramBucketsList() - .equals(other.getSensitiveValueFrequencyHistogramBucketsList()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getSensitiveValueFrequencyHistogramBucketsList() + .equals(other.getSensitiveValueFrequencyHistogramBucketsList())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -12452,7 +12413,7 @@ public com.google.privacy.dlp.v2.AnalyzeDataSourceRiskDetails.LDiversityResult b new com.google.privacy.dlp.v2.AnalyzeDataSourceRiskDetails.LDiversityResult(this); int from_bitField0_ = bitField0_; if (sensitiveValueFrequencyHistogramBucketsBuilder_ == null) { - if (((bitField0_ & 0x00000001) == 0x00000001)) { + if (((bitField0_ & 0x00000001) != 0)) { sensitiveValueFrequencyHistogramBuckets_ = java.util.Collections.unmodifiableList(sensitiveValueFrequencyHistogramBuckets_); bitField0_ = (bitField0_ & ~0x00000001); @@ -12469,23 +12430,23 @@ public com.google.privacy.dlp.v2.AnalyzeDataSourceRiskDetails.LDiversityResult b @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 @@ -12493,13 +12454,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 @@ -12590,7 +12551,7 @@ public Builder mergeFrom( sensitiveValueFrequencyHistogramBuckets_ = java.util.Collections.emptyList(); private void ensureSensitiveValueFrequencyHistogramBucketsIsMutable() { - if (!((bitField0_ & 0x00000001) == 0x00000001)) { + if (!((bitField0_ & 0x00000001) != 0)) { sensitiveValueFrequencyHistogramBuckets_ = new java.util.ArrayList< com.google.privacy.dlp.v2.AnalyzeDataSourceRiskDetails.LDiversityResult @@ -13028,7 +12989,7 @@ public Builder removeSensitiveValueFrequencyHistogramBuckets(int index) { com.google.privacy.dlp.v2.AnalyzeDataSourceRiskDetails.LDiversityResult .LDiversityHistogramBucketOrBuilder>( sensitiveValueFrequencyHistogramBuckets_, - ((bitField0_ & 0x00000001) == 0x00000001), + ((bitField0_ & 0x00000001) != 0), getParentForChildren(), isClean()); sensitiveValueFrequencyHistogramBuckets_ = null; @@ -13039,7 +13000,7 @@ public Builder removeSensitiveValueFrequencyHistogramBuckets(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 @@ -13254,7 +13215,7 @@ private KMapEstimationResult( break; case 10: { - if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) { + if (!((mutable_bitField0_ & 0x00000001) != 0)) { kMapEstimationHistogram_ = new java.util.ArrayList< com.google.privacy.dlp.v2.AnalyzeDataSourceRiskDetails @@ -13270,7 +13231,7 @@ private KMapEstimationResult( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -13282,7 +13243,7 @@ private KMapEstimationResult( } 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)) { kMapEstimationHistogram_ = java.util.Collections.unmodifiableList(kMapEstimationHistogram_); } @@ -13399,7 +13360,6 @@ private KMapEstimationQuasiIdValues( private KMapEstimationQuasiIdValues() { quasiIdsValues_ = java.util.Collections.emptyList(); - estimatedAnonymity_ = 0L; } @java.lang.Override @@ -13428,7 +13388,7 @@ private KMapEstimationQuasiIdValues( break; case 10: { - if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) { + if (!((mutable_bitField0_ & 0x00000001) != 0)) { quasiIdsValues_ = new java.util.ArrayList(); mutable_bitField0_ |= 0x00000001; } @@ -13444,7 +13404,7 @@ private KMapEstimationQuasiIdValues( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -13457,7 +13417,7 @@ private KMapEstimationQuasiIdValues( throw new com.google.protobuf.InvalidProtocolBufferException(e) .setUnfinishedMessage(this); } finally { - if (((mutable_bitField0_ & 0x00000001) == 0x00000001)) { + if (((mutable_bitField0_ & 0x00000001) != 0)) { quasiIdsValues_ = java.util.Collections.unmodifiableList(quasiIdsValues_); } this.unknownFields = unknownFields.build(); @@ -13621,11 +13581,10 @@ public boolean equals(final java.lang.Object obj) { .KMapEstimationQuasiIdValues) obj; - boolean result = true; - result = result && getQuasiIdsValuesList().equals(other.getQuasiIdsValuesList()); - result = result && (getEstimatedAnonymity() == other.getEstimatedAnonymity()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getQuasiIdsValuesList().equals(other.getQuasiIdsValuesList())) return false; + if (getEstimatedAnonymity() != other.getEstimatedAnonymity()) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -13868,7 +13827,7 @@ public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { int from_bitField0_ = bitField0_; int to_bitField0_ = 0; if (quasiIdsValuesBuilder_ == null) { - if (((bitField0_ & 0x00000001) == 0x00000001)) { + if (((bitField0_ & 0x00000001) != 0)) { quasiIdsValues_ = java.util.Collections.unmodifiableList(quasiIdsValues_); bitField0_ = (bitField0_ & ~0x00000001); } @@ -13884,23 +13843,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 @@ -13908,13 +13867,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 @@ -14010,7 +13969,7 @@ public Builder mergeFrom( java.util.Collections.emptyList(); private void ensureQuasiIdsValuesIsMutable() { - if (!((bitField0_ & 0x00000001) == 0x00000001)) { + if (!((bitField0_ & 0x00000001) != 0)) { quasiIdsValues_ = new java.util.ArrayList(quasiIdsValues_); bitField0_ |= 0x00000001; @@ -14351,7 +14310,7 @@ public com.google.privacy.dlp.v2.Value.Builder addQuasiIdsValuesBuilder(int inde com.google.privacy.dlp.v2.Value.Builder, com.google.privacy.dlp.v2.ValueOrBuilder>( quasiIdsValues_, - ((bitField0_ & 0x00000001) == 0x00000001), + ((bitField0_ & 0x00000001) != 0), getParentForChildren(), isClean()); quasiIdsValues_ = null; @@ -14406,7 +14365,7 @@ public Builder clearEstimatedAnonymity() { @java.lang.Override public final Builder setUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { - return super.setUnknownFieldsProto3(unknownFields); + return super.setUnknownFields(unknownFields); } @java.lang.Override @@ -14619,11 +14578,7 @@ private KMapEstimationHistogramBucket( } private KMapEstimationHistogramBucket() { - minAnonymity_ = 0L; - maxAnonymity_ = 0L; - bucketSize_ = 0L; bucketValues_ = java.util.Collections.emptyList(); - bucketValueCount_ = 0L; } @java.lang.Override @@ -14667,7 +14622,7 @@ private KMapEstimationHistogramBucket( } case 50: { - if (!((mutable_bitField0_ & 0x00000008) == 0x00000008)) { + if (!((mutable_bitField0_ & 0x00000008) != 0)) { bucketValues_ = new java.util.ArrayList< com.google.privacy.dlp.v2.AnalyzeDataSourceRiskDetails @@ -14688,7 +14643,7 @@ private KMapEstimationHistogramBucket( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -14701,7 +14656,7 @@ private KMapEstimationHistogramBucket( throw new com.google.protobuf.InvalidProtocolBufferException(e) .setUnfinishedMessage(this); } finally { - if (((mutable_bitField0_ & 0x00000008) == 0x00000008)) { + if (((mutable_bitField0_ & 0x00000008) != 0)) { bucketValues_ = java.util.Collections.unmodifiableList(bucketValues_); } this.unknownFields = unknownFields.build(); @@ -14955,14 +14910,13 @@ public boolean equals(final java.lang.Object obj) { .KMapEstimationHistogramBucket) obj; - boolean result = true; - result = result && (getMinAnonymity() == other.getMinAnonymity()); - result = result && (getMaxAnonymity() == other.getMaxAnonymity()); - result = result && (getBucketSize() == other.getBucketSize()); - result = result && getBucketValuesList().equals(other.getBucketValuesList()); - result = result && (getBucketValueCount() == other.getBucketValueCount()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (getMinAnonymity() != other.getMinAnonymity()) return false; + if (getMaxAnonymity() != other.getMaxAnonymity()) return false; + if (getBucketSize() != other.getBucketSize()) return false; + if (!getBucketValuesList().equals(other.getBucketValuesList())) return false; + if (getBucketValueCount() != other.getBucketValueCount()) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -15227,7 +15181,7 @@ public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { result.maxAnonymity_ = maxAnonymity_; result.bucketSize_ = bucketSize_; if (bucketValuesBuilder_ == null) { - if (((bitField0_ & 0x00000008) == 0x00000008)) { + if (((bitField0_ & 0x00000008) != 0)) { bucketValues_ = java.util.Collections.unmodifiableList(bucketValues_); bitField0_ = (bitField0_ & ~0x00000008); } @@ -15243,23 +15197,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 @@ -15267,13 +15221,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 @@ -15512,7 +15466,7 @@ public Builder clearBucketSize() { bucketValues_ = java.util.Collections.emptyList(); private void ensureBucketValuesIsMutable() { - if (!((bitField0_ & 0x00000008) == 0x00000008)) { + if (!((bitField0_ & 0x00000008) != 0)) { bucketValues_ = new java.util.ArrayList< com.google.privacy.dlp.v2.AnalyzeDataSourceRiskDetails.KMapEstimationResult @@ -15965,7 +15919,7 @@ public Builder removeBucketValues(int index) { com.google.privacy.dlp.v2.AnalyzeDataSourceRiskDetails.KMapEstimationResult .KMapEstimationQuasiIdValuesOrBuilder>( bucketValues_, - ((bitField0_ & 0x00000008) == 0x00000008), + ((bitField0_ & 0x00000008) != 0), getParentForChildren(), isClean()); bucketValues_ = null; @@ -16020,7 +15974,7 @@ public Builder clearBucketValueCount() { @java.lang.Override public final Builder setUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { - return super.setUnknownFieldsProto3(unknownFields); + return super.setUnknownFields(unknownFields); } @java.lang.Override @@ -16247,11 +16201,10 @@ public boolean equals(final java.lang.Object obj) { com.google.privacy.dlp.v2.AnalyzeDataSourceRiskDetails.KMapEstimationResult other = (com.google.privacy.dlp.v2.AnalyzeDataSourceRiskDetails.KMapEstimationResult) obj; - boolean result = true; - result = - result && getKMapEstimationHistogramList().equals(other.getKMapEstimationHistogramList()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getKMapEstimationHistogramList().equals(other.getKMapEstimationHistogramList())) + return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -16463,7 +16416,7 @@ public com.google.privacy.dlp.v2.AnalyzeDataSourceRiskDetails.KMapEstimationResu new com.google.privacy.dlp.v2.AnalyzeDataSourceRiskDetails.KMapEstimationResult(this); int from_bitField0_ = bitField0_; if (kMapEstimationHistogramBuilder_ == null) { - if (((bitField0_ & 0x00000001) == 0x00000001)) { + if (((bitField0_ & 0x00000001) != 0)) { kMapEstimationHistogram_ = java.util.Collections.unmodifiableList(kMapEstimationHistogram_); bitField0_ = (bitField0_ & ~0x00000001); @@ -16478,23 +16431,23 @@ public com.google.privacy.dlp.v2.AnalyzeDataSourceRiskDetails.KMapEstimationResu @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 @@ -16502,13 +16455,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 @@ -16596,7 +16549,7 @@ public Builder mergeFrom( kMapEstimationHistogram_ = java.util.Collections.emptyList(); private void ensureKMapEstimationHistogramIsMutable() { - if (!((bitField0_ & 0x00000001) == 0x00000001)) { + if (!((bitField0_ & 0x00000001) != 0)) { kMapEstimationHistogram_ = new java.util.ArrayList< com.google.privacy.dlp.v2.AnalyzeDataSourceRiskDetails.KMapEstimationResult @@ -17157,7 +17110,7 @@ public Builder removeKMapEstimationHistogram(int index) { com.google.privacy.dlp.v2.AnalyzeDataSourceRiskDetails.KMapEstimationResult .KMapEstimationHistogramBucketOrBuilder>( kMapEstimationHistogram_, - ((bitField0_ & 0x00000001) == 0x00000001), + ((bitField0_ & 0x00000001) != 0), getParentForChildren(), isClean()); kMapEstimationHistogram_ = null; @@ -17168,7 +17121,7 @@ public Builder removeKMapEstimationHistogram(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 @@ -17386,7 +17339,7 @@ private DeltaPresenceEstimationResult( break; case 10: { - if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) { + if (!((mutable_bitField0_ & 0x00000001) != 0)) { deltaPresenceEstimationHistogram_ = new java.util.ArrayList< com.google.privacy.dlp.v2.AnalyzeDataSourceRiskDetails @@ -17404,7 +17357,7 @@ private DeltaPresenceEstimationResult( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -17416,7 +17369,7 @@ private DeltaPresenceEstimationResult( } 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)) { deltaPresenceEstimationHistogram_ = java.util.Collections.unmodifiableList(deltaPresenceEstimationHistogram_); } @@ -17541,7 +17494,6 @@ private DeltaPresenceEstimationQuasiIdValues( private DeltaPresenceEstimationQuasiIdValues() { quasiIdsValues_ = java.util.Collections.emptyList(); - estimatedProbability_ = 0D; } @java.lang.Override @@ -17570,7 +17522,7 @@ private DeltaPresenceEstimationQuasiIdValues( break; case 10: { - if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) { + if (!((mutable_bitField0_ & 0x00000001) != 0)) { quasiIdsValues_ = new java.util.ArrayList(); mutable_bitField0_ |= 0x00000001; } @@ -17586,7 +17538,7 @@ private DeltaPresenceEstimationQuasiIdValues( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -17599,7 +17551,7 @@ private DeltaPresenceEstimationQuasiIdValues( throw new com.google.protobuf.InvalidProtocolBufferException(e) .setUnfinishedMessage(this); } finally { - if (((mutable_bitField0_ & 0x00000001) == 0x00000001)) { + if (((mutable_bitField0_ & 0x00000001) != 0)) { quasiIdsValues_ = java.util.Collections.unmodifiableList(quasiIdsValues_); } this.unknownFields = unknownFields.build(); @@ -17770,14 +17722,11 @@ public boolean equals(final java.lang.Object obj) { .DeltaPresenceEstimationResult.DeltaPresenceEstimationQuasiIdValues) obj; - boolean result = true; - result = result && getQuasiIdsValuesList().equals(other.getQuasiIdsValuesList()); - result = - result - && (java.lang.Double.doubleToLongBits(getEstimatedProbability()) - == java.lang.Double.doubleToLongBits(other.getEstimatedProbability())); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getQuasiIdsValuesList().equals(other.getQuasiIdsValuesList())) return false; + if (java.lang.Double.doubleToLongBits(getEstimatedProbability()) + != java.lang.Double.doubleToLongBits(other.getEstimatedProbability())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -18025,7 +17974,7 @@ public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { int from_bitField0_ = bitField0_; int to_bitField0_ = 0; if (quasiIdsValuesBuilder_ == null) { - if (((bitField0_ & 0x00000001) == 0x00000001)) { + if (((bitField0_ & 0x00000001) != 0)) { quasiIdsValues_ = java.util.Collections.unmodifiableList(quasiIdsValues_); bitField0_ = (bitField0_ & ~0x00000001); } @@ -18041,23 +17990,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 @@ -18065,13 +18014,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 @@ -18168,7 +18117,7 @@ public Builder mergeFrom( java.util.Collections.emptyList(); private void ensureQuasiIdsValuesIsMutable() { - if (!((bitField0_ & 0x00000001) == 0x00000001)) { + if (!((bitField0_ & 0x00000001) != 0)) { quasiIdsValues_ = new java.util.ArrayList(quasiIdsValues_); bitField0_ |= 0x00000001; @@ -18509,7 +18458,7 @@ public com.google.privacy.dlp.v2.Value.Builder addQuasiIdsValuesBuilder(int inde com.google.privacy.dlp.v2.Value.Builder, com.google.privacy.dlp.v2.ValueOrBuilder>( quasiIdsValues_, - ((bitField0_ & 0x00000001) == 0x00000001), + ((bitField0_ & 0x00000001) != 0), getParentForChildren(), isClean()); quasiIdsValues_ = null; @@ -18585,7 +18534,7 @@ public Builder clearEstimatedProbability() { @java.lang.Override public final Builder setUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { - return super.setUnknownFieldsProto3(unknownFields); + return super.setUnknownFields(unknownFields); } @java.lang.Override @@ -18799,11 +18748,7 @@ private DeltaPresenceEstimationHistogramBucket( } private DeltaPresenceEstimationHistogramBucket() { - minProbability_ = 0D; - maxProbability_ = 0D; - bucketSize_ = 0L; bucketValues_ = java.util.Collections.emptyList(); - bucketValueCount_ = 0L; } @java.lang.Override @@ -18847,7 +18792,7 @@ private DeltaPresenceEstimationHistogramBucket( } case 50: { - if (!((mutable_bitField0_ & 0x00000008) == 0x00000008)) { + if (!((mutable_bitField0_ & 0x00000008) != 0)) { bucketValues_ = new java.util.ArrayList< com.google.privacy.dlp.v2.AnalyzeDataSourceRiskDetails @@ -18870,7 +18815,7 @@ private DeltaPresenceEstimationHistogramBucket( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -18883,7 +18828,7 @@ private DeltaPresenceEstimationHistogramBucket( throw new com.google.protobuf.InvalidProtocolBufferException(e) .setUnfinishedMessage(this); } finally { - if (((mutable_bitField0_ & 0x00000008) == 0x00000008)) { + if (((mutable_bitField0_ & 0x00000008) != 0)) { bucketValues_ = java.util.Collections.unmodifiableList(bucketValues_); } this.unknownFields = unknownFields.build(); @@ -19137,20 +19082,15 @@ public boolean equals(final java.lang.Object obj) { .DeltaPresenceEstimationResult.DeltaPresenceEstimationHistogramBucket) obj; - boolean result = true; - result = - result - && (java.lang.Double.doubleToLongBits(getMinProbability()) - == java.lang.Double.doubleToLongBits(other.getMinProbability())); - result = - result - && (java.lang.Double.doubleToLongBits(getMaxProbability()) - == java.lang.Double.doubleToLongBits(other.getMaxProbability())); - result = result && (getBucketSize() == other.getBucketSize()); - result = result && getBucketValuesList().equals(other.getBucketValuesList()); - result = result && (getBucketValueCount() == other.getBucketValueCount()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (java.lang.Double.doubleToLongBits(getMinProbability()) + != java.lang.Double.doubleToLongBits(other.getMinProbability())) return false; + if (java.lang.Double.doubleToLongBits(getMaxProbability()) + != java.lang.Double.doubleToLongBits(other.getMaxProbability())) return false; + if (getBucketSize() != other.getBucketSize()) return false; + if (!getBucketValuesList().equals(other.getBucketValuesList())) return false; + if (getBucketValueCount() != other.getBucketValueCount()) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -19424,7 +19364,7 @@ public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { result.maxProbability_ = maxProbability_; result.bucketSize_ = bucketSize_; if (bucketValuesBuilder_ == null) { - if (((bitField0_ & 0x00000008) == 0x00000008)) { + if (((bitField0_ & 0x00000008) != 0)) { bucketValues_ = java.util.Collections.unmodifiableList(bucketValues_); bitField0_ = (bitField0_ & ~0x00000008); } @@ -19440,23 +19380,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 @@ -19464,13 +19404,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 @@ -19710,7 +19650,7 @@ public Builder clearBucketSize() { bucketValues_ = java.util.Collections.emptyList(); private void ensureBucketValuesIsMutable() { - if (!((bitField0_ & 0x00000008) == 0x00000008)) { + if (!((bitField0_ & 0x00000008) != 0)) { bucketValues_ = new java.util.ArrayList< com.google.privacy.dlp.v2.AnalyzeDataSourceRiskDetails @@ -20168,7 +20108,7 @@ public Builder removeBucketValues(int index) { .DeltaPresenceEstimationResult .DeltaPresenceEstimationQuasiIdValuesOrBuilder>( bucketValues_, - ((bitField0_ & 0x00000008) == 0x00000008), + ((bitField0_ & 0x00000008) != 0), getParentForChildren(), isClean()); bucketValues_ = null; @@ -20223,7 +20163,7 @@ public Builder clearBucketValueCount() { @java.lang.Override public final Builder setUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { - return super.setUnknownFieldsProto3(unknownFields); + return super.setUnknownFields(unknownFields); } @java.lang.Override @@ -20453,13 +20393,10 @@ public boolean equals(final java.lang.Object obj) { (com.google.privacy.dlp.v2.AnalyzeDataSourceRiskDetails.DeltaPresenceEstimationResult) obj; - boolean result = true; - result = - result - && getDeltaPresenceEstimationHistogramList() - .equals(other.getDeltaPresenceEstimationHistogramList()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getDeltaPresenceEstimationHistogramList() + .equals(other.getDeltaPresenceEstimationHistogramList())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -20690,7 +20627,7 @@ public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { .DeltaPresenceEstimationResult(this); int from_bitField0_ = bitField0_; if (deltaPresenceEstimationHistogramBuilder_ == null) { - if (((bitField0_ & 0x00000001) == 0x00000001)) { + if (((bitField0_ & 0x00000001) != 0)) { deltaPresenceEstimationHistogram_ = java.util.Collections.unmodifiableList(deltaPresenceEstimationHistogram_); bitField0_ = (bitField0_ & ~0x00000001); @@ -20706,23 +20643,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 @@ -20730,13 +20667,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 @@ -20827,7 +20764,7 @@ public Builder mergeFrom( deltaPresenceEstimationHistogram_ = java.util.Collections.emptyList(); private void ensureDeltaPresenceEstimationHistogramIsMutable() { - if (!((bitField0_ & 0x00000001) == 0x00000001)) { + if (!((bitField0_ & 0x00000001) != 0)) { deltaPresenceEstimationHistogram_ = new java.util.ArrayList< com.google.privacy.dlp.v2.AnalyzeDataSourceRiskDetails @@ -21392,7 +21329,7 @@ public Builder removeDeltaPresenceEstimationHistogram(int index) { .DeltaPresenceEstimationResult .DeltaPresenceEstimationHistogramBucketOrBuilder>( deltaPresenceEstimationHistogram_, - ((bitField0_ & 0x00000001) == 0x00000001), + ((bitField0_ & 0x00000001) != 0), getParentForChildren(), isClean()); deltaPresenceEstimationHistogram_ = null; @@ -21403,7 +21340,7 @@ public Builder removeDeltaPresenceEstimationHistogram(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 @@ -21932,44 +21869,40 @@ public boolean equals(final java.lang.Object obj) { com.google.privacy.dlp.v2.AnalyzeDataSourceRiskDetails other = (com.google.privacy.dlp.v2.AnalyzeDataSourceRiskDetails) obj; - boolean result = true; - result = result && (hasRequestedPrivacyMetric() == other.hasRequestedPrivacyMetric()); + if (hasRequestedPrivacyMetric() != other.hasRequestedPrivacyMetric()) return false; if (hasRequestedPrivacyMetric()) { - result = result && getRequestedPrivacyMetric().equals(other.getRequestedPrivacyMetric()); + if (!getRequestedPrivacyMetric().equals(other.getRequestedPrivacyMetric())) return false; } - result = result && (hasRequestedSourceTable() == other.hasRequestedSourceTable()); + if (hasRequestedSourceTable() != other.hasRequestedSourceTable()) return false; if (hasRequestedSourceTable()) { - result = result && getRequestedSourceTable().equals(other.getRequestedSourceTable()); + if (!getRequestedSourceTable().equals(other.getRequestedSourceTable())) return false; } - result = result && getResultCase().equals(other.getResultCase()); - if (!result) return false; + if (!getResultCase().equals(other.getResultCase())) return false; switch (resultCase_) { case 3: - result = result && getNumericalStatsResult().equals(other.getNumericalStatsResult()); + if (!getNumericalStatsResult().equals(other.getNumericalStatsResult())) return false; break; case 4: - result = result && getCategoricalStatsResult().equals(other.getCategoricalStatsResult()); + if (!getCategoricalStatsResult().equals(other.getCategoricalStatsResult())) return false; break; case 5: - result = result && getKAnonymityResult().equals(other.getKAnonymityResult()); + if (!getKAnonymityResult().equals(other.getKAnonymityResult())) return false; break; case 6: - result = result && getLDiversityResult().equals(other.getLDiversityResult()); + if (!getLDiversityResult().equals(other.getLDiversityResult())) return false; break; case 7: - result = result && getKMapEstimationResult().equals(other.getKMapEstimationResult()); + if (!getKMapEstimationResult().equals(other.getKMapEstimationResult())) return false; break; case 9: - result = - result - && getDeltaPresenceEstimationResult() - .equals(other.getDeltaPresenceEstimationResult()); + if (!getDeltaPresenceEstimationResult().equals(other.getDeltaPresenceEstimationResult())) + 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 @@ -22261,35 +22194,35 @@ public com.google.privacy.dlp.v2.AnalyzeDataSourceRiskDetails 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 @@ -22391,7 +22324,7 @@ public Builder clearResult() { return this; } - private com.google.privacy.dlp.v2.PrivacyMetric requestedPrivacyMetric_ = null; + private com.google.privacy.dlp.v2.PrivacyMetric requestedPrivacyMetric_; private com.google.protobuf.SingleFieldBuilderV3< com.google.privacy.dlp.v2.PrivacyMetric, com.google.privacy.dlp.v2.PrivacyMetric.Builder, @@ -22573,7 +22506,7 @@ public com.google.privacy.dlp.v2.PrivacyMetricOrBuilder getRequestedPrivacyMetri return requestedPrivacyMetricBuilder_; } - private com.google.privacy.dlp.v2.BigQueryTable requestedSourceTable_ = null; + private com.google.privacy.dlp.v2.BigQueryTable requestedSourceTable_; private com.google.protobuf.SingleFieldBuilderV3< com.google.privacy.dlp.v2.BigQueryTable, com.google.privacy.dlp.v2.BigQueryTable.Builder, @@ -23873,7 +23806,7 @@ public Builder clearDeltaPresenceEstimationResult() { @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/BigQueryField.java b/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/BigQueryField.java index 631664487235..b11790a6d654 100644 --- a/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/BigQueryField.java +++ b/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/BigQueryField.java @@ -81,7 +81,7 @@ private BigQueryField( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -241,17 +241,16 @@ public boolean equals(final java.lang.Object obj) { } com.google.privacy.dlp.v2.BigQueryField other = (com.google.privacy.dlp.v2.BigQueryField) 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 && (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 @@ -469,35 +468,35 @@ public com.google.privacy.dlp.v2.BigQueryField 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 @@ -547,7 +546,7 @@ public Builder mergeFrom( return this; } - 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, @@ -728,7 +727,7 @@ public com.google.privacy.dlp.v2.BigQueryTableOrBuilder getTableOrBuilder() { return tableBuilder_; } - 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, @@ -905,7 +904,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 diff --git a/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/BigQueryKey.java b/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/BigQueryKey.java index e74371c2a3d7..a03c68e23b95 100644 --- a/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/BigQueryKey.java +++ b/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/BigQueryKey.java @@ -22,9 +22,7 @@ private BigQueryKey(com.google.protobuf.GeneratedMessageV3.Builder builder) { super(builder); } - private BigQueryKey() { - rowNumber_ = 0L; - } + private BigQueryKey() {} @java.lang.Override public final com.google.protobuf.UnknownFieldSet getUnknownFields() { @@ -73,7 +71,7 @@ private BigQueryKey( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -212,14 +210,13 @@ public boolean equals(final java.lang.Object obj) { } com.google.privacy.dlp.v2.BigQueryKey other = (com.google.privacy.dlp.v2.BigQueryKey) obj; - boolean result = true; - result = result && (hasTableReference() == other.hasTableReference()); + if (hasTableReference() != other.hasTableReference()) return false; if (hasTableReference()) { - result = result && getTableReference().equals(other.getTableReference()); + if (!getTableReference().equals(other.getTableReference())) return false; } - result = result && (getRowNumber() == other.getRowNumber()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (getRowNumber() != other.getRowNumber()) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -426,35 +423,35 @@ public com.google.privacy.dlp.v2.BigQueryKey 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 @@ -504,7 +501,7 @@ public Builder mergeFrom( return this; } - private com.google.privacy.dlp.v2.BigQueryTable tableReference_ = null; + private com.google.privacy.dlp.v2.BigQueryTable tableReference_; private com.google.protobuf.SingleFieldBuilderV3< com.google.privacy.dlp.v2.BigQueryTable, com.google.privacy.dlp.v2.BigQueryTable.Builder, @@ -735,7 +732,7 @@ public Builder clearRowNumber() { @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/BigQueryOptions.java b/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/BigQueryOptions.java index de9689113da9..183f7efa57be 100644 --- a/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/BigQueryOptions.java +++ b/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/BigQueryOptions.java @@ -24,8 +24,6 @@ private BigQueryOptions(com.google.protobuf.GeneratedMessageV3.Builder builde private BigQueryOptions() { identifyingFields_ = java.util.Collections.emptyList(); - rowsLimit_ = 0L; - rowsLimitPercent_ = 0; sampleMethod_ = 0; excludedFields_ = java.util.Collections.emptyList(); } @@ -72,7 +70,7 @@ private BigQueryOptions( } case 18: { - if (!((mutable_bitField0_ & 0x00000002) == 0x00000002)) { + if (!((mutable_bitField0_ & 0x00000002) != 0)) { identifyingFields_ = new java.util.ArrayList(); mutable_bitField0_ |= 0x00000002; } @@ -94,7 +92,7 @@ private BigQueryOptions( } case 42: { - if (!((mutable_bitField0_ & 0x00000020) == 0x00000020)) { + if (!((mutable_bitField0_ & 0x00000020) != 0)) { excludedFields_ = new java.util.ArrayList(); mutable_bitField0_ |= 0x00000020; } @@ -109,7 +107,7 @@ private BigQueryOptions( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -121,10 +119,10 @@ private BigQueryOptions( } 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)) { identifyingFields_ = java.util.Collections.unmodifiableList(identifyingFields_); } - if (((mutable_bitField0_ & 0x00000020) == 0x00000020)) { + if (((mutable_bitField0_ & 0x00000020) != 0)) { excludedFields_ = java.util.Collections.unmodifiableList(excludedFields_); } this.unknownFields = unknownFields.build(); @@ -591,18 +589,17 @@ public boolean equals(final java.lang.Object obj) { com.google.privacy.dlp.v2.BigQueryOptions other = (com.google.privacy.dlp.v2.BigQueryOptions) obj; - boolean result = true; - result = result && (hasTableReference() == other.hasTableReference()); + if (hasTableReference() != other.hasTableReference()) return false; if (hasTableReference()) { - result = result && getTableReference().equals(other.getTableReference()); - } - result = result && getIdentifyingFieldsList().equals(other.getIdentifyingFieldsList()); - result = result && (getRowsLimit() == other.getRowsLimit()); - result = result && (getRowsLimitPercent() == other.getRowsLimitPercent()); - result = result && sampleMethod_ == other.sampleMethod_; - result = result && getExcludedFieldsList().equals(other.getExcludedFieldsList()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getTableReference().equals(other.getTableReference())) return false; + } + if (!getIdentifyingFieldsList().equals(other.getIdentifyingFieldsList())) return false; + if (getRowsLimit() != other.getRowsLimit()) return false; + if (getRowsLimitPercent() != other.getRowsLimitPercent()) return false; + if (sampleMethod_ != other.sampleMethod_) return false; + if (!getExcludedFieldsList().equals(other.getExcludedFieldsList())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -837,7 +834,7 @@ public com.google.privacy.dlp.v2.BigQueryOptions buildPartial() { result.tableReference_ = tableReferenceBuilder_.build(); } if (identifyingFieldsBuilder_ == null) { - if (((bitField0_ & 0x00000002) == 0x00000002)) { + if (((bitField0_ & 0x00000002) != 0)) { identifyingFields_ = java.util.Collections.unmodifiableList(identifyingFields_); bitField0_ = (bitField0_ & ~0x00000002); } @@ -849,7 +846,7 @@ public com.google.privacy.dlp.v2.BigQueryOptions buildPartial() { result.rowsLimitPercent_ = rowsLimitPercent_; result.sampleMethod_ = sampleMethod_; if (excludedFieldsBuilder_ == null) { - if (((bitField0_ & 0x00000020) == 0x00000020)) { + if (((bitField0_ & 0x00000020) != 0)) { excludedFields_ = java.util.Collections.unmodifiableList(excludedFields_); bitField0_ = (bitField0_ & ~0x00000020); } @@ -864,35 +861,35 @@ public com.google.privacy.dlp.v2.BigQueryOptions 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 @@ -1004,7 +1001,7 @@ public Builder mergeFrom( private int bitField0_; - private com.google.privacy.dlp.v2.BigQueryTable tableReference_ = null; + private com.google.privacy.dlp.v2.BigQueryTable tableReference_; private com.google.protobuf.SingleFieldBuilderV3< com.google.privacy.dlp.v2.BigQueryTable, com.google.privacy.dlp.v2.BigQueryTable.Builder, @@ -1190,7 +1187,7 @@ public com.google.privacy.dlp.v2.BigQueryTableOrBuilder getTableReferenceOrBuild java.util.Collections.emptyList(); private void ensureIdentifyingFieldsIsMutable() { - if (!((bitField0_ & 0x00000002) == 0x00000002)) { + if (!((bitField0_ & 0x00000002) != 0)) { identifyingFields_ = new java.util.ArrayList(identifyingFields_); bitField0_ |= 0x00000002; @@ -1549,7 +1546,7 @@ public com.google.privacy.dlp.v2.FieldId.Builder addIdentifyingFieldsBuilder(int com.google.privacy.dlp.v2.FieldId.Builder, com.google.privacy.dlp.v2.FieldIdOrBuilder>( identifyingFields_, - ((bitField0_ & 0x00000002) == 0x00000002), + ((bitField0_ & 0x00000002) != 0), getParentForChildren(), isClean()); identifyingFields_ = null; @@ -1708,7 +1705,7 @@ public Builder clearSampleMethod() { java.util.Collections.emptyList(); private void ensureExcludedFieldsIsMutable() { - if (!((bitField0_ & 0x00000020) == 0x00000020)) { + if (!((bitField0_ & 0x00000020) != 0)) { excludedFields_ = new java.util.ArrayList(excludedFields_); bitField0_ |= 0x00000020; @@ -2067,7 +2064,7 @@ public com.google.privacy.dlp.v2.FieldId.Builder addExcludedFieldsBuilder(int in com.google.privacy.dlp.v2.FieldId.Builder, com.google.privacy.dlp.v2.FieldIdOrBuilder>( excludedFields_, - ((bitField0_ & 0x00000020) == 0x00000020), + ((bitField0_ & 0x00000020) != 0), getParentForChildren(), isClean()); excludedFields_ = null; @@ -2077,7 +2074,7 @@ public com.google.privacy.dlp.v2.FieldId.Builder addExcludedFieldsBuilder(int in @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/BigQueryTable.java b/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/BigQueryTable.java index 48a4a0cb5699..a947e6ccba0a 100644 --- a/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/BigQueryTable.java +++ b/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/BigQueryTable.java @@ -79,7 +79,7 @@ private BigQueryTable( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -298,12 +298,11 @@ public boolean equals(final java.lang.Object obj) { } com.google.privacy.dlp.v2.BigQueryTable other = (com.google.privacy.dlp.v2.BigQueryTable) obj; - boolean result = true; - result = result && getProjectId().equals(other.getProjectId()); - result = result && getDatasetId().equals(other.getDatasetId()); - result = result && getTableId().equals(other.getTableId()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getProjectId().equals(other.getProjectId())) return false; + if (!getDatasetId().equals(other.getDatasetId())) return false; + if (!getTableId().equals(other.getTableId())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -510,35 +509,35 @@ public com.google.privacy.dlp.v2.BigQueryTable 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 @@ -883,7 +882,7 @@ public Builder setTableIdBytes(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/BoundingBox.java b/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/BoundingBox.java index 855e903f06ce..364dda7d025e 100644 --- a/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/BoundingBox.java +++ b/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/BoundingBox.java @@ -22,12 +22,7 @@ private BoundingBox(com.google.protobuf.GeneratedMessageV3.Builder builder) { super(builder); } - private BoundingBox() { - top_ = 0; - left_ = 0; - width_ = 0; - height_ = 0; - } + private BoundingBox() {} @java.lang.Override public final com.google.protobuf.UnknownFieldSet getUnknownFields() { @@ -75,7 +70,7 @@ private BoundingBox( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -229,13 +224,12 @@ public boolean equals(final java.lang.Object obj) { } com.google.privacy.dlp.v2.BoundingBox other = (com.google.privacy.dlp.v2.BoundingBox) obj; - boolean result = true; - result = result && (getTop() == other.getTop()); - result = result && (getLeft() == other.getLeft()); - result = result && (getWidth() == other.getWidth()); - result = result && (getHeight() == other.getHeight()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (getTop() != other.getTop()) return false; + if (getLeft() != other.getLeft()) return false; + if (getWidth() != other.getWidth()) return false; + if (getHeight() != other.getHeight()) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -442,35 +436,35 @@ public com.google.privacy.dlp.v2.BoundingBox 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 @@ -704,7 +698,7 @@ public Builder clearHeight() { @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/BucketingConfig.java b/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/BucketingConfig.java index 7d426b28b591..5f5a4a11964f 100644 --- a/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/BucketingConfig.java +++ b/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/BucketingConfig.java @@ -60,7 +60,7 @@ private BucketingConfig( break; case 10: { - if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) { + if (!((mutable_bitField0_ & 0x00000001) != 0)) { buckets_ = new java.util.ArrayList(); mutable_bitField0_ |= 0x00000001; @@ -73,7 +73,7 @@ private BucketingConfig( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -85,7 +85,7 @@ private BucketingConfig( } 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)) { buckets_ = java.util.Collections.unmodifiableList(buckets_); } this.unknownFields = unknownFields.build(); @@ -304,7 +304,7 @@ private Bucket( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -518,21 +518,20 @@ public boolean equals(final java.lang.Object obj) { com.google.privacy.dlp.v2.BucketingConfig.Bucket other = (com.google.privacy.dlp.v2.BucketingConfig.Bucket) obj; - boolean result = true; - result = result && (hasMin() == other.hasMin()); + if (hasMin() != other.hasMin()) return false; if (hasMin()) { - result = result && getMin().equals(other.getMin()); + if (!getMin().equals(other.getMin())) return false; } - result = result && (hasMax() == other.hasMax()); + if (hasMax() != other.hasMax()) return false; if (hasMax()) { - result = result && getMax().equals(other.getMax()); + if (!getMax().equals(other.getMax())) return false; } - result = result && (hasReplacementValue() == other.hasReplacementValue()); + if (hasReplacementValue() != other.hasReplacementValue()) return false; if (hasReplacementValue()) { - result = result && getReplacementValue().equals(other.getReplacementValue()); + if (!getReplacementValue().equals(other.getReplacementValue())) return false; } - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -767,23 +766,23 @@ public com.google.privacy.dlp.v2.BucketingConfig.Bucket 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 @@ -791,13 +790,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 @@ -852,7 +851,7 @@ public Builder mergeFrom( return this; } - private com.google.privacy.dlp.v2.Value min_ = null; + private com.google.privacy.dlp.v2.Value min_; private com.google.protobuf.SingleFieldBuilderV3< com.google.privacy.dlp.v2.Value, com.google.privacy.dlp.v2.Value.Builder, @@ -1035,7 +1034,7 @@ public com.google.privacy.dlp.v2.ValueOrBuilder getMinOrBuilder() { return minBuilder_; } - private com.google.privacy.dlp.v2.Value max_ = null; + private com.google.privacy.dlp.v2.Value max_; private com.google.protobuf.SingleFieldBuilderV3< com.google.privacy.dlp.v2.Value, com.google.privacy.dlp.v2.Value.Builder, @@ -1209,7 +1208,7 @@ public com.google.privacy.dlp.v2.ValueOrBuilder getMaxOrBuilder() { return maxBuilder_; } - private com.google.privacy.dlp.v2.Value replacementValue_ = null; + private com.google.privacy.dlp.v2.Value replacementValue_; private com.google.protobuf.SingleFieldBuilderV3< com.google.privacy.dlp.v2.Value, com.google.privacy.dlp.v2.Value.Builder, @@ -1402,7 +1401,7 @@ public com.google.privacy.dlp.v2.ValueOrBuilder getReplacementValueOrBuilder() { @java.lang.Override public final Builder setUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { - return super.setUnknownFieldsProto3(unknownFields); + return super.setUnknownFields(unknownFields); } @java.lang.Override @@ -1560,10 +1559,9 @@ public boolean equals(final java.lang.Object obj) { com.google.privacy.dlp.v2.BucketingConfig other = (com.google.privacy.dlp.v2.BucketingConfig) obj; - boolean result = true; - result = result && getBucketsList().equals(other.getBucketsList()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getBucketsList().equals(other.getBucketsList())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -1767,7 +1765,7 @@ public com.google.privacy.dlp.v2.BucketingConfig buildPartial() { new com.google.privacy.dlp.v2.BucketingConfig(this); int from_bitField0_ = bitField0_; if (bucketsBuilder_ == null) { - if (((bitField0_ & 0x00000001) == 0x00000001)) { + if (((bitField0_ & 0x00000001) != 0)) { buckets_ = java.util.Collections.unmodifiableList(buckets_); bitField0_ = (bitField0_ & ~0x00000001); } @@ -1781,35 +1779,35 @@ public com.google.privacy.dlp.v2.BucketingConfig 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 @@ -1886,7 +1884,7 @@ public Builder mergeFrom( java.util.Collections.emptyList(); private void ensureBucketsIsMutable() { - if (!((bitField0_ & 0x00000001) == 0x00000001)) { + if (!((bitField0_ & 0x00000001) != 0)) { buckets_ = new java.util.ArrayList(buckets_); bitField0_ |= 0x00000001; @@ -2228,10 +2226,7 @@ public com.google.privacy.dlp.v2.BucketingConfig.Bucket.Builder addBucketsBuilde com.google.privacy.dlp.v2.BucketingConfig.Bucket, com.google.privacy.dlp.v2.BucketingConfig.Bucket.Builder, com.google.privacy.dlp.v2.BucketingConfig.BucketOrBuilder>( - buckets_, - ((bitField0_ & 0x00000001) == 0x00000001), - getParentForChildren(), - isClean()); + buckets_, ((bitField0_ & 0x00000001) != 0), getParentForChildren(), isClean()); buckets_ = null; } return bucketsBuilder_; @@ -2239,7 +2234,7 @@ public com.google.privacy.dlp.v2.BucketingConfig.Bucket.Builder addBucketsBuilde @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/ByteContentItem.java b/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/ByteContentItem.java index f383a0a0628f..bd795d514aac 100644 --- a/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/ByteContentItem.java +++ b/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/ByteContentItem.java @@ -65,7 +65,7 @@ private ByteContentItem( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -310,11 +310,10 @@ public boolean equals(final java.lang.Object obj) { com.google.privacy.dlp.v2.ByteContentItem other = (com.google.privacy.dlp.v2.ByteContentItem) obj; - boolean result = true; - result = result && type_ == other.type_; - result = result && getData().equals(other.getData()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (type_ != other.type_) return false; + if (!getData().equals(other.getData())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -512,35 +511,35 @@ public com.google.privacy.dlp.v2.ByteContentItem 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 @@ -717,7 +716,7 @@ public Builder clearData() { @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/CancelDlpJobRequest.java b/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/CancelDlpJobRequest.java index 35e9ea792833..2c89e3f0db7c 100644 --- a/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/CancelDlpJobRequest.java +++ b/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/CancelDlpJobRequest.java @@ -59,7 +59,7 @@ private CancelDlpJobRequest( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -179,10 +179,9 @@ public boolean equals(final java.lang.Object obj) { com.google.privacy.dlp.v2.CancelDlpJobRequest other = (com.google.privacy.dlp.v2.CancelDlpJobRequest) 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 @@ -375,35 +374,35 @@ public com.google.privacy.dlp.v2.CancelDlpJobRequest 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 @@ -547,7 +546,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/CharacterMaskConfig.java b/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/CharacterMaskConfig.java index 291e76c9d9ca..86462aae97bb 100644 --- a/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/CharacterMaskConfig.java +++ b/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/CharacterMaskConfig.java @@ -29,8 +29,6 @@ private CharacterMaskConfig(com.google.protobuf.GeneratedMessageV3.Builder bu private CharacterMaskConfig() { maskingCharacter_ = ""; - numberToMask_ = 0; - reverseOrder_ = false; charactersToIgnore_ = java.util.Collections.emptyList(); } @@ -77,7 +75,7 @@ private CharacterMaskConfig( } case 34: { - if (!((mutable_bitField0_ & 0x00000008) == 0x00000008)) { + if (!((mutable_bitField0_ & 0x00000008) != 0)) { charactersToIgnore_ = new java.util.ArrayList(); mutable_bitField0_ |= 0x00000008; @@ -89,7 +87,7 @@ private CharacterMaskConfig( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -101,7 +99,7 @@ private CharacterMaskConfig( } 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)) { charactersToIgnore_ = java.util.Collections.unmodifiableList(charactersToIgnore_); } this.unknownFields = unknownFields.build(); @@ -348,13 +346,12 @@ public boolean equals(final java.lang.Object obj) { com.google.privacy.dlp.v2.CharacterMaskConfig other = (com.google.privacy.dlp.v2.CharacterMaskConfig) obj; - boolean result = true; - result = result && getMaskingCharacter().equals(other.getMaskingCharacter()); - result = result && (getNumberToMask() == other.getNumberToMask()); - result = result && (getReverseOrder() == other.getReverseOrder()); - result = result && getCharactersToIgnoreList().equals(other.getCharactersToIgnoreList()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getMaskingCharacter().equals(other.getMaskingCharacter())) return false; + if (getNumberToMask() != other.getNumberToMask()) return false; + if (getReverseOrder() != other.getReverseOrder()) return false; + if (!getCharactersToIgnoreList().equals(other.getCharactersToIgnoreList())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -571,7 +568,7 @@ public com.google.privacy.dlp.v2.CharacterMaskConfig buildPartial() { result.numberToMask_ = numberToMask_; result.reverseOrder_ = reverseOrder_; if (charactersToIgnoreBuilder_ == null) { - if (((bitField0_ & 0x00000008) == 0x00000008)) { + if (((bitField0_ & 0x00000008) != 0)) { charactersToIgnore_ = java.util.Collections.unmodifiableList(charactersToIgnore_); bitField0_ = (bitField0_ & ~0x00000008); } @@ -586,35 +583,35 @@ public com.google.privacy.dlp.v2.CharacterMaskConfig 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 @@ -913,7 +910,7 @@ public Builder clearReverseOrder() { java.util.Collections.emptyList(); private void ensureCharactersToIgnoreIsMutable() { - if (!((bitField0_ & 0x00000008) == 0x00000008)) { + if (!((bitField0_ & 0x00000008) != 0)) { charactersToIgnore_ = new java.util.ArrayList(charactersToIgnore_); bitField0_ |= 0x00000008; @@ -1292,7 +1289,7 @@ public com.google.privacy.dlp.v2.CharsToIgnore.Builder addCharactersToIgnoreBuil com.google.privacy.dlp.v2.CharsToIgnore.Builder, com.google.privacy.dlp.v2.CharsToIgnoreOrBuilder>( charactersToIgnore_, - ((bitField0_ & 0x00000008) == 0x00000008), + ((bitField0_ & 0x00000008) != 0), getParentForChildren(), isClean()); charactersToIgnore_ = null; @@ -1302,7 +1299,7 @@ public com.google.privacy.dlp.v2.CharsToIgnore.Builder addCharactersToIgnoreBuil @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/CharsToIgnore.java b/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/CharsToIgnore.java index 166da1441618..75119f3d93be 100644 --- a/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/CharsToIgnore.java +++ b/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/CharsToIgnore.java @@ -65,7 +65,7 @@ private CharsToIgnore( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -444,23 +444,20 @@ public boolean equals(final java.lang.Object obj) { } com.google.privacy.dlp.v2.CharsToIgnore other = (com.google.privacy.dlp.v2.CharsToIgnore) obj; - boolean result = true; - result = result && getCharactersCase().equals(other.getCharactersCase()); - if (!result) return false; + if (!getCharactersCase().equals(other.getCharactersCase())) return false; switch (charactersCase_) { case 1: - result = result && getCharactersToSkip().equals(other.getCharactersToSkip()); + if (!getCharactersToSkip().equals(other.getCharactersToSkip())) return false; break; case 2: - result = - result - && getCommonCharactersToIgnoreValue() == other.getCommonCharactersToIgnoreValue(); + if (getCommonCharactersToIgnoreValue() != other.getCommonCharactersToIgnoreValue()) + 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 @@ -670,35 +667,35 @@ public com.google.privacy.dlp.v2.CharsToIgnore 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 @@ -911,7 +908,7 @@ public Builder clearCommonCharactersToIgnore() { @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/CloudStorageFileSet.java b/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/CloudStorageFileSet.java index f6e9931bf2a1..86cdb09991eb 100644 --- a/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/CloudStorageFileSet.java +++ b/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/CloudStorageFileSet.java @@ -59,7 +59,7 @@ private CloudStorageFileSet( } 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.CloudStorageFileSet other = (com.google.privacy.dlp.v2.CloudStorageFileSet) obj; - boolean result = true; - result = result && getUrl().equals(other.getUrl()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getUrl().equals(other.getUrl())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -377,35 +376,35 @@ public com.google.privacy.dlp.v2.CloudStorageFileSet buildPartial() { @java.lang.Override public Builder clone() { - return (Builder) super.clone(); + return super.clone(); } @java.lang.Override public Builder setField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.setField(field, value); + return super.setField(field, value); } @java.lang.Override public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) { - return (Builder) super.clearField(field); + return super.clearField(field); } @java.lang.Override public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) { - return (Builder) super.clearOneof(oneof); + return super.clearOneof(oneof); } @java.lang.Override public Builder setRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) { - return (Builder) super.setRepeatedField(field, index, value); + return super.setRepeatedField(field, index, value); } @java.lang.Override public Builder addRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.addRepeatedField(field, value); + return super.addRepeatedField(field, value); } @java.lang.Override @@ -554,7 +553,7 @@ public Builder setUrlBytes(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/CloudStorageOptions.java b/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/CloudStorageOptions.java index c5491673ed5b..911007c23d5d 100644 --- a/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/CloudStorageOptions.java +++ b/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/CloudStorageOptions.java @@ -24,11 +24,8 @@ private CloudStorageOptions(com.google.protobuf.GeneratedMessageV3.Builder bu } private CloudStorageOptions() { - bytesLimitPerFile_ = 0L; - bytesLimitPerFilePercent_ = 0; fileTypes_ = java.util.Collections.emptyList(); sampleMethod_ = 0; - filesLimitPercent_ = 0; } @java.lang.Override @@ -80,7 +77,7 @@ private CloudStorageOptions( case 40: { int rawValue = input.readEnum(); - if (!((mutable_bitField0_ & 0x00000008) == 0x00000008)) { + if (!((mutable_bitField0_ & 0x00000008) != 0)) { fileTypes_ = new java.util.ArrayList(); mutable_bitField0_ |= 0x00000008; } @@ -93,7 +90,7 @@ private CloudStorageOptions( int oldLimit = input.pushLimit(length); while (input.getBytesUntilLimit() > 0) { int rawValue = input.readEnum(); - if (!((mutable_bitField0_ & 0x00000008) == 0x00000008)) { + if (!((mutable_bitField0_ & 0x00000008) != 0)) { fileTypes_ = new java.util.ArrayList(); mutable_bitField0_ |= 0x00000008; } @@ -121,7 +118,7 @@ private CloudStorageOptions( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -133,7 +130,7 @@ private CloudStorageOptions( } 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)) { fileTypes_ = java.util.Collections.unmodifiableList(fileTypes_); } this.unknownFields = unknownFields.build(); @@ -436,7 +433,7 @@ private FileSet( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -620,14 +617,13 @@ public boolean equals(final java.lang.Object obj) { com.google.privacy.dlp.v2.CloudStorageOptions.FileSet other = (com.google.privacy.dlp.v2.CloudStorageOptions.FileSet) obj; - boolean result = true; - result = result && getUrl().equals(other.getUrl()); - result = result && (hasRegexFileSet() == other.hasRegexFileSet()); + if (!getUrl().equals(other.getUrl())) return false; + if (hasRegexFileSet() != other.hasRegexFileSet()) return false; if (hasRegexFileSet()) { - result = result && getRegexFileSet().equals(other.getRegexFileSet()); + if (!getRegexFileSet().equals(other.getRegexFileSet())) return false; } - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -838,23 +834,23 @@ public com.google.privacy.dlp.v2.CloudStorageOptions.FileSet 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 @@ -862,13 +858,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 @@ -1050,7 +1046,7 @@ public Builder setUrlBytes(com.google.protobuf.ByteString value) { return this; } - private com.google.privacy.dlp.v2.CloudStorageRegexFileSet regexFileSet_ = null; + private com.google.privacy.dlp.v2.CloudStorageRegexFileSet regexFileSet_; private com.google.protobuf.SingleFieldBuilderV3< com.google.privacy.dlp.v2.CloudStorageRegexFileSet, com.google.privacy.dlp.v2.CloudStorageRegexFileSet.Builder, @@ -1245,7 +1241,7 @@ public com.google.privacy.dlp.v2.CloudStorageRegexFileSet.Builder getRegexFileSe @java.lang.Override public final Builder setUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { - return super.setUnknownFieldsProto3(unknownFields); + return super.setUnknownFields(unknownFields); } @java.lang.Override @@ -1590,18 +1586,17 @@ public boolean equals(final java.lang.Object obj) { com.google.privacy.dlp.v2.CloudStorageOptions other = (com.google.privacy.dlp.v2.CloudStorageOptions) obj; - boolean result = true; - result = result && (hasFileSet() == other.hasFileSet()); + if (hasFileSet() != other.hasFileSet()) return false; if (hasFileSet()) { - result = result && getFileSet().equals(other.getFileSet()); - } - result = result && (getBytesLimitPerFile() == other.getBytesLimitPerFile()); - result = result && (getBytesLimitPerFilePercent() == other.getBytesLimitPerFilePercent()); - result = result && fileTypes_.equals(other.fileTypes_); - result = result && sampleMethod_ == other.sampleMethod_; - result = result && (getFilesLimitPercent() == other.getFilesLimitPercent()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getFileSet().equals(other.getFileSet())) return false; + } + if (getBytesLimitPerFile() != other.getBytesLimitPerFile()) return false; + if (getBytesLimitPerFilePercent() != other.getBytesLimitPerFilePercent()) return false; + if (!fileTypes_.equals(other.fileTypes_)) return false; + if (sampleMethod_ != other.sampleMethod_) return false; + if (getFilesLimitPercent() != other.getFilesLimitPercent()) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -1825,7 +1820,7 @@ public com.google.privacy.dlp.v2.CloudStorageOptions buildPartial() { } result.bytesLimitPerFile_ = bytesLimitPerFile_; result.bytesLimitPerFilePercent_ = bytesLimitPerFilePercent_; - if (((bitField0_ & 0x00000008) == 0x00000008)) { + if (((bitField0_ & 0x00000008) != 0)) { fileTypes_ = java.util.Collections.unmodifiableList(fileTypes_); bitField0_ = (bitField0_ & ~0x00000008); } @@ -1839,35 +1834,35 @@ public com.google.privacy.dlp.v2.CloudStorageOptions 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 @@ -1938,7 +1933,7 @@ public Builder mergeFrom( private int bitField0_; - private com.google.privacy.dlp.v2.CloudStorageOptions.FileSet fileSet_ = null; + private com.google.privacy.dlp.v2.CloudStorageOptions.FileSet fileSet_; private com.google.protobuf.SingleFieldBuilderV3< com.google.privacy.dlp.v2.CloudStorageOptions.FileSet, com.google.privacy.dlp.v2.CloudStorageOptions.FileSet.Builder, @@ -2226,7 +2221,7 @@ public Builder clearBytesLimitPerFilePercent() { private java.util.List fileTypes_ = java.util.Collections.emptyList(); private void ensureFileTypesIsMutable() { - if (!((bitField0_ & 0x00000008) == 0x00000008)) { + if (!((bitField0_ & 0x00000008) != 0)) { fileTypes_ = new java.util.ArrayList(fileTypes_); bitField0_ |= 0x00000008; } @@ -2536,7 +2531,7 @@ public Builder clearFilesLimitPercent() { @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/CloudStoragePath.java b/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/CloudStoragePath.java index 955172bde878..dbb4db540ff9 100644 --- a/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/CloudStoragePath.java +++ b/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/CloudStoragePath.java @@ -59,7 +59,7 @@ private CloudStoragePath( } 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.CloudStoragePath other = (com.google.privacy.dlp.v2.CloudStoragePath) obj; - boolean result = true; - result = result && getPath().equals(other.getPath()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getPath().equals(other.getPath())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -377,35 +376,35 @@ public com.google.privacy.dlp.v2.CloudStoragePath buildPartial() { @java.lang.Override public Builder clone() { - return (Builder) super.clone(); + return super.clone(); } @java.lang.Override public Builder setField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.setField(field, value); + return super.setField(field, value); } @java.lang.Override public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) { - return (Builder) super.clearField(field); + return super.clearField(field); } @java.lang.Override public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) { - return (Builder) super.clearOneof(oneof); + return super.clearOneof(oneof); } @java.lang.Override public Builder setRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) { - return (Builder) super.setRepeatedField(field, index, value); + return super.setRepeatedField(field, index, value); } @java.lang.Override public Builder addRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.addRepeatedField(field, value); + return super.addRepeatedField(field, value); } @java.lang.Override @@ -554,7 +553,7 @@ public Builder setPathBytes(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/CloudStorageRegexFileSet.java b/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/CloudStorageRegexFileSet.java index 03d60cd792f7..0a64edf5d113 100644 --- a/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/CloudStorageRegexFileSet.java +++ b/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/CloudStorageRegexFileSet.java @@ -87,7 +87,7 @@ private CloudStorageRegexFileSet( case 18: { java.lang.String s = input.readStringRequireUtf8(); - if (!((mutable_bitField0_ & 0x00000002) == 0x00000002)) { + if (!((mutable_bitField0_ & 0x00000002) != 0)) { includeRegex_ = new com.google.protobuf.LazyStringArrayList(); mutable_bitField0_ |= 0x00000002; } @@ -97,7 +97,7 @@ private CloudStorageRegexFileSet( case 26: { java.lang.String s = input.readStringRequireUtf8(); - if (!((mutable_bitField0_ & 0x00000004) == 0x00000004)) { + if (!((mutable_bitField0_ & 0x00000004) != 0)) { excludeRegex_ = new com.google.protobuf.LazyStringArrayList(); mutable_bitField0_ |= 0x00000004; } @@ -106,7 +106,7 @@ private CloudStorageRegexFileSet( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -118,10 +118,10 @@ private CloudStorageRegexFileSet( } 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)) { includeRegex_ = includeRegex_.getUnmodifiableView(); } - if (((mutable_bitField0_ & 0x00000004) == 0x00000004)) { + if (((mutable_bitField0_ & 0x00000004) != 0)) { excludeRegex_ = excludeRegex_.getUnmodifiableView(); } this.unknownFields = unknownFields.build(); @@ -405,12 +405,11 @@ public boolean equals(final java.lang.Object obj) { com.google.privacy.dlp.v2.CloudStorageRegexFileSet other = (com.google.privacy.dlp.v2.CloudStorageRegexFileSet) obj; - boolean result = true; - result = result && getBucketName().equals(other.getBucketName()); - result = result && getIncludeRegexList().equals(other.getIncludeRegexList()); - result = result && getExcludeRegexList().equals(other.getExcludeRegexList()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getBucketName().equals(other.getBucketName())) return false; + if (!getIncludeRegexList().equals(other.getIncludeRegexList())) return false; + if (!getExcludeRegexList().equals(other.getExcludeRegexList())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -636,12 +635,12 @@ public com.google.privacy.dlp.v2.CloudStorageRegexFileSet buildPartial() { int from_bitField0_ = bitField0_; int to_bitField0_ = 0; result.bucketName_ = bucketName_; - if (((bitField0_ & 0x00000002) == 0x00000002)) { + if (((bitField0_ & 0x00000002) != 0)) { includeRegex_ = includeRegex_.getUnmodifiableView(); bitField0_ = (bitField0_ & ~0x00000002); } result.includeRegex_ = includeRegex_; - if (((bitField0_ & 0x00000004) == 0x00000004)) { + if (((bitField0_ & 0x00000004) != 0)) { excludeRegex_ = excludeRegex_.getUnmodifiableView(); bitField0_ = (bitField0_ & ~0x00000004); } @@ -653,35 +652,35 @@ public com.google.privacy.dlp.v2.CloudStorageRegexFileSet 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 @@ -851,7 +850,7 @@ public Builder setBucketNameBytes(com.google.protobuf.ByteString value) { com.google.protobuf.LazyStringArrayList.EMPTY; private void ensureIncludeRegexIsMutable() { - if (!((bitField0_ & 0x00000002) == 0x00000002)) { + if (!((bitField0_ & 0x00000002) != 0)) { includeRegex_ = new com.google.protobuf.LazyStringArrayList(includeRegex_); bitField0_ |= 0x00000002; } @@ -1057,7 +1056,7 @@ public Builder addIncludeRegexBytes(com.google.protobuf.ByteString value) { com.google.protobuf.LazyStringArrayList.EMPTY; private void ensureExcludeRegexIsMutable() { - if (!((bitField0_ & 0x00000004) == 0x00000004)) { + if (!((bitField0_ & 0x00000004) != 0)) { excludeRegex_ = new com.google.protobuf.LazyStringArrayList(excludeRegex_); bitField0_ |= 0x00000004; } @@ -1243,7 +1242,7 @@ public Builder addExcludeRegexBytes(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/Color.java b/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/Color.java index 78f39157e659..21b07beb13a2 100644 --- a/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/Color.java +++ b/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/Color.java @@ -22,11 +22,7 @@ private Color(com.google.protobuf.GeneratedMessageV3.Builder builder) { super(builder); } - private Color() { - red_ = 0F; - green_ = 0F; - blue_ = 0F; - } + private Color() {} @java.lang.Override public final com.google.protobuf.UnknownFieldSet getUnknownFields() { @@ -69,7 +65,7 @@ private Color( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -201,21 +197,14 @@ public boolean equals(final java.lang.Object obj) { } com.google.privacy.dlp.v2.Color other = (com.google.privacy.dlp.v2.Color) obj; - boolean result = true; - result = - result - && (java.lang.Float.floatToIntBits(getRed()) - == java.lang.Float.floatToIntBits(other.getRed())); - result = - result - && (java.lang.Float.floatToIntBits(getGreen()) - == java.lang.Float.floatToIntBits(other.getGreen())); - result = - result - && (java.lang.Float.floatToIntBits(getBlue()) - == java.lang.Float.floatToIntBits(other.getBlue())); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (java.lang.Float.floatToIntBits(getRed()) != java.lang.Float.floatToIntBits(other.getRed())) + return false; + if (java.lang.Float.floatToIntBits(getGreen()) + != java.lang.Float.floatToIntBits(other.getGreen())) return false; + if (java.lang.Float.floatToIntBits(getBlue()) + != java.lang.Float.floatToIntBits(other.getBlue())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -415,35 +404,35 @@ public com.google.privacy.dlp.v2.Color 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 @@ -630,7 +619,7 @@ public Builder clearBlue() { @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/ContentItem.java b/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/ContentItem.java index dc8df527fb03..4c3c20f55cd6 100644 --- a/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/ContentItem.java +++ b/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/ContentItem.java @@ -88,7 +88,7 @@ private ContentItem( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -369,24 +369,22 @@ public boolean equals(final java.lang.Object obj) { } com.google.privacy.dlp.v2.ContentItem other = (com.google.privacy.dlp.v2.ContentItem) obj; - boolean result = true; - result = result && getDataItemCase().equals(other.getDataItemCase()); - if (!result) return false; + if (!getDataItemCase().equals(other.getDataItemCase())) return false; switch (dataItemCase_) { case 3: - result = result && getValue().equals(other.getValue()); + if (!getValue().equals(other.getValue())) return false; break; case 4: - result = result && getTable().equals(other.getTable()); + if (!getTable().equals(other.getTable())) return false; break; case 5: - result = result && getByteItem().equals(other.getByteItem()); + if (!getByteItem().equals(other.getByteItem())) 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 @@ -609,35 +607,35 @@ public com.google.privacy.dlp.v2.ContentItem 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 @@ -1243,7 +1241,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/ContentLocation.java b/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/ContentLocation.java index 6e9f9974187e..0a4c890c4356 100644 --- a/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/ContentLocation.java +++ b/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/ContentLocation.java @@ -130,7 +130,7 @@ private ContentLocation( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -570,30 +570,28 @@ public boolean equals(final java.lang.Object obj) { com.google.privacy.dlp.v2.ContentLocation other = (com.google.privacy.dlp.v2.ContentLocation) obj; - boolean result = true; - result = result && getContainerName().equals(other.getContainerName()); - result = result && (hasContainerTimestamp() == other.hasContainerTimestamp()); + if (!getContainerName().equals(other.getContainerName())) return false; + if (hasContainerTimestamp() != other.hasContainerTimestamp()) return false; if (hasContainerTimestamp()) { - result = result && getContainerTimestamp().equals(other.getContainerTimestamp()); + if (!getContainerTimestamp().equals(other.getContainerTimestamp())) return false; } - result = result && getContainerVersion().equals(other.getContainerVersion()); - result = result && getLocationCase().equals(other.getLocationCase()); - if (!result) return false; + if (!getContainerVersion().equals(other.getContainerVersion())) return false; + if (!getLocationCase().equals(other.getLocationCase())) return false; switch (locationCase_) { case 2: - result = result && getRecordLocation().equals(other.getRecordLocation()); + if (!getRecordLocation().equals(other.getRecordLocation())) return false; break; case 3: - result = result && getImageLocation().equals(other.getImageLocation()); + if (!getImageLocation().equals(other.getImageLocation())) return false; break; case 5: - result = result && getDocumentLocation().equals(other.getDocumentLocation()); + if (!getDocumentLocation().equals(other.getDocumentLocation())) 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 @@ -846,35 +844,35 @@ public com.google.privacy.dlp.v2.ContentLocation 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 @@ -1699,7 +1697,7 @@ public com.google.privacy.dlp.v2.DocumentLocationOrBuilder getDocumentLocationOr return documentLocationBuilder_; } - private com.google.protobuf.Timestamp containerTimestamp_ = null; + private com.google.protobuf.Timestamp containerTimestamp_; private com.google.protobuf.SingleFieldBuilderV3< com.google.protobuf.Timestamp, com.google.protobuf.Timestamp.Builder, @@ -2008,7 +2006,7 @@ public Builder setContainerVersionBytes(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/CreateDeidentifyTemplateRequest.java b/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/CreateDeidentifyTemplateRequest.java index a871734cf0c2..629fe793da5b 100644 --- a/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/CreateDeidentifyTemplateRequest.java +++ b/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/CreateDeidentifyTemplateRequest.java @@ -84,7 +84,7 @@ private CreateDeidentifyTemplateRequest( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -210,7 +210,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.
    *
* @@ -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 + implements + // @@protoc_insertion_point(builder_implements:google.privacy.dlp.v2.CryptoDeterministicConfig) + com.google.privacy.dlp.v2.CryptoDeterministicConfigOrBuilder { + 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); + } + + // Construct using com.google.privacy.dlp.v2.CryptoDeterministicConfig.newBuilder() + private Builder() { + maybeForceBuilderInitialization(); + } + + private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { + super(parent); + maybeForceBuilderInitialization(); + } + + private void maybeForceBuilderInitialization() { + if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {} + } + + @java.lang.Override + public Builder clear() { + super.clear(); + if (cryptoKeyBuilder_ == null) { + cryptoKey_ = null; + } else { + cryptoKey_ = null; + cryptoKeyBuilder_ = null; + } + if (surrogateInfoTypeBuilder_ == null) { + surrogateInfoType_ = null; + } else { + surrogateInfoType_ = null; + surrogateInfoTypeBuilder_ = null; + } + if (contextBuilder_ == null) { + context_ = null; + } else { + context_ = null; + contextBuilder_ = null; + } + return this; + } + + @java.lang.Override + public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { + return com.google.privacy.dlp.v2.DlpProto + .internal_static_google_privacy_dlp_v2_CryptoDeterministicConfig_descriptor; + } + + @java.lang.Override + public com.google.privacy.dlp.v2.CryptoDeterministicConfig getDefaultInstanceForType() { + return com.google.privacy.dlp.v2.CryptoDeterministicConfig.getDefaultInstance(); + } + + @java.lang.Override + public com.google.privacy.dlp.v2.CryptoDeterministicConfig build() { + com.google.privacy.dlp.v2.CryptoDeterministicConfig result = buildPartial(); + if (!result.isInitialized()) { + throw newUninitializedMessageException(result); + } + return result; + } + + @java.lang.Override + public com.google.privacy.dlp.v2.CryptoDeterministicConfig buildPartial() { + com.google.privacy.dlp.v2.CryptoDeterministicConfig result = + new com.google.privacy.dlp.v2.CryptoDeterministicConfig(this); + if (cryptoKeyBuilder_ == null) { + result.cryptoKey_ = cryptoKey_; + } else { + result.cryptoKey_ = cryptoKeyBuilder_.build(); + } + if (surrogateInfoTypeBuilder_ == null) { + result.surrogateInfoType_ = surrogateInfoType_; + } else { + result.surrogateInfoType_ = surrogateInfoTypeBuilder_.build(); + } + if (contextBuilder_ == null) { + result.context_ = context_; + } else { + result.context_ = contextBuilder_.build(); + } + onBuilt(); + return result; + } + + @java.lang.Override + public Builder clone() { + return super.clone(); + } + + @java.lang.Override + public Builder setField( + com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { + return super.setField(field, value); + } + + @java.lang.Override + public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) { + return super.clearField(field); + } + + @java.lang.Override + public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) { + return super.clearOneof(oneof); + } + + @java.lang.Override + public Builder setRepeatedField( + com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) { + return super.setRepeatedField(field, index, value); + } + + @java.lang.Override + public Builder addRepeatedField( + com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { + return super.addRepeatedField(field, value); + } + + @java.lang.Override + public Builder mergeFrom(com.google.protobuf.Message other) { + if (other instanceof com.google.privacy.dlp.v2.CryptoDeterministicConfig) { + return mergeFrom((com.google.privacy.dlp.v2.CryptoDeterministicConfig) other); + } else { + super.mergeFrom(other); + return this; + } + } + + public Builder mergeFrom(com.google.privacy.dlp.v2.CryptoDeterministicConfig other) { + if (other == com.google.privacy.dlp.v2.CryptoDeterministicConfig.getDefaultInstance()) + return this; + if (other.hasCryptoKey()) { + mergeCryptoKey(other.getCryptoKey()); + } + if (other.hasSurrogateInfoType()) { + mergeSurrogateInfoType(other.getSurrogateInfoType()); + } + if (other.hasContext()) { + mergeContext(other.getContext()); + } + this.mergeUnknownFields(other.unknownFields); + onChanged(); + return this; + } + + @java.lang.Override + public final boolean isInitialized() { + return true; + } + + @java.lang.Override + public Builder mergeFrom( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + com.google.privacy.dlp.v2.CryptoDeterministicConfig parsedMessage = null; + try { + parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); + } catch (com.google.protobuf.InvalidProtocolBufferException e) { + parsedMessage = + (com.google.privacy.dlp.v2.CryptoDeterministicConfig) e.getUnfinishedMessage(); + throw e.unwrapIOException(); + } finally { + if (parsedMessage != null) { + mergeFrom(parsedMessage); + } + } + return this; + } + + 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, + com.google.privacy.dlp.v2.CryptoKeyOrBuilder> + cryptoKeyBuilder_; + /** + * + * + * 
+     * 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 PARSER = + new com.google.protobuf.AbstractParser() { + @java.lang.Override + public CryptoDeterministicConfig parsePartialFrom( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return new CryptoDeterministicConfig(input, extensionRegistry); + } + }; + + public static com.google.protobuf.Parser parser() { + return PARSER; + } + + @java.lang.Override + public com.google.protobuf.Parser getParserForType() { + return PARSER; + } + + @java.lang.Override + public com.google.privacy.dlp.v2.CryptoDeterministicConfig getDefaultInstanceForType() { + return DEFAULT_INSTANCE; + } +} diff --git a/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/CryptoDeterministicConfigOrBuilder.java b/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/CryptoDeterministicConfigOrBuilder.java new file mode 100644 index 000000000000..cf879e30bb50 --- /dev/null +++ b/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/CryptoDeterministicConfigOrBuilder.java @@ -0,0 +1,205 @@ +// Generated by the protocol buffer compiler. DO NOT EDIT! +// source: google/privacy/dlp/v2/dlp.proto + +package com.google.privacy.dlp.v2; + +public interface CryptoDeterministicConfigOrBuilder + extends + // @@protoc_insertion_point(interface_extends:google.privacy.dlp.v2.CryptoDeterministicConfig) + com.google.protobuf.MessageOrBuilder { + + /** + * + * + * 
+   * 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(); + if (!((mutable_bitField0_ & 0x00000002) != 0)) { + groupIndexes_ = newIntList(); mutable_bitField0_ |= 0x00000002; } - groupIndexes_.add(input.readInt32()); + groupIndexes_.addInt(input.readInt32()); break; } case 18: { int length = input.readRawVarint32(); int limit = input.pushLimit(length); - if (!((mutable_bitField0_ & 0x00000002) == 0x00000002) - && input.getBytesUntilLimit() > 0) { - groupIndexes_ = new java.util.ArrayList(); + if (!((mutable_bitField0_ & 0x00000002) != 0) && input.getBytesUntilLimit() > 0) { + groupIndexes_ = newIntList(); mutable_bitField0_ |= 0x00000002; } while (input.getBytesUntilLimit() > 0) { - groupIndexes_.add(input.readInt32()); + groupIndexes_.addInt(input.readInt32()); } input.popLimit(limit); break; } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -2476,8 +2472,8 @@ private Regex( } catch (java.io.IOException e) { throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this); } finally { - if (((mutable_bitField0_ & 0x00000002) == 0x00000002)) { - groupIndexes_ = java.util.Collections.unmodifiableList(groupIndexes_); + if (((mutable_bitField0_ & 0x00000002) != 0)) { + groupIndexes_.makeImmutable(); // C } this.unknownFields = unknownFields.build(); makeExtensionsImmutable(); @@ -2548,7 +2544,7 @@ public com.google.protobuf.ByteString getPatternBytes() { } public static final int GROUP_INDEXES_FIELD_NUMBER = 2; - private java.util.List groupIndexes_; + private com.google.protobuf.Internal.IntList groupIndexes_; /** * * @@ -2586,7 +2582,7 @@ public int getGroupIndexesCount() { * 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.List groupIndexes_ = java.util.Collections.emptyList(); + private com.google.protobuf.Internal.IntList groupIndexes_ = emptyIntList(); private void ensureGroupIndexesIsMutable() { - if (!((bitField0_ & 0x00000002) == 0x00000002)) { - groupIndexes_ = new java.util.ArrayList(groupIndexes_); + if (!((bitField0_ & 0x00000002) != 0)) { + groupIndexes_ = mutableCopy(groupIndexes_); bitField0_ |= 0x00000002; } } @@ -3084,7 +3079,9 @@ private void ensureGroupIndexesIsMutable() { * repeated int32 group_indexes = 2; */ public java.util.List getGroupIndexesList() { - return java.util.Collections.unmodifiableList(groupIndexes_); + return ((bitField0_ & 0x00000002) != 0) + ? java.util.Collections.unmodifiableList(groupIndexes_) + : groupIndexes_; } /** * @@ -3110,7 +3107,7 @@ public int getGroupIndexesCount() { * repeated 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.Iterablerepeated 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( detectionRules_); @@ -10137,7 +10122,7 @@ public com.google.privacy.dlp.v2.CustomInfoType.DetectionRule.Builder addDetecti com.google.privacy.dlp.v2.CustomInfoType.DetectionRule.Builder, com.google.privacy.dlp.v2.CustomInfoType.DetectionRuleOrBuilder>( detectionRules_, - ((bitField0_ & 0x00000040) == 0x00000040), + ((bitField0_ & 0x00000040) != 0), getParentForChildren(), isClean()); detectionRules_ = null; @@ -10230,7 +10215,7 @@ public Builder clearExclusionType() { @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/DatastoreKey.java b/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/DatastoreKey.java index c418c00700cc..70dffffb04e4 100644 --- a/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/DatastoreKey.java +++ b/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/DatastoreKey.java @@ -65,7 +65,7 @@ private DatastoreKey( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -180,13 +180,12 @@ public boolean equals(final java.lang.Object obj) { } com.google.privacy.dlp.v2.DatastoreKey other = (com.google.privacy.dlp.v2.DatastoreKey) obj; - boolean result = true; - result = result && (hasEntityKey() == other.hasEntityKey()); + if (hasEntityKey() != other.hasEntityKey()) return false; if (hasEntityKey()) { - result = result && getEntityKey().equals(other.getEntityKey()); + if (!getEntityKey().equals(other.getEntityKey())) return false; } - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -389,35 +388,35 @@ public com.google.privacy.dlp.v2.DatastoreKey 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 @@ -464,7 +463,7 @@ public Builder mergeFrom( return this; } - private com.google.privacy.dlp.v2.Key entityKey_ = null; + private com.google.privacy.dlp.v2.Key entityKey_; private com.google.protobuf.SingleFieldBuilderV3< com.google.privacy.dlp.v2.Key, com.google.privacy.dlp.v2.Key.Builder, @@ -641,7 +640,7 @@ public com.google.privacy.dlp.v2.KeyOrBuilder getEntityKeyOrBuilder() { @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/DatastoreOptions.java b/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/DatastoreOptions.java index 93cd25622f1e..64c15c10587b 100644 --- a/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/DatastoreOptions.java +++ b/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/DatastoreOptions.java @@ -82,7 +82,7 @@ private DatastoreOptions( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -248,17 +248,16 @@ public boolean equals(final java.lang.Object obj) { com.google.privacy.dlp.v2.DatastoreOptions other = (com.google.privacy.dlp.v2.DatastoreOptions) obj; - boolean result = true; - result = result && (hasPartitionId() == other.hasPartitionId()); + if (hasPartitionId() != other.hasPartitionId()) return false; if (hasPartitionId()) { - result = result && getPartitionId().equals(other.getPartitionId()); + if (!getPartitionId().equals(other.getPartitionId())) return false; } - result = result && (hasKind() == other.hasKind()); + if (hasKind() != other.hasKind()) return false; if (hasKind()) { - result = result && getKind().equals(other.getKind()); + if (!getKind().equals(other.getKind())) return false; } - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -476,35 +475,35 @@ public com.google.privacy.dlp.v2.DatastoreOptions buildPartial() { @java.lang.Override public Builder clone() { - return (Builder) super.clone(); + return super.clone(); } @java.lang.Override public Builder setField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.setField(field, value); + return super.setField(field, value); } @java.lang.Override public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) { - return (Builder) super.clearField(field); + return super.clearField(field); } @java.lang.Override public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) { - return (Builder) super.clearOneof(oneof); + return super.clearOneof(oneof); } @java.lang.Override public Builder setRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) { - return (Builder) super.setRepeatedField(field, index, value); + return super.setRepeatedField(field, index, value); } @java.lang.Override public Builder addRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.addRepeatedField(field, value); + return super.addRepeatedField(field, value); } @java.lang.Override @@ -554,7 +553,7 @@ public Builder mergeFrom( return this; } - private com.google.privacy.dlp.v2.PartitionId partitionId_ = null; + private com.google.privacy.dlp.v2.PartitionId partitionId_; private com.google.protobuf.SingleFieldBuilderV3< com.google.privacy.dlp.v2.PartitionId, com.google.privacy.dlp.v2.PartitionId.Builder, @@ -744,7 +743,7 @@ public com.google.privacy.dlp.v2.PartitionIdOrBuilder getPartitionIdOrBuilder() return partitionIdBuilder_; } - private com.google.privacy.dlp.v2.KindExpression kind_ = null; + private com.google.privacy.dlp.v2.KindExpression kind_; private com.google.protobuf.SingleFieldBuilderV3< com.google.privacy.dlp.v2.KindExpression, com.google.privacy.dlp.v2.KindExpression.Builder, @@ -927,7 +926,7 @@ public com.google.privacy.dlp.v2.KindExpressionOrBuilder getKindOrBuilder() { @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/DateShiftConfig.java b/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/DateShiftConfig.java index c670013840ad..8b7d53d8830e 100644 --- a/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/DateShiftConfig.java +++ b/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/DateShiftConfig.java @@ -24,10 +24,7 @@ private DateShiftConfig(com.google.protobuf.GeneratedMessageV3.Builder builde super(builder); } - private DateShiftConfig() { - upperBoundDays_ = 0; - lowerBoundDays_ = 0; - } + private DateShiftConfig() {} @java.lang.Override public final com.google.protobuf.UnknownFieldSet getUnknownFields() { @@ -96,7 +93,7 @@ private DateShiftConfig( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -357,24 +354,22 @@ public boolean equals(final java.lang.Object obj) { com.google.privacy.dlp.v2.DateShiftConfig other = (com.google.privacy.dlp.v2.DateShiftConfig) obj; - boolean result = true; - result = result && (getUpperBoundDays() == other.getUpperBoundDays()); - result = result && (getLowerBoundDays() == other.getLowerBoundDays()); - result = result && (hasContext() == other.hasContext()); + if (getUpperBoundDays() != other.getUpperBoundDays()) return false; + if (getLowerBoundDays() != other.getLowerBoundDays()) return false; + if (hasContext() != other.hasContext()) return false; if (hasContext()) { - result = result && getContext().equals(other.getContext()); + if (!getContext().equals(other.getContext())) return false; } - result = result && getMethodCase().equals(other.getMethodCase()); - if (!result) return false; + if (!getMethodCase().equals(other.getMethodCase())) return false; switch (methodCase_) { case 4: - result = result && getCryptoKey().equals(other.getCryptoKey()); + if (!getCryptoKey().equals(other.getCryptoKey())) 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 @@ -607,35 +602,35 @@ public com.google.privacy.dlp.v2.DateShiftConfig buildPartial() { @java.lang.Override public Builder clone() { - return (Builder) super.clone(); + return super.clone(); } @java.lang.Override public Builder setField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.setField(field, value); + return super.setField(field, value); } @java.lang.Override public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) { - return (Builder) super.clearField(field); + return super.clearField(field); } @java.lang.Override public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) { - return (Builder) super.clearOneof(oneof); + return super.clearOneof(oneof); } @java.lang.Override public Builder setRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) { - return (Builder) super.setRepeatedField(field, index, value); + return super.setRepeatedField(field, index, value); } @java.lang.Override public Builder addRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.addRepeatedField(field, value); + return super.addRepeatedField(field, value); } @java.lang.Override @@ -816,7 +811,7 @@ public Builder clearLowerBoundDays() { return this; } - 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, @@ -1221,7 +1216,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/DateTime.java b/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/DateTime.java index cfeb90288db1..17ca48884af2 100644 --- a/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/DateTime.java +++ b/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/DateTime.java @@ -104,7 +104,7 @@ private DateTime( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -164,9 +164,7 @@ private TimeZone(com.google.protobuf.GeneratedMessageV3.Builder builder) { super(builder); } - private TimeZone() { - offsetMinutes_ = 0; - } + private TimeZone() {} @java.lang.Override public final com.google.protobuf.UnknownFieldSet getUnknownFields() { @@ -199,7 +197,7 @@ private TimeZone( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -292,10 +290,9 @@ public boolean equals(final java.lang.Object obj) { com.google.privacy.dlp.v2.DateTime.TimeZone other = (com.google.privacy.dlp.v2.DateTime.TimeZone) obj; - boolean result = true; - result = result && (getOffsetMinutes() == other.getOffsetMinutes()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (getOffsetMinutes() != other.getOffsetMinutes()) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -482,23 +479,23 @@ public com.google.privacy.dlp.v2.DateTime.TimeZone 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 @@ -506,13 +503,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 @@ -609,7 +606,7 @@ public Builder clearOffsetMinutes() { @java.lang.Override public final Builder setUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { - return super.setUnknownFieldsProto3(unknownFields); + return super.setUnknownFields(unknownFields); } @java.lang.Override @@ -807,22 +804,21 @@ public boolean equals(final java.lang.Object obj) { } com.google.privacy.dlp.v2.DateTime other = (com.google.privacy.dlp.v2.DateTime) obj; - boolean result = true; - result = result && (hasDate() == other.hasDate()); + if (hasDate() != other.hasDate()) return false; if (hasDate()) { - result = result && getDate().equals(other.getDate()); + if (!getDate().equals(other.getDate())) return false; } - result = result && dayOfWeek_ == other.dayOfWeek_; - result = result && (hasTime() == other.hasTime()); + if (dayOfWeek_ != other.dayOfWeek_) return false; + if (hasTime() != other.hasTime()) return false; if (hasTime()) { - result = result && getTime().equals(other.getTime()); + if (!getTime().equals(other.getTime())) return false; } - result = result && (hasTimeZone() == other.hasTimeZone()); + if (hasTimeZone() != other.hasTimeZone()) return false; if (hasTimeZone()) { - result = result && getTimeZone().equals(other.getTimeZone()); + if (!getTimeZone().equals(other.getTimeZone())) return false; } - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -1059,35 +1055,35 @@ public com.google.privacy.dlp.v2.DateTime 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 @@ -1143,7 +1139,7 @@ public Builder mergeFrom( return this; } - private com.google.type.Date date_ = null; + private com.google.type.Date date_; private com.google.protobuf.SingleFieldBuilderV3< com.google.type.Date, com.google.type.Date.Builder, com.google.type.DateOrBuilder> dateBuilder_; @@ -1355,7 +1351,7 @@ public Builder clearDayOfWeek() { return this; } - private com.google.type.TimeOfDay time_ = null; + private com.google.type.TimeOfDay time_; private com.google.protobuf.SingleFieldBuilderV3< com.google.type.TimeOfDay, com.google.type.TimeOfDay.Builder, @@ -1456,7 +1452,7 @@ public com.google.type.TimeOfDayOrBuilder getTimeOrBuilder() { return timeBuilder_; } - private com.google.privacy.dlp.v2.DateTime.TimeZone timeZone_ = null; + private com.google.privacy.dlp.v2.DateTime.TimeZone timeZone_; private com.google.protobuf.SingleFieldBuilderV3< com.google.privacy.dlp.v2.DateTime.TimeZone, com.google.privacy.dlp.v2.DateTime.TimeZone.Builder, @@ -1568,7 +1564,7 @@ public com.google.privacy.dlp.v2.DateTime.TimeZoneOrBuilder getTimeZoneOrBuilder @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/DeidentifyConfig.java b/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/DeidentifyConfig.java index 8e34e7f551c1..a6a1dc22c481 100644 --- a/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/DeidentifyConfig.java +++ b/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/DeidentifyConfig.java @@ -88,7 +88,7 @@ private DeidentifyConfig( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -314,21 +314,19 @@ public boolean equals(final java.lang.Object obj) { com.google.privacy.dlp.v2.DeidentifyConfig other = (com.google.privacy.dlp.v2.DeidentifyConfig) 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 && getInfoTypeTransformations().equals(other.getInfoTypeTransformations()); + if (!getInfoTypeTransformations().equals(other.getInfoTypeTransformations())) return false; break; case 2: - result = result && getRecordTransformations().equals(other.getRecordTransformations()); + if (!getRecordTransformations().equals(other.getRecordTransformations())) 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 @@ -545,35 +543,35 @@ public com.google.privacy.dlp.v2.DeidentifyConfig 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 @@ -1089,7 +1087,7 @@ public Builder clearRecordTransformations() { @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/DeidentifyContentRequest.java b/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/DeidentifyContentRequest.java index 6b4d0d546feb..d7ef0ba087af 100644 --- a/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/DeidentifyContentRequest.java +++ b/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/DeidentifyContentRequest.java @@ -123,7 +123,7 @@ private DeidentifyContentRequest( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -508,24 +508,23 @@ public boolean equals(final java.lang.Object obj) { com.google.privacy.dlp.v2.DeidentifyContentRequest other = (com.google.privacy.dlp.v2.DeidentifyContentRequest) obj; - boolean result = true; - result = result && getParent().equals(other.getParent()); - result = result && (hasDeidentifyConfig() == other.hasDeidentifyConfig()); + if (!getParent().equals(other.getParent())) return false; + if (hasDeidentifyConfig() != other.hasDeidentifyConfig()) return false; if (hasDeidentifyConfig()) { - result = result && getDeidentifyConfig().equals(other.getDeidentifyConfig()); + if (!getDeidentifyConfig().equals(other.getDeidentifyConfig())) 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 && getDeidentifyTemplateName().equals(other.getDeidentifyTemplateName()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getInspectTemplateName().equals(other.getInspectTemplateName())) return false; + if (!getDeidentifyTemplateName().equals(other.getDeidentifyTemplateName())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -773,35 +772,35 @@ public com.google.privacy.dlp.v2.DeidentifyContentRequest 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 @@ -962,7 +961,7 @@ public Builder setParentBytes(com.google.protobuf.ByteString value) { return this; } - private com.google.privacy.dlp.v2.DeidentifyConfig deidentifyConfig_ = null; + private com.google.privacy.dlp.v2.DeidentifyConfig deidentifyConfig_; private com.google.protobuf.SingleFieldBuilderV3< com.google.privacy.dlp.v2.DeidentifyConfig, com.google.privacy.dlp.v2.DeidentifyConfig.Builder, @@ -1162,7 +1161,7 @@ public com.google.privacy.dlp.v2.DeidentifyConfigOrBuilder getDeidentifyConfigOr return deidentifyConfigBuilder_; } - 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, @@ -1362,7 +1361,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, @@ -1769,7 +1768,7 @@ public Builder setDeidentifyTemplateNameBytes(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/DeidentifyContentResponse.java b/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/DeidentifyContentResponse.java index 590ff792ebfe..12b944e520ba 100644 --- a/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/DeidentifyContentResponse.java +++ b/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/DeidentifyContentResponse.java @@ -82,7 +82,7 @@ private DeidentifyContentResponse( } 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.DeidentifyContentResponse other = (com.google.privacy.dlp.v2.DeidentifyContentResponse) 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.DeidentifyContentResponse 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/DeidentifyTemplate.java b/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/DeidentifyTemplate.java index 2e86d9a6f86f..e32fe1892ee2 100644 --- a/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/DeidentifyTemplate.java +++ b/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/DeidentifyTemplate.java @@ -122,7 +122,7 @@ private DeidentifyTemplate( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -483,24 +483,23 @@ public boolean equals(final java.lang.Object obj) { com.google.privacy.dlp.v2.DeidentifyTemplate other = (com.google.privacy.dlp.v2.DeidentifyTemplate) obj; - boolean result = true; - result = result && getName().equals(other.getName()); - result = result && getDisplayName().equals(other.getDisplayName()); - result = result && getDescription().equals(other.getDescription()); - result = result && (hasCreateTime() == other.hasCreateTime()); + if (!getName().equals(other.getName())) return false; + if (!getDisplayName().equals(other.getDisplayName())) return false; + if (!getDescription().equals(other.getDescription())) 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 && (hasUpdateTime() == other.hasUpdateTime()); + if (hasUpdateTime() != other.hasUpdateTime()) return false; if (hasUpdateTime()) { - result = result && getUpdateTime().equals(other.getUpdateTime()); + if (!getUpdateTime().equals(other.getUpdateTime())) return false; } - result = result && (hasDeidentifyConfig() == other.hasDeidentifyConfig()); + if (hasDeidentifyConfig() != other.hasDeidentifyConfig()) return false; if (hasDeidentifyConfig()) { - result = result && getDeidentifyConfig().equals(other.getDeidentifyConfig()); + if (!getDeidentifyConfig().equals(other.getDeidentifyConfig())) return false; } - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -749,35 +748,35 @@ public com.google.privacy.dlp.v2.DeidentifyTemplate buildPartial() { @java.lang.Override public Builder clone() { - return (Builder) super.clone(); + return super.clone(); } @java.lang.Override public Builder setField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.setField(field, value); + return super.setField(field, value); } @java.lang.Override public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) { - return (Builder) super.clearField(field); + return super.clearField(field); } @java.lang.Override public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) { - return (Builder) super.clearOneof(oneof); + return super.clearOneof(oneof); } @java.lang.Override public Builder setRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) { - return (Builder) super.setRepeatedField(field, index, value); + return super.setRepeatedField(field, index, value); } @java.lang.Override public Builder addRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.addRepeatedField(field, value); + return super.addRepeatedField(field, value); } @java.lang.Override @@ -1139,7 +1138,7 @@ public Builder setDescriptionBytes(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, @@ -1318,7 +1317,7 @@ public com.google.protobuf.TimestampOrBuilder getCreateTimeOrBuilder() { return createTimeBuilder_; } - private com.google.protobuf.Timestamp updateTime_ = null; + private com.google.protobuf.Timestamp updateTime_; private com.google.protobuf.SingleFieldBuilderV3< com.google.protobuf.Timestamp, com.google.protobuf.Timestamp.Builder, @@ -1497,7 +1496,7 @@ public com.google.protobuf.TimestampOrBuilder getUpdateTimeOrBuilder() { return updateTimeBuilder_; } - private com.google.privacy.dlp.v2.DeidentifyConfig deidentifyConfig_ = null; + private com.google.privacy.dlp.v2.DeidentifyConfig deidentifyConfig_; private com.google.protobuf.SingleFieldBuilderV3< com.google.privacy.dlp.v2.DeidentifyConfig, com.google.privacy.dlp.v2.DeidentifyConfig.Builder, @@ -1681,7 +1680,7 @@ public com.google.privacy.dlp.v2.DeidentifyConfigOrBuilder getDeidentifyConfigOr @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/DeleteDeidentifyTemplateRequest.java b/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/DeleteDeidentifyTemplateRequest.java index 1a97e8490492..f778d4855a1f 100644 --- a/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/DeleteDeidentifyTemplateRequest.java +++ b/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/DeleteDeidentifyTemplateRequest.java @@ -60,7 +60,7 @@ private DeleteDeidentifyTemplateRequest( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -184,10 +184,9 @@ public boolean equals(final java.lang.Object obj) { com.google.privacy.dlp.v2.DeleteDeidentifyTemplateRequest other = (com.google.privacy.dlp.v2.DeleteDeidentifyTemplateRequest) obj; - boolean result = true; - result = result && getName().equals(other.getName()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getName().equals(other.getName())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -381,35 +380,35 @@ public com.google.privacy.dlp.v2.DeleteDeidentifyTemplateRequest 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 @@ -565,7 +564,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/DeleteDlpJobRequest.java b/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/DeleteDlpJobRequest.java index 5fdef3e9e8c4..44248793f528 100644 --- a/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/DeleteDlpJobRequest.java +++ b/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/DeleteDlpJobRequest.java @@ -59,7 +59,7 @@ private DeleteDlpJobRequest( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -179,10 +179,9 @@ public boolean equals(final java.lang.Object obj) { com.google.privacy.dlp.v2.DeleteDlpJobRequest other = (com.google.privacy.dlp.v2.DeleteDlpJobRequest) 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 @@ -375,35 +374,35 @@ public com.google.privacy.dlp.v2.DeleteDlpJobRequest 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 @@ -547,7 +546,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/DeleteInspectTemplateRequest.java b/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/DeleteInspectTemplateRequest.java index 6cb3c3f06f7b..ccc62ef1bd68 100644 --- a/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/DeleteInspectTemplateRequest.java +++ b/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/DeleteInspectTemplateRequest.java @@ -59,7 +59,7 @@ private DeleteInspectTemplateRequest( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -183,10 +183,9 @@ public boolean equals(final java.lang.Object obj) { com.google.privacy.dlp.v2.DeleteInspectTemplateRequest other = (com.google.privacy.dlp.v2.DeleteInspectTemplateRequest) 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 @@ -380,35 +379,35 @@ public com.google.privacy.dlp.v2.DeleteInspectTemplateRequest 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 @@ -564,7 +563,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/DeleteJobTriggerRequest.java b/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/DeleteJobTriggerRequest.java index 7719c069a447..62e91084f42f 100644 --- a/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/DeleteJobTriggerRequest.java +++ b/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/DeleteJobTriggerRequest.java @@ -59,7 +59,7 @@ private DeleteJobTriggerRequest( } 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.DeleteJobTriggerRequest other = (com.google.privacy.dlp.v2.DeleteJobTriggerRequest) 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.DeleteJobTriggerRequest 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/DeleteStoredInfoTypeRequest.java b/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/DeleteStoredInfoTypeRequest.java index e1ee49010e50..5a5530f57123 100644 --- a/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/DeleteStoredInfoTypeRequest.java +++ b/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/DeleteStoredInfoTypeRequest.java @@ -59,7 +59,7 @@ private DeleteStoredInfoTypeRequest( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -183,10 +183,9 @@ public boolean equals(final java.lang.Object obj) { com.google.privacy.dlp.v2.DeleteStoredInfoTypeRequest other = (com.google.privacy.dlp.v2.DeleteStoredInfoTypeRequest) 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 @@ -380,35 +379,35 @@ public com.google.privacy.dlp.v2.DeleteStoredInfoTypeRequest 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 @@ -564,7 +563,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/DlpJob.java b/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/DlpJob.java index de94245fce98..986432f12810 100644 --- a/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/DlpJob.java +++ b/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/DlpJob.java @@ -166,7 +166,7 @@ private DlpJob( } case 90: { - if (!((mutable_bitField0_ & 0x00000200) == 0x00000200)) { + if (!((mutable_bitField0_ & 0x00000200) != 0)) { errors_ = new java.util.ArrayList(); mutable_bitField0_ |= 0x00000200; } @@ -176,7 +176,7 @@ private DlpJob( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -188,7 +188,7 @@ private DlpJob( } catch (java.io.IOException e) { throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this); } finally { - if (((mutable_bitField0_ & 0x00000200) == 0x00000200)) { + if (((mutable_bitField0_ & 0x00000200) != 0)) { errors_ = java.util.Collections.unmodifiableList(errors_); } this.unknownFields = unknownFields.build(); @@ -957,38 +957,36 @@ public boolean equals(final java.lang.Object obj) { } com.google.privacy.dlp.v2.DlpJob other = (com.google.privacy.dlp.v2.DlpJob) obj; - boolean result = true; - result = result && getName().equals(other.getName()); - result = result && type_ == other.type_; - result = result && state_ == other.state_; - result = result && (hasCreateTime() == other.hasCreateTime()); + if (!getName().equals(other.getName())) return false; + if (type_ != other.type_) return false; + if (state_ != other.state_) 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 && (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 && getJobTriggerName().equals(other.getJobTriggerName()); - result = result && getErrorsList().equals(other.getErrorsList()); - result = result && getDetailsCase().equals(other.getDetailsCase()); - if (!result) return false; + if (!getJobTriggerName().equals(other.getJobTriggerName())) return false; + if (!getErrorsList().equals(other.getErrorsList())) return false; + if (!getDetailsCase().equals(other.getDetailsCase())) return false; switch (detailsCase_) { case 4: - result = result && getRiskDetails().equals(other.getRiskDetails()); + if (!getRiskDetails().equals(other.getRiskDetails())) return false; break; case 5: - result = result && getInspectDetails().equals(other.getInspectDetails()); + if (!getInspectDetails().equals(other.getInspectDetails())) 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 @@ -1276,7 +1274,7 @@ public com.google.privacy.dlp.v2.DlpJob buildPartial() { } result.jobTriggerName_ = jobTriggerName_; if (errorsBuilder_ == null) { - if (((bitField0_ & 0x00000200) == 0x00000200)) { + if (((bitField0_ & 0x00000200) != 0)) { errors_ = java.util.Collections.unmodifiableList(errors_); bitField0_ = (bitField0_ & ~0x00000200); } @@ -1292,35 +1290,35 @@ public com.google.privacy.dlp.v2.DlpJob 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 @@ -2100,7 +2098,7 @@ public com.google.privacy.dlp.v2.InspectDataSourceDetails.Builder getInspectDeta return inspectDetailsBuilder_; } - 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, @@ -2279,7 +2277,7 @@ public com.google.protobuf.TimestampOrBuilder getCreateTimeOrBuilder() { return createTimeBuilder_; } - 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, @@ -2454,7 +2452,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, @@ -2732,7 +2730,7 @@ public Builder setJobTriggerNameBytes(com.google.protobuf.ByteString value) { java.util.Collections.emptyList(); private void ensureErrorsIsMutable() { - if (!((bitField0_ & 0x00000200) == 0x00000200)) { + if (!((bitField0_ & 0x00000200) != 0)) { errors_ = new java.util.ArrayList(errors_); bitField0_ |= 0x00000200; } @@ -3068,10 +3066,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_ & 0x00000200) == 0x00000200), - getParentForChildren(), - isClean()); + errors_, ((bitField0_ & 0x00000200) != 0), getParentForChildren(), isClean()); errors_ = null; } return errorsBuilder_; @@ -3079,7 +3074,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/DlpProto.java b/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/DlpProto.java index 126534709ee3..700bd957a8dc 100644 --- a/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/DlpProto.java +++ b/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/DlpProto.java @@ -324,6 +324,10 @@ public static void registerAllExtensions(com.google.protobuf.ExtensionRegistry r internal_static_google_privacy_dlp_v2_CryptoHashConfig_descriptor; static final com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internal_static_google_privacy_dlp_v2_CryptoHashConfig_fieldAccessorTable; + static final com.google.protobuf.Descriptors.Descriptor + internal_static_google_privacy_dlp_v2_CryptoDeterministicConfig_descriptor; + static final com.google.protobuf.GeneratedMessageV3.FieldAccessorTable + internal_static_google_privacy_dlp_v2_CryptoDeterministicConfig_fieldAccessorTable; static final com.google.protobuf.Descriptors.Descriptor internal_static_google_privacy_dlp_v2_ReplaceValueConfig_descriptor; static final com.google.protobuf.GeneratedMessageV3.FieldAccessorTable @@ -631,813 +635,821 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { java.lang.String[] descriptorData = { "\n\037google/privacy/dlp/v2/dlp.proto\022\025googl" + "e.privacy.dlp.v2\032\034google/api/annotations" - + ".proto\032#google/privacy/dlp/v2/storage.pr" - + "oto\032\036google/protobuf/duration.proto\032\033goo" - + "gle/protobuf/empty.proto\032 google/protobu" - + "f/field_mask.proto\032\037google/protobuf/time" - + "stamp.proto\032\027google/rpc/status.proto\032\026go" - + "ogle/type/date.proto\032\033google/type/dayofw" - + "eek.proto\032\033google/type/timeofday.proto\"G" - + "\n\020ExcludeInfoTypes\0223\n\ninfo_types\030\001 \003(\0132\037" - + ".google.privacy.dlp.v2.InfoType\"\240\002\n\rExcl" - + "usionRule\022F\n\ndictionary\030\001 \001(\01320.google.p" - + "rivacy.dlp.v2.CustomInfoType.DictionaryH" - + "\000\022<\n\005regex\030\002 \001(\0132+.google.privacy.dlp.v2" - + ".CustomInfoType.RegexH\000\022E\n\022exclude_info_" - + "types\030\003 \001(\0132\'.google.privacy.dlp.v2.Excl" - + "udeInfoTypesH\000\022:\n\rmatching_type\030\004 \001(\0162#." - + "google.privacy.dlp.v2.MatchingTypeB\006\n\004ty" - + "pe\"\261\001\n\016InspectionRule\022W\n\014hotword_rule\030\001 " - + "\001(\0132?.google.privacy.dlp.v2.CustomInfoTy" - + "pe.DetectionRule.HotwordRuleH\000\022>\n\016exclus" - + "ion_rule\030\002 \001(\0132$.google.privacy.dlp.v2.E" - + "xclusionRuleH\000B\006\n\004type\"~\n\021InspectionRule" - + "Set\0223\n\ninfo_types\030\001 \003(\0132\037.google.privacy" - + ".dlp.v2.InfoType\0224\n\005rules\030\002 \003(\0132%.google" - + ".privacy.dlp.v2.InspectionRule\"\307\005\n\rInspe" - + "ctConfig\0223\n\ninfo_types\030\001 \003(\0132\037.google.pr" - + "ivacy.dlp.v2.InfoType\0229\n\016min_likelihood\030" - + "\002 \001(\0162!.google.privacy.dlp.v2.Likelihood" - + "\022B\n\006limits\030\003 \001(\01322.google.privacy.dlp.v2" - + ".InspectConfig.FindingLimits\022\025\n\rinclude_" - + "quote\030\004 \001(\010\022\032\n\022exclude_info_types\030\005 \001(\010\022" - + "@\n\021custom_info_types\030\006 \003(\0132%.google.priv" - + "acy.dlp.v2.CustomInfoType\022=\n\017content_opt" - + "ions\030\010 \003(\0162$.google.privacy.dlp.v2.Conte" - + "ntOption\022:\n\010rule_set\030\n \003(\0132(.google.priv" - + "acy.dlp.v2.InspectionRuleSet\032\221\002\n\rFinding" - + "Limits\022\035\n\025max_findings_per_item\030\001 \001(\005\022 \n" - + "\030max_findings_per_request\030\002 \001(\005\022d\n\032max_f" - + "indings_per_info_type\030\003 \003(\0132@.google.pri" - + "vacy.dlp.v2.InspectConfig.FindingLimits." - + "InfoTypeLimit\032Y\n\rInfoTypeLimit\0222\n\tinfo_t" - + "ype\030\001 \001(\0132\037.google.privacy.dlp.v2.InfoTy" - + "pe\022\024\n\014max_findings\030\002 \001(\005\"\337\001\n\017ByteContent" - + "Item\022>\n\004type\030\001 \001(\01620.google.privacy.dlp." - + "v2.ByteContentItem.BytesType\022\014\n\004data\030\002 \001" - + "(\014\"~\n\tBytesType\022\032\n\026BYTES_TYPE_UNSPECIFIE" - + "D\020\000\022\t\n\005IMAGE\020\006\022\016\n\nIMAGE_JPEG\020\001\022\r\n\tIMAGE_" - + "BMP\020\002\022\r\n\tIMAGE_PNG\020\003\022\r\n\tIMAGE_SVG\020\004\022\r\n\tT" - + "EXT_UTF8\020\005\"\227\001\n\013ContentItem\022\017\n\005value\030\003 \001(" - + "\tH\000\022-\n\005table\030\004 \001(\0132\034.google.privacy.dlp." - + "v2.TableH\000\022;\n\tbyte_item\030\005 \001(\0132&.google.p" - + "rivacy.dlp.v2.ByteContentItemH\000B\013\n\tdata_" - + "item\"\235\001\n\005Table\022/\n\007headers\030\001 \003(\0132\036.google" - + ".privacy.dlp.v2.FieldId\022.\n\004rows\030\002 \003(\0132 ." - + "google.privacy.dlp.v2.Table.Row\0323\n\003Row\022," - + "\n\006values\030\001 \003(\0132\034.google.privacy.dlp.v2.V" - + "alue\"]\n\rInspectResult\0220\n\010findings\030\001 \003(\0132" - + "\036.google.privacy.dlp.v2.Finding\022\032\n\022findi" - + "ngs_truncated\030\002 \001(\010\"\235\002\n\007Finding\022\r\n\005quote" - + "\030\001 \001(\t\0222\n\tinfo_type\030\002 \001(\0132\037.google.priva" - + "cy.dlp.v2.InfoType\0225\n\nlikelihood\030\003 \001(\0162!" - + ".google.privacy.dlp.v2.Likelihood\0221\n\010loc" - + "ation\030\004 \001(\0132\037.google.privacy.dlp.v2.Loca" - + "tion\022/\n\013create_time\030\006 \001(\0132\032.google.proto" - + "buf.Timestamp\0224\n\nquote_info\030\007 \001(\0132 .goog" - + "le.privacy.dlp.v2.QuoteInfo\"\266\001\n\010Location" - + "\0220\n\nbyte_range\030\001 \001(\0132\034.google.privacy.dl" - + "p.v2.Range\0225\n\017codepoint_range\030\002 \001(\0132\034.go" - + "ogle.privacy.dlp.v2.Range\022A\n\021content_loc" - + "ations\030\007 \003(\0132&.google.privacy.dlp.v2.Con" - + "tentLocation\"\321\002\n\017ContentLocation\022\026\n\016cont" - + "ainer_name\030\001 \001(\t\022@\n\017record_location\030\002 \001(" - + "\0132%.google.privacy.dlp.v2.RecordLocation" - + "H\000\022>\n\016image_location\030\003 \001(\0132$.google.priv" - + "acy.dlp.v2.ImageLocationH\000\022D\n\021document_l" - + "ocation\030\005 \001(\0132\'.google.privacy.dlp.v2.Do" - + "cumentLocationH\000\0227\n\023container_timestamp\030" - + "\006 \001(\0132\032.google.protobuf.Timestamp\022\031\n\021con" - + "tainer_version\030\007 \001(\tB\n\n\010location\"\'\n\020Docu" - + "mentLocation\022\023\n\013file_offset\030\001 \001(\003\"\266\001\n\016Re" - + "cordLocation\0224\n\nrecord_key\030\001 \001(\0132 .googl" - + "e.privacy.dlp.v2.RecordKey\0220\n\010field_id\030\002" - + " \001(\0132\036.google.privacy.dlp.v2.FieldId\022<\n\016" - + "table_location\030\003 \001(\0132$.google.privacy.dl" - + "p.v2.TableLocation\"\"\n\rTableLocation\022\021\n\tr" - + "ow_index\030\001 \001(\003\"#\n\005Range\022\r\n\005start\030\001 \001(\003\022\013" - + "\n\003end\030\002 \001(\003\"K\n\rImageLocation\022:\n\016bounding" - + "_boxes\030\001 \003(\0132\".google.privacy.dlp.v2.Bou" - + "ndingBox\"G\n\013BoundingBox\022\013\n\003top\030\001 \001(\005\022\014\n\004" - + "left\030\002 \001(\005\022\r\n\005width\030\003 \001(\005\022\016\n\006height\030\004 \001(" - + "\005\"\303\003\n\022RedactImageRequest\022\016\n\006parent\030\001 \001(\t" - + "\022<\n\016inspect_config\030\002 \001(\0132$.google.privac" - + "y.dlp.v2.InspectConfig\022_\n\027image_redactio" - + "n_configs\030\005 \003(\0132>.google.privacy.dlp.v2." - + "RedactImageRequest.ImageRedactionConfig\022" - + "\030\n\020include_findings\030\006 \001(\010\0229\n\tbyte_item\030\007" - + " \001(\0132&.google.privacy.dlp.v2.ByteContent" - + "Item\032\250\001\n\024ImageRedactionConfig\0224\n\tinfo_ty" - + "pe\030\001 \001(\0132\037.google.privacy.dlp.v2.InfoTyp" - + "eH\000\022\031\n\017redact_all_text\030\002 \001(\010H\000\0225\n\017redact" - + "ion_color\030\003 \001(\0132\034.google.privacy.dlp.v2." - + "ColorB\010\n\006target\"1\n\005Color\022\013\n\003red\030\001 \001(\002\022\r\n" - + "\005green\030\002 \001(\002\022\014\n\004blue\030\003 \001(\002\"\203\001\n\023RedactIma" - + "geResponse\022\026\n\016redacted_image\030\001 \001(\014\022\026\n\016ex" - + "tracted_text\030\002 \001(\t\022<\n\016inspect_result\030\003 \001" - + "(\0132$.google.privacy.dlp.v2.InspectResult" - + "\"\237\002\n\030DeidentifyContentRequest\022\016\n\006parent\030" - + "\001 \001(\t\022B\n\021deidentify_config\030\002 \001(\0132\'.googl" - + "e.privacy.dlp.v2.DeidentifyConfig\022<\n\016ins" - + "pect_config\030\003 \001(\0132$.google.privacy.dlp.v" - + "2.InspectConfig\0220\n\004item\030\004 \001(\0132\".google.p" - + "rivacy.dlp.v2.ContentItem\022\035\n\025inspect_tem" - + "plate_name\030\005 \001(\t\022 \n\030deidentify_template_" - + "name\030\006 \001(\t\"\216\001\n\031DeidentifyContentResponse" - + "\0220\n\004item\030\001 \001(\0132\".google.privacy.dlp.v2.C" - + "ontentItem\022?\n\010overview\030\002 \001(\0132-.google.pr" - + "ivacy.dlp.v2.TransformationOverview\"\237\002\n\030" - + "ReidentifyContentRequest\022\016\n\006parent\030\001 \001(\t" - + "\022B\n\021reidentify_config\030\002 \001(\0132\'.google.pri" - + "vacy.dlp.v2.DeidentifyConfig\022<\n\016inspect_" - + "config\030\003 \001(\0132$.google.privacy.dlp.v2.Ins" - + "pectConfig\0220\n\004item\030\004 \001(\0132\".google.privac" - + "y.dlp.v2.ContentItem\022\035\n\025inspect_template" - + "_name\030\005 \001(\t\022 \n\030reidentify_template_name\030" - + "\006 \001(\t\"\216\001\n\031ReidentifyContentResponse\0220\n\004i" - + "tem\030\001 \001(\0132\".google.privacy.dlp.v2.Conten" - + "tItem\022?\n\010overview\030\002 \001(\0132-.google.privacy" - + ".dlp.v2.TransformationOverview\"\266\001\n\025Inspe" - + "ctContentRequest\022\016\n\006parent\030\001 \001(\t\022<\n\016insp" - + "ect_config\030\002 \001(\0132$.google.privacy.dlp.v2" - + ".InspectConfig\0220\n\004item\030\003 \001(\0132\".google.pr" - + "ivacy.dlp.v2.ContentItem\022\035\n\025inspect_temp" - + "late_name\030\004 \001(\t\"N\n\026InspectContentRespons" - + "e\0224\n\006result\030\001 \001(\0132$.google.privacy.dlp.v" - + "2.InspectResult\"\267\002\n\023OutputStorageConfig\022" - + "5\n\005table\030\001 \001(\0132$.google.privacy.dlp.v2.B" - + "igQueryTableH\000\022N\n\routput_schema\030\003 \001(\01627." - + "google.privacy.dlp.v2.OutputStorageConfi" - + "g.OutputSchema\"\220\001\n\014OutputSchema\022\035\n\031OUTPU" - + "T_SCHEMA_UNSPECIFIED\020\000\022\021\n\rBASIC_COLUMNS\020" - + "\001\022\017\n\013GCS_COLUMNS\020\002\022\025\n\021DATASTORE_COLUMNS\020" - + "\003\022\025\n\021BIG_QUERY_COLUMNS\020\004\022\017\n\013ALL_COLUMNS\020" - + "\005B\006\n\004type\"R\n\rInfoTypeStats\0222\n\tinfo_type\030" - + "\001 \001(\0132\037.google.privacy.dlp.v2.InfoType\022\r" - + "\n\005count\030\002 \001(\003\"\335\003\n\030InspectDataSourceDetai" - + "ls\022[\n\021requested_options\030\002 \001(\0132@.google.p" - + "rivacy.dlp.v2.InspectDataSourceDetails.R" - + "equestedOptions\022F\n\006result\030\003 \001(\01326.google" - + ".privacy.dlp.v2.InspectDataSourceDetails" - + ".Result\032\232\001\n\020RequestedOptions\022I\n\031snapshot" - + "_inspect_template\030\001 \001(\0132&.google.privacy" - + ".dlp.v2.InspectTemplate\022;\n\njob_config\030\003 " - + "\001(\0132\'.google.privacy.dlp.v2.InspectJobCo" - + "nfig\032\177\n\006Result\022\027\n\017processed_bytes\030\001 \001(\003\022" - + "\035\n\025total_estimated_bytes\030\002 \001(\003\022=\n\017info_t" - + "ype_stats\030\003 \003(\0132$.google.privacy.dlp.v2." - + "InfoTypeStats\"\220\001\n\023InfoTypeDescription\022\014\n" - + "\004name\030\001 \001(\t\022\024\n\014display_name\030\002 \001(\t\022@\n\014sup" - + "ported_by\030\003 \003(\0162*.google.privacy.dlp.v2." - + "InfoTypeSupportedBy\022\023\n\013description\030\004 \001(\t" - + "\"=\n\024ListInfoTypesRequest\022\025\n\rlanguage_cod" - + "e\030\001 \001(\t\022\016\n\006filter\030\002 \001(\t\"W\n\025ListInfoTypes" - + "Response\022>\n\ninfo_types\030\001 \003(\0132*.google.pr" - + "ivacy.dlp.v2.InfoTypeDescription\"\301\001\n\025Ris" - + "kAnalysisJobConfig\022<\n\016privacy_metric\030\001 \001" - + "(\0132$.google.privacy.dlp.v2.PrivacyMetric" - + "\022:\n\014source_table\030\002 \001(\0132$.google.privacy." - + "dlp.v2.BigQueryTable\022.\n\007actions\030\003 \003(\0132\035." - + "google.privacy.dlp.v2.Action\"\267\001\n\007QuasiId" - + "\022-\n\005field\030\001 \001(\0132\036.google.privacy.dlp.v2." - + "FieldId\0224\n\tinfo_type\030\002 \001(\0132\037.google.priv" - + "acy.dlp.v2.InfoTypeH\000\022\024\n\ncustom_tag\030\003 \001(" - + "\tH\000\022*\n\010inferred\030\004 \001(\0132\026.google.protobuf." - + "EmptyH\000B\005\n\003tag\"\257\002\n\020StatisticalTable\0223\n\005t" - + "able\030\003 \001(\0132$.google.privacy.dlp.v2.BigQu" - + "eryTable\022O\n\tquasi_ids\030\001 \003(\0132<.google.pri" - + "vacy.dlp.v2.StatisticalTable.QuasiIdenti" - + "fierField\022:\n\022relative_frequency\030\002 \001(\0132\036." - + "google.privacy.dlp.v2.FieldId\032Y\n\024QuasiId" - + "entifierField\022-\n\005field\030\001 \001(\0132\036.google.pr" - + "ivacy.dlp.v2.FieldId\022\022\n\ncustom_tag\030\002 \001(\t" - + "\"\365\016\n\rPrivacyMetric\022[\n\026numerical_stats_co" - + "nfig\030\001 \001(\01329.google.privacy.dlp.v2.Priva" - + "cyMetric.NumericalStatsConfigH\000\022_\n\030categ" - + "orical_stats_config\030\002 \001(\0132;.google.priva" - + "cy.dlp.v2.PrivacyMetric.CategoricalStats" - + "ConfigH\000\022S\n\022k_anonymity_config\030\003 \001(\01325.g" - + "oogle.privacy.dlp.v2.PrivacyMetric.KAnon" - + "ymityConfigH\000\022S\n\022l_diversity_config\030\004 \001(" - + "\01325.google.privacy.dlp.v2.PrivacyMetric." - + "LDiversityConfigH\000\022\\\n\027k_map_estimation_c" - + "onfig\030\005 \001(\01329.google.privacy.dlp.v2.Priv" - + "acyMetric.KMapEstimationConfigH\000\022n\n delt" - + "a_presence_estimation_config\030\006 \001(\0132B.goo" - + "gle.privacy.dlp.v2.PrivacyMetric.DeltaPr" - + "esenceEstimationConfigH\000\032E\n\024NumericalSta" - + "tsConfig\022-\n\005field\030\001 \001(\0132\036.google.privacy" - + ".dlp.v2.FieldId\032G\n\026CategoricalStatsConfi" - + "g\022-\n\005field\030\001 \001(\0132\036.google.privacy.dlp.v2" - + ".FieldId\032y\n\020KAnonymityConfig\0221\n\tquasi_id" - + "s\030\001 \003(\0132\036.google.privacy.dlp.v2.FieldId\022" - + "2\n\tentity_id\030\002 \001(\0132\037.google.privacy.dlp." - + "v2.EntityId\032\202\001\n\020LDiversityConfig\0221\n\tquas" - + "i_ids\030\001 \003(\0132\036.google.privacy.dlp.v2.Fiel" - + "dId\022;\n\023sensitive_attribute\030\002 \001(\0132\036.googl" - + "e.privacy.dlp.v2.FieldId\032\350\005\n\024KMapEstimat" - + "ionConfig\022X\n\tquasi_ids\030\001 \003(\0132E.google.pr" - + "ivacy.dlp.v2.PrivacyMetric.KMapEstimatio" - + "nConfig.TaggedField\022\023\n\013region_code\030\002 \001(\t" - + "\022b\n\020auxiliary_tables\030\003 \003(\0132H.google.priv" - + "acy.dlp.v2.PrivacyMetric.KMapEstimationC" - + "onfig.AuxiliaryTable\032\273\001\n\013TaggedField\022-\n\005" - + "field\030\001 \001(\0132\036.google.privacy.dlp.v2.Fiel" - + "dId\0224\n\tinfo_type\030\002 \001(\0132\037.google.privacy." - + "dlp.v2.InfoTypeH\000\022\024\n\ncustom_tag\030\003 \001(\tH\000\022" - + "*\n\010inferred\030\004 \001(\0132\026.google.protobuf.Empt" - + "yH\000B\005\n\003tag\032\276\002\n\016AuxiliaryTable\0223\n\005table\030\003" - + " \001(\0132$.google.privacy.dlp.v2.BigQueryTab" - + "le\022h\n\tquasi_ids\030\001 \003(\0132U.google.privacy.d" - + "lp.v2.PrivacyMetric.KMapEstimationConfig" - + ".AuxiliaryTable.QuasiIdField\022:\n\022relative" - + "_frequency\030\002 \001(\0132\036.google.privacy.dlp.v2" - + ".FieldId\032Q\n\014QuasiIdField\022-\n\005field\030\001 \001(\0132" - + "\036.google.privacy.dlp.v2.FieldId\022\022\n\ncusto" - + "m_tag\030\002 \001(\t\032\252\001\n\035DeltaPresenceEstimationC" - + "onfig\0221\n\tquasi_ids\030\001 \003(\0132\036.google.privac" - + "y.dlp.v2.QuasiId\022\023\n\013region_code\030\002 \001(\t\022A\n" - + "\020auxiliary_tables\030\003 \003(\0132\'.google.privacy" - + ".dlp.v2.StatisticalTableB\006\n\004type\"\362\035\n\034Ana" - + "lyzeDataSourceRiskDetails\022F\n\030requested_p" - + "rivacy_metric\030\001 \001(\0132$.google.privacy.dlp" - + ".v2.PrivacyMetric\022D\n\026requested_source_ta" + + ".proto\032\031google/api/resource.proto\032#googl" + + "e/privacy/dlp/v2/storage.proto\032\036google/p" + + "rotobuf/duration.proto\032\033google/protobuf/" + + "empty.proto\032 google/protobuf/field_mask." + + "proto\032\037google/protobuf/timestamp.proto\032\027" + + "google/rpc/status.proto\032\026google/type/dat" + + "e.proto\032\033google/type/dayofweek.proto\032\033go" + + "ogle/type/timeofday.proto\"G\n\020ExcludeInfo" + + "Types\0223\n\ninfo_types\030\001 \003(\0132\037.google.priva" + + "cy.dlp.v2.InfoType\"\240\002\n\rExclusionRule\022F\n\n" + + "dictionary\030\001 \001(\01320.google.privacy.dlp.v2" + + ".CustomInfoType.DictionaryH\000\022<\n\005regex\030\002 " + + "\001(\0132+.google.privacy.dlp.v2.CustomInfoTy" + + "pe.RegexH\000\022E\n\022exclude_info_types\030\003 \001(\0132\'" + + ".google.privacy.dlp.v2.ExcludeInfoTypesH" + + "\000\022:\n\rmatching_type\030\004 \001(\0162#.google.privac" + + "y.dlp.v2.MatchingTypeB\006\n\004type\"\261\001\n\016Inspec" + + "tionRule\022W\n\014hotword_rule\030\001 \001(\0132?.google." + + "privacy.dlp.v2.CustomInfoType.DetectionR" + + "ule.HotwordRuleH\000\022>\n\016exclusion_rule\030\002 \001(" + + "\0132$.google.privacy.dlp.v2.ExclusionRuleH" + + "\000B\006\n\004type\"~\n\021InspectionRuleSet\0223\n\ninfo_t" + + "ypes\030\001 \003(\0132\037.google.privacy.dlp.v2.InfoT" + + "ype\0224\n\005rules\030\002 \003(\0132%.google.privacy.dlp." + + "v2.InspectionRule\"\307\005\n\rInspectConfig\0223\n\ni" + + "nfo_types\030\001 \003(\0132\037.google.privacy.dlp.v2." + + "InfoType\0229\n\016min_likelihood\030\002 \001(\0162!.googl" + + "e.privacy.dlp.v2.Likelihood\022B\n\006limits\030\003 " + + "\001(\01322.google.privacy.dlp.v2.InspectConfi" + + "g.FindingLimits\022\025\n\rinclude_quote\030\004 \001(\010\022\032" + + "\n\022exclude_info_types\030\005 \001(\010\022@\n\021custom_inf" + + "o_types\030\006 \003(\0132%.google.privacy.dlp.v2.Cu" + + "stomInfoType\022=\n\017content_options\030\010 \003(\0162$." + + "google.privacy.dlp.v2.ContentOption\022:\n\010r" + + "ule_set\030\n \003(\0132(.google.privacy.dlp.v2.In" + + "spectionRuleSet\032\221\002\n\rFindingLimits\022\035\n\025max" + + "_findings_per_item\030\001 \001(\005\022 \n\030max_findings" + + "_per_request\030\002 \001(\005\022d\n\032max_findings_per_i" + + "nfo_type\030\003 \003(\0132@.google.privacy.dlp.v2.I" + + "nspectConfig.FindingLimits.InfoTypeLimit" + + "\032Y\n\rInfoTypeLimit\0222\n\tinfo_type\030\001 \001(\0132\037.g" + + "oogle.privacy.dlp.v2.InfoType\022\024\n\014max_fin" + + "dings\030\002 \001(\005\"\337\001\n\017ByteContentItem\022>\n\004type\030" + + "\001 \001(\01620.google.privacy.dlp.v2.ByteConten" + + "tItem.BytesType\022\014\n\004data\030\002 \001(\014\"~\n\tBytesTy" + + "pe\022\032\n\026BYTES_TYPE_UNSPECIFIED\020\000\022\t\n\005IMAGE\020" + + "\006\022\016\n\nIMAGE_JPEG\020\001\022\r\n\tIMAGE_BMP\020\002\022\r\n\tIMAG" + + "E_PNG\020\003\022\r\n\tIMAGE_SVG\020\004\022\r\n\tTEXT_UTF8\020\005\"\227\001" + + "\n\013ContentItem\022\017\n\005value\030\003 \001(\tH\000\022-\n\005table\030" + + "\004 \001(\0132\034.google.privacy.dlp.v2.TableH\000\022;\n" + + "\tbyte_item\030\005 \001(\0132&.google.privacy.dlp.v2" + + ".ByteContentItemH\000B\013\n\tdata_item\"\235\001\n\005Tabl" + + "e\022/\n\007headers\030\001 \003(\0132\036.google.privacy.dlp." + + "v2.FieldId\022.\n\004rows\030\002 \003(\0132 .google.privac" + + "y.dlp.v2.Table.Row\0323\n\003Row\022,\n\006values\030\001 \003(" + + "\0132\034.google.privacy.dlp.v2.Value\"]\n\rInspe" + + "ctResult\0220\n\010findings\030\001 \003(\0132\036.google.priv" + + "acy.dlp.v2.Finding\022\032\n\022findings_truncated" + + "\030\002 \001(\010\"\235\002\n\007Finding\022\r\n\005quote\030\001 \001(\t\0222\n\tinf" + + "o_type\030\002 \001(\0132\037.google.privacy.dlp.v2.Inf" + + "oType\0225\n\nlikelihood\030\003 \001(\0162!.google.priva" + + "cy.dlp.v2.Likelihood\0221\n\010location\030\004 \001(\0132\037" + + ".google.privacy.dlp.v2.Location\022/\n\013creat" + + "e_time\030\006 \001(\0132\032.google.protobuf.Timestamp" + + "\0224\n\nquote_info\030\007 \001(\0132 .google.privacy.dl" + + "p.v2.QuoteInfo\"\266\001\n\010Location\0220\n\nbyte_rang" + + "e\030\001 \001(\0132\034.google.privacy.dlp.v2.Range\0225\n" + + "\017codepoint_range\030\002 \001(\0132\034.google.privacy." + + "dlp.v2.Range\022A\n\021content_locations\030\007 \003(\0132" + + "&.google.privacy.dlp.v2.ContentLocation\"" + + "\321\002\n\017ContentLocation\022\026\n\016container_name\030\001 " + + "\001(\t\022@\n\017record_location\030\002 \001(\0132%.google.pr" + + "ivacy.dlp.v2.RecordLocationH\000\022>\n\016image_l" + + "ocation\030\003 \001(\0132$.google.privacy.dlp.v2.Im" + + "ageLocationH\000\022D\n\021document_location\030\005 \001(\013" + + "2\'.google.privacy.dlp.v2.DocumentLocatio" + + "nH\000\0227\n\023container_timestamp\030\006 \001(\0132\032.googl" + + "e.protobuf.Timestamp\022\031\n\021container_versio" + + "n\030\007 \001(\tB\n\n\010location\"\'\n\020DocumentLocation\022" + + "\023\n\013file_offset\030\001 \001(\003\"\266\001\n\016RecordLocation\022" + + "4\n\nrecord_key\030\001 \001(\0132 .google.privacy.dlp" + + ".v2.RecordKey\0220\n\010field_id\030\002 \001(\0132\036.google" + + ".privacy.dlp.v2.FieldId\022<\n\016table_locatio" + + "n\030\003 \001(\0132$.google.privacy.dlp.v2.TableLoc" + + "ation\"\"\n\rTableLocation\022\021\n\trow_index\030\001 \001(" + + "\003\"#\n\005Range\022\r\n\005start\030\001 \001(\003\022\013\n\003end\030\002 \001(\003\"K" + + "\n\rImageLocation\022:\n\016bounding_boxes\030\001 \003(\0132" + + "\".google.privacy.dlp.v2.BoundingBox\"G\n\013B" + + "oundingBox\022\013\n\003top\030\001 \001(\005\022\014\n\004left\030\002 \001(\005\022\r\n" + + "\005width\030\003 \001(\005\022\016\n\006height\030\004 \001(\005\"\303\003\n\022RedactI" + + "mageRequest\022\016\n\006parent\030\001 \001(\t\022<\n\016inspect_c" + + "onfig\030\002 \001(\0132$.google.privacy.dlp.v2.Insp" + + "ectConfig\022_\n\027image_redaction_configs\030\005 \003" + + "(\0132>.google.privacy.dlp.v2.RedactImageRe" + + "quest.ImageRedactionConfig\022\030\n\020include_fi" + + "ndings\030\006 \001(\010\0229\n\tbyte_item\030\007 \001(\0132&.google" + + ".privacy.dlp.v2.ByteContentItem\032\250\001\n\024Imag" + + "eRedactionConfig\0224\n\tinfo_type\030\001 \001(\0132\037.go" + + "ogle.privacy.dlp.v2.InfoTypeH\000\022\031\n\017redact" + + "_all_text\030\002 \001(\010H\000\0225\n\017redaction_color\030\003 \001" + + "(\0132\034.google.privacy.dlp.v2.ColorB\010\n\006targ" + + "et\"1\n\005Color\022\013\n\003red\030\001 \001(\002\022\r\n\005green\030\002 \001(\002\022" + + "\014\n\004blue\030\003 \001(\002\"\203\001\n\023RedactImageResponse\022\026\n" + + "\016redacted_image\030\001 \001(\014\022\026\n\016extracted_text\030" + + "\002 \001(\t\022<\n\016inspect_result\030\003 \001(\0132$.google.p" + + "rivacy.dlp.v2.InspectResult\"\237\002\n\030Deidenti" + + "fyContentRequest\022\016\n\006parent\030\001 \001(\t\022B\n\021deid" + + "entify_config\030\002 \001(\0132\'.google.privacy.dlp" + + ".v2.DeidentifyConfig\022<\n\016inspect_config\030\003" + + " \001(\0132$.google.privacy.dlp.v2.InspectConf" + + "ig\0220\n\004item\030\004 \001(\0132\".google.privacy.dlp.v2" + + ".ContentItem\022\035\n\025inspect_template_name\030\005 " + + "\001(\t\022 \n\030deidentify_template_name\030\006 \001(\t\"\216\001" + + "\n\031DeidentifyContentResponse\0220\n\004item\030\001 \001(" + + "\0132\".google.privacy.dlp.v2.ContentItem\022?\n" + + "\010overview\030\002 \001(\0132-.google.privacy.dlp.v2." + + "TransformationOverview\"\237\002\n\030ReidentifyCon" + + "tentRequest\022\016\n\006parent\030\001 \001(\t\022B\n\021reidentif" + + "y_config\030\002 \001(\0132\'.google.privacy.dlp.v2.D" + + "eidentifyConfig\022<\n\016inspect_config\030\003 \001(\0132" + + "$.google.privacy.dlp.v2.InspectConfig\0220\n" + + "\004item\030\004 \001(\0132\".google.privacy.dlp.v2.Cont" + + "entItem\022\035\n\025inspect_template_name\030\005 \001(\t\022 " + + "\n\030reidentify_template_name\030\006 \001(\t\"\216\001\n\031Rei" + + "dentifyContentResponse\0220\n\004item\030\001 \001(\0132\".g" + + "oogle.privacy.dlp.v2.ContentItem\022?\n\010over" + + "view\030\002 \001(\0132-.google.privacy.dlp.v2.Trans" + + "formationOverview\"\266\001\n\025InspectContentRequ" + + "est\022\016\n\006parent\030\001 \001(\t\022<\n\016inspect_config\030\002 " + + "\001(\0132$.google.privacy.dlp.v2.InspectConfi" + + "g\0220\n\004item\030\003 \001(\0132\".google.privacy.dlp.v2." + + "ContentItem\022\035\n\025inspect_template_name\030\004 \001" + + "(\t\"N\n\026InspectContentResponse\0224\n\006result\030\001" + + " \001(\0132$.google.privacy.dlp.v2.InspectResu" + + "lt\"\267\002\n\023OutputStorageConfig\0225\n\005table\030\001 \001(" + + "\0132$.google.privacy.dlp.v2.BigQueryTableH" + + "\000\022N\n\routput_schema\030\003 \001(\01627.google.privac" + + "y.dlp.v2.OutputStorageConfig.OutputSchem" + + "a\"\220\001\n\014OutputSchema\022\035\n\031OUTPUT_SCHEMA_UNSP" + + "ECIFIED\020\000\022\021\n\rBASIC_COLUMNS\020\001\022\017\n\013GCS_COLU" + + "MNS\020\002\022\025\n\021DATASTORE_COLUMNS\020\003\022\025\n\021BIG_QUER" + + "Y_COLUMNS\020\004\022\017\n\013ALL_COLUMNS\020\005B\006\n\004type\"R\n\r" + + "InfoTypeStats\0222\n\tinfo_type\030\001 \001(\0132\037.googl" + + "e.privacy.dlp.v2.InfoType\022\r\n\005count\030\002 \001(\003" + + "\"\335\003\n\030InspectDataSourceDetails\022[\n\021request" + + "ed_options\030\002 \001(\0132@.google.privacy.dlp.v2" + + ".InspectDataSourceDetails.RequestedOptio" + + "ns\022F\n\006result\030\003 \001(\01326.google.privacy.dlp." + + "v2.InspectDataSourceDetails.Result\032\232\001\n\020R" + + "equestedOptions\022I\n\031snapshot_inspect_temp" + + "late\030\001 \001(\0132&.google.privacy.dlp.v2.Inspe" + + "ctTemplate\022;\n\njob_config\030\003 \001(\0132\'.google." + + "privacy.dlp.v2.InspectJobConfig\032\177\n\006Resul" + + "t\022\027\n\017processed_bytes\030\001 \001(\003\022\035\n\025total_esti" + + "mated_bytes\030\002 \001(\003\022=\n\017info_type_stats\030\003 \003" + + "(\0132$.google.privacy.dlp.v2.InfoTypeStats" + + "\"\220\001\n\023InfoTypeDescription\022\014\n\004name\030\001 \001(\t\022\024" + + "\n\014display_name\030\002 \001(\t\022@\n\014supported_by\030\003 \003" + + "(\0162*.google.privacy.dlp.v2.InfoTypeSuppo" + + "rtedBy\022\023\n\013description\030\004 \001(\t\"=\n\024ListInfoT" + + "ypesRequest\022\025\n\rlanguage_code\030\001 \001(\t\022\016\n\006fi" + + "lter\030\002 \001(\t\"W\n\025ListInfoTypesResponse\022>\n\ni" + + "nfo_types\030\001 \003(\0132*.google.privacy.dlp.v2." + + "InfoTypeDescription\"\301\001\n\025RiskAnalysisJobC" + + "onfig\022<\n\016privacy_metric\030\001 \001(\0132$.google.p" + + "rivacy.dlp.v2.PrivacyMetric\022:\n\014source_ta" + "ble\030\002 \001(\0132$.google.privacy.dlp.v2.BigQue" - + "ryTable\022j\n\026numerical_stats_result\030\003 \001(\0132" - + "H.google.privacy.dlp.v2.AnalyzeDataSourc" - + "eRiskDetails.NumericalStatsResultH\000\022n\n\030c" - + "ategorical_stats_result\030\004 \001(\0132J.google.p" - + "rivacy.dlp.v2.AnalyzeDataSourceRiskDetai" - + "ls.CategoricalStatsResultH\000\022b\n\022k_anonymi" - + "ty_result\030\005 \001(\0132D.google.privacy.dlp.v2." - + "AnalyzeDataSourceRiskDetails.KAnonymityR" - + "esultH\000\022b\n\022l_diversity_result\030\006 \001(\0132D.go" - + "ogle.privacy.dlp.v2.AnalyzeDataSourceRis" - + "kDetails.LDiversityResultH\000\022k\n\027k_map_est" - + "imation_result\030\007 \001(\0132H.google.privacy.dl" - + "p.v2.AnalyzeDataSourceRiskDetails.KMapEs" - + "timationResultH\000\022}\n delta_presence_estim" - + "ation_result\030\t \001(\0132Q.google.privacy.dlp." - + "v2.AnalyzeDataSourceRiskDetails.DeltaPre" - + "senceEstimationResultH\000\032\257\001\n\024NumericalSta" - + "tsResult\022/\n\tmin_value\030\001 \001(\0132\034.google.pri" - + "vacy.dlp.v2.Value\022/\n\tmax_value\030\002 \001(\0132\034.g" - + "oogle.privacy.dlp.v2.Value\0225\n\017quantile_v" - + "alues\030\004 \003(\0132\034.google.privacy.dlp.v2.Valu" - + "e\032\215\003\n\026CategoricalStatsResult\022\225\001\n!value_f" - + "requency_histogram_buckets\030\005 \003(\0132j.googl" - + "e.privacy.dlp.v2.AnalyzeDataSourceRiskDe" - + "tails.CategoricalStatsResult.Categorical" - + "StatsHistogramBucket\032\332\001\n\037CategoricalStat" - + "sHistogramBucket\022#\n\033value_frequency_lowe" - + "r_bound\030\001 \001(\003\022#\n\033value_frequency_upper_b" - + "ound\030\002 \001(\003\022\023\n\013bucket_size\030\003 \001(\003\022<\n\rbucke" - + "t_values\030\004 \003(\0132%.google.privacy.dlp.v2.V" - + "alueFrequency\022\032\n\022bucket_value_count\030\005 \001(" - + "\003\032\265\004\n\020KAnonymityResult\022\213\001\n#equivalence_c" - + "lass_histogram_buckets\030\005 \003(\0132^.google.pr" - + "ivacy.dlp.v2.AnalyzeDataSourceRiskDetail" - + "s.KAnonymityResult.KAnonymityHistogramBu" - + "cket\032t\n\032KAnonymityEquivalenceClass\0226\n\020qu" - + "asi_ids_values\030\001 \003(\0132\034.google.privacy.dl" - + "p.v2.Value\022\036\n\026equivalence_class_size\030\002 \001" - + "(\003\032\234\002\n\031KAnonymityHistogramBucket\022*\n\"equi" - + "valence_class_size_lower_bound\030\001 \001(\003\022*\n\"" - + "equivalence_class_size_upper_bound\030\002 \001(\003" - + "\022\023\n\013bucket_size\030\003 \001(\003\022v\n\rbucket_values\030\004" - + " \003(\0132_.google.privacy.dlp.v2.AnalyzeData" - + "SourceRiskDetails.KAnonymityResult.KAnon" - + "ymityEquivalenceClass\022\032\n\022bucket_value_co" - + "unt\030\005 \001(\003\032\260\005\n\020LDiversityResult\022\223\001\n+sensi" - + "tive_value_frequency_histogram_buckets\030\005" - + " \003(\0132^.google.privacy.dlp.v2.AnalyzeData" - + "SourceRiskDetails.LDiversityResult.LDive" - + "rsityHistogramBucket\032\340\001\n\032LDiversityEquiv" - + "alenceClass\0226\n\020quasi_ids_values\030\001 \003(\0132\034." - + "google.privacy.dlp.v2.Value\022\036\n\026equivalen" - + "ce_class_size\030\002 \001(\003\022%\n\035num_distinct_sens" - + "itive_values\030\003 \001(\003\022C\n\024top_sensitive_valu" - + "es\030\004 \003(\0132%.google.privacy.dlp.v2.ValueFr" - + "equency\032\242\002\n\031LDiversityHistogramBucket\022-\n" - + "%sensitive_value_frequency_lower_bound\030\001" - + " \001(\003\022-\n%sensitive_value_frequency_upper_" - + "bound\030\002 \001(\003\022\023\n\013bucket_size\030\003 \001(\003\022v\n\rbuck" - + "et_values\030\004 \003(\0132_.google.privacy.dlp.v2." - + "AnalyzeDataSourceRiskDetails.LDiversityR" - + "esult.LDiversityEquivalenceClass\022\032\n\022buck" - + "et_value_count\030\005 \001(\003\032\225\004\n\024KMapEstimationR" - + "esult\022\212\001\n\032k_map_estimation_histogram\030\001 \003" - + "(\0132f.google.privacy.dlp.v2.AnalyzeDataSo" - + "urceRiskDetails.KMapEstimationResult.KMa" - + "pEstimationHistogramBucket\032r\n\033KMapEstima" - + "tionQuasiIdValues\0226\n\020quasi_ids_values\030\001 " - + "\003(\0132\034.google.privacy.dlp.v2.Value\022\033\n\023est" - + "imated_anonymity\030\002 \001(\003\032\373\001\n\035KMapEstimatio" - + "nHistogramBucket\022\025\n\rmin_anonymity\030\001 \001(\003\022" - + "\025\n\rmax_anonymity\030\002 \001(\003\022\023\n\013bucket_size\030\005 " - + "\001(\003\022{\n\rbucket_values\030\006 \003(\0132d.google.priv" + + "ryTable\022.\n\007actions\030\003 \003(\0132\035.google.privac" + + "y.dlp.v2.Action\"\267\001\n\007QuasiId\022-\n\005field\030\001 \001" + + "(\0132\036.google.privacy.dlp.v2.FieldId\0224\n\tin" + + "fo_type\030\002 \001(\0132\037.google.privacy.dlp.v2.In" + + "foTypeH\000\022\024\n\ncustom_tag\030\003 \001(\tH\000\022*\n\010inferr" + + "ed\030\004 \001(\0132\026.google.protobuf.EmptyH\000B\005\n\003ta" + + "g\"\257\002\n\020StatisticalTable\0223\n\005table\030\003 \001(\0132$." + + "google.privacy.dlp.v2.BigQueryTable\022O\n\tq" + + "uasi_ids\030\001 \003(\0132<.google.privacy.dlp.v2.S" + + "tatisticalTable.QuasiIdentifierField\022:\n\022" + + "relative_frequency\030\002 \001(\0132\036.google.privac" + + "y.dlp.v2.FieldId\032Y\n\024QuasiIdentifierField" + + "\022-\n\005field\030\001 \001(\0132\036.google.privacy.dlp.v2." + + "FieldId\022\022\n\ncustom_tag\030\002 \001(\t\"\365\016\n\rPrivacyM" + + "etric\022[\n\026numerical_stats_config\030\001 \001(\01329." + + "google.privacy.dlp.v2.PrivacyMetric.Nume" + + "ricalStatsConfigH\000\022_\n\030categorical_stats_" + + "config\030\002 \001(\0132;.google.privacy.dlp.v2.Pri" + + "vacyMetric.CategoricalStatsConfigH\000\022S\n\022k" + + "_anonymity_config\030\003 \001(\01325.google.privacy" + + ".dlp.v2.PrivacyMetric.KAnonymityConfigH\000" + + "\022S\n\022l_diversity_config\030\004 \001(\01325.google.pr" + + "ivacy.dlp.v2.PrivacyMetric.LDiversityCon" + + "figH\000\022\\\n\027k_map_estimation_config\030\005 \001(\01329" + + ".google.privacy.dlp.v2.PrivacyMetric.KMa" + + "pEstimationConfigH\000\022n\n delta_presence_es" + + "timation_config\030\006 \001(\0132B.google.privacy.d" + + "lp.v2.PrivacyMetric.DeltaPresenceEstimat" + + "ionConfigH\000\032E\n\024NumericalStatsConfig\022-\n\005f" + + "ield\030\001 \001(\0132\036.google.privacy.dlp.v2.Field" + + "Id\032G\n\026CategoricalStatsConfig\022-\n\005field\030\001 " + + "\001(\0132\036.google.privacy.dlp.v2.FieldId\032y\n\020K" + + "AnonymityConfig\0221\n\tquasi_ids\030\001 \003(\0132\036.goo" + + "gle.privacy.dlp.v2.FieldId\0222\n\tentity_id\030" + + "\002 \001(\0132\037.google.privacy.dlp.v2.EntityId\032\202" + + "\001\n\020LDiversityConfig\0221\n\tquasi_ids\030\001 \003(\0132\036" + + ".google.privacy.dlp.v2.FieldId\022;\n\023sensit" + + "ive_attribute\030\002 \001(\0132\036.google.privacy.dlp" + + ".v2.FieldId\032\350\005\n\024KMapEstimationConfig\022X\n\t" + + "quasi_ids\030\001 \003(\0132E.google.privacy.dlp.v2." + + "PrivacyMetric.KMapEstimationConfig.Tagge" + + "dField\022\023\n\013region_code\030\002 \001(\t\022b\n\020auxiliary" + + "_tables\030\003 \003(\0132H.google.privacy.dlp.v2.Pr" + + "ivacyMetric.KMapEstimationConfig.Auxilia" + + "ryTable\032\273\001\n\013TaggedField\022-\n\005field\030\001 \001(\0132\036" + + ".google.privacy.dlp.v2.FieldId\0224\n\tinfo_t" + + "ype\030\002 \001(\0132\037.google.privacy.dlp.v2.InfoTy" + + "peH\000\022\024\n\ncustom_tag\030\003 \001(\tH\000\022*\n\010inferred\030\004" + + " \001(\0132\026.google.protobuf.EmptyH\000B\005\n\003tag\032\276\002" + + "\n\016AuxiliaryTable\0223\n\005table\030\003 \001(\0132$.google" + + ".privacy.dlp.v2.BigQueryTable\022h\n\tquasi_i" + + "ds\030\001 \003(\0132U.google.privacy.dlp.v2.Privacy" + + "Metric.KMapEstimationConfig.AuxiliaryTab" + + "le.QuasiIdField\022:\n\022relative_frequency\030\002 " + + "\001(\0132\036.google.privacy.dlp.v2.FieldId\032Q\n\014Q" + + "uasiIdField\022-\n\005field\030\001 \001(\0132\036.google.priv" + + "acy.dlp.v2.FieldId\022\022\n\ncustom_tag\030\002 \001(\t\032\252" + + "\001\n\035DeltaPresenceEstimationConfig\0221\n\tquas" + + "i_ids\030\001 \003(\0132\036.google.privacy.dlp.v2.Quas" + + "iId\022\023\n\013region_code\030\002 \001(\t\022A\n\020auxiliary_ta" + + "bles\030\003 \003(\0132\'.google.privacy.dlp.v2.Stati" + + "sticalTableB\006\n\004type\"\362\035\n\034AnalyzeDataSourc" + + "eRiskDetails\022F\n\030requested_privacy_metric" + + "\030\001 \001(\0132$.google.privacy.dlp.v2.PrivacyMe" + + "tric\022D\n\026requested_source_table\030\002 \001(\0132$.g" + + "oogle.privacy.dlp.v2.BigQueryTable\022j\n\026nu" + + "merical_stats_result\030\003 \001(\0132H.google.priv" + "acy.dlp.v2.AnalyzeDataSourceRiskDetails." - + "KMapEstimationResult.KMapEstimationQuasi" - + "IdValues\022\032\n\022bucket_value_count\030\007 \001(\003\032\344\004\n" - + "\035DeltaPresenceEstimationResult\022\245\001\n#delta" - + "_presence_estimation_histogram\030\001 \003(\0132x.g" - + "oogle.privacy.dlp.v2.AnalyzeDataSourceRi" - + "skDetails.DeltaPresenceEstimationResult." - + "DeltaPresenceEstimationHistogramBucket\032}" - + "\n$DeltaPresenceEstimationQuasiIdValues\0226" + + "NumericalStatsResultH\000\022n\n\030categorical_st" + + "ats_result\030\004 \001(\0132J.google.privacy.dlp.v2" + + ".AnalyzeDataSourceRiskDetails.Categorica" + + "lStatsResultH\000\022b\n\022k_anonymity_result\030\005 \001" + + "(\0132D.google.privacy.dlp.v2.AnalyzeDataSo" + + "urceRiskDetails.KAnonymityResultH\000\022b\n\022l_" + + "diversity_result\030\006 \001(\0132D.google.privacy." + + "dlp.v2.AnalyzeDataSourceRiskDetails.LDiv" + + "ersityResultH\000\022k\n\027k_map_estimation_resul" + + "t\030\007 \001(\0132H.google.privacy.dlp.v2.AnalyzeD" + + "ataSourceRiskDetails.KMapEstimationResul" + + "tH\000\022}\n delta_presence_estimation_result\030" + + "\t \001(\0132Q.google.privacy.dlp.v2.AnalyzeDat" + + "aSourceRiskDetails.DeltaPresenceEstimati" + + "onResultH\000\032\257\001\n\024NumericalStatsResult\022/\n\tm" + + "in_value\030\001 \001(\0132\034.google.privacy.dlp.v2.V" + + "alue\022/\n\tmax_value\030\002 \001(\0132\034.google.privacy" + + ".dlp.v2.Value\0225\n\017quantile_values\030\004 \003(\0132\034" + + ".google.privacy.dlp.v2.Value\032\215\003\n\026Categor" + + "icalStatsResult\022\225\001\n!value_frequency_hist" + + "ogram_buckets\030\005 \003(\0132j.google.privacy.dlp" + + ".v2.AnalyzeDataSourceRiskDetails.Categor" + + "icalStatsResult.CategoricalStatsHistogra" + + "mBucket\032\332\001\n\037CategoricalStatsHistogramBuc" + + "ket\022#\n\033value_frequency_lower_bound\030\001 \001(\003" + + "\022#\n\033value_frequency_upper_bound\030\002 \001(\003\022\023\n" + + "\013bucket_size\030\003 \001(\003\022<\n\rbucket_values\030\004 \003(" + + "\0132%.google.privacy.dlp.v2.ValueFrequency" + + "\022\032\n\022bucket_value_count\030\005 \001(\003\032\265\004\n\020KAnonym" + + "ityResult\022\213\001\n#equivalence_class_histogra" + + "m_buckets\030\005 \003(\0132^.google.privacy.dlp.v2." + + "AnalyzeDataSourceRiskDetails.KAnonymityR" + + "esult.KAnonymityHistogramBucket\032t\n\032KAnon" + + "ymityEquivalenceClass\0226\n\020quasi_ids_value" + + "s\030\001 \003(\0132\034.google.privacy.dlp.v2.Value\022\036\n" + + "\026equivalence_class_size\030\002 \001(\003\032\234\002\n\031KAnony" + + "mityHistogramBucket\022*\n\"equivalence_class" + + "_size_lower_bound\030\001 \001(\003\022*\n\"equivalence_c" + + "lass_size_upper_bound\030\002 \001(\003\022\023\n\013bucket_si" + + "ze\030\003 \001(\003\022v\n\rbucket_values\030\004 \003(\0132_.google" + + ".privacy.dlp.v2.AnalyzeDataSourceRiskDet" + + "ails.KAnonymityResult.KAnonymityEquivale" + + "nceClass\022\032\n\022bucket_value_count\030\005 \001(\003\032\260\005\n" + + "\020LDiversityResult\022\223\001\n+sensitive_value_fr" + + "equency_histogram_buckets\030\005 \003(\0132^.google" + + ".privacy.dlp.v2.AnalyzeDataSourceRiskDet" + + "ails.LDiversityResult.LDiversityHistogra" + + "mBucket\032\340\001\n\032LDiversityEquivalenceClass\0226" + "\n\020quasi_ids_values\030\001 \003(\0132\034.google.privac" - + "y.dlp.v2.Value\022\035\n\025estimated_probability\030" - + "\002 \001(\001\032\233\002\n&DeltaPresenceEstimationHistogr" - + "amBucket\022\027\n\017min_probability\030\001 \001(\001\022\027\n\017max" - + "_probability\030\002 \001(\001\022\023\n\013bucket_size\030\005 \001(\003\022" - + "\215\001\n\rbucket_values\030\006 \003(\0132v.google.privacy" + + "y.dlp.v2.Value\022\036\n\026equivalence_class_size" + + "\030\002 \001(\003\022%\n\035num_distinct_sensitive_values\030" + + "\003 \001(\003\022C\n\024top_sensitive_values\030\004 \003(\0132%.go" + + "ogle.privacy.dlp.v2.ValueFrequency\032\242\002\n\031L" + + "DiversityHistogramBucket\022-\n%sensitive_va" + + "lue_frequency_lower_bound\030\001 \001(\003\022-\n%sensi" + + "tive_value_frequency_upper_bound\030\002 \001(\003\022\023" + + "\n\013bucket_size\030\003 \001(\003\022v\n\rbucket_values\030\004 \003" + + "(\0132_.google.privacy.dlp.v2.AnalyzeDataSo" + + "urceRiskDetails.LDiversityResult.LDivers" + + "ityEquivalenceClass\022\032\n\022bucket_value_coun" + + "t\030\005 \001(\003\032\225\004\n\024KMapEstimationResult\022\212\001\n\032k_m" + + "ap_estimation_histogram\030\001 \003(\0132f.google.p" + + "rivacy.dlp.v2.AnalyzeDataSourceRiskDetai" + + "ls.KMapEstimationResult.KMapEstimationHi" + + "stogramBucket\032r\n\033KMapEstimationQuasiIdVa" + + "lues\0226\n\020quasi_ids_values\030\001 \003(\0132\034.google." + + "privacy.dlp.v2.Value\022\033\n\023estimated_anonym" + + "ity\030\002 \001(\003\032\373\001\n\035KMapEstimationHistogramBuc" + + "ket\022\025\n\rmin_anonymity\030\001 \001(\003\022\025\n\rmax_anonym" + + "ity\030\002 \001(\003\022\023\n\013bucket_size\030\005 \001(\003\022{\n\rbucket" + + "_values\030\006 \003(\0132d.google.privacy.dlp.v2.An" + + "alyzeDataSourceRiskDetails.KMapEstimatio" + + "nResult.KMapEstimationQuasiIdValues\022\032\n\022b" + + "ucket_value_count\030\007 \001(\003\032\344\004\n\035DeltaPresenc" + + "eEstimationResult\022\245\001\n#delta_presence_est" + + "imation_histogram\030\001 \003(\0132x.google.privacy" + ".dlp.v2.AnalyzeDataSourceRiskDetails.Del" + "taPresenceEstimationResult.DeltaPresence" - + "EstimationQuasiIdValues\022\032\n\022bucket_value_" - + "count\030\007 \001(\003B\010\n\006result\"L\n\016ValueFrequency\022" - + "+\n\005value\030\001 \001(\0132\034.google.privacy.dlp.v2.V" - + "alue\022\r\n\005count\030\002 \001(\003\"\263\002\n\005Value\022\027\n\rinteger" - + "_value\030\001 \001(\003H\000\022\025\n\013float_value\030\002 \001(\001H\000\022\026\n" - + "\014string_value\030\003 \001(\tH\000\022\027\n\rboolean_value\030\004" - + " \001(\010H\000\0225\n\017timestamp_value\030\005 \001(\0132\032.google" - + ".protobuf.TimestampH\000\022,\n\ntime_value\030\006 \001(" - + "\0132\026.google.type.TimeOfDayH\000\022\'\n\ndate_valu" - + "e\030\007 \001(\0132\021.google.type.DateH\000\0223\n\021day_of_w" - + "eek_value\030\010 \001(\0162\026.google.type.DayOfWeekH" - + "\000B\006\n\004type\"Q\n\tQuoteInfo\0224\n\tdate_time\030\002 \001(" - + "\0132\037.google.privacy.dlp.v2.DateTimeH\000B\016\n\014" - + "parsed_quote\"\337\001\n\010DateTime\022\037\n\004date\030\001 \001(\0132" - + "\021.google.type.Date\022+\n\013day_of_week\030\002 \001(\0162" - + "\026.google.type.DayOfWeek\022$\n\004time\030\003 \001(\0132\026." - + "google.type.TimeOfDay\022;\n\ttime_zone\030\004 \001(\013" - + "2(.google.privacy.dlp.v2.DateTime.TimeZo" - + "ne\032\"\n\010TimeZone\022\026\n\016offset_minutes\030\001 \001(\005\"\311" - + "\001\n\020DeidentifyConfig\022S\n\031info_type_transfo" - + "rmations\030\001 \001(\0132..google.privacy.dlp.v2.I" - + "nfoTypeTransformationsH\000\022N\n\026record_trans" - + "formations\030\002 \001(\0132,.google.privacy.dlp.v2" - + ".RecordTransformationsH\000B\020\n\016transformati" - + "on\"\234\006\n\027PrimitiveTransformation\022C\n\016replac" - + "e_config\030\001 \001(\0132).google.privacy.dlp.v2.R" - + "eplaceValueConfigH\000\022<\n\rredact_config\030\002 \001" - + "(\0132#.google.privacy.dlp.v2.RedactConfigH" - + "\000\022K\n\025character_mask_config\030\003 \001(\0132*.googl" - + "e.privacy.dlp.v2.CharacterMaskConfigH\000\022Y" - + "\n\035crypto_replace_ffx_fpe_config\030\004 \001(\01320." - + "google.privacy.dlp.v2.CryptoReplaceFfxFp" - + "eConfigH\000\022V\n\033fixed_size_bucketing_config" - + "\030\005 \001(\0132/.google.privacy.dlp.v2.FixedSize" - + "BucketingConfigH\000\022B\n\020bucketing_config\030\006 " - + "\001(\0132&.google.privacy.dlp.v2.BucketingCon" - + "figH\000\022Y\n\035replace_with_info_type_config\030\007" - + " \001(\01320.google.privacy.dlp.v2.ReplaceWith" - + "InfoTypeConfigH\000\022A\n\020time_part_config\030\010 \001" - + "(\0132%.google.privacy.dlp.v2.TimePartConfi" - + "gH\000\022E\n\022crypto_hash_config\030\t \001(\0132\'.google" - + ".privacy.dlp.v2.CryptoHashConfigH\000\022C\n\021da" - + "te_shift_config\030\013 \001(\0132&.google.privacy.d" - + "lp.v2.DateShiftConfigH\000B\020\n\016transformatio" - + "n\"\334\001\n\016TimePartConfig\022G\n\017part_to_extract\030" - + "\001 \001(\0162..google.privacy.dlp.v2.TimePartCo" - + "nfig.TimePart\"\200\001\n\010TimePart\022\031\n\025TIME_PART_" - + "UNSPECIFIED\020\000\022\010\n\004YEAR\020\001\022\t\n\005MONTH\020\002\022\020\n\014DA" - + "Y_OF_MONTH\020\003\022\017\n\013DAY_OF_WEEK\020\004\022\020\n\014WEEK_OF" - + "_YEAR\020\005\022\017\n\013HOUR_OF_DAY\020\006\"H\n\020CryptoHashCo" + + "EstimationHistogramBucket\032}\n$DeltaPresen" + + "ceEstimationQuasiIdValues\0226\n\020quasi_ids_v" + + "alues\030\001 \003(\0132\034.google.privacy.dlp.v2.Valu" + + "e\022\035\n\025estimated_probability\030\002 \001(\001\032\233\002\n&Del" + + "taPresenceEstimationHistogramBucket\022\027\n\017m" + + "in_probability\030\001 \001(\001\022\027\n\017max_probability\030" + + "\002 \001(\001\022\023\n\013bucket_size\030\005 \001(\003\022\215\001\n\rbucket_va" + + "lues\030\006 \003(\0132v.google.privacy.dlp.v2.Analy" + + "zeDataSourceRiskDetails.DeltaPresenceEst" + + "imationResult.DeltaPresenceEstimationQua" + + "siIdValues\022\032\n\022bucket_value_count\030\007 \001(\003B\010" + + "\n\006result\"L\n\016ValueFrequency\022+\n\005value\030\001 \001(" + + "\0132\034.google.privacy.dlp.v2.Value\022\r\n\005count" + + "\030\002 \001(\003\"\263\002\n\005Value\022\027\n\rinteger_value\030\001 \001(\003H" + + "\000\022\025\n\013float_value\030\002 \001(\001H\000\022\026\n\014string_value" + + "\030\003 \001(\tH\000\022\027\n\rboolean_value\030\004 \001(\010H\000\0225\n\017tim" + + "estamp_value\030\005 \001(\0132\032.google.protobuf.Tim" + + "estampH\000\022,\n\ntime_value\030\006 \001(\0132\026.google.ty" + + "pe.TimeOfDayH\000\022\'\n\ndate_value\030\007 \001(\0132\021.goo" + + "gle.type.DateH\000\0223\n\021day_of_week_value\030\010 \001" + + "(\0162\026.google.type.DayOfWeekH\000B\006\n\004type\"Q\n\t" + + "QuoteInfo\0224\n\tdate_time\030\002 \001(\0132\037.google.pr" + + "ivacy.dlp.v2.DateTimeH\000B\016\n\014parsed_quote\"" + + "\337\001\n\010DateTime\022\037\n\004date\030\001 \001(\0132\021.google.type" + + ".Date\022+\n\013day_of_week\030\002 \001(\0162\026.google.type" + + ".DayOfWeek\022$\n\004time\030\003 \001(\0132\026.google.type.T" + + "imeOfDay\022;\n\ttime_zone\030\004 \001(\0132(.google.pri" + + "vacy.dlp.v2.DateTime.TimeZone\032\"\n\010TimeZon" + + "e\022\026\n\016offset_minutes\030\001 \001(\005\"\311\001\n\020Deidentify" + + "Config\022S\n\031info_type_transformations\030\001 \001(" + + "\0132..google.privacy.dlp.v2.InfoTypeTransf" + + "ormationsH\000\022N\n\026record_transformations\030\002 " + + "\001(\0132,.google.privacy.dlp.v2.RecordTransf" + + "ormationsH\000B\020\n\016transformation\"\365\006\n\027Primit" + + "iveTransformation\022C\n\016replace_config\030\001 \001(" + + "\0132).google.privacy.dlp.v2.ReplaceValueCo" + + "nfigH\000\022<\n\rredact_config\030\002 \001(\0132#.google.p" + + "rivacy.dlp.v2.RedactConfigH\000\022K\n\025characte" + + "r_mask_config\030\003 \001(\0132*.google.privacy.dlp" + + ".v2.CharacterMaskConfigH\000\022Y\n\035crypto_repl" + + "ace_ffx_fpe_config\030\004 \001(\01320.google.privac" + + "y.dlp.v2.CryptoReplaceFfxFpeConfigH\000\022V\n\033" + + "fixed_size_bucketing_config\030\005 \001(\0132/.goog" + + "le.privacy.dlp.v2.FixedSizeBucketingConf" + + "igH\000\022B\n\020bucketing_config\030\006 \001(\0132&.google." + + "privacy.dlp.v2.BucketingConfigH\000\022Y\n\035repl" + + "ace_with_info_type_config\030\007 \001(\01320.google" + + ".privacy.dlp.v2.ReplaceWithInfoTypeConfi" + + "gH\000\022A\n\020time_part_config\030\010 \001(\0132%.google.p" + + "rivacy.dlp.v2.TimePartConfigH\000\022E\n\022crypto" + + "_hash_config\030\t \001(\0132\'.google.privacy.dlp." + + "v2.CryptoHashConfigH\000\022C\n\021date_shift_conf" + + "ig\030\013 \001(\0132&.google.privacy.dlp.v2.DateShi" + + "ftConfigH\000\022W\n\033crypto_deterministic_confi" + + "g\030\014 \001(\01320.google.privacy.dlp.v2.CryptoDe" + + "terministicConfigH\000B\020\n\016transformation\"\334\001" + + "\n\016TimePartConfig\022G\n\017part_to_extract\030\001 \001(" + + "\0162..google.privacy.dlp.v2.TimePartConfig" + + ".TimePart\"\200\001\n\010TimePart\022\031\n\025TIME_PART_UNSP" + + "ECIFIED\020\000\022\010\n\004YEAR\020\001\022\t\n\005MONTH\020\002\022\020\n\014DAY_OF" + + "_MONTH\020\003\022\017\n\013DAY_OF_WEEK\020\004\022\020\n\014WEEK_OF_YEA" + + "R\020\005\022\017\n\013HOUR_OF_DAY\020\006\"H\n\020CryptoHashConfig" + + "\0224\n\ncrypto_key\030\001 \001(\0132 .google.privacy.dl" + + "p.v2.CryptoKey\"\300\001\n\031CryptoDeterministicCo" + "nfig\0224\n\ncrypto_key\030\001 \001(\0132 .google.privac" - + "y.dlp.v2.CryptoKey\"E\n\022ReplaceValueConfig" - + "\022/\n\tnew_value\030\001 \001(\0132\034.google.privacy.dlp" - + ".v2.Value\"\033\n\031ReplaceWithInfoTypeConfig\"\016" - + "\n\014RedactConfig\"\266\002\n\rCharsToIgnore\022\034\n\022char" - + "acters_to_skip\030\001 \001(\tH\000\022_\n\033common_charact" - + "ers_to_ignore\030\002 \001(\01628.google.privacy.dlp" - + ".v2.CharsToIgnore.CommonCharsToIgnoreH\000\"" - + "\227\001\n\023CommonCharsToIgnore\022&\n\"COMMON_CHARS_" - + "TO_IGNORE_UNSPECIFIED\020\000\022\013\n\007NUMERIC\020\001\022\024\n\020" - + "ALPHA_UPPER_CASE\020\002\022\024\n\020ALPHA_LOWER_CASE\020\003" - + "\022\017\n\013PUNCTUATION\020\004\022\016\n\nWHITESPACE\020\005B\014\n\ncha" - + "racters\"\243\001\n\023CharacterMaskConfig\022\031\n\021maski" - + "ng_character\030\001 \001(\t\022\026\n\016number_to_mask\030\002 \001" - + "(\005\022\025\n\rreverse_order\030\003 \001(\010\022B\n\024characters_" - + "to_ignore\030\004 \003(\0132$.google.privacy.dlp.v2." - + "CharsToIgnore\"\225\001\n\030FixedSizeBucketingConf" - + "ig\0221\n\013lower_bound\030\001 \001(\0132\034.google.privacy" - + ".dlp.v2.Value\0221\n\013upper_bound\030\002 \001(\0132\034.goo" - + "gle.privacy.dlp.v2.Value\022\023\n\013bucket_size\030" - + "\003 \001(\001\"\353\001\n\017BucketingConfig\022>\n\007buckets\030\001 \003" - + "(\0132-.google.privacy.dlp.v2.BucketingConf" - + "ig.Bucket\032\227\001\n\006Bucket\022)\n\003min\030\001 \001(\0132\034.goog" - + "le.privacy.dlp.v2.Value\022)\n\003max\030\002 \001(\0132\034.g" - + "oogle.privacy.dlp.v2.Value\0227\n\021replacemen" - + "t_value\030\003 \001(\0132\034.google.privacy.dlp.v2.Va", - "lue\"\364\003\n\031CryptoReplaceFfxFpeConfig\0224\n\ncry" - + "pto_key\030\001 \001(\0132 .google.privacy.dlp.v2.Cr" - + "yptoKey\022/\n\007context\030\002 \001(\0132\036.google.privac" - + "y.dlp.v2.FieldId\022c\n\017common_alphabet\030\004 \001(" - + "\0162H.google.privacy.dlp.v2.CryptoReplaceF" - + "fxFpeConfig.FfxCommonNativeAlphabetH\000\022\031\n" - + "\017custom_alphabet\030\005 \001(\tH\000\022\017\n\005radix\030\006 \001(\005H" - + "\000\022<\n\023surrogate_info_type\030\010 \001(\0132\037.google." - + "privacy.dlp.v2.InfoType\"\224\001\n\027FfxCommonNat" - + "iveAlphabet\022*\n&FFX_COMMON_NATIVE_ALPHABE" - + "T_UNSPECIFIED\020\000\022\013\n\007NUMERIC\020\001\022\017\n\013HEXADECI" - + "MAL\020\002\022\034\n\030UPPER_CASE_ALPHA_NUMERIC\020\003\022\021\n\rA" - + "LPHA_NUMERIC\020\004B\n\n\010alphabet\"\330\001\n\tCryptoKey" - + "\022>\n\ttransient\030\001 \001(\0132).google.privacy.dlp" - + ".v2.TransientCryptoKeyH\000\022>\n\tunwrapped\030\002 " - + "\001(\0132).google.privacy.dlp.v2.UnwrappedCry" - + "ptoKeyH\000\022A\n\013kms_wrapped\030\003 \001(\0132*.google.p" - + "rivacy.dlp.v2.KmsWrappedCryptoKeyH\000B\010\n\006s" - + "ource\"\"\n\022TransientCryptoKey\022\014\n\004name\030\001 \001(" - + "\t\"!\n\022UnwrappedCryptoKey\022\013\n\003key\030\001 \001(\014\"C\n\023" - + "KmsWrappedCryptoKey\022\023\n\013wrapped_key\030\001 \001(\014" - + "\022\027\n\017crypto_key_name\030\002 \001(\t\"\270\001\n\017DateShiftC" - + "onfig\022\030\n\020upper_bound_days\030\001 \001(\005\022\030\n\020lower" - + "_bound_days\030\002 \001(\005\022/\n\007context\030\003 \001(\0132\036.goo" - + "gle.privacy.dlp.v2.FieldId\0226\n\ncrypto_key" - + "\030\004 \001(\0132 .google.privacy.dlp.v2.CryptoKey" - + "H\000B\010\n\006method\"\233\002\n\027InfoTypeTransformations" - + "\022^\n\017transformations\030\001 \003(\0132E.google.priva" - + "cy.dlp.v2.InfoTypeTransformations.InfoTy" - + "peTransformation\032\237\001\n\026InfoTypeTransformat" - + "ion\0223\n\ninfo_types\030\001 \003(\0132\037.google.privacy" - + ".dlp.v2.InfoType\022P\n\030primitive_transforma" - + "tion\030\002 \001(\0132..google.privacy.dlp.v2.Primi" - + "tiveTransformation\"\273\002\n\023FieldTransformati" - + "on\022.\n\006fields\030\001 \003(\0132\036.google.privacy.dlp." - + "v2.FieldId\0229\n\tcondition\030\003 \001(\0132&.google.p" - + "rivacy.dlp.v2.RecordCondition\022R\n\030primiti" - + "ve_transformation\030\004 \001(\0132..google.privacy" - + ".dlp.v2.PrimitiveTransformationH\000\022S\n\031inf" - + "o_type_transformations\030\005 \001(\0132..google.pr" - + "ivacy.dlp.v2.InfoTypeTransformationsH\000B\020" - + "\n\016transformation\"\251\001\n\025RecordTransformatio" - + "ns\022I\n\025field_transformations\030\001 \003(\0132*.goog" - + "le.privacy.dlp.v2.FieldTransformation\022E\n" - + "\023record_suppressions\030\002 \003(\0132(.google.priv" - + "acy.dlp.v2.RecordSuppression\"N\n\021RecordSu" - + "ppression\0229\n\tcondition\030\001 \001(\0132&.google.pr" - + "ivacy.dlp.v2.RecordCondition\"\322\004\n\017RecordC" - + "ondition\022G\n\013expressions\030\003 \001(\01322.google.p" - + "rivacy.dlp.v2.RecordCondition.Expression" - + "s\032\244\001\n\tCondition\022-\n\005field\030\001 \001(\0132\036.google." - + "privacy.dlp.v2.FieldId\022;\n\010operator\030\003 \001(\016" - + "2).google.privacy.dlp.v2.RelationalOpera" - + "tor\022+\n\005value\030\004 \001(\0132\034.google.privacy.dlp." - + "v2.Value\032R\n\nConditions\022D\n\nconditions\030\001 \003" - + "(\01320.google.privacy.dlp.v2.RecordConditi" - + "on.Condition\032\372\001\n\013Expressions\022\\\n\020logical_" - + "operator\030\001 \001(\0162B.google.privacy.dlp.v2.R" - + "ecordCondition.Expressions.LogicalOperat" - + "or\022G\n\nconditions\030\003 \001(\01321.google.privacy." - + "dlp.v2.RecordCondition.ConditionsH\000\"<\n\017L" - + "ogicalOperator\022 \n\034LOGICAL_OPERATOR_UNSPE" - + "CIFIED\020\000\022\007\n\003AND\020\001B\006\n\004type\"\203\001\n\026Transforma" - + "tionOverview\022\031\n\021transformed_bytes\030\002 \001(\003\022" - + "N\n\030transformation_summaries\030\003 \003(\0132,.goog" - + "le.privacy.dlp.v2.TransformationSummary\"" - + "\237\005\n\025TransformationSummary\0222\n\tinfo_type\030\001" - + " \001(\0132\037.google.privacy.dlp.v2.InfoType\022-\n" - + "\005field\030\002 \001(\0132\036.google.privacy.dlp.v2.Fie" - + "ldId\022F\n\016transformation\030\003 \001(\0132..google.pr" - + "ivacy.dlp.v2.PrimitiveTransformation\022I\n\025" - + "field_transformations\030\005 \003(\0132*.google.pri" - + "vacy.dlp.v2.FieldTransformation\022A\n\017recor" - + "d_suppress\030\006 \001(\0132(.google.privacy.dlp.v2" - + ".RecordSuppression\022K\n\007results\030\004 \003(\0132:.go" - + "ogle.privacy.dlp.v2.TransformationSummar" - + "y.SummaryResult\022\031\n\021transformed_bytes\030\007 \001" - + "(\003\032\204\001\n\rSummaryResult\022\r\n\005count\030\001 \001(\003\022S\n\004c" - + "ode\030\002 \001(\0162E.google.privacy.dlp.v2.Transf" - + "ormationSummary.TransformationResultCode" - + "\022\017\n\007details\030\003 \001(\t\"^\n\030TransformationResul" - + "tCode\022*\n&TRANSFORMATION_RESULT_CODE_UNSP" - + "ECIFIED\020\000\022\013\n\007SUCCESS\020\001\022\t\n\005ERROR\020\002\"U\n\010Sch" - + "edule\022?\n\032recurrence_period_duration\030\001 \001(" - + "\0132\031.google.protobuf.DurationH\000B\010\n\006option" - + "\"\352\001\n\017InspectTemplate\022\014\n\004name\030\001 \001(\t\022\024\n\014di" - + "splay_name\030\002 \001(\t\022\023\n\013description\030\003 \001(\t\022/\n" - + "\013create_time\030\004 \001(\0132\032.google.protobuf.Tim" - + "estamp\022/\n\013update_time\030\005 \001(\0132\032.google.pro" - + "tobuf.Timestamp\022<\n\016inspect_config\030\006 \001(\0132" - + "$.google.privacy.dlp.v2.InspectConfig\"\363\001" - + "\n\022DeidentifyTemplate\022\014\n\004name\030\001 \001(\t\022\024\n\014di" - + "splay_name\030\002 \001(\t\022\023\n\013description\030\003 \001(\t\022/\n" - + "\013create_time\030\004 \001(\0132\032.google.protobuf.Tim" - + "estamp\022/\n\013update_time\030\005 \001(\0132\032.google.pro" - + "tobuf.Timestamp\022B\n\021deidentify_config\030\006 \001" - + "(\0132\'.google.privacy.dlp.v2.DeidentifyCon" - + "fig\"\\\n\005Error\022#\n\007details\030\001 \001(\0132\022.google.r" - + "pc.Status\022.\n\ntimestamps\030\002 \003(\0132\032.google.p" - + "rotobuf.Timestamp\"\333\004\n\nJobTrigger\022\014\n\004name" - + "\030\001 \001(\t\022\024\n\014display_name\030\002 \001(\t\022\023\n\013descript" - + "ion\030\003 \001(\t\022>\n\013inspect_job\030\004 \001(\0132\'.google." - + "privacy.dlp.v2.InspectJobConfigH\000\022;\n\010tri" - + "ggers\030\005 \003(\0132).google.privacy.dlp.v2.JobT" - + "rigger.Trigger\022,\n\006errors\030\006 \003(\0132\034.google." - + "privacy.dlp.v2.Error\022/\n\013create_time\030\007 \001(" - + "\0132\032.google.protobuf.Timestamp\022/\n\013update_" - + "time\030\010 \001(\0132\032.google.protobuf.Timestamp\0221" - + "\n\rlast_run_time\030\t \001(\0132\032.google.protobuf." - + "Timestamp\0228\n\006status\030\n \001(\0162(.google.priva" - + "cy.dlp.v2.JobTrigger.Status\032I\n\007Trigger\0223" - + "\n\010schedule\030\001 \001(\0132\037.google.privacy.dlp.v2" - + ".ScheduleH\000B\t\n\007trigger\"H\n\006Status\022\026\n\022STAT" - + "US_UNSPECIFIED\020\000\022\013\n\007HEALTHY\020\001\022\n\n\006PAUSED\020" - + "\002\022\r\n\tCANCELLED\020\003B\005\n\003job\"\356\003\n\006Action\022C\n\rsa" - + "ve_findings\030\001 \001(\0132*.google.privacy.dlp.v" - + "2.Action.SaveFindingsH\000\022@\n\007pub_sub\030\002 \001(\013" - + "2-.google.privacy.dlp.v2.Action.PublishT" - + "oPubSubH\000\022U\n\027publish_summary_to_cscc\030\003 \001" - + "(\01322.google.privacy.dlp.v2.Action.Publis" - + "hSummaryToCsccH\000\022V\n\027job_notification_ema" - + "ils\030\010 \001(\01323.google.privacy.dlp.v2.Action" - + ".JobNotificationEmailsH\000\032Q\n\014SaveFindings" - + "\022A\n\routput_config\030\001 \001(\0132*.google.privacy" - + ".dlp.v2.OutputStorageConfig\032 \n\017PublishTo" - + "PubSub\022\r\n\005topic\030\001 \001(\t\032\026\n\024PublishSummaryT" - + "oCscc\032\027\n\025JobNotificationEmailsB\010\n\006action" - + "\"\205\001\n\034CreateInspectTemplateRequest\022\016\n\006par" - + "ent\030\001 \001(\t\022@\n\020inspect_template\030\002 \001(\0132&.go" - + "ogle.privacy.dlp.v2.InspectTemplate\022\023\n\013t" - + "emplate_id\030\003 \001(\t\"\237\001\n\034UpdateInspectTempla" - + "teRequest\022\014\n\004name\030\001 \001(\t\022@\n\020inspect_templ" - + "ate\030\002 \001(\0132&.google.privacy.dlp.v2.Inspec" - + "tTemplate\022/\n\013update_mask\030\003 \001(\0132\032.google." - + "protobuf.FieldMask\")\n\031GetInspectTemplate" - + "Request\022\014\n\004name\030\001 \001(\t\"f\n\033ListInspectTemp" - + "latesRequest\022\016\n\006parent\030\001 \001(\t\022\022\n\npage_tok" + + "y.dlp.v2.CryptoKey\022<\n\023surrogate_info_typ" + + "e\030\002 \001(\0132\037.google.privacy.dlp.v2.InfoType" + + "\022/\n\007context\030\003 \001(\0132\036.google.privacy.dlp.v" + + "2.FieldId\"E\n\022ReplaceValueConfig\022/\n\tnew_v" + + "alue\030\001 \001(\0132\034.google.privacy.dlp.v2.Value" + + "\"\033\n\031ReplaceWithInfoTypeConfig\"\016\n\014RedactC" + + "onfig\"\266\002\n\rCharsToIgnore\022\034\n\022characters_to" + + "_skip\030\001 \001(\tH\000\022_\n\033common_characters_to_ig" + + "nore\030\002 \001(\01628.google.privacy.dlp.v2.Chars" + + "ToIgnore.CommonCharsToIgnoreH\000\"\227\001\n\023Commo" + + "nCharsToIgnore\022&\n\"COMMON_CHARS_TO_IGNORE" + + "_UNSPECIFIED\020\000\022\013\n\007NUMERIC\020\001\022\024\n\020ALPHA_UPP" + + "ER_CASE\020\002\022\024\n\020ALPHA_LOWER_CASE\020\003\022\017\n\013PUNCT" + + "UATION\020\004\022\016\n\nWHITESPACE\020\005B\014\n\ncharacters\"\243" + + "\001\n\023CharacterMaskConfig\022\031\n\021masking_charac" + + "ter\030\001 \001(\t\022\026\n\016number_to_mask\030\002 \001(\005\022\025\n\rrev" + + "erse_order\030\003 \001(\010\022B\n\024characters_to_ignore" + + "\030\004 \003(\0132$.google.privacy.dlp.v2.CharsToIg" + + "nore\"\225\001\n\030FixedSizeBucketingConfig\0221\n\013low" + + "er_bound\030\001 \001(\0132\034.google.privacy.dlp.v2.V", + "alue\0221\n\013upper_bound\030\002 \001(\0132\034.google.priva" + + "cy.dlp.v2.Value\022\023\n\013bucket_size\030\003 \001(\001\"\353\001\n" + + "\017BucketingConfig\022>\n\007buckets\030\001 \003(\0132-.goog" + + "le.privacy.dlp.v2.BucketingConfig.Bucket" + + "\032\227\001\n\006Bucket\022)\n\003min\030\001 \001(\0132\034.google.privac" + + "y.dlp.v2.Value\022)\n\003max\030\002 \001(\0132\034.google.pri" + + "vacy.dlp.v2.Value\0227\n\021replacement_value\030\003" + + " \001(\0132\034.google.privacy.dlp.v2.Value\"\364\003\n\031C" + + "ryptoReplaceFfxFpeConfig\0224\n\ncrypto_key\030\001" + + " \001(\0132 .google.privacy.dlp.v2.CryptoKey\022/" + + "\n\007context\030\002 \001(\0132\036.google.privacy.dlp.v2." + + "FieldId\022c\n\017common_alphabet\030\004 \001(\0162H.googl" + + "e.privacy.dlp.v2.CryptoReplaceFfxFpeConf" + + "ig.FfxCommonNativeAlphabetH\000\022\031\n\017custom_a" + + "lphabet\030\005 \001(\tH\000\022\017\n\005radix\030\006 \001(\005H\000\022<\n\023surr" + + "ogate_info_type\030\010 \001(\0132\037.google.privacy.d" + + "lp.v2.InfoType\"\224\001\n\027FfxCommonNativeAlphab" + + "et\022*\n&FFX_COMMON_NATIVE_ALPHABET_UNSPECI" + + "FIED\020\000\022\013\n\007NUMERIC\020\001\022\017\n\013HEXADECIMAL\020\002\022\034\n\030" + + "UPPER_CASE_ALPHA_NUMERIC\020\003\022\021\n\rALPHA_NUME" + + "RIC\020\004B\n\n\010alphabet\"\330\001\n\tCryptoKey\022>\n\ttrans" + + "ient\030\001 \001(\0132).google.privacy.dlp.v2.Trans" + + "ientCryptoKeyH\000\022>\n\tunwrapped\030\002 \001(\0132).goo" + + "gle.privacy.dlp.v2.UnwrappedCryptoKeyH\000\022" + + "A\n\013kms_wrapped\030\003 \001(\0132*.google.privacy.dl" + + "p.v2.KmsWrappedCryptoKeyH\000B\010\n\006source\"\"\n\022" + + "TransientCryptoKey\022\014\n\004name\030\001 \001(\t\"!\n\022Unwr" + + "appedCryptoKey\022\013\n\003key\030\001 \001(\014\"C\n\023KmsWrappe" + + "dCryptoKey\022\023\n\013wrapped_key\030\001 \001(\014\022\027\n\017crypt" + + "o_key_name\030\002 \001(\t\"\270\001\n\017DateShiftConfig\022\030\n\020" + + "upper_bound_days\030\001 \001(\005\022\030\n\020lower_bound_da" + + "ys\030\002 \001(\005\022/\n\007context\030\003 \001(\0132\036.google.priva" + + "cy.dlp.v2.FieldId\0226\n\ncrypto_key\030\004 \001(\0132 ." + + "google.privacy.dlp.v2.CryptoKeyH\000B\010\n\006met" + + "hod\"\233\002\n\027InfoTypeTransformations\022^\n\017trans" + + "formations\030\001 \003(\0132E.google.privacy.dlp.v2" + + ".InfoTypeTransformations.InfoTypeTransfo" + + "rmation\032\237\001\n\026InfoTypeTransformation\0223\n\nin" + + "fo_types\030\001 \003(\0132\037.google.privacy.dlp.v2.I" + + "nfoType\022P\n\030primitive_transformation\030\002 \001(" + + "\0132..google.privacy.dlp.v2.PrimitiveTrans" + + "formation\"\273\002\n\023FieldTransformation\022.\n\006fie" + + "lds\030\001 \003(\0132\036.google.privacy.dlp.v2.FieldI" + + "d\0229\n\tcondition\030\003 \001(\0132&.google.privacy.dl" + + "p.v2.RecordCondition\022R\n\030primitive_transf" + + "ormation\030\004 \001(\0132..google.privacy.dlp.v2.P" + + "rimitiveTransformationH\000\022S\n\031info_type_tr" + + "ansformations\030\005 \001(\0132..google.privacy.dlp" + + ".v2.InfoTypeTransformationsH\000B\020\n\016transfo" + + "rmation\"\251\001\n\025RecordTransformations\022I\n\025fie" + + "ld_transformations\030\001 \003(\0132*.google.privac" + + "y.dlp.v2.FieldTransformation\022E\n\023record_s" + + "uppressions\030\002 \003(\0132(.google.privacy.dlp.v" + + "2.RecordSuppression\"N\n\021RecordSuppression" + + "\0229\n\tcondition\030\001 \001(\0132&.google.privacy.dlp" + + ".v2.RecordCondition\"\322\004\n\017RecordCondition\022" + + "G\n\013expressions\030\003 \001(\01322.google.privacy.dl" + + "p.v2.RecordCondition.Expressions\032\244\001\n\tCon" + + "dition\022-\n\005field\030\001 \001(\0132\036.google.privacy.d" + + "lp.v2.FieldId\022;\n\010operator\030\003 \001(\0162).google" + + ".privacy.dlp.v2.RelationalOperator\022+\n\005va" + + "lue\030\004 \001(\0132\034.google.privacy.dlp.v2.Value\032" + + "R\n\nConditions\022D\n\nconditions\030\001 \003(\01320.goog" + + "le.privacy.dlp.v2.RecordCondition.Condit" + + "ion\032\372\001\n\013Expressions\022\\\n\020logical_operator\030" + + "\001 \001(\0162B.google.privacy.dlp.v2.RecordCond" + + "ition.Expressions.LogicalOperator\022G\n\ncon" + + "ditions\030\003 \001(\01321.google.privacy.dlp.v2.Re" + + "cordCondition.ConditionsH\000\"<\n\017LogicalOpe" + + "rator\022 \n\034LOGICAL_OPERATOR_UNSPECIFIED\020\000\022" + + "\007\n\003AND\020\001B\006\n\004type\"\203\001\n\026TransformationOverv" + + "iew\022\031\n\021transformed_bytes\030\002 \001(\003\022N\n\030transf" + + "ormation_summaries\030\003 \003(\0132,.google.privac" + + "y.dlp.v2.TransformationSummary\"\237\005\n\025Trans" + + "formationSummary\0222\n\tinfo_type\030\001 \001(\0132\037.go" + + "ogle.privacy.dlp.v2.InfoType\022-\n\005field\030\002 " + + "\001(\0132\036.google.privacy.dlp.v2.FieldId\022F\n\016t" + + "ransformation\030\003 \001(\0132..google.privacy.dlp" + + ".v2.PrimitiveTransformation\022I\n\025field_tra" + + "nsformations\030\005 \003(\0132*.google.privacy.dlp." + + "v2.FieldTransformation\022A\n\017record_suppres" + + "s\030\006 \001(\0132(.google.privacy.dlp.v2.RecordSu" + + "ppression\022K\n\007results\030\004 \003(\0132:.google.priv" + + "acy.dlp.v2.TransformationSummary.Summary" + + "Result\022\031\n\021transformed_bytes\030\007 \001(\003\032\204\001\n\rSu" + + "mmaryResult\022\r\n\005count\030\001 \001(\003\022S\n\004code\030\002 \001(\016" + + "2E.google.privacy.dlp.v2.TransformationS" + + "ummary.TransformationResultCode\022\017\n\007detai" + + "ls\030\003 \001(\t\"^\n\030TransformationResultCode\022*\n&" + + "TRANSFORMATION_RESULT_CODE_UNSPECIFIED\020\000" + + "\022\013\n\007SUCCESS\020\001\022\t\n\005ERROR\020\002\"U\n\010Schedule\022?\n\032" + + "recurrence_period_duration\030\001 \001(\0132\031.googl" + + "e.protobuf.DurationH\000B\010\n\006option\"\352\001\n\017Insp" + + "ectTemplate\022\014\n\004name\030\001 \001(\t\022\024\n\014display_nam" + + "e\030\002 \001(\t\022\023\n\013description\030\003 \001(\t\022/\n\013create_t" + + "ime\030\004 \001(\0132\032.google.protobuf.Timestamp\022/\n" + + "\013update_time\030\005 \001(\0132\032.google.protobuf.Tim" + + "estamp\022<\n\016inspect_config\030\006 \001(\0132$.google." + + "privacy.dlp.v2.InspectConfig\"\363\001\n\022Deident" + + "ifyTemplate\022\014\n\004name\030\001 \001(\t\022\024\n\014display_nam" + + "e\030\002 \001(\t\022\023\n\013description\030\003 \001(\t\022/\n\013create_t" + + "ime\030\004 \001(\0132\032.google.protobuf.Timestamp\022/\n" + + "\013update_time\030\005 \001(\0132\032.google.protobuf.Tim" + + "estamp\022B\n\021deidentify_config\030\006 \001(\0132\'.goog" + + "le.privacy.dlp.v2.DeidentifyConfig\"\\\n\005Er" + + "ror\022#\n\007details\030\001 \001(\0132\022.google.rpc.Status" + + "\022.\n\ntimestamps\030\002 \003(\0132\032.google.protobuf.T" + + "imestamp\"\333\004\n\nJobTrigger\022\014\n\004name\030\001 \001(\t\022\024\n" + + "\014display_name\030\002 \001(\t\022\023\n\013description\030\003 \001(\t" + + "\022>\n\013inspect_job\030\004 \001(\0132\'.google.privacy.d" + + "lp.v2.InspectJobConfigH\000\022;\n\010triggers\030\005 \003" + + "(\0132).google.privacy.dlp.v2.JobTrigger.Tr" + + "igger\022,\n\006errors\030\006 \003(\0132\034.google.privacy.d" + + "lp.v2.Error\022/\n\013create_time\030\007 \001(\0132\032.googl" + + "e.protobuf.Timestamp\022/\n\013update_time\030\010 \001(" + + "\0132\032.google.protobuf.Timestamp\0221\n\rlast_ru" + + "n_time\030\t \001(\0132\032.google.protobuf.Timestamp" + + "\0228\n\006status\030\n \001(\0162(.google.privacy.dlp.v2" + + ".JobTrigger.Status\032I\n\007Trigger\0223\n\010schedul" + + "e\030\001 \001(\0132\037.google.privacy.dlp.v2.Schedule" + + "H\000B\t\n\007trigger\"H\n\006Status\022\026\n\022STATUS_UNSPEC" + + "IFIED\020\000\022\013\n\007HEALTHY\020\001\022\n\n\006PAUSED\020\002\022\r\n\tCANC" + + "ELLED\020\003B\005\n\003job\"\356\003\n\006Action\022C\n\rsave_findin" + + "gs\030\001 \001(\0132*.google.privacy.dlp.v2.Action." + + "SaveFindingsH\000\022@\n\007pub_sub\030\002 \001(\0132-.google" + + ".privacy.dlp.v2.Action.PublishToPubSubH\000" + + "\022U\n\027publish_summary_to_cscc\030\003 \001(\01322.goog" + + "le.privacy.dlp.v2.Action.PublishSummaryT" + + "oCsccH\000\022V\n\027job_notification_emails\030\010 \001(\013" + + "23.google.privacy.dlp.v2.Action.JobNotif" + + "icationEmailsH\000\032Q\n\014SaveFindings\022A\n\routpu" + + "t_config\030\001 \001(\0132*.google.privacy.dlp.v2.O" + + "utputStorageConfig\032 \n\017PublishToPubSub\022\r\n" + + "\005topic\030\001 \001(\t\032\026\n\024PublishSummaryToCscc\032\027\n\025" + + "JobNotificationEmailsB\010\n\006action\"\205\001\n\034Crea" + + "teInspectTemplateRequest\022\016\n\006parent\030\001 \001(\t" + + "\022@\n\020inspect_template\030\002 \001(\0132&.google.priv" + + "acy.dlp.v2.InspectTemplate\022\023\n\013template_i" + + "d\030\003 \001(\t\"\237\001\n\034UpdateInspectTemplateRequest" + + "\022\014\n\004name\030\001 \001(\t\022@\n\020inspect_template\030\002 \001(\013" + + "2&.google.privacy.dlp.v2.InspectTemplate" + + "\022/\n\013update_mask\030\003 \001(\0132\032.google.protobuf." + + "FieldMask\")\n\031GetInspectTemplateRequest\022\014" + + "\n\004name\030\001 \001(\t\"f\n\033ListInspectTemplatesRequ" + + "est\022\016\n\006parent\030\001 \001(\t\022\022\n\npage_token\030\002 \001(\t\022" + + "\021\n\tpage_size\030\003 \001(\005\022\020\n\010order_by\030\004 \001(\t\"z\n\034" + + "ListInspectTemplatesResponse\022A\n\021inspect_" + + "templates\030\001 \003(\0132&.google.privacy.dlp.v2." + + "InspectTemplate\022\027\n\017next_page_token\030\002 \001(\t" + + "\",\n\034DeleteInspectTemplateRequest\022\014\n\004name" + + "\030\001 \001(\t\"u\n\027CreateJobTriggerRequest\022\016\n\006par" + + "ent\030\001 \001(\t\0226\n\013job_trigger\030\002 \001(\0132!.google." + + "privacy.dlp.v2.JobTrigger\022\022\n\ntrigger_id\030" + + "\003 \001(\t\")\n\031ActivateJobTriggerRequest\022\014\n\004na" + + "me\030\001 \001(\t\"\220\001\n\027UpdateJobTriggerRequest\022\014\n\004" + + "name\030\001 \001(\t\0226\n\013job_trigger\030\002 \001(\0132!.google" + + ".privacy.dlp.v2.JobTrigger\022/\n\013update_mas" + + "k\030\003 \001(\0132\032.google.protobuf.FieldMask\"$\n\024G" + + "etJobTriggerRequest\022\014\n\004name\030\001 \001(\t\"\276\001\n\023Cr" + + "eateDlpJobRequest\022\016\n\006parent\030\001 \001(\t\022>\n\013ins" + + "pect_job\030\002 \001(\0132\'.google.privacy.dlp.v2.I" + + "nspectJobConfigH\000\022@\n\010risk_job\030\003 \001(\0132,.go" + + "ogle.privacy.dlp.v2.RiskAnalysisJobConfi" + + "gH\000\022\016\n\006job_id\030\004 \001(\tB\005\n\003job\"q\n\026ListJobTri" + + "ggersRequest\022\016\n\006parent\030\001 \001(\t\022\022\n\npage_tok" + "en\030\002 \001(\t\022\021\n\tpage_size\030\003 \001(\005\022\020\n\010order_by\030" - + "\004 \001(\t\"z\n\034ListInspectTemplatesResponse\022A\n" - + "\021inspect_templates\030\001 \003(\0132&.google.privac" - + "y.dlp.v2.InspectTemplate\022\027\n\017next_page_to" - + "ken\030\002 \001(\t\",\n\034DeleteInspectTemplateReques" - + "t\022\014\n\004name\030\001 \001(\t\"u\n\027CreateJobTriggerReque" - + "st\022\016\n\006parent\030\001 \001(\t\0226\n\013job_trigger\030\002 \001(\0132" - + "!.google.privacy.dlp.v2.JobTrigger\022\022\n\ntr" - + "igger_id\030\003 \001(\t\")\n\031ActivateJobTriggerRequ" - + "est\022\014\n\004name\030\001 \001(\t\"\220\001\n\027UpdateJobTriggerRe" - + "quest\022\014\n\004name\030\001 \001(\t\0226\n\013job_trigger\030\002 \001(\013" - + "2!.google.privacy.dlp.v2.JobTrigger\022/\n\013u" - + "pdate_mask\030\003 \001(\0132\032.google.protobuf.Field" - + "Mask\"$\n\024GetJobTriggerRequest\022\014\n\004name\030\001 \001" - + "(\t\"\276\001\n\023CreateDlpJobRequest\022\016\n\006parent\030\001 \001" - + "(\t\022>\n\013inspect_job\030\002 \001(\0132\'.google.privacy" - + ".dlp.v2.InspectJobConfigH\000\022@\n\010risk_job\030\003" - + " \001(\0132,.google.privacy.dlp.v2.RiskAnalysi" - + "sJobConfigH\000\022\016\n\006job_id\030\004 \001(\tB\005\n\003job\"q\n\026L" - + "istJobTriggersRequest\022\016\n\006parent\030\001 \001(\t\022\022\n" - + "\npage_token\030\002 \001(\t\022\021\n\tpage_size\030\003 \001(\005\022\020\n\010" - + "order_by\030\004 \001(\t\022\016\n\006filter\030\005 \001(\t\"k\n\027ListJo" - + "bTriggersResponse\0227\n\014job_triggers\030\001 \003(\0132" - + "!.google.privacy.dlp.v2.JobTrigger\022\027\n\017ne" - + "xt_page_token\030\002 \001(\t\"\'\n\027DeleteJobTriggerR" - + "equest\022\014\n\004name\030\001 \001(\t\"\335\001\n\020InspectJobConfi" - + "g\022<\n\016storage_config\030\001 \001(\0132$.google.priva" - + "cy.dlp.v2.StorageConfig\022<\n\016inspect_confi" - + "g\030\002 \001(\0132$.google.privacy.dlp.v2.InspectC" - + "onfig\022\035\n\025inspect_template_name\030\003 \001(\t\022.\n\007" - + "actions\030\004 \003(\0132\035.google.privacy.dlp.v2.Ac" - + "tion\"\336\004\n\006DlpJob\022\014\n\004name\030\001 \001(\t\022/\n\004type\030\002 " - + "\001(\0162!.google.privacy.dlp.v2.DlpJobType\0225" - + "\n\005state\030\003 \001(\0162&.google.privacy.dlp.v2.Dl" - + "pJob.JobState\022K\n\014risk_details\030\004 \001(\01323.go" - + "ogle.privacy.dlp.v2.AnalyzeDataSourceRis" - + "kDetailsH\000\022J\n\017inspect_details\030\005 \001(\0132/.go" - + "ogle.privacy.dlp.v2.InspectDataSourceDet" - + "ailsH\000\022/\n\013create_time\030\006 \001(\0132\032.google.pro" - + "tobuf.Timestamp\022.\n\nstart_time\030\007 \001(\0132\032.go" - + "ogle.protobuf.Timestamp\022,\n\010end_time\030\010 \001(" - + "\0132\032.google.protobuf.Timestamp\022\030\n\020job_tri" - + "gger_name\030\n \001(\t\022,\n\006errors\030\013 \003(\0132\034.google" - + ".privacy.dlp.v2.Error\"c\n\010JobState\022\031\n\025JOB" - + "_STATE_UNSPECIFIED\020\000\022\013\n\007PENDING\020\001\022\013\n\007RUN" - + "NING\020\002\022\010\n\004DONE\020\003\022\014\n\010CANCELED\020\004\022\n\n\006FAILED" - + "\020\005B\t\n\007details\" \n\020GetDlpJobRequest\022\014\n\004nam" - + "e\030\001 \001(\t\"\236\001\n\022ListDlpJobsRequest\022\016\n\006parent" - + "\030\004 \001(\t\022\016\n\006filter\030\001 \001(\t\022\021\n\tpage_size\030\002 \001(" - + "\005\022\022\n\npage_token\030\003 \001(\t\022/\n\004type\030\005 \001(\0162!.go" - + "ogle.privacy.dlp.v2.DlpJobType\022\020\n\010order_" - + "by\030\006 \001(\t\"[\n\023ListDlpJobsResponse\022+\n\004jobs\030" - + "\001 \003(\0132\035.google.privacy.dlp.v2.DlpJob\022\027\n\017" - + "next_page_token\030\002 \001(\t\"#\n\023CancelDlpJobReq" - + "uest\022\014\n\004name\030\001 \001(\t\"#\n\023DeleteDlpJobReques" - + "t\022\014\n\004name\030\001 \001(\t\"\216\001\n\037CreateDeidentifyTemp" - + "lateRequest\022\016\n\006parent\030\001 \001(\t\022F\n\023deidentif" - + "y_template\030\002 \001(\0132).google.privacy.dlp.v2" - + ".DeidentifyTemplate\022\023\n\013template_id\030\003 \001(\t" - + "\"\250\001\n\037UpdateDeidentifyTemplateRequest\022\014\n\004" - + "name\030\001 \001(\t\022F\n\023deidentify_template\030\002 \001(\0132" - + ").google.privacy.dlp.v2.DeidentifyTempla" - + "te\022/\n\013update_mask\030\003 \001(\0132\032.google.protobu" - + "f.FieldMask\",\n\034GetDeidentifyTemplateRequ" - + "est\022\014\n\004name\030\001 \001(\t\"i\n\036ListDeidentifyTempl" - + "atesRequest\022\016\n\006parent\030\001 \001(\t\022\022\n\npage_toke" + + "\004 \001(\t\022\016\n\006filter\030\005 \001(\t\"k\n\027ListJobTriggers" + + "Response\0227\n\014job_triggers\030\001 \003(\0132!.google." + + "privacy.dlp.v2.JobTrigger\022\027\n\017next_page_t" + + "oken\030\002 \001(\t\"\'\n\027DeleteJobTriggerRequest\022\014\n" + + "\004name\030\001 \001(\t\"\335\001\n\020InspectJobConfig\022<\n\016stor" + + "age_config\030\001 \001(\0132$.google.privacy.dlp.v2" + + ".StorageConfig\022<\n\016inspect_config\030\002 \001(\0132$" + + ".google.privacy.dlp.v2.InspectConfig\022\035\n\025" + + "inspect_template_name\030\003 \001(\t\022.\n\007actions\030\004" + + " \003(\0132\035.google.privacy.dlp.v2.Action\"\336\004\n\006" + + "DlpJob\022\014\n\004name\030\001 \001(\t\022/\n\004type\030\002 \001(\0162!.goo" + + "gle.privacy.dlp.v2.DlpJobType\0225\n\005state\030\003" + + " \001(\0162&.google.privacy.dlp.v2.DlpJob.JobS" + + "tate\022K\n\014risk_details\030\004 \001(\01323.google.priv" + + "acy.dlp.v2.AnalyzeDataSourceRiskDetailsH" + + "\000\022J\n\017inspect_details\030\005 \001(\0132/.google.priv" + + "acy.dlp.v2.InspectDataSourceDetailsH\000\022/\n" + + "\013create_time\030\006 \001(\0132\032.google.protobuf.Tim" + + "estamp\022.\n\nstart_time\030\007 \001(\0132\032.google.prot" + + "obuf.Timestamp\022,\n\010end_time\030\010 \001(\0132\032.googl" + + "e.protobuf.Timestamp\022\030\n\020job_trigger_name" + + "\030\n \001(\t\022,\n\006errors\030\013 \003(\0132\034.google.privacy." + + "dlp.v2.Error\"c\n\010JobState\022\031\n\025JOB_STATE_UN" + + "SPECIFIED\020\000\022\013\n\007PENDING\020\001\022\013\n\007RUNNING\020\002\022\010\n" + + "\004DONE\020\003\022\014\n\010CANCELED\020\004\022\n\n\006FAILED\020\005B\t\n\007det" + + "ails\" \n\020GetDlpJobRequest\022\014\n\004name\030\001 \001(\t\"\236" + + "\001\n\022ListDlpJobsRequest\022\016\n\006parent\030\004 \001(\t\022\016\n" + + "\006filter\030\001 \001(\t\022\021\n\tpage_size\030\002 \001(\005\022\022\n\npage" + + "_token\030\003 \001(\t\022/\n\004type\030\005 \001(\0162!.google.priv" + + "acy.dlp.v2.DlpJobType\022\020\n\010order_by\030\006 \001(\t\"" + + "[\n\023ListDlpJobsResponse\022+\n\004jobs\030\001 \003(\0132\035.g" + + "oogle.privacy.dlp.v2.DlpJob\022\027\n\017next_page" + + "_token\030\002 \001(\t\"#\n\023CancelDlpJobRequest\022\014\n\004n" + + "ame\030\001 \001(\t\"#\n\023DeleteDlpJobRequest\022\014\n\004name" + + "\030\001 \001(\t\"\216\001\n\037CreateDeidentifyTemplateReque" + + "st\022\016\n\006parent\030\001 \001(\t\022F\n\023deidentify_templat" + + "e\030\002 \001(\0132).google.privacy.dlp.v2.Deidenti" + + "fyTemplate\022\023\n\013template_id\030\003 \001(\t\"\250\001\n\037Upda" + + "teDeidentifyTemplateRequest\022\014\n\004name\030\001 \001(" + + "\t\022F\n\023deidentify_template\030\002 \001(\0132).google." + + "privacy.dlp.v2.DeidentifyTemplate\022/\n\013upd" + + "ate_mask\030\003 \001(\0132\032.google.protobuf.FieldMa" + + "sk\",\n\034GetDeidentifyTemplateRequest\022\014\n\004na" + + "me\030\001 \001(\t\"i\n\036ListDeidentifyTemplatesReque" + + "st\022\016\n\006parent\030\001 \001(\t\022\022\n\npage_token\030\002 \001(\t\022\021" + + "\n\tpage_size\030\003 \001(\005\022\020\n\010order_by\030\004 \001(\t\"\203\001\n\037" + + "ListDeidentifyTemplatesResponse\022G\n\024deide" + + "ntify_templates\030\001 \003(\0132).google.privacy.d" + + "lp.v2.DeidentifyTemplate\022\027\n\017next_page_to" + + "ken\030\002 \001(\t\"/\n\037DeleteDeidentifyTemplateReq" + + "uest\022\014\n\004name\030\001 \001(\t\"\364\001\n\033LargeCustomDictio" + + "naryConfig\022<\n\013output_path\030\001 \001(\0132\'.google" + + ".privacy.dlp.v2.CloudStoragePath\022L\n\026clou" + + "d_storage_file_set\030\002 \001(\0132*.google.privac" + + "y.dlp.v2.CloudStorageFileSetH\000\022?\n\017big_qu" + + "ery_field\030\003 \001(\0132$.google.privacy.dlp.v2." + + "BigQueryFieldH\000B\010\n\006source\"\240\001\n\024StoredInfo" + + "TypeConfig\022\024\n\014display_name\030\001 \001(\t\022\023\n\013desc" + + "ription\030\002 \001(\t\022U\n\027large_custom_dictionary" + + "\030\003 \001(\01322.google.privacy.dlp.v2.LargeCust" + + "omDictionaryConfigH\000B\006\n\004type\"\356\001\n\025StoredI" + + "nfoTypeVersion\022;\n\006config\030\001 \001(\0132+.google." + + "privacy.dlp.v2.StoredInfoTypeConfig\022/\n\013c" + + "reate_time\030\002 \001(\0132\032.google.protobuf.Times" + + "tamp\0229\n\005state\030\003 \001(\0162*.google.privacy.dlp" + + ".v2.StoredInfoTypeState\022,\n\006errors\030\004 \003(\0132" + + "\034.google.privacy.dlp.v2.Error\"\255\001\n\016Stored" + + "InfoType\022\014\n\004name\030\001 \001(\t\022E\n\017current_versio" + + "n\030\002 \001(\0132,.google.privacy.dlp.v2.StoredIn" + + "foTypeVersion\022F\n\020pending_versions\030\003 \003(\0132" + + ",.google.privacy.dlp.v2.StoredInfoTypeVe" + + "rsion\"\207\001\n\033CreateStoredInfoTypeRequest\022\016\n" + + "\006parent\030\001 \001(\t\022;\n\006config\030\002 \001(\0132+.google.p" + + "rivacy.dlp.v2.StoredInfoTypeConfig\022\033\n\023st" + + "ored_info_type_id\030\003 \001(\t\"\231\001\n\033UpdateStored" + + "InfoTypeRequest\022\014\n\004name\030\001 \001(\t\022;\n\006config\030" + + "\002 \001(\0132+.google.privacy.dlp.v2.StoredInfo" + + "TypeConfig\022/\n\013update_mask\030\003 \001(\0132\032.google" + + ".protobuf.FieldMask\"(\n\030GetStoredInfoType" + + "Request\022\014\n\004name\030\001 \001(\t\"e\n\032ListStoredInfoT" + + "ypesRequest\022\016\n\006parent\030\001 \001(\t\022\022\n\npage_toke" + "n\030\002 \001(\t\022\021\n\tpage_size\030\003 \001(\005\022\020\n\010order_by\030\004" - + " \001(\t\"\203\001\n\037ListDeidentifyTemplatesResponse" - + "\022G\n\024deidentify_templates\030\001 \003(\0132).google." - + "privacy.dlp.v2.DeidentifyTemplate\022\027\n\017nex" - + "t_page_token\030\002 \001(\t\"/\n\037DeleteDeidentifyTe" - + "mplateRequest\022\014\n\004name\030\001 \001(\t\"\364\001\n\033LargeCus" - + "tomDictionaryConfig\022<\n\013output_path\030\001 \001(\013" - + "2\'.google.privacy.dlp.v2.CloudStoragePat" - + "h\022L\n\026cloud_storage_file_set\030\002 \001(\0132*.goog" - + "le.privacy.dlp.v2.CloudStorageFileSetH\000\022" - + "?\n\017big_query_field\030\003 \001(\0132$.google.privac" - + "y.dlp.v2.BigQueryFieldH\000B\010\n\006source\"\240\001\n\024S" - + "toredInfoTypeConfig\022\024\n\014display_name\030\001 \001(" - + "\t\022\023\n\013description\030\002 \001(\t\022U\n\027large_custom_d" - + "ictionary\030\003 \001(\01322.google.privacy.dlp.v2." - + "LargeCustomDictionaryConfigH\000B\006\n\004type\"\356\001" - + "\n\025StoredInfoTypeVersion\022;\n\006config\030\001 \001(\0132" - + "+.google.privacy.dlp.v2.StoredInfoTypeCo" - + "nfig\022/\n\013create_time\030\002 \001(\0132\032.google.proto" - + "buf.Timestamp\0229\n\005state\030\003 \001(\0162*.google.pr" - + "ivacy.dlp.v2.StoredInfoTypeState\022,\n\006erro" - + "rs\030\004 \003(\0132\034.google.privacy.dlp.v2.Error\"\255" - + "\001\n\016StoredInfoType\022\014\n\004name\030\001 \001(\t\022E\n\017curre" - + "nt_version\030\002 \001(\0132,.google.privacy.dlp.v2" - + ".StoredInfoTypeVersion\022F\n\020pending_versio" - + "ns\030\003 \003(\0132,.google.privacy.dlp.v2.StoredI" - + "nfoTypeVersion\"\207\001\n\033CreateStoredInfoTypeR" - + "equest\022\016\n\006parent\030\001 \001(\t\022;\n\006config\030\002 \001(\0132+" - + ".google.privacy.dlp.v2.StoredInfoTypeCon" - + "fig\022\033\n\023stored_info_type_id\030\003 \001(\t\"\231\001\n\033Upd" - + "ateStoredInfoTypeRequest\022\014\n\004name\030\001 \001(\t\022;" - + "\n\006config\030\002 \001(\0132+.google.privacy.dlp.v2.S" - + "toredInfoTypeConfig\022/\n\013update_mask\030\003 \001(\013" - + "2\032.google.protobuf.FieldMask\"(\n\030GetStore" - + "dInfoTypeRequest\022\014\n\004name\030\001 \001(\t\"e\n\032ListSt" - + "oredInfoTypesRequest\022\016\n\006parent\030\001 \001(\t\022\022\n\n" - + "page_token\030\002 \001(\t\022\021\n\tpage_size\030\003 \001(\005\022\020\n\010o" - + "rder_by\030\004 \001(\t\"x\n\033ListStoredInfoTypesResp" - + "onse\022@\n\021stored_info_types\030\001 \003(\0132%.google" - + ".privacy.dlp.v2.StoredInfoType\022\027\n\017next_p" - + "age_token\030\002 \001(\t\"+\n\033DeleteStoredInfoTypeR" - + "equest\022\014\n\004name\030\001 \001(\t*M\n\rContentOption\022\027\n" - + "\023CONTENT_UNSPECIFIED\020\000\022\020\n\014CONTENT_TEXT\020\001" - + "\022\021\n\rCONTENT_IMAGE\020\002*\215\001\n\014MatchingType\022\035\n\031" - + "MATCHING_TYPE_UNSPECIFIED\020\000\022\034\n\030MATCHING_" - + "TYPE_FULL_MATCH\020\001\022\037\n\033MATCHING_TYPE_PARTI" - + "AL_MATCH\020\002\022\037\n\033MATCHING_TYPE_INVERSE_MATC" - + "H\020\003*P\n\023InfoTypeSupportedBy\022\031\n\025ENUM_TYPE_" - + "UNSPECIFIED\020\000\022\013\n\007INSPECT\020\001\022\021\n\rRISK_ANALY" - + "SIS\020\002*\273\001\n\022RelationalOperator\022#\n\037RELATION" - + "AL_OPERATOR_UNSPECIFIED\020\000\022\014\n\010EQUAL_TO\020\001\022" - + "\020\n\014NOT_EQUAL_TO\020\002\022\020\n\014GREATER_THAN\020\003\022\r\n\tL" - + "ESS_THAN\020\004\022\032\n\026GREATER_THAN_OR_EQUALS\020\005\022\027" - + "\n\023LESS_THAN_OR_EQUALS\020\006\022\n\n\006EXISTS\020\007*R\n\nD" - + "lpJobType\022\034\n\030DLP_JOB_TYPE_UNSPECIFIED\020\000\022" - + "\017\n\013INSPECT_JOB\020\001\022\025\n\021RISK_ANALYSIS_JOB\020\002*" - + "n\n\023StoredInfoTypeState\022&\n\"STORED_INFO_TY" - + "PE_STATE_UNSPECIFIED\020\000\022\013\n\007PENDING\020\001\022\t\n\005R" - + "EADY\020\002\022\n\n\006FAILED\020\003\022\013\n\007INVALID\020\0042\312,\n\nDlpS" - + "ervice\022\241\001\n\016InspectContent\022,.google.priva" - + "cy.dlp.v2.InspectContentRequest\032-.google" - + ".privacy.dlp.v2.InspectContentResponse\"2" - + "\202\323\344\223\002,\"\'/v2/{parent=projects/*}/content:" - + "inspect:\001*\022\225\001\n\013RedactImage\022).google.priv" - + "acy.dlp.v2.RedactImageRequest\032*.google.p" - + "rivacy.dlp.v2.RedactImageResponse\"/\202\323\344\223\002" - + ")\"$/v2/{parent=projects/*}/image:redact:" - + "\001*\022\255\001\n\021DeidentifyContent\022/.google.privac" - + "y.dlp.v2.DeidentifyContentRequest\0320.goog" - + "le.privacy.dlp.v2.DeidentifyContentRespo" - + "nse\"5\202\323\344\223\002/\"*/v2/{parent=projects/*}/con" - + "tent:deidentify:\001*\022\255\001\n\021ReidentifyContent" - + "\022/.google.privacy.dlp.v2.ReidentifyConte" - + "ntRequest\0320.google.privacy.dlp.v2.Reiden" - + "tifyContentResponse\"5\202\323\344\223\002/\"*/v2/{parent" - + "=projects/*}/content:reidentify:\001*\022\201\001\n\rL" - + "istInfoTypes\022+.google.privacy.dlp.v2.Lis" - + "tInfoTypesRequest\032,.google.privacy.dlp.v" - + "2.ListInfoTypesResponse\"\025\202\323\344\223\002\017\022\r/v2/inf" - + "oTypes\022\335\001\n\025CreateInspectTemplate\0223.googl" - + "e.privacy.dlp.v2.CreateInspectTemplateRe" - + "quest\032&.google.privacy.dlp.v2.InspectTem" - + "plate\"g\202\323\344\223\002a\"-/v2/{parent=organizations" - + "/*}/inspectTemplates:\001*Z-\"(/v2/{parent=p" - + "rojects/*}/inspectTemplates:\001*\022\335\001\n\025Updat" - + "eInspectTemplate\0223.google.privacy.dlp.v2" - + ".UpdateInspectTemplateRequest\032&.google.p" - + "rivacy.dlp.v2.InspectTemplate\"g\202\323\344\223\002a2-/" + + " \001(\t\"x\n\033ListStoredInfoTypesResponse\022@\n\021s" + + "tored_info_types\030\001 \003(\0132%.google.privacy." + + "dlp.v2.StoredInfoType\022\027\n\017next_page_token" + + "\030\002 \001(\t\"+\n\033DeleteStoredInfoTypeRequest\022\014\n" + + "\004name\030\001 \001(\t*M\n\rContentOption\022\027\n\023CONTENT_" + + "UNSPECIFIED\020\000\022\020\n\014CONTENT_TEXT\020\001\022\021\n\rCONTE" + + "NT_IMAGE\020\002*\215\001\n\014MatchingType\022\035\n\031MATCHING_" + + "TYPE_UNSPECIFIED\020\000\022\034\n\030MATCHING_TYPE_FULL" + + "_MATCH\020\001\022\037\n\033MATCHING_TYPE_PARTIAL_MATCH\020" + + "\002\022\037\n\033MATCHING_TYPE_INVERSE_MATCH\020\003*P\n\023In" + + "foTypeSupportedBy\022\031\n\025ENUM_TYPE_UNSPECIFI" + + "ED\020\000\022\013\n\007INSPECT\020\001\022\021\n\rRISK_ANALYSIS\020\002*\273\001\n" + + "\022RelationalOperator\022#\n\037RELATIONAL_OPERAT" + + "OR_UNSPECIFIED\020\000\022\014\n\010EQUAL_TO\020\001\022\020\n\014NOT_EQ" + + "UAL_TO\020\002\022\020\n\014GREATER_THAN\020\003\022\r\n\tLESS_THAN\020" + + "\004\022\032\n\026GREATER_THAN_OR_EQUALS\020\005\022\027\n\023LESS_TH" + + "AN_OR_EQUALS\020\006\022\n\n\006EXISTS\020\007*R\n\nDlpJobType" + + "\022\034\n\030DLP_JOB_TYPE_UNSPECIFIED\020\000\022\017\n\013INSPEC" + + "T_JOB\020\001\022\025\n\021RISK_ANALYSIS_JOB\020\002*n\n\023Stored" + + "InfoTypeState\022&\n\"STORED_INFO_TYPE_STATE_" + + "UNSPECIFIED\020\000\022\013\n\007PENDING\020\001\022\t\n\005READY\020\002\022\n\n" + + "\006FAILED\020\003\022\013\n\007INVALID\020\0042\312,\n\nDlpService\022\241\001" + + "\n\016InspectContent\022,.google.privacy.dlp.v2" + + ".InspectContentRequest\032-.google.privacy." + + "dlp.v2.InspectContentResponse\"2\202\323\344\223\002,\"\'/" + + "v2/{parent=projects/*}/content:inspect:\001" + + "*\022\225\001\n\013RedactImage\022).google.privacy.dlp.v" + + "2.RedactImageRequest\032*.google.privacy.dl" + + "p.v2.RedactImageResponse\"/\202\323\344\223\002)\"$/v2/{p" + + "arent=projects/*}/image:redact:\001*\022\255\001\n\021De" + + "identifyContent\022/.google.privacy.dlp.v2." + + "DeidentifyContentRequest\0320.google.privac" + + "y.dlp.v2.DeidentifyContentResponse\"5\202\323\344\223" + + "\002/\"*/v2/{parent=projects/*}/content:deid" + + "entify:\001*\022\255\001\n\021ReidentifyContent\022/.google" + + ".privacy.dlp.v2.ReidentifyContentRequest" + + "\0320.google.privacy.dlp.v2.ReidentifyConte" + + "ntResponse\"5\202\323\344\223\002/\"*/v2/{parent=projects" + + "/*}/content:reidentify:\001*\022\201\001\n\rListInfoTy" + + "pes\022+.google.privacy.dlp.v2.ListInfoType" + + "sRequest\032,.google.privacy.dlp.v2.ListInf" + + "oTypesResponse\"\025\202\323\344\223\002\017\022\r/v2/infoTypes\022\335\001" + + "\n\025CreateInspectTemplate\0223.google.privacy" + + ".dlp.v2.CreateInspectTemplateRequest\032&.g" + + "oogle.privacy.dlp.v2.InspectTemplate\"g\202\323" + + "\344\223\002a\"-/v2/{parent=organizations/*}/inspe" + + "ctTemplates:\001*Z-\"(/v2/{parent=projects/*" + + "}/inspectTemplates:\001*\022\335\001\n\025UpdateInspectT" + + "emplate\0223.google.privacy.dlp.v2.UpdateIn" + + "spectTemplateRequest\032&.google.privacy.dl" + + "p.v2.InspectTemplate\"g\202\323\344\223\002a2-/v2/{name=" + + "organizations/*/inspectTemplates/*}:\001*Z-" + + "2(/v2/{name=projects/*/inspectTemplates/" + + "*}:\001*\022\321\001\n\022GetInspectTemplate\0220.google.pr" + + "ivacy.dlp.v2.GetInspectTemplateRequest\032&" + + ".google.privacy.dlp.v2.InspectTemplate\"a" + + "\202\323\344\223\002[\022-/v2/{name=organizations/*/inspec" + + "tTemplates/*}Z*\022(/v2/{name=projects/*/in" + + "spectTemplates/*}\022\342\001\n\024ListInspectTemplat" + + "es\0222.google.privacy.dlp.v2.ListInspectTe" + + "mplatesRequest\0323.google.privacy.dlp.v2.L" + + "istInspectTemplatesResponse\"a\202\323\344\223\002[\022-/v2" + + "/{parent=organizations/*}/inspectTemplat" + + "esZ*\022(/v2/{parent=projects/*}/inspectTem" + + "plates\022\307\001\n\025DeleteInspectTemplate\0223.googl" + + "e.privacy.dlp.v2.DeleteInspectTemplateRe" + + "quest\032\026.google.protobuf.Empty\"a\202\323\344\223\002[*-/" + "v2/{name=organizations/*/inspectTemplate" - + "s/*}:\001*Z-2(/v2/{name=projects/*/inspectT" - + "emplates/*}:\001*\022\321\001\n\022GetInspectTemplate\0220." - + "google.privacy.dlp.v2.GetInspectTemplate" - + "Request\032&.google.privacy.dlp.v2.InspectT" - + "emplate\"a\202\323\344\223\002[\022-/v2/{name=organizations" - + "/*/inspectTemplates/*}Z*\022(/v2/{name=proj" - + "ects/*/inspectTemplates/*}\022\342\001\n\024ListInspe" - + "ctTemplates\0222.google.privacy.dlp.v2.List" - + "InspectTemplatesRequest\0323.google.privacy" - + ".dlp.v2.ListInspectTemplatesResponse\"a\202\323" - + "\344\223\002[\022-/v2/{parent=organizations/*}/inspe" - + "ctTemplatesZ*\022(/v2/{parent=projects/*}/i" - + "nspectTemplates\022\307\001\n\025DeleteInspectTemplat" - + "e\0223.google.privacy.dlp.v2.DeleteInspectT" - + "emplateRequest\032\026.google.protobuf.Empty\"a" - + "\202\323\344\223\002[*-/v2/{name=organizations/*/inspec" - + "tTemplates/*}Z**(/v2/{name=projects/*/in" - + "spectTemplates/*}\022\354\001\n\030CreateDeidentifyTe" - + "mplate\0226.google.privacy.dlp.v2.CreateDei" - + "dentifyTemplateRequest\032).google.privacy." - + "dlp.v2.DeidentifyTemplate\"m\202\323\344\223\002g\"0/v2/{" - + "parent=organizations/*}/deidentifyTempla" - + "tes:\001*Z0\"+/v2/{parent=projects/*}/deiden" - + "tifyTemplates:\001*\022\354\001\n\030UpdateDeidentifyTem" - + "plate\0226.google.privacy.dlp.v2.UpdateDeid" - + "entifyTemplateRequest\032).google.privacy.d" - + "lp.v2.DeidentifyTemplate\"m\202\323\344\223\002g20/v2/{n" - + "ame=organizations/*/deidentifyTemplates/" - + "*}:\001*Z02+/v2/{name=projects/*/deidentify" - + "Templates/*}:\001*\022\340\001\n\025GetDeidentifyTemplat" - + "e\0223.google.privacy.dlp.v2.GetDeidentifyT" - + "emplateRequest\032).google.privacy.dlp.v2.D" - + "eidentifyTemplate\"g\202\323\344\223\002a\0220/v2/{name=org" - + "anizations/*/deidentifyTemplates/*}Z-\022+/" - + "v2/{name=projects/*/deidentifyTemplates/" - + "*}\022\361\001\n\027ListDeidentifyTemplates\0225.google." - + "privacy.dlp.v2.ListDeidentifyTemplatesRe" - + "quest\0326.google.privacy.dlp.v2.ListDeiden" - + "tifyTemplatesResponse\"g\202\323\344\223\002a\0220/v2/{pare" - + "nt=organizations/*}/deidentifyTemplatesZ" - + "-\022+/v2/{parent=projects/*}/deidentifyTem" - + "plates\022\323\001\n\030DeleteDeidentifyTemplate\0226.go" - + "ogle.privacy.dlp.v2.DeleteDeidentifyTemp" - + "lateRequest\032\026.google.protobuf.Empty\"g\202\323\344" - + "\223\002a*0/v2/{name=organizations/*/deidentif" - + "yTemplates/*}Z-*+/v2/{name=projects/*/de" - + "identifyTemplates/*}\022\225\001\n\020CreateJobTrigge" - + "r\022..google.privacy.dlp.v2.CreateJobTrigg" - + "erRequest\032!.google.privacy.dlp.v2.JobTri" - + "gger\".\202\323\344\223\002(\"#/v2/{parent=projects/*}/jo" - + "bTriggers:\001*\022\225\001\n\020UpdateJobTrigger\022..goog" - + "le.privacy.dlp.v2.UpdateJobTriggerReques" - + "t\032!.google.privacy.dlp.v2.JobTrigger\".\202\323" - + "\344\223\002(2#/v2/{name=projects/*/jobTriggers/*" - + "}:\001*\022\214\001\n\rGetJobTrigger\022+.google.privacy." - + "dlp.v2.GetJobTriggerRequest\032!.google.pri" - + "vacy.dlp.v2.JobTrigger\"+\202\323\344\223\002%\022#/v2/{nam" - + "e=projects/*/jobTriggers/*}\022\235\001\n\017ListJobT" - + "riggers\022-.google.privacy.dlp.v2.ListJobT" - + "riggersRequest\032..google.privacy.dlp.v2.L" - + "istJobTriggersResponse\"+\202\323\344\223\002%\022#/v2/{par" - + "ent=projects/*}/jobTriggers\022\207\001\n\020DeleteJo" - + "bTrigger\022..google.privacy.dlp.v2.DeleteJ" - + "obTriggerRequest\032\026.google.protobuf.Empty" - + "\"+\202\323\344\223\002%*#/v2/{name=projects/*/jobTrigge" - + "rs/*}\022\236\001\n\022ActivateJobTrigger\0220.google.pr" - + "ivacy.dlp.v2.ActivateJobTriggerRequest\032\035" - + ".google.privacy.dlp.v2.DlpJob\"7\202\323\344\223\0021\",/" - + "v2/{name=projects/*/jobTriggers/*}:activ" - + "ate:\001*\022\205\001\n\014CreateDlpJob\022*.google.privacy" - + ".dlp.v2.CreateDlpJobRequest\032\035.google.pri" - + "vacy.dlp.v2.DlpJob\"*\202\323\344\223\002$\"\037/v2/{parent=" - + "projects/*}/dlpJobs:\001*\022\215\001\n\013ListDlpJobs\022)" - + ".google.privacy.dlp.v2.ListDlpJobsReques" - + "t\032*.google.privacy.dlp.v2.ListDlpJobsRes" - + "ponse\"\'\202\323\344\223\002!\022\037/v2/{parent=projects/*}/d" - + "lpJobs\022|\n\tGetDlpJob\022\'.google.privacy.dlp" - + ".v2.GetDlpJobRequest\032\035.google.privacy.dl" - + "p.v2.DlpJob\"\'\202\323\344\223\002!\022\037/v2/{name=projects/" - + "*/dlpJobs/*}\022{\n\014DeleteDlpJob\022*.google.pr" - + "ivacy.dlp.v2.DeleteDlpJobRequest\032\026.googl" - + "e.protobuf.Empty\"\'\202\323\344\223\002!*\037/v2/{name=proj" - + "ects/*/dlpJobs/*}\022\205\001\n\014CancelDlpJob\022*.goo" - + "gle.privacy.dlp.v2.CancelDlpJobRequest\032\026" - + ".google.protobuf.Empty\"1\202\323\344\223\002+\"&/v2/{nam" - + "e=projects/*/dlpJobs/*}:cancel:\001*\022\330\001\n\024Cr" - + "eateStoredInfoType\0222.google.privacy.dlp." - + "v2.CreateStoredInfoTypeRequest\032%.google." - + "privacy.dlp.v2.StoredInfoType\"e\202\323\344\223\002_\",/" - + "v2/{parent=organizations/*}/storedInfoTy" - + "pes:\001*Z,\"\'/v2/{parent=projects/*}/stored" - + "InfoTypes:\001*\022\330\001\n\024UpdateStoredInfoType\0222." - + "google.privacy.dlp.v2.UpdateStoredInfoTy" - + "peRequest\032%.google.privacy.dlp.v2.Stored" - + "InfoType\"e\202\323\344\223\002_2,/v2/{name=organization" - + "s/*/storedInfoTypes/*}:\001*Z,2\'/v2/{name=p" - + "rojects/*/storedInfoTypes/*}:\001*\022\314\001\n\021GetS" - + "toredInfoType\022/.google.privacy.dlp.v2.Ge" - + "tStoredInfoTypeRequest\032%.google.privacy." - + "dlp.v2.StoredInfoType\"_\202\323\344\223\002Y\022,/v2/{name" - + "=organizations/*/storedInfoTypes/*}Z)\022\'/" - + "v2/{name=projects/*/storedInfoTypes/*}\022\335" - + "\001\n\023ListStoredInfoTypes\0221.google.privacy." - + "dlp.v2.ListStoredInfoTypesRequest\0322.goog" - + "le.privacy.dlp.v2.ListStoredInfoTypesRes" - + "ponse\"_\202\323\344\223\002Y\022,/v2/{parent=organizations" - + "/*}/storedInfoTypesZ)\022\'/v2/{parent=proje" - + "cts/*}/storedInfoTypes\022\303\001\n\024DeleteStoredI", - "nfoType\0222.google.privacy.dlp.v2.DeleteSt" - + "oredInfoTypeRequest\032\026.google.protobuf.Em" - + "pty\"_\202\323\344\223\002Y*,/v2/{name=organizations/*/s" - + "toredInfoTypes/*}Z)*\'/v2/{name=projects/" - + "*/storedInfoTypes/*}B\215\001\n\031com.google.priv" - + "acy.dlp.v2B\010DlpProtoP\001Z8google.golang.or" - + "g/genproto/googleapis/privacy/dlp/v2;dlp" - + "\252\002\023Google.Cloud.Dlp.V2\312\002\023Google\\Cloud\\Dl" - + "p\\V2b\006proto3" + + "s/*}Z**(/v2/{name=projects/*/inspectTemp" + + "lates/*}\022\354\001\n\030CreateDeidentifyTemplate\0226." + + "google.privacy.dlp.v2.CreateDeidentifyTe" + + "mplateRequest\032).google.privacy.dlp.v2.De" + + "identifyTemplate\"m\202\323\344\223\002g\"0/v2/{parent=or" + + "ganizations/*}/deidentifyTemplates:\001*Z0\"" + + "+/v2/{parent=projects/*}/deidentifyTempl" + + "ates:\001*\022\354\001\n\030UpdateDeidentifyTemplate\0226.g" + + "oogle.privacy.dlp.v2.UpdateDeidentifyTem" + + "plateRequest\032).google.privacy.dlp.v2.Dei" + + "dentifyTemplate\"m\202\323\344\223\002g20/v2/{name=organ" + + "izations/*/deidentifyTemplates/*}:\001*Z02+" + + "/v2/{name=projects/*/deidentifyTemplates" + + "/*}:\001*\022\340\001\n\025GetDeidentifyTemplate\0223.googl" + + "e.privacy.dlp.v2.GetDeidentifyTemplateRe" + + "quest\032).google.privacy.dlp.v2.Deidentify" + + "Template\"g\202\323\344\223\002a\0220/v2/{name=organization" + + "s/*/deidentifyTemplates/*}Z-\022+/v2/{name=" + + "projects/*/deidentifyTemplates/*}\022\361\001\n\027Li" + + "stDeidentifyTemplates\0225.google.privacy.d" + + "lp.v2.ListDeidentifyTemplatesRequest\0326.g" + + "oogle.privacy.dlp.v2.ListDeidentifyTempl" + + "atesResponse\"g\202\323\344\223\002a\0220/v2/{parent=organi" + + "zations/*}/deidentifyTemplatesZ-\022+/v2/{p" + + "arent=projects/*}/deidentifyTemplates\022\323\001" + + "\n\030DeleteDeidentifyTemplate\0226.google.priv" + + "acy.dlp.v2.DeleteDeidentifyTemplateReque" + + "st\032\026.google.protobuf.Empty\"g\202\323\344\223\002a*0/v2/" + + "{name=organizations/*/deidentifyTemplate" + + "s/*}Z-*+/v2/{name=projects/*/deidentifyT" + + "emplates/*}\022\225\001\n\020CreateJobTrigger\022..googl" + + "e.privacy.dlp.v2.CreateJobTriggerRequest" + + "\032!.google.privacy.dlp.v2.JobTrigger\".\202\323\344" + + "\223\002(\"#/v2/{parent=projects/*}/jobTriggers" + + ":\001*\022\225\001\n\020UpdateJobTrigger\022..google.privac" + + "y.dlp.v2.UpdateJobTriggerRequest\032!.googl" + + "e.privacy.dlp.v2.JobTrigger\".\202\323\344\223\002(2#/v2" + + "/{name=projects/*/jobTriggers/*}:\001*\022\214\001\n\r" + + "GetJobTrigger\022+.google.privacy.dlp.v2.Ge" + + "tJobTriggerRequest\032!.google.privacy.dlp." + + "v2.JobTrigger\"+\202\323\344\223\002%\022#/v2/{name=project" + + "s/*/jobTriggers/*}\022\235\001\n\017ListJobTriggers\022-" + + ".google.privacy.dlp.v2.ListJobTriggersRe" + + "quest\032..google.privacy.dlp.v2.ListJobTri" + + "ggersResponse\"+\202\323\344\223\002%\022#/v2/{parent=proje" + + "cts/*}/jobTriggers\022\207\001\n\020DeleteJobTrigger\022" + + "..google.privacy.dlp.v2.DeleteJobTrigger" + + "Request\032\026.google.protobuf.Empty\"+\202\323\344\223\002%*" + + "#/v2/{name=projects/*/jobTriggers/*}\022\236\001\n" + + "\022ActivateJobTrigger\0220.google.privacy.dlp" + + ".v2.ActivateJobTriggerRequest\032\035.google.p" + + "rivacy.dlp.v2.DlpJob\"7\202\323\344\223\0021\",/v2/{name=" + + "projects/*/jobTriggers/*}:activate:\001*\022\205\001" + + "\n\014CreateDlpJob\022*.google.privacy.dlp.v2.C" + + "reateDlpJobRequest\032\035.google.privacy.dlp." + + "v2.DlpJob\"*\202\323\344\223\002$\"\037/v2/{parent=projects/" + + "*}/dlpJobs:\001*\022\215\001\n\013ListDlpJobs\022).google.p" + + "rivacy.dlp.v2.ListDlpJobsRequest\032*.googl" + + "e.privacy.dlp.v2.ListDlpJobsResponse\"\'\202\323" + + "\344\223\002!\022\037/v2/{parent=projects/*}/dlpJobs\022|\n" + + "\tGetDlpJob\022\'.google.privacy.dlp.v2.GetDl" + + "pJobRequest\032\035.google.privacy.dlp.v2.DlpJ" + + "ob\"\'\202\323\344\223\002!\022\037/v2/{name=projects/*/dlpJobs" + + "/*}\022{\n\014DeleteDlpJob\022*.google.privacy.dlp" + + ".v2.DeleteDlpJobRequest\032\026.google.protobu" + + "f.Empty\"\'\202\323\344\223\002!*\037/v2/{name=projects/*/dl" + + "pJobs/*}\022\205\001\n\014CancelDlpJob\022*.google.priva" + + "cy.dlp.v2.CancelDlpJobRequest\032\026.google.p" + + "rotobuf.Empty\"1\202\323\344\223\002+\"&/v2/{name=project" + + "s/*/dlpJobs/*}:cancel:\001*\022\330\001\n\024CreateStore" + + "dInfoType\0222.google.privacy.dlp.v2.Create" + + "StoredInfoTypeRequest\032%.google.privacy.d" + + "lp.v2.StoredInfoType\"e\202\323\344\223\002_\",/v2/{paren" + + "t=organizations/*}/storedInfoTypes:\001*Z,\"" + + "\'/v2/{parent=projects/*}/storedInfoTypes" + + ":\001*\022\330\001\n\024UpdateStoredInfoType\0222.google.pr" + + "ivacy.dlp.v2.UpdateStoredInfoTypeRequest" + + "\032%.google.privacy.dlp.v2.StoredInfoType\"" + + "e\202\323\344\223\002_2,/v2/{name=organizations/*/store" + + "dInfoTypes/*}:\001*Z,2\'/v2/{name=projects/*" + + "/storedInfoTypes/*}:\001*\022\314\001\n\021GetStoredInfo" + + "Type\022/.google.privacy.dlp.v2.GetStoredIn" + + "foTypeRequest\032%.google.privacy.dlp.v2.St" + + "oredInfoType\"_\202\323\344\223\002Y\022,/v2/{name=organiza", + "tions/*/storedInfoTypes/*}Z)\022\'/v2/{name=" + + "projects/*/storedInfoTypes/*}\022\335\001\n\023ListSt" + + "oredInfoTypes\0221.google.privacy.dlp.v2.Li" + + "stStoredInfoTypesRequest\0322.google.privac" + + "y.dlp.v2.ListStoredInfoTypesResponse\"_\202\323" + + "\344\223\002Y\022,/v2/{parent=organizations/*}/store" + + "dInfoTypesZ)\022\'/v2/{parent=projects/*}/st" + + "oredInfoTypes\022\303\001\n\024DeleteStoredInfoType\0222" + + ".google.privacy.dlp.v2.DeleteStoredInfoT" + + "ypeRequest\032\026.google.protobuf.Empty\"_\202\323\344\223" + + "\002Y*,/v2/{name=organizations/*/storedInfo" + + "Types/*}Z)*\'/v2/{name=projects/*/storedI" + + "nfoTypes/*}B\215\001\n\031com.google.privacy.dlp.v" + + "2B\010DlpProtoP\001Z8google.golang.org/genprot" + + "o/googleapis/privacy/dlp/v2;dlp\252\002\023Google" + + ".Cloud.Dlp.V2\312\002\023Google\\Cloud\\Dlp\\V2b\006pro" + + "to3" }; com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner assigner = new com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner() { @@ -1451,6 +1463,7 @@ public com.google.protobuf.ExtensionRegistry assignDescriptors( descriptorData, new com.google.protobuf.Descriptors.FileDescriptor[] { com.google.api.AnnotationsProto.getDescriptor(), + com.google.api.ResourceProto.getDescriptor(), com.google.privacy.dlp.v2.DlpStorage.getDescriptor(), com.google.protobuf.DurationProto.getDescriptor(), com.google.protobuf.EmptyProto.getDescriptor(), @@ -2180,6 +2193,7 @@ public com.google.protobuf.ExtensionRegistry assignDescriptors( "TimePartConfig", "CryptoHashConfig", "DateShiftConfig", + "CryptoDeterministicConfig", "Transformation", }); internal_static_google_privacy_dlp_v2_TimePartConfig_descriptor = @@ -2198,8 +2212,16 @@ public com.google.protobuf.ExtensionRegistry assignDescriptors( new java.lang.String[] { "CryptoKey", }); - internal_static_google_privacy_dlp_v2_ReplaceValueConfig_descriptor = + internal_static_google_privacy_dlp_v2_CryptoDeterministicConfig_descriptor = getDescriptor().getMessageTypes().get(46); + internal_static_google_privacy_dlp_v2_CryptoDeterministicConfig_fieldAccessorTable = + new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( + internal_static_google_privacy_dlp_v2_CryptoDeterministicConfig_descriptor, + new java.lang.String[] { + "CryptoKey", "SurrogateInfoType", "Context", + }); + internal_static_google_privacy_dlp_v2_ReplaceValueConfig_descriptor = + getDescriptor().getMessageTypes().get(47); internal_static_google_privacy_dlp_v2_ReplaceValueConfig_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_google_privacy_dlp_v2_ReplaceValueConfig_descriptor, @@ -2207,19 +2229,19 @@ public com.google.protobuf.ExtensionRegistry assignDescriptors( "NewValue", }); internal_static_google_privacy_dlp_v2_ReplaceWithInfoTypeConfig_descriptor = - getDescriptor().getMessageTypes().get(47); + getDescriptor().getMessageTypes().get(48); internal_static_google_privacy_dlp_v2_ReplaceWithInfoTypeConfig_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_google_privacy_dlp_v2_ReplaceWithInfoTypeConfig_descriptor, new java.lang.String[] {}); internal_static_google_privacy_dlp_v2_RedactConfig_descriptor = - getDescriptor().getMessageTypes().get(48); + getDescriptor().getMessageTypes().get(49); internal_static_google_privacy_dlp_v2_RedactConfig_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_google_privacy_dlp_v2_RedactConfig_descriptor, new java.lang.String[] {}); internal_static_google_privacy_dlp_v2_CharsToIgnore_descriptor = - getDescriptor().getMessageTypes().get(49); + getDescriptor().getMessageTypes().get(50); internal_static_google_privacy_dlp_v2_CharsToIgnore_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_google_privacy_dlp_v2_CharsToIgnore_descriptor, @@ -2227,7 +2249,7 @@ public com.google.protobuf.ExtensionRegistry assignDescriptors( "CharactersToSkip", "CommonCharactersToIgnore", "Characters", }); internal_static_google_privacy_dlp_v2_CharacterMaskConfig_descriptor = - getDescriptor().getMessageTypes().get(50); + getDescriptor().getMessageTypes().get(51); internal_static_google_privacy_dlp_v2_CharacterMaskConfig_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_google_privacy_dlp_v2_CharacterMaskConfig_descriptor, @@ -2235,7 +2257,7 @@ public com.google.protobuf.ExtensionRegistry assignDescriptors( "MaskingCharacter", "NumberToMask", "ReverseOrder", "CharactersToIgnore", }); internal_static_google_privacy_dlp_v2_FixedSizeBucketingConfig_descriptor = - getDescriptor().getMessageTypes().get(51); + getDescriptor().getMessageTypes().get(52); internal_static_google_privacy_dlp_v2_FixedSizeBucketingConfig_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_google_privacy_dlp_v2_FixedSizeBucketingConfig_descriptor, @@ -2243,7 +2265,7 @@ public com.google.protobuf.ExtensionRegistry assignDescriptors( "LowerBound", "UpperBound", "BucketSize", }); internal_static_google_privacy_dlp_v2_BucketingConfig_descriptor = - getDescriptor().getMessageTypes().get(52); + getDescriptor().getMessageTypes().get(53); internal_static_google_privacy_dlp_v2_BucketingConfig_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_google_privacy_dlp_v2_BucketingConfig_descriptor, @@ -2259,7 +2281,7 @@ public com.google.protobuf.ExtensionRegistry assignDescriptors( "Min", "Max", "ReplacementValue", }); internal_static_google_privacy_dlp_v2_CryptoReplaceFfxFpeConfig_descriptor = - getDescriptor().getMessageTypes().get(53); + getDescriptor().getMessageTypes().get(54); internal_static_google_privacy_dlp_v2_CryptoReplaceFfxFpeConfig_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_google_privacy_dlp_v2_CryptoReplaceFfxFpeConfig_descriptor, @@ -2273,7 +2295,7 @@ public com.google.protobuf.ExtensionRegistry assignDescriptors( "Alphabet", }); internal_static_google_privacy_dlp_v2_CryptoKey_descriptor = - getDescriptor().getMessageTypes().get(54); + getDescriptor().getMessageTypes().get(55); internal_static_google_privacy_dlp_v2_CryptoKey_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_google_privacy_dlp_v2_CryptoKey_descriptor, @@ -2281,7 +2303,7 @@ public com.google.protobuf.ExtensionRegistry assignDescriptors( "Transient", "Unwrapped", "KmsWrapped", "Source", }); internal_static_google_privacy_dlp_v2_TransientCryptoKey_descriptor = - getDescriptor().getMessageTypes().get(55); + getDescriptor().getMessageTypes().get(56); internal_static_google_privacy_dlp_v2_TransientCryptoKey_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_google_privacy_dlp_v2_TransientCryptoKey_descriptor, @@ -2289,7 +2311,7 @@ public com.google.protobuf.ExtensionRegistry assignDescriptors( "Name", }); internal_static_google_privacy_dlp_v2_UnwrappedCryptoKey_descriptor = - getDescriptor().getMessageTypes().get(56); + getDescriptor().getMessageTypes().get(57); internal_static_google_privacy_dlp_v2_UnwrappedCryptoKey_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_google_privacy_dlp_v2_UnwrappedCryptoKey_descriptor, @@ -2297,7 +2319,7 @@ public com.google.protobuf.ExtensionRegistry assignDescriptors( "Key", }); internal_static_google_privacy_dlp_v2_KmsWrappedCryptoKey_descriptor = - getDescriptor().getMessageTypes().get(57); + getDescriptor().getMessageTypes().get(58); internal_static_google_privacy_dlp_v2_KmsWrappedCryptoKey_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_google_privacy_dlp_v2_KmsWrappedCryptoKey_descriptor, @@ -2305,7 +2327,7 @@ public com.google.protobuf.ExtensionRegistry assignDescriptors( "WrappedKey", "CryptoKeyName", }); internal_static_google_privacy_dlp_v2_DateShiftConfig_descriptor = - getDescriptor().getMessageTypes().get(58); + getDescriptor().getMessageTypes().get(59); internal_static_google_privacy_dlp_v2_DateShiftConfig_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_google_privacy_dlp_v2_DateShiftConfig_descriptor, @@ -2313,7 +2335,7 @@ public com.google.protobuf.ExtensionRegistry assignDescriptors( "UpperBoundDays", "LowerBoundDays", "Context", "CryptoKey", "Method", }); internal_static_google_privacy_dlp_v2_InfoTypeTransformations_descriptor = - getDescriptor().getMessageTypes().get(59); + getDescriptor().getMessageTypes().get(60); internal_static_google_privacy_dlp_v2_InfoTypeTransformations_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_google_privacy_dlp_v2_InfoTypeTransformations_descriptor, @@ -2331,7 +2353,7 @@ public com.google.protobuf.ExtensionRegistry assignDescriptors( "InfoTypes", "PrimitiveTransformation", }); internal_static_google_privacy_dlp_v2_FieldTransformation_descriptor = - getDescriptor().getMessageTypes().get(60); + getDescriptor().getMessageTypes().get(61); internal_static_google_privacy_dlp_v2_FieldTransformation_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_google_privacy_dlp_v2_FieldTransformation_descriptor, @@ -2343,7 +2365,7 @@ public com.google.protobuf.ExtensionRegistry assignDescriptors( "Transformation", }); internal_static_google_privacy_dlp_v2_RecordTransformations_descriptor = - getDescriptor().getMessageTypes().get(61); + getDescriptor().getMessageTypes().get(62); internal_static_google_privacy_dlp_v2_RecordTransformations_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_google_privacy_dlp_v2_RecordTransformations_descriptor, @@ -2351,7 +2373,7 @@ public com.google.protobuf.ExtensionRegistry assignDescriptors( "FieldTransformations", "RecordSuppressions", }); internal_static_google_privacy_dlp_v2_RecordSuppression_descriptor = - getDescriptor().getMessageTypes().get(62); + getDescriptor().getMessageTypes().get(63); internal_static_google_privacy_dlp_v2_RecordSuppression_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_google_privacy_dlp_v2_RecordSuppression_descriptor, @@ -2359,7 +2381,7 @@ public com.google.protobuf.ExtensionRegistry assignDescriptors( "Condition", }); internal_static_google_privacy_dlp_v2_RecordCondition_descriptor = - getDescriptor().getMessageTypes().get(63); + getDescriptor().getMessageTypes().get(64); internal_static_google_privacy_dlp_v2_RecordCondition_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_google_privacy_dlp_v2_RecordCondition_descriptor, @@ -2391,7 +2413,7 @@ public com.google.protobuf.ExtensionRegistry assignDescriptors( "LogicalOperator", "Conditions", "Type", }); internal_static_google_privacy_dlp_v2_TransformationOverview_descriptor = - getDescriptor().getMessageTypes().get(64); + getDescriptor().getMessageTypes().get(65); internal_static_google_privacy_dlp_v2_TransformationOverview_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_google_privacy_dlp_v2_TransformationOverview_descriptor, @@ -2399,7 +2421,7 @@ public com.google.protobuf.ExtensionRegistry assignDescriptors( "TransformedBytes", "TransformationSummaries", }); internal_static_google_privacy_dlp_v2_TransformationSummary_descriptor = - getDescriptor().getMessageTypes().get(65); + getDescriptor().getMessageTypes().get(66); internal_static_google_privacy_dlp_v2_TransformationSummary_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_google_privacy_dlp_v2_TransformationSummary_descriptor, @@ -2423,7 +2445,7 @@ public com.google.protobuf.ExtensionRegistry assignDescriptors( "Count", "Code", "Details", }); internal_static_google_privacy_dlp_v2_Schedule_descriptor = - getDescriptor().getMessageTypes().get(66); + getDescriptor().getMessageTypes().get(67); internal_static_google_privacy_dlp_v2_Schedule_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_google_privacy_dlp_v2_Schedule_descriptor, @@ -2431,7 +2453,7 @@ public com.google.protobuf.ExtensionRegistry assignDescriptors( "RecurrencePeriodDuration", "Option", }); internal_static_google_privacy_dlp_v2_InspectTemplate_descriptor = - getDescriptor().getMessageTypes().get(67); + getDescriptor().getMessageTypes().get(68); internal_static_google_privacy_dlp_v2_InspectTemplate_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_google_privacy_dlp_v2_InspectTemplate_descriptor, @@ -2439,7 +2461,7 @@ public com.google.protobuf.ExtensionRegistry assignDescriptors( "Name", "DisplayName", "Description", "CreateTime", "UpdateTime", "InspectConfig", }); internal_static_google_privacy_dlp_v2_DeidentifyTemplate_descriptor = - getDescriptor().getMessageTypes().get(68); + getDescriptor().getMessageTypes().get(69); internal_static_google_privacy_dlp_v2_DeidentifyTemplate_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_google_privacy_dlp_v2_DeidentifyTemplate_descriptor, @@ -2447,7 +2469,7 @@ public com.google.protobuf.ExtensionRegistry assignDescriptors( "Name", "DisplayName", "Description", "CreateTime", "UpdateTime", "DeidentifyConfig", }); internal_static_google_privacy_dlp_v2_Error_descriptor = - getDescriptor().getMessageTypes().get(69); + getDescriptor().getMessageTypes().get(70); internal_static_google_privacy_dlp_v2_Error_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_google_privacy_dlp_v2_Error_descriptor, @@ -2455,7 +2477,7 @@ public com.google.protobuf.ExtensionRegistry assignDescriptors( "Details", "Timestamps", }); internal_static_google_privacy_dlp_v2_JobTrigger_descriptor = - getDescriptor().getMessageTypes().get(70); + getDescriptor().getMessageTypes().get(71); internal_static_google_privacy_dlp_v2_JobTrigger_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_google_privacy_dlp_v2_JobTrigger_descriptor, @@ -2481,7 +2503,7 @@ public com.google.protobuf.ExtensionRegistry assignDescriptors( "Schedule", "Trigger", }); internal_static_google_privacy_dlp_v2_Action_descriptor = - getDescriptor().getMessageTypes().get(71); + getDescriptor().getMessageTypes().get(72); internal_static_google_privacy_dlp_v2_Action_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_google_privacy_dlp_v2_Action_descriptor, @@ -2517,7 +2539,7 @@ public com.google.protobuf.ExtensionRegistry assignDescriptors( internal_static_google_privacy_dlp_v2_Action_JobNotificationEmails_descriptor, new java.lang.String[] {}); internal_static_google_privacy_dlp_v2_CreateInspectTemplateRequest_descriptor = - getDescriptor().getMessageTypes().get(72); + getDescriptor().getMessageTypes().get(73); internal_static_google_privacy_dlp_v2_CreateInspectTemplateRequest_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_google_privacy_dlp_v2_CreateInspectTemplateRequest_descriptor, @@ -2525,7 +2547,7 @@ public com.google.protobuf.ExtensionRegistry assignDescriptors( "Parent", "InspectTemplate", "TemplateId", }); internal_static_google_privacy_dlp_v2_UpdateInspectTemplateRequest_descriptor = - getDescriptor().getMessageTypes().get(73); + getDescriptor().getMessageTypes().get(74); internal_static_google_privacy_dlp_v2_UpdateInspectTemplateRequest_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_google_privacy_dlp_v2_UpdateInspectTemplateRequest_descriptor, @@ -2533,7 +2555,7 @@ public com.google.protobuf.ExtensionRegistry assignDescriptors( "Name", "InspectTemplate", "UpdateMask", }); internal_static_google_privacy_dlp_v2_GetInspectTemplateRequest_descriptor = - getDescriptor().getMessageTypes().get(74); + getDescriptor().getMessageTypes().get(75); internal_static_google_privacy_dlp_v2_GetInspectTemplateRequest_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_google_privacy_dlp_v2_GetInspectTemplateRequest_descriptor, @@ -2541,7 +2563,7 @@ public com.google.protobuf.ExtensionRegistry assignDescriptors( "Name", }); internal_static_google_privacy_dlp_v2_ListInspectTemplatesRequest_descriptor = - getDescriptor().getMessageTypes().get(75); + getDescriptor().getMessageTypes().get(76); internal_static_google_privacy_dlp_v2_ListInspectTemplatesRequest_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_google_privacy_dlp_v2_ListInspectTemplatesRequest_descriptor, @@ -2549,7 +2571,7 @@ public com.google.protobuf.ExtensionRegistry assignDescriptors( "Parent", "PageToken", "PageSize", "OrderBy", }); internal_static_google_privacy_dlp_v2_ListInspectTemplatesResponse_descriptor = - getDescriptor().getMessageTypes().get(76); + getDescriptor().getMessageTypes().get(77); internal_static_google_privacy_dlp_v2_ListInspectTemplatesResponse_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_google_privacy_dlp_v2_ListInspectTemplatesResponse_descriptor, @@ -2557,7 +2579,7 @@ public com.google.protobuf.ExtensionRegistry assignDescriptors( "InspectTemplates", "NextPageToken", }); internal_static_google_privacy_dlp_v2_DeleteInspectTemplateRequest_descriptor = - getDescriptor().getMessageTypes().get(77); + getDescriptor().getMessageTypes().get(78); internal_static_google_privacy_dlp_v2_DeleteInspectTemplateRequest_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_google_privacy_dlp_v2_DeleteInspectTemplateRequest_descriptor, @@ -2565,7 +2587,7 @@ public com.google.protobuf.ExtensionRegistry assignDescriptors( "Name", }); internal_static_google_privacy_dlp_v2_CreateJobTriggerRequest_descriptor = - getDescriptor().getMessageTypes().get(78); + getDescriptor().getMessageTypes().get(79); internal_static_google_privacy_dlp_v2_CreateJobTriggerRequest_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_google_privacy_dlp_v2_CreateJobTriggerRequest_descriptor, @@ -2573,7 +2595,7 @@ public com.google.protobuf.ExtensionRegistry assignDescriptors( "Parent", "JobTrigger", "TriggerId", }); internal_static_google_privacy_dlp_v2_ActivateJobTriggerRequest_descriptor = - getDescriptor().getMessageTypes().get(79); + getDescriptor().getMessageTypes().get(80); internal_static_google_privacy_dlp_v2_ActivateJobTriggerRequest_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_google_privacy_dlp_v2_ActivateJobTriggerRequest_descriptor, @@ -2581,7 +2603,7 @@ public com.google.protobuf.ExtensionRegistry assignDescriptors( "Name", }); internal_static_google_privacy_dlp_v2_UpdateJobTriggerRequest_descriptor = - getDescriptor().getMessageTypes().get(80); + getDescriptor().getMessageTypes().get(81); internal_static_google_privacy_dlp_v2_UpdateJobTriggerRequest_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_google_privacy_dlp_v2_UpdateJobTriggerRequest_descriptor, @@ -2589,7 +2611,7 @@ public com.google.protobuf.ExtensionRegistry assignDescriptors( "Name", "JobTrigger", "UpdateMask", }); internal_static_google_privacy_dlp_v2_GetJobTriggerRequest_descriptor = - getDescriptor().getMessageTypes().get(81); + getDescriptor().getMessageTypes().get(82); internal_static_google_privacy_dlp_v2_GetJobTriggerRequest_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_google_privacy_dlp_v2_GetJobTriggerRequest_descriptor, @@ -2597,7 +2619,7 @@ public com.google.protobuf.ExtensionRegistry assignDescriptors( "Name", }); internal_static_google_privacy_dlp_v2_CreateDlpJobRequest_descriptor = - getDescriptor().getMessageTypes().get(82); + getDescriptor().getMessageTypes().get(83); internal_static_google_privacy_dlp_v2_CreateDlpJobRequest_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_google_privacy_dlp_v2_CreateDlpJobRequest_descriptor, @@ -2605,7 +2627,7 @@ public com.google.protobuf.ExtensionRegistry assignDescriptors( "Parent", "InspectJob", "RiskJob", "JobId", "Job", }); internal_static_google_privacy_dlp_v2_ListJobTriggersRequest_descriptor = - getDescriptor().getMessageTypes().get(83); + getDescriptor().getMessageTypes().get(84); internal_static_google_privacy_dlp_v2_ListJobTriggersRequest_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_google_privacy_dlp_v2_ListJobTriggersRequest_descriptor, @@ -2613,7 +2635,7 @@ public com.google.protobuf.ExtensionRegistry assignDescriptors( "Parent", "PageToken", "PageSize", "OrderBy", "Filter", }); internal_static_google_privacy_dlp_v2_ListJobTriggersResponse_descriptor = - getDescriptor().getMessageTypes().get(84); + getDescriptor().getMessageTypes().get(85); internal_static_google_privacy_dlp_v2_ListJobTriggersResponse_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_google_privacy_dlp_v2_ListJobTriggersResponse_descriptor, @@ -2621,7 +2643,7 @@ public com.google.protobuf.ExtensionRegistry assignDescriptors( "JobTriggers", "NextPageToken", }); internal_static_google_privacy_dlp_v2_DeleteJobTriggerRequest_descriptor = - getDescriptor().getMessageTypes().get(85); + getDescriptor().getMessageTypes().get(86); internal_static_google_privacy_dlp_v2_DeleteJobTriggerRequest_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_google_privacy_dlp_v2_DeleteJobTriggerRequest_descriptor, @@ -2629,7 +2651,7 @@ public com.google.protobuf.ExtensionRegistry assignDescriptors( "Name", }); internal_static_google_privacy_dlp_v2_InspectJobConfig_descriptor = - getDescriptor().getMessageTypes().get(86); + getDescriptor().getMessageTypes().get(87); internal_static_google_privacy_dlp_v2_InspectJobConfig_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_google_privacy_dlp_v2_InspectJobConfig_descriptor, @@ -2637,7 +2659,7 @@ public com.google.protobuf.ExtensionRegistry assignDescriptors( "StorageConfig", "InspectConfig", "InspectTemplateName", "Actions", }); internal_static_google_privacy_dlp_v2_DlpJob_descriptor = - getDescriptor().getMessageTypes().get(87); + getDescriptor().getMessageTypes().get(88); internal_static_google_privacy_dlp_v2_DlpJob_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_google_privacy_dlp_v2_DlpJob_descriptor, @@ -2655,7 +2677,7 @@ public com.google.protobuf.ExtensionRegistry assignDescriptors( "Details", }); internal_static_google_privacy_dlp_v2_GetDlpJobRequest_descriptor = - getDescriptor().getMessageTypes().get(88); + getDescriptor().getMessageTypes().get(89); internal_static_google_privacy_dlp_v2_GetDlpJobRequest_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_google_privacy_dlp_v2_GetDlpJobRequest_descriptor, @@ -2663,7 +2685,7 @@ public com.google.protobuf.ExtensionRegistry assignDescriptors( "Name", }); internal_static_google_privacy_dlp_v2_ListDlpJobsRequest_descriptor = - getDescriptor().getMessageTypes().get(89); + getDescriptor().getMessageTypes().get(90); internal_static_google_privacy_dlp_v2_ListDlpJobsRequest_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_google_privacy_dlp_v2_ListDlpJobsRequest_descriptor, @@ -2671,7 +2693,7 @@ public com.google.protobuf.ExtensionRegistry assignDescriptors( "Parent", "Filter", "PageSize", "PageToken", "Type", "OrderBy", }); internal_static_google_privacy_dlp_v2_ListDlpJobsResponse_descriptor = - getDescriptor().getMessageTypes().get(90); + getDescriptor().getMessageTypes().get(91); internal_static_google_privacy_dlp_v2_ListDlpJobsResponse_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_google_privacy_dlp_v2_ListDlpJobsResponse_descriptor, @@ -2679,7 +2701,7 @@ public com.google.protobuf.ExtensionRegistry assignDescriptors( "Jobs", "NextPageToken", }); internal_static_google_privacy_dlp_v2_CancelDlpJobRequest_descriptor = - getDescriptor().getMessageTypes().get(91); + getDescriptor().getMessageTypes().get(92); internal_static_google_privacy_dlp_v2_CancelDlpJobRequest_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_google_privacy_dlp_v2_CancelDlpJobRequest_descriptor, @@ -2687,7 +2709,7 @@ public com.google.protobuf.ExtensionRegistry assignDescriptors( "Name", }); internal_static_google_privacy_dlp_v2_DeleteDlpJobRequest_descriptor = - getDescriptor().getMessageTypes().get(92); + getDescriptor().getMessageTypes().get(93); internal_static_google_privacy_dlp_v2_DeleteDlpJobRequest_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_google_privacy_dlp_v2_DeleteDlpJobRequest_descriptor, @@ -2695,7 +2717,7 @@ public com.google.protobuf.ExtensionRegistry assignDescriptors( "Name", }); internal_static_google_privacy_dlp_v2_CreateDeidentifyTemplateRequest_descriptor = - getDescriptor().getMessageTypes().get(93); + getDescriptor().getMessageTypes().get(94); internal_static_google_privacy_dlp_v2_CreateDeidentifyTemplateRequest_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_google_privacy_dlp_v2_CreateDeidentifyTemplateRequest_descriptor, @@ -2703,7 +2725,7 @@ public com.google.protobuf.ExtensionRegistry assignDescriptors( "Parent", "DeidentifyTemplate", "TemplateId", }); internal_static_google_privacy_dlp_v2_UpdateDeidentifyTemplateRequest_descriptor = - getDescriptor().getMessageTypes().get(94); + getDescriptor().getMessageTypes().get(95); internal_static_google_privacy_dlp_v2_UpdateDeidentifyTemplateRequest_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_google_privacy_dlp_v2_UpdateDeidentifyTemplateRequest_descriptor, @@ -2711,7 +2733,7 @@ public com.google.protobuf.ExtensionRegistry assignDescriptors( "Name", "DeidentifyTemplate", "UpdateMask", }); internal_static_google_privacy_dlp_v2_GetDeidentifyTemplateRequest_descriptor = - getDescriptor().getMessageTypes().get(95); + getDescriptor().getMessageTypes().get(96); internal_static_google_privacy_dlp_v2_GetDeidentifyTemplateRequest_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_google_privacy_dlp_v2_GetDeidentifyTemplateRequest_descriptor, @@ -2719,7 +2741,7 @@ public com.google.protobuf.ExtensionRegistry assignDescriptors( "Name", }); internal_static_google_privacy_dlp_v2_ListDeidentifyTemplatesRequest_descriptor = - getDescriptor().getMessageTypes().get(96); + getDescriptor().getMessageTypes().get(97); internal_static_google_privacy_dlp_v2_ListDeidentifyTemplatesRequest_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_google_privacy_dlp_v2_ListDeidentifyTemplatesRequest_descriptor, @@ -2727,7 +2749,7 @@ public com.google.protobuf.ExtensionRegistry assignDescriptors( "Parent", "PageToken", "PageSize", "OrderBy", }); internal_static_google_privacy_dlp_v2_ListDeidentifyTemplatesResponse_descriptor = - getDescriptor().getMessageTypes().get(97); + getDescriptor().getMessageTypes().get(98); internal_static_google_privacy_dlp_v2_ListDeidentifyTemplatesResponse_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_google_privacy_dlp_v2_ListDeidentifyTemplatesResponse_descriptor, @@ -2735,7 +2757,7 @@ public com.google.protobuf.ExtensionRegistry assignDescriptors( "DeidentifyTemplates", "NextPageToken", }); internal_static_google_privacy_dlp_v2_DeleteDeidentifyTemplateRequest_descriptor = - getDescriptor().getMessageTypes().get(98); + getDescriptor().getMessageTypes().get(99); internal_static_google_privacy_dlp_v2_DeleteDeidentifyTemplateRequest_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_google_privacy_dlp_v2_DeleteDeidentifyTemplateRequest_descriptor, @@ -2743,7 +2765,7 @@ public com.google.protobuf.ExtensionRegistry assignDescriptors( "Name", }); internal_static_google_privacy_dlp_v2_LargeCustomDictionaryConfig_descriptor = - getDescriptor().getMessageTypes().get(99); + getDescriptor().getMessageTypes().get(100); internal_static_google_privacy_dlp_v2_LargeCustomDictionaryConfig_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_google_privacy_dlp_v2_LargeCustomDictionaryConfig_descriptor, @@ -2751,7 +2773,7 @@ public com.google.protobuf.ExtensionRegistry assignDescriptors( "OutputPath", "CloudStorageFileSet", "BigQueryField", "Source", }); internal_static_google_privacy_dlp_v2_StoredInfoTypeConfig_descriptor = - getDescriptor().getMessageTypes().get(100); + getDescriptor().getMessageTypes().get(101); internal_static_google_privacy_dlp_v2_StoredInfoTypeConfig_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_google_privacy_dlp_v2_StoredInfoTypeConfig_descriptor, @@ -2759,7 +2781,7 @@ public com.google.protobuf.ExtensionRegistry assignDescriptors( "DisplayName", "Description", "LargeCustomDictionary", "Type", }); internal_static_google_privacy_dlp_v2_StoredInfoTypeVersion_descriptor = - getDescriptor().getMessageTypes().get(101); + getDescriptor().getMessageTypes().get(102); internal_static_google_privacy_dlp_v2_StoredInfoTypeVersion_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_google_privacy_dlp_v2_StoredInfoTypeVersion_descriptor, @@ -2767,7 +2789,7 @@ public com.google.protobuf.ExtensionRegistry assignDescriptors( "Config", "CreateTime", "State", "Errors", }); internal_static_google_privacy_dlp_v2_StoredInfoType_descriptor = - getDescriptor().getMessageTypes().get(102); + getDescriptor().getMessageTypes().get(103); internal_static_google_privacy_dlp_v2_StoredInfoType_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_google_privacy_dlp_v2_StoredInfoType_descriptor, @@ -2775,7 +2797,7 @@ public com.google.protobuf.ExtensionRegistry assignDescriptors( "Name", "CurrentVersion", "PendingVersions", }); internal_static_google_privacy_dlp_v2_CreateStoredInfoTypeRequest_descriptor = - getDescriptor().getMessageTypes().get(103); + getDescriptor().getMessageTypes().get(104); internal_static_google_privacy_dlp_v2_CreateStoredInfoTypeRequest_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_google_privacy_dlp_v2_CreateStoredInfoTypeRequest_descriptor, @@ -2783,7 +2805,7 @@ public com.google.protobuf.ExtensionRegistry assignDescriptors( "Parent", "Config", "StoredInfoTypeId", }); internal_static_google_privacy_dlp_v2_UpdateStoredInfoTypeRequest_descriptor = - getDescriptor().getMessageTypes().get(104); + getDescriptor().getMessageTypes().get(105); internal_static_google_privacy_dlp_v2_UpdateStoredInfoTypeRequest_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_google_privacy_dlp_v2_UpdateStoredInfoTypeRequest_descriptor, @@ -2791,7 +2813,7 @@ public com.google.protobuf.ExtensionRegistry assignDescriptors( "Name", "Config", "UpdateMask", }); internal_static_google_privacy_dlp_v2_GetStoredInfoTypeRequest_descriptor = - getDescriptor().getMessageTypes().get(105); + getDescriptor().getMessageTypes().get(106); internal_static_google_privacy_dlp_v2_GetStoredInfoTypeRequest_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_google_privacy_dlp_v2_GetStoredInfoTypeRequest_descriptor, @@ -2799,7 +2821,7 @@ public com.google.protobuf.ExtensionRegistry assignDescriptors( "Name", }); internal_static_google_privacy_dlp_v2_ListStoredInfoTypesRequest_descriptor = - getDescriptor().getMessageTypes().get(106); + getDescriptor().getMessageTypes().get(107); internal_static_google_privacy_dlp_v2_ListStoredInfoTypesRequest_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_google_privacy_dlp_v2_ListStoredInfoTypesRequest_descriptor, @@ -2807,7 +2829,7 @@ public com.google.protobuf.ExtensionRegistry assignDescriptors( "Parent", "PageToken", "PageSize", "OrderBy", }); internal_static_google_privacy_dlp_v2_ListStoredInfoTypesResponse_descriptor = - getDescriptor().getMessageTypes().get(107); + getDescriptor().getMessageTypes().get(108); internal_static_google_privacy_dlp_v2_ListStoredInfoTypesResponse_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_google_privacy_dlp_v2_ListStoredInfoTypesResponse_descriptor, @@ -2815,7 +2837,7 @@ public com.google.protobuf.ExtensionRegistry assignDescriptors( "StoredInfoTypes", "NextPageToken", }); internal_static_google_privacy_dlp_v2_DeleteStoredInfoTypeRequest_descriptor = - getDescriptor().getMessageTypes().get(108); + getDescriptor().getMessageTypes().get(109); internal_static_google_privacy_dlp_v2_DeleteStoredInfoTypeRequest_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_google_privacy_dlp_v2_DeleteStoredInfoTypeRequest_descriptor, @@ -2828,6 +2850,7 @@ public com.google.protobuf.ExtensionRegistry assignDescriptors( com.google.protobuf.Descriptors.FileDescriptor.internalUpdateFileDescriptor( descriptor, registry); com.google.api.AnnotationsProto.getDescriptor(); + com.google.api.ResourceProto.getDescriptor(); com.google.privacy.dlp.v2.DlpStorage.getDescriptor(); com.google.protobuf.DurationProto.getDescriptor(); com.google.protobuf.EmptyProto.getDescriptor(); diff --git a/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/DlpStorage.java b/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/DlpStorage.java index e7201a6a3d5e..04f00f8d1acb 100644 --- a/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/DlpStorage.java +++ b/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/DlpStorage.java @@ -147,121 +147,122 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { java.lang.String[] descriptorData = { "\n#google/privacy/dlp/v2/storage.proto\022\025g" + "oogle.privacy.dlp.v2\032\034google/api/annotat" - + "ions.proto\032\037google/protobuf/timestamp.pr" - + "oto\"\030\n\010InfoType\022\014\n\004name\030\001 \001(\t\"K\n\nStoredT" - + "ype\022\014\n\004name\030\001 \001(\t\022/\n\013create_time\030\002 \001(\0132\032" - + ".google.protobuf.Timestamp\"\310\013\n\016CustomInf" - + "oType\0222\n\tinfo_type\030\001 \001(\0132\037.google.privac" - + "y.dlp.v2.InfoType\0225\n\nlikelihood\030\006 \001(\0162!." - + "google.privacy.dlp.v2.Likelihood\022F\n\ndict" - + "ionary\030\002 \001(\01320.google.privacy.dlp.v2.Cus" - + "tomInfoType.DictionaryH\000\022<\n\005regex\030\003 \001(\0132" - + "+.google.privacy.dlp.v2.CustomInfoType.R" - + "egexH\000\022M\n\016surrogate_type\030\004 \001(\01323.google." - + "privacy.dlp.v2.CustomInfoType.SurrogateT" - + "ypeH\000\0228\n\013stored_type\030\005 \001(\0132!.google.priv" - + "acy.dlp.v2.StoredTypeH\000\022L\n\017detection_rul" - + "es\030\007 \003(\01323.google.privacy.dlp.v2.CustomI" - + "nfoType.DetectionRule\022K\n\016exclusion_type\030" - + "\010 \001(\01623.google.privacy.dlp.v2.CustomInfo" - + "Type.ExclusionType\032\310\001\n\nDictionary\022N\n\twor" - + "d_list\030\001 \001(\01329.google.privacy.dlp.v2.Cus" - + "tomInfoType.Dictionary.WordListH\000\022E\n\022clo" - + "ud_storage_path\030\003 \001(\0132\'.google.privacy.d" - + "lp.v2.CloudStoragePathH\000\032\031\n\010WordList\022\r\n\005" - + "words\030\001 \003(\tB\010\n\006source\032/\n\005Regex\022\017\n\007patter" - + "n\030\001 \001(\t\022\025\n\rgroup_indexes\030\002 \003(\005\032\017\n\rSurrog" - + "ateType\032\276\004\n\rDetectionRule\022W\n\014hotword_rul" - + "e\030\001 \001(\0132?.google.privacy.dlp.v2.CustomIn" - + "foType.DetectionRule.HotwordRuleH\000\0328\n\tPr" - + "oximity\022\025\n\rwindow_before\030\001 \001(\005\022\024\n\014window" - + "_after\030\002 \001(\005\032\202\001\n\024LikelihoodAdjustment\022=\n" - + "\020fixed_likelihood\030\001 \001(\0162!.google.privacy" - + ".dlp.v2.LikelihoodH\000\022\035\n\023relative_likelih" - + "ood\030\002 \001(\005H\000B\014\n\nadjustment\032\214\002\n\013HotwordRul" - + "e\022B\n\rhotword_regex\030\001 \001(\0132+.google.privac" - + "y.dlp.v2.CustomInfoType.Regex\022P\n\tproximi" - + "ty\030\002 \001(\0132=.google.privacy.dlp.v2.CustomI" - + "nfoType.DetectionRule.Proximity\022g\n\025likel" - + "ihood_adjustment\030\003 \001(\0132H.google.privacy." - + "dlp.v2.CustomInfoType.DetectionRule.Like" - + "lihoodAdjustmentB\006\n\004type\"K\n\rExclusionTyp" - + "e\022\036\n\032EXCLUSION_TYPE_UNSPECIFIED\020\000\022\032\n\026EXC" - + "LUSION_TYPE_EXCLUDE\020\001B\006\n\004type\"\027\n\007FieldId" - + "\022\014\n\004name\030\001 \001(\t\"7\n\013PartitionId\022\022\n\nproject" - + "_id\030\002 \001(\t\022\024\n\014namespace_id\030\004 \001(\t\"\036\n\016KindE" - + "xpression\022\014\n\004name\030\001 \001(\t\"\201\001\n\020DatastoreOpt" - + "ions\0228\n\014partition_id\030\001 \001(\0132\".google.priv" - + "acy.dlp.v2.PartitionId\0223\n\004kind\030\002 \001(\0132%.g" - + "oogle.privacy.dlp.v2.KindExpression\"]\n\030C" - + "loudStorageRegexFileSet\022\023\n\013bucket_name\030\001" - + " \001(\t\022\025\n\rinclude_regex\030\002 \003(\t\022\025\n\rexclude_r" - + "egex\030\003 \003(\t\"\354\003\n\023CloudStorageOptions\022D\n\010fi" - + "le_set\030\001 \001(\01322.google.privacy.dlp.v2.Clo" - + "udStorageOptions.FileSet\022\034\n\024bytes_limit_" - + "per_file\030\004 \001(\003\022$\n\034bytes_limit_per_file_p" - + "ercent\030\010 \001(\005\0223\n\nfile_types\030\005 \003(\0162\037.googl" - + "e.privacy.dlp.v2.FileType\022N\n\rsample_meth" - + "od\030\006 \001(\01627.google.privacy.dlp.v2.CloudSt" - + "orageOptions.SampleMethod\022\033\n\023files_limit" - + "_percent\030\007 \001(\005\032_\n\007FileSet\022\013\n\003url\030\001 \001(\t\022G" - + "\n\016regex_file_set\030\002 \001(\0132/.google.privacy." - + "dlp.v2.CloudStorageRegexFileSet\"H\n\014Sampl" - + "eMethod\022\035\n\031SAMPLE_METHOD_UNSPECIFIED\020\000\022\007" - + "\n\003TOP\020\001\022\020\n\014RANDOM_START\020\002\"\"\n\023CloudStorag" - + "eFileSet\022\013\n\003url\030\001 \001(\t\" \n\020CloudStoragePat" - + "h\022\014\n\004path\030\001 \001(\t\"\213\003\n\017BigQueryOptions\022=\n\017t" - + "able_reference\030\001 \001(\0132$.google.privacy.dl" - + "p.v2.BigQueryTable\022:\n\022identifying_fields" - + "\030\002 \003(\0132\036.google.privacy.dlp.v2.FieldId\022\022" - + "\n\nrows_limit\030\003 \001(\003\022\032\n\022rows_limit_percent" - + "\030\006 \001(\005\022J\n\rsample_method\030\004 \001(\01623.google.p" - + "rivacy.dlp.v2.BigQueryOptions.SampleMeth" - + "od\0227\n\017excluded_fields\030\005 \003(\0132\036.google.pri" - + "vacy.dlp.v2.FieldId\"H\n\014SampleMethod\022\035\n\031S" - + "AMPLE_METHOD_UNSPECIFIED\020\000\022\007\n\003TOP\020\001\022\020\n\014R" - + "ANDOM_START\020\002\"\232\004\n\rStorageConfig\022D\n\021datas" - + "tore_options\030\002 \001(\0132\'.google.privacy.dlp." - + "v2.DatastoreOptionsH\000\022K\n\025cloud_storage_o" - + "ptions\030\003 \001(\0132*.google.privacy.dlp.v2.Clo" - + "udStorageOptionsH\000\022C\n\021big_query_options\030" - + "\004 \001(\0132&.google.privacy.dlp.v2.BigQueryOp" - + "tionsH\000\022L\n\017timespan_config\030\006 \001(\01323.googl" - + "e.privacy.dlp.v2.StorageConfig.TimespanC" - + "onfig\032\332\001\n\016TimespanConfig\022.\n\nstart_time\030\001" - + " \001(\0132\032.google.protobuf.Timestamp\022,\n\010end_" - + "time\030\002 \001(\0132\032.google.protobuf.Timestamp\0227" - + "\n\017timestamp_field\030\003 \001(\0132\036.google.privacy" - + ".dlp.v2.FieldId\0221\n)enable_auto_populatio" - + "n_of_timespan_config\030\004 \001(\010B\006\n\004type\"`\n\013Bi" - + "gQueryKey\022=\n\017table_reference\030\001 \001(\0132$.goo" - + "gle.privacy.dlp.v2.BigQueryTable\022\022\n\nrow_" - + "number\030\002 \001(\003\">\n\014DatastoreKey\022.\n\nentity_k" - + "ey\030\001 \001(\0132\032.google.privacy.dlp.v2.Key\"\273\001\n" - + "\003Key\0228\n\014partition_id\030\001 \001(\0132\".google.priv" - + "acy.dlp.v2.PartitionId\0224\n\004path\030\002 \003(\0132&.g" - + "oogle.privacy.dlp.v2.Key.PathElement\032D\n\013" - + "PathElement\022\014\n\004kind\030\001 \001(\t\022\014\n\002id\030\002 \001(\003H\000\022" - + "\016\n\004name\030\003 \001(\tH\000B\t\n\007id_type\"\241\001\n\tRecordKey" - + "\022<\n\rdatastore_key\030\002 \001(\0132#.google.privacy" - + ".dlp.v2.DatastoreKeyH\000\022;\n\rbig_query_key\030" - + "\003 \001(\0132\".google.privacy.dlp.v2.BigQueryKe" - + "yH\000\022\021\n\tid_values\030\005 \003(\tB\006\n\004type\"I\n\rBigQue" - + "ryTable\022\022\n\nproject_id\030\001 \001(\t\022\022\n\ndataset_i" - + "d\030\002 \001(\t\022\020\n\010table_id\030\003 \001(\t\"s\n\rBigQueryFie" - + "ld\0223\n\005table\030\001 \001(\0132$.google.privacy.dlp.v" - + "2.BigQueryTable\022-\n\005field\030\002 \001(\0132\036.google." - + "privacy.dlp.v2.FieldId\"9\n\010EntityId\022-\n\005fi" - + "eld\030\001 \001(\0132\036.google.privacy.dlp.v2.FieldI" - + "d*t\n\nLikelihood\022\032\n\026LIKELIHOOD_UNSPECIFIE" - + "D\020\000\022\021\n\rVERY_UNLIKELY\020\001\022\014\n\010UNLIKELY\020\002\022\014\n\010" - + "POSSIBLE\020\003\022\n\n\006LIKELY\020\004\022\017\n\013VERY_LIKELY\020\005*" - + "P\n\010FileType\022\031\n\025FILE_TYPE_UNSPECIFIED\020\000\022\017" - + "\n\013BINARY_FILE\020\001\022\r\n\tTEXT_FILE\020\002\022\t\n\005IMAGE\020" - + "\003B\217\001\n\031com.google.privacy.dlp.v2B\nDlpStor" - + "ageP\001Z8google.golang.org/genproto/google" - + "apis/privacy/dlp/v2;dlp\252\002\023Google.Cloud.D" - + "lp.V2\312\002\023Google\\Cloud\\Dlp\\V2b\006proto3" + + "ions.proto\032\031google/api/resource.proto\032\037g" + + "oogle/protobuf/timestamp.proto\"\030\n\010InfoTy" + + "pe\022\014\n\004name\030\001 \001(\t\"K\n\nStoredType\022\014\n\004name\030\001" + + " \001(\t\022/\n\013create_time\030\002 \001(\0132\032.google.proto" + + "buf.Timestamp\"\310\013\n\016CustomInfoType\0222\n\tinfo" + + "_type\030\001 \001(\0132\037.google.privacy.dlp.v2.Info" + + "Type\0225\n\nlikelihood\030\006 \001(\0162!.google.privac" + + "y.dlp.v2.Likelihood\022F\n\ndictionary\030\002 \001(\0132" + + "0.google.privacy.dlp.v2.CustomInfoType.D" + + "ictionaryH\000\022<\n\005regex\030\003 \001(\0132+.google.priv" + + "acy.dlp.v2.CustomInfoType.RegexH\000\022M\n\016sur" + + "rogate_type\030\004 \001(\01323.google.privacy.dlp.v" + + "2.CustomInfoType.SurrogateTypeH\000\0228\n\013stor" + + "ed_type\030\005 \001(\0132!.google.privacy.dlp.v2.St" + + "oredTypeH\000\022L\n\017detection_rules\030\007 \003(\01323.go" + + "ogle.privacy.dlp.v2.CustomInfoType.Detec" + + "tionRule\022K\n\016exclusion_type\030\010 \001(\01623.googl" + + "e.privacy.dlp.v2.CustomInfoType.Exclusio" + + "nType\032\310\001\n\nDictionary\022N\n\tword_list\030\001 \001(\0132" + + "9.google.privacy.dlp.v2.CustomInfoType.D" + + "ictionary.WordListH\000\022E\n\022cloud_storage_pa" + + "th\030\003 \001(\0132\'.google.privacy.dlp.v2.CloudSt" + + "oragePathH\000\032\031\n\010WordList\022\r\n\005words\030\001 \003(\tB\010" + + "\n\006source\032/\n\005Regex\022\017\n\007pattern\030\001 \001(\t\022\025\n\rgr" + + "oup_indexes\030\002 \003(\005\032\017\n\rSurrogateType\032\276\004\n\rD" + + "etectionRule\022W\n\014hotword_rule\030\001 \001(\0132?.goo" + + "gle.privacy.dlp.v2.CustomInfoType.Detect" + + "ionRule.HotwordRuleH\000\0328\n\tProximity\022\025\n\rwi" + + "ndow_before\030\001 \001(\005\022\024\n\014window_after\030\002 \001(\005\032" + + "\202\001\n\024LikelihoodAdjustment\022=\n\020fixed_likeli" + + "hood\030\001 \001(\0162!.google.privacy.dlp.v2.Likel" + + "ihoodH\000\022\035\n\023relative_likelihood\030\002 \001(\005H\000B\014" + + "\n\nadjustment\032\214\002\n\013HotwordRule\022B\n\rhotword_" + + "regex\030\001 \001(\0132+.google.privacy.dlp.v2.Cust" + + "omInfoType.Regex\022P\n\tproximity\030\002 \001(\0132=.go" + + "ogle.privacy.dlp.v2.CustomInfoType.Detec" + + "tionRule.Proximity\022g\n\025likelihood_adjustm" + + "ent\030\003 \001(\0132H.google.privacy.dlp.v2.Custom" + + "InfoType.DetectionRule.LikelihoodAdjustm" + + "entB\006\n\004type\"K\n\rExclusionType\022\036\n\032EXCLUSIO" + + "N_TYPE_UNSPECIFIED\020\000\022\032\n\026EXCLUSION_TYPE_E" + + "XCLUDE\020\001B\006\n\004type\"\027\n\007FieldId\022\014\n\004name\030\001 \001(" + + "\t\"7\n\013PartitionId\022\022\n\nproject_id\030\002 \001(\t\022\024\n\014" + + "namespace_id\030\004 \001(\t\"\036\n\016KindExpression\022\014\n\004" + + "name\030\001 \001(\t\"\201\001\n\020DatastoreOptions\0228\n\014parti" + + "tion_id\030\001 \001(\0132\".google.privacy.dlp.v2.Pa" + + "rtitionId\0223\n\004kind\030\002 \001(\0132%.google.privacy" + + ".dlp.v2.KindExpression\"]\n\030CloudStorageRe" + + "gexFileSet\022\023\n\013bucket_name\030\001 \001(\t\022\025\n\rinclu" + + "de_regex\030\002 \003(\t\022\025\n\rexclude_regex\030\003 \003(\t\"\354\003" + + "\n\023CloudStorageOptions\022D\n\010file_set\030\001 \001(\0132" + + "2.google.privacy.dlp.v2.CloudStorageOpti" + + "ons.FileSet\022\034\n\024bytes_limit_per_file\030\004 \001(" + + "\003\022$\n\034bytes_limit_per_file_percent\030\010 \001(\005\022" + + "3\n\nfile_types\030\005 \003(\0162\037.google.privacy.dlp" + + ".v2.FileType\022N\n\rsample_method\030\006 \001(\01627.go" + + "ogle.privacy.dlp.v2.CloudStorageOptions." + + "SampleMethod\022\033\n\023files_limit_percent\030\007 \001(" + + "\005\032_\n\007FileSet\022\013\n\003url\030\001 \001(\t\022G\n\016regex_file_" + + "set\030\002 \001(\0132/.google.privacy.dlp.v2.CloudS" + + "torageRegexFileSet\"H\n\014SampleMethod\022\035\n\031SA" + + "MPLE_METHOD_UNSPECIFIED\020\000\022\007\n\003TOP\020\001\022\020\n\014RA" + + "NDOM_START\020\002\"\"\n\023CloudStorageFileSet\022\013\n\003u" + + "rl\030\001 \001(\t\" \n\020CloudStoragePath\022\014\n\004path\030\001 \001" + + "(\t\"\213\003\n\017BigQueryOptions\022=\n\017table_referenc" + + "e\030\001 \001(\0132$.google.privacy.dlp.v2.BigQuery" + + "Table\022:\n\022identifying_fields\030\002 \003(\0132\036.goog" + + "le.privacy.dlp.v2.FieldId\022\022\n\nrows_limit\030" + + "\003 \001(\003\022\032\n\022rows_limit_percent\030\006 \001(\005\022J\n\rsam" + + "ple_method\030\004 \001(\01623.google.privacy.dlp.v2" + + ".BigQueryOptions.SampleMethod\0227\n\017exclude" + + "d_fields\030\005 \003(\0132\036.google.privacy.dlp.v2.F" + + "ieldId\"H\n\014SampleMethod\022\035\n\031SAMPLE_METHOD_" + + "UNSPECIFIED\020\000\022\007\n\003TOP\020\001\022\020\n\014RANDOM_START\020\002" + + "\"\232\004\n\rStorageConfig\022D\n\021datastore_options\030" + + "\002 \001(\0132\'.google.privacy.dlp.v2.DatastoreO" + + "ptionsH\000\022K\n\025cloud_storage_options\030\003 \001(\0132" + + "*.google.privacy.dlp.v2.CloudStorageOpti" + + "onsH\000\022C\n\021big_query_options\030\004 \001(\0132&.googl" + + "e.privacy.dlp.v2.BigQueryOptionsH\000\022L\n\017ti" + + "mespan_config\030\006 \001(\01323.google.privacy.dlp" + + ".v2.StorageConfig.TimespanConfig\032\332\001\n\016Tim" + + "espanConfig\022.\n\nstart_time\030\001 \001(\0132\032.google" + + ".protobuf.Timestamp\022,\n\010end_time\030\002 \001(\0132\032." + + "google.protobuf.Timestamp\0227\n\017timestamp_f" + + "ield\030\003 \001(\0132\036.google.privacy.dlp.v2.Field" + + "Id\0221\n)enable_auto_population_of_timespan" + + "_config\030\004 \001(\010B\006\n\004type\"`\n\013BigQueryKey\022=\n\017" + + "table_reference\030\001 \001(\0132$.google.privacy.d" + + "lp.v2.BigQueryTable\022\022\n\nrow_number\030\002 \001(\003\"" + + ">\n\014DatastoreKey\022.\n\nentity_key\030\001 \001(\0132\032.go" + + "ogle.privacy.dlp.v2.Key\"\273\001\n\003Key\0228\n\014parti" + + "tion_id\030\001 \001(\0132\".google.privacy.dlp.v2.Pa" + + "rtitionId\0224\n\004path\030\002 \003(\0132&.google.privacy" + + ".dlp.v2.Key.PathElement\032D\n\013PathElement\022\014" + + "\n\004kind\030\001 \001(\t\022\014\n\002id\030\002 \001(\003H\000\022\016\n\004name\030\003 \001(\t" + + "H\000B\t\n\007id_type\"\241\001\n\tRecordKey\022<\n\rdatastore" + + "_key\030\002 \001(\0132#.google.privacy.dlp.v2.Datas" + + "toreKeyH\000\022;\n\rbig_query_key\030\003 \001(\0132\".googl" + + "e.privacy.dlp.v2.BigQueryKeyH\000\022\021\n\tid_val" + + "ues\030\005 \003(\tB\006\n\004type\"I\n\rBigQueryTable\022\022\n\npr" + + "oject_id\030\001 \001(\t\022\022\n\ndataset_id\030\002 \001(\t\022\020\n\010ta" + + "ble_id\030\003 \001(\t\"s\n\rBigQueryField\0223\n\005table\030\001" + + " \001(\0132$.google.privacy.dlp.v2.BigQueryTab" + + "le\022-\n\005field\030\002 \001(\0132\036.google.privacy.dlp.v" + + "2.FieldId\"9\n\010EntityId\022-\n\005field\030\001 \001(\0132\036.g" + + "oogle.privacy.dlp.v2.FieldId*t\n\nLikeliho" + + "od\022\032\n\026LIKELIHOOD_UNSPECIFIED\020\000\022\021\n\rVERY_U" + + "NLIKELY\020\001\022\014\n\010UNLIKELY\020\002\022\014\n\010POSSIBLE\020\003\022\n\n" + + "\006LIKELY\020\004\022\017\n\013VERY_LIKELY\020\005*P\n\010FileType\022\031" + + "\n\025FILE_TYPE_UNSPECIFIED\020\000\022\017\n\013BINARY_FILE" + + "\020\001\022\r\n\tTEXT_FILE\020\002\022\t\n\005IMAGE\020\003B\217\001\n\031com.goo" + + "gle.privacy.dlp.v2B\nDlpStorageP\001Z8google" + + ".golang.org/genproto/googleapis/privacy/" + + "dlp/v2;dlp\252\002\023Google.Cloud.Dlp.V2\312\002\023Googl" + + "e\\Cloud\\Dlp\\V2b\006proto3" }; com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner assigner = new com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner() { @@ -275,6 +276,7 @@ public com.google.protobuf.ExtensionRegistry assignDescriptors( descriptorData, new com.google.protobuf.Descriptors.FileDescriptor[] { com.google.api.AnnotationsProto.getDescriptor(), + com.google.api.ResourceProto.getDescriptor(), com.google.protobuf.TimestampProto.getDescriptor(), }, assigner); @@ -557,6 +559,7 @@ public com.google.protobuf.ExtensionRegistry assignDescriptors( "Field", }); com.google.api.AnnotationsProto.getDescriptor(); + com.google.api.ResourceProto.getDescriptor(); com.google.protobuf.TimestampProto.getDescriptor(); } diff --git a/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/DocumentLocation.java b/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/DocumentLocation.java index 23ef134f4a51..84dfa4c597c7 100644 --- a/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/DocumentLocation.java +++ b/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/DocumentLocation.java @@ -22,9 +22,7 @@ private DocumentLocation(com.google.protobuf.GeneratedMessageV3.Builder build super(builder); } - private DocumentLocation() { - fileOffset_ = 0L; - } + private DocumentLocation() {} @java.lang.Override public final com.google.protobuf.UnknownFieldSet getUnknownFields() { @@ -57,7 +55,7 @@ private DocumentLocation( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -150,10 +148,9 @@ public boolean equals(final java.lang.Object obj) { com.google.privacy.dlp.v2.DocumentLocation other = (com.google.privacy.dlp.v2.DocumentLocation) obj; - boolean result = true; - result = result && (getFileOffset() == other.getFileOffset()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (getFileOffset() != other.getFileOffset()) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -346,35 +343,35 @@ public com.google.privacy.dlp.v2.DocumentLocation 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 @@ -470,7 +467,7 @@ public Builder clearFileOffset() { @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/EntityId.java b/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/EntityId.java index 2ef4b09cf820..91ca75766a61 100644 --- a/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/EntityId.java +++ b/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/EntityId.java @@ -69,7 +69,7 @@ private EntityId( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -184,13 +184,12 @@ public boolean equals(final java.lang.Object obj) { } com.google.privacy.dlp.v2.EntityId other = (com.google.privacy.dlp.v2.EntityId) 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 @@ -395,35 +394,35 @@ public com.google.privacy.dlp.v2.EntityId 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 @@ -470,7 +469,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, @@ -647,7 +646,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 diff --git a/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/Error.java b/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/Error.java index 7480c08759ac..1797aefd4607 100644 --- a/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/Error.java +++ b/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/Error.java @@ -68,7 +68,7 @@ private Error( } case 18: { - if (!((mutable_bitField0_ & 0x00000002) == 0x00000002)) { + if (!((mutable_bitField0_ & 0x00000002) != 0)) { timestamps_ = new java.util.ArrayList(); mutable_bitField0_ |= 0x00000002; } @@ -78,7 +78,7 @@ private Error( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -90,7 +90,7 @@ private Error( } 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)) { timestamps_ = java.util.Collections.unmodifiableList(timestamps_); } this.unknownFields = unknownFields.build(); @@ -242,14 +242,13 @@ public boolean equals(final java.lang.Object obj) { } com.google.privacy.dlp.v2.Error other = (com.google.privacy.dlp.v2.Error) obj; - boolean result = true; - result = result && (hasDetails() == other.hasDetails()); + if (hasDetails() != other.hasDetails()) return false; if (hasDetails()) { - result = result && getDetails().equals(other.getDetails()); + if (!getDetails().equals(other.getDetails())) return false; } - result = result && getTimestampsList().equals(other.getTimestampsList()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getTimestampsList().equals(other.getTimestampsList())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -460,7 +459,7 @@ public com.google.privacy.dlp.v2.Error buildPartial() { result.details_ = detailsBuilder_.build(); } if (timestampsBuilder_ == null) { - if (((bitField0_ & 0x00000002) == 0x00000002)) { + if (((bitField0_ & 0x00000002) != 0)) { timestamps_ = java.util.Collections.unmodifiableList(timestamps_); bitField0_ = (bitField0_ & ~0x00000002); } @@ -475,35 +474,35 @@ public com.google.privacy.dlp.v2.Error 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 @@ -579,7 +578,7 @@ public Builder mergeFrom( private int bitField0_; - private com.google.rpc.Status details_ = null; + private com.google.rpc.Status details_; private com.google.protobuf.SingleFieldBuilderV3< com.google.rpc.Status, com.google.rpc.Status.Builder, com.google.rpc.StatusOrBuilder> detailsBuilder_; @@ -680,7 +679,7 @@ public com.google.rpc.StatusOrBuilder getDetailsOrBuilder() { java.util.Collections.emptyList(); private void ensureTimestampsIsMutable() { - if (!((bitField0_ & 0x00000002) == 0x00000002)) { + if (!((bitField0_ & 0x00000002) != 0)) { timestamps_ = new java.util.ArrayList(timestamps_); bitField0_ |= 0x00000002; } @@ -1016,10 +1015,7 @@ public java.util.List getTimestampsBuilde com.google.protobuf.Timestamp, com.google.protobuf.Timestamp.Builder, com.google.protobuf.TimestampOrBuilder>( - timestamps_, - ((bitField0_ & 0x00000002) == 0x00000002), - getParentForChildren(), - isClean()); + timestamps_, ((bitField0_ & 0x00000002) != 0), getParentForChildren(), isClean()); timestamps_ = null; } return timestampsBuilder_; @@ -1027,7 +1023,7 @@ public java.util.List getTimestampsBuilde @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/ExcludeInfoTypes.java b/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/ExcludeInfoTypes.java index 3a57573e7f01..e0c7ff959a3a 100644 --- a/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/ExcludeInfoTypes.java +++ b/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/ExcludeInfoTypes.java @@ -52,7 +52,7 @@ private ExcludeInfoTypes( break; case 10: { - if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) { + if (!((mutable_bitField0_ & 0x00000001) != 0)) { infoTypes_ = new java.util.ArrayList(); mutable_bitField0_ |= 0x00000001; } @@ -63,7 +63,7 @@ private ExcludeInfoTypes( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -75,7 +75,7 @@ private ExcludeInfoTypes( } 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(); @@ -242,10 +242,9 @@ public boolean equals(final java.lang.Object obj) { com.google.privacy.dlp.v2.ExcludeInfoTypes other = (com.google.privacy.dlp.v2.ExcludeInfoTypes) 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 @@ -441,7 +440,7 @@ public com.google.privacy.dlp.v2.ExcludeInfoTypes buildPartial() { new com.google.privacy.dlp.v2.ExcludeInfoTypes(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); } @@ -455,35 +454,35 @@ public com.google.privacy.dlp.v2.ExcludeInfoTypes buildPartial() { @java.lang.Override public Builder clone() { - return (Builder) super.clone(); + return super.clone(); } @java.lang.Override public Builder setField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.setField(field, value); + return super.setField(field, value); } @java.lang.Override public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) { - return (Builder) super.clearField(field); + return super.clearField(field); } @java.lang.Override public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) { - return (Builder) super.clearOneof(oneof); + return super.clearOneof(oneof); } @java.lang.Override public Builder setRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) { - return (Builder) super.setRepeatedField(field, index, value); + return super.setRepeatedField(field, index, value); } @java.lang.Override public Builder addRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.addRepeatedField(field, value); + return super.addRepeatedField(field, value); } @java.lang.Override @@ -560,7 +559,7 @@ public Builder mergeFrom( java.util.Collections.emptyList(); private void ensureInfoTypesIsMutable() { - if (!((bitField0_ & 0x00000001) == 0x00000001)) { + if (!((bitField0_ & 0x00000001) != 0)) { infoTypes_ = new java.util.ArrayList(infoTypes_); bitField0_ |= 0x00000001; } @@ -1024,10 +1023,7 @@ public java.util.List getInfoTypesBu com.google.privacy.dlp.v2.InfoType, com.google.privacy.dlp.v2.InfoType.Builder, com.google.privacy.dlp.v2.InfoTypeOrBuilder>( - infoTypes_, - ((bitField0_ & 0x00000001) == 0x00000001), - getParentForChildren(), - isClean()); + infoTypes_, ((bitField0_ & 0x00000001) != 0), getParentForChildren(), isClean()); infoTypes_ = null; } return infoTypesBuilder_; @@ -1035,7 +1031,7 @@ public java.util.List getInfoTypesBu @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/ExclusionRule.java b/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/ExclusionRule.java index 5a2419092cda..af9d2996ec79 100644 --- a/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/ExclusionRule.java +++ b/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/ExclusionRule.java @@ -110,7 +110,7 @@ private ExclusionRule( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -417,25 +417,23 @@ public boolean equals(final java.lang.Object obj) { } com.google.privacy.dlp.v2.ExclusionRule other = (com.google.privacy.dlp.v2.ExclusionRule) obj; - boolean result = true; - result = result && matchingType_ == other.matchingType_; - result = result && getTypeCase().equals(other.getTypeCase()); - if (!result) return false; + if (matchingType_ != other.matchingType_) return false; + if (!getTypeCase().equals(other.getTypeCase())) return false; switch (typeCase_) { case 1: - result = result && getDictionary().equals(other.getDictionary()); + if (!getDictionary().equals(other.getDictionary())) return false; break; case 2: - result = result && getRegex().equals(other.getRegex()); + if (!getRegex().equals(other.getRegex())) return false; break; case 3: - result = result && getExcludeInfoTypes().equals(other.getExcludeInfoTypes()); + if (!getExcludeInfoTypes().equals(other.getExcludeInfoTypes())) 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 @@ -669,35 +667,35 @@ public com.google.privacy.dlp.v2.ExclusionRule 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 @@ -1463,7 +1461,7 @@ public Builder clearMatchingType() { @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/FieldId.java b/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/FieldId.java index 30e68aeaad7d..4c080ca0abbd 100644 --- a/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/FieldId.java +++ b/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/FieldId.java @@ -59,7 +59,7 @@ private FieldId( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -178,10 +178,9 @@ public boolean equals(final java.lang.Object obj) { } com.google.privacy.dlp.v2.FieldId other = (com.google.privacy.dlp.v2.FieldId) 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 @@ -372,35 +371,35 @@ public com.google.privacy.dlp.v2.FieldId buildPartial() { @java.lang.Override public Builder clone() { - return (Builder) super.clone(); + return super.clone(); } @java.lang.Override public Builder setField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.setField(field, value); + return super.setField(field, value); } @java.lang.Override public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) { - return (Builder) super.clearField(field); + return super.clearField(field); } @java.lang.Override public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) { - return (Builder) super.clearOneof(oneof); + return super.clearOneof(oneof); } @java.lang.Override public Builder setRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) { - return (Builder) super.setRepeatedField(field, index, value); + return super.setRepeatedField(field, index, value); } @java.lang.Override public Builder addRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.addRepeatedField(field, value); + return super.addRepeatedField(field, value); } @java.lang.Override @@ -544,7 +543,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/FieldTransformation.java b/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/FieldTransformation.java index 4138ff72c341..a03999c95930 100644 --- a/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/FieldTransformation.java +++ b/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/FieldTransformation.java @@ -52,7 +52,7 @@ private FieldTransformation( break; case 10: { - if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) { + if (!((mutable_bitField0_ & 0x00000001) != 0)) { fields_ = new java.util.ArrayList(); mutable_bitField0_ |= 0x00000001; } @@ -118,7 +118,7 @@ private FieldTransformation( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -130,7 +130,7 @@ private FieldTransformation( } 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)) { fields_ = java.util.Collections.unmodifiableList(fields_); } this.unknownFields = unknownFields.build(); @@ -477,26 +477,24 @@ public boolean equals(final java.lang.Object obj) { com.google.privacy.dlp.v2.FieldTransformation other = (com.google.privacy.dlp.v2.FieldTransformation) obj; - boolean result = true; - result = result && getFieldsList().equals(other.getFieldsList()); - result = result && (hasCondition() == other.hasCondition()); + if (!getFieldsList().equals(other.getFieldsList())) return false; + if (hasCondition() != other.hasCondition()) return false; if (hasCondition()) { - result = result && getCondition().equals(other.getCondition()); + if (!getCondition().equals(other.getCondition())) return false; } - result = result && getTransformationCase().equals(other.getTransformationCase()); - if (!result) return false; + if (!getTransformationCase().equals(other.getTransformationCase())) return false; switch (transformationCase_) { case 4: - result = result && getPrimitiveTransformation().equals(other.getPrimitiveTransformation()); + if (!getPrimitiveTransformation().equals(other.getPrimitiveTransformation())) return false; break; case 5: - result = result && getInfoTypeTransformations().equals(other.getInfoTypeTransformations()); + if (!getInfoTypeTransformations().equals(other.getInfoTypeTransformations())) 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 @@ -717,7 +715,7 @@ public com.google.privacy.dlp.v2.FieldTransformation buildPartial() { int from_bitField0_ = bitField0_; int to_bitField0_ = 0; if (fieldsBuilder_ == null) { - if (((bitField0_ & 0x00000001) == 0x00000001)) { + if (((bitField0_ & 0x00000001) != 0)) { fields_ = java.util.Collections.unmodifiableList(fields_); bitField0_ = (bitField0_ & ~0x00000001); } @@ -752,35 +750,35 @@ public com.google.privacy.dlp.v2.FieldTransformation 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 @@ -890,7 +888,7 @@ public Builder clearTransformation() { java.util.Collections.emptyList(); private void ensureFieldsIsMutable() { - if (!((bitField0_ & 0x00000001) == 0x00000001)) { + if (!((bitField0_ & 0x00000001) != 0)) { fields_ = new java.util.ArrayList(fields_); bitField0_ |= 0x00000001; } @@ -1226,16 +1224,13 @@ public java.util.List getFieldsBuilde com.google.privacy.dlp.v2.FieldId, com.google.privacy.dlp.v2.FieldId.Builder, com.google.privacy.dlp.v2.FieldIdOrBuilder>( - fields_, - ((bitField0_ & 0x00000001) == 0x00000001), - getParentForChildren(), - isClean()); + fields_, ((bitField0_ & 0x00000001) != 0), getParentForChildren(), isClean()); fields_ = null; } return fieldsBuilder_; } - 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, @@ -1895,7 +1890,7 @@ public Builder clearInfoTypeTransformations() { @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/Finding.java b/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/Finding.java index 7ea9da111dba..01dd32f018b4 100644 --- a/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/Finding.java +++ b/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/Finding.java @@ -128,7 +128,7 @@ private Finding( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -482,27 +482,26 @@ public boolean equals(final java.lang.Object obj) { } com.google.privacy.dlp.v2.Finding other = (com.google.privacy.dlp.v2.Finding) obj; - boolean result = true; - result = result && getQuote().equals(other.getQuote()); - result = result && (hasInfoType() == other.hasInfoType()); + if (!getQuote().equals(other.getQuote())) return false; + 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 && (hasLocation() == other.hasLocation()); + if (likelihood_ != other.likelihood_) return false; + if (hasLocation() != other.hasLocation()) return false; if (hasLocation()) { - result = result && getLocation().equals(other.getLocation()); + if (!getLocation().equals(other.getLocation())) 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 && (hasQuoteInfo() == other.hasQuoteInfo()); + if (hasQuoteInfo() != other.hasQuoteInfo()) return false; if (hasQuoteInfo()) { - result = result && getQuoteInfo().equals(other.getQuoteInfo()); + if (!getQuoteInfo().equals(other.getQuoteInfo())) return false; } - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -758,35 +757,35 @@ public com.google.privacy.dlp.v2.Finding 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 @@ -963,7 +962,7 @@ public Builder setQuoteBytes(com.google.protobuf.ByteString value) { return this; } - 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, @@ -1229,7 +1228,7 @@ public Builder clearLikelihood() { return this; } - private com.google.privacy.dlp.v2.Location location_ = null; + private com.google.privacy.dlp.v2.Location location_; private com.google.protobuf.SingleFieldBuilderV3< com.google.privacy.dlp.v2.Location, com.google.privacy.dlp.v2.Location.Builder, @@ -1410,7 +1409,7 @@ public com.google.privacy.dlp.v2.LocationOrBuilder getLocationOrBuilder() { return locationBuilder_; } - 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, @@ -1589,7 +1588,7 @@ public com.google.protobuf.TimestampOrBuilder getCreateTimeOrBuilder() { return createTimeBuilder_; } - private com.google.privacy.dlp.v2.QuoteInfo quoteInfo_ = null; + private com.google.privacy.dlp.v2.QuoteInfo quoteInfo_; private com.google.protobuf.SingleFieldBuilderV3< com.google.privacy.dlp.v2.QuoteInfo, com.google.privacy.dlp.v2.QuoteInfo.Builder, @@ -1790,7 +1789,7 @@ public com.google.privacy.dlp.v2.QuoteInfoOrBuilder getQuoteInfoOrBuilder() { @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/FixedSizeBucketingConfig.java b/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/FixedSizeBucketingConfig.java index 673c4d90a5e3..8b821d0aa0a6 100644 --- a/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/FixedSizeBucketingConfig.java +++ b/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/FixedSizeBucketingConfig.java @@ -33,9 +33,7 @@ private FixedSizeBucketingConfig(com.google.protobuf.GeneratedMessageV3.Builder< super(builder); } - private FixedSizeBucketingConfig() { - bucketSize_ = 0D; - } + private FixedSizeBucketingConfig() {} @java.lang.Override public final com.google.protobuf.UnknownFieldSet getUnknownFields() { @@ -98,7 +96,7 @@ private FixedSizeBucketingConfig( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -298,21 +296,18 @@ public boolean equals(final java.lang.Object obj) { com.google.privacy.dlp.v2.FixedSizeBucketingConfig other = (com.google.privacy.dlp.v2.FixedSizeBucketingConfig) obj; - boolean result = true; - result = result && (hasLowerBound() == other.hasLowerBound()); + if (hasLowerBound() != other.hasLowerBound()) return false; if (hasLowerBound()) { - result = result && getLowerBound().equals(other.getLowerBound()); + if (!getLowerBound().equals(other.getLowerBound())) return false; } - result = result && (hasUpperBound() == other.hasUpperBound()); + if (hasUpperBound() != other.hasUpperBound()) return false; if (hasUpperBound()) { - result = result && getUpperBound().equals(other.getUpperBound()); + if (!getUpperBound().equals(other.getUpperBound())) return false; } - result = - result - && (java.lang.Double.doubleToLongBits(getBucketSize()) - == java.lang.Double.doubleToLongBits(other.getBucketSize())); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (java.lang.Double.doubleToLongBits(getBucketSize()) + != java.lang.Double.doubleToLongBits(other.getBucketSize())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -549,35 +544,35 @@ public com.google.privacy.dlp.v2.FixedSizeBucketingConfig 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 @@ -632,7 +627,7 @@ public Builder mergeFrom( return this; } - private com.google.privacy.dlp.v2.Value lowerBound_ = null; + private com.google.privacy.dlp.v2.Value lowerBound_; private com.google.protobuf.SingleFieldBuilderV3< com.google.privacy.dlp.v2.Value, com.google.privacy.dlp.v2.Value.Builder, @@ -831,7 +826,7 @@ public com.google.privacy.dlp.v2.ValueOrBuilder getLowerBoundOrBuilder() { return lowerBoundBuilder_; } - private com.google.privacy.dlp.v2.Value upperBound_ = null; + private com.google.privacy.dlp.v2.Value upperBound_; private com.google.protobuf.SingleFieldBuilderV3< com.google.privacy.dlp.v2.Value, com.google.privacy.dlp.v2.Value.Builder, @@ -1094,7 +1089,7 @@ public Builder clearBucketSize() { @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/GetDeidentifyTemplateRequest.java b/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/GetDeidentifyTemplateRequest.java index 9f3787bb4020..4dea223acc4a 100644 --- a/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/GetDeidentifyTemplateRequest.java +++ b/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/GetDeidentifyTemplateRequest.java @@ -59,7 +59,7 @@ private GetDeidentifyTemplateRequest( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -183,10 +183,9 @@ public boolean equals(final java.lang.Object obj) { com.google.privacy.dlp.v2.GetDeidentifyTemplateRequest other = (com.google.privacy.dlp.v2.GetDeidentifyTemplateRequest) 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 @@ -380,35 +379,35 @@ public com.google.privacy.dlp.v2.GetDeidentifyTemplateRequest 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 @@ -564,7 +563,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/GetDlpJobRequest.java b/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/GetDlpJobRequest.java index 2d3f2318879f..6691a9838fba 100644 --- a/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/GetDlpJobRequest.java +++ b/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/GetDlpJobRequest.java @@ -59,7 +59,7 @@ private GetDlpJobRequest( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -179,10 +179,9 @@ public boolean equals(final java.lang.Object obj) { com.google.privacy.dlp.v2.GetDlpJobRequest other = (com.google.privacy.dlp.v2.GetDlpJobRequest) 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 @@ -375,35 +374,35 @@ public com.google.privacy.dlp.v2.GetDlpJobRequest 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 @@ -547,7 +546,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/GetInspectTemplateRequest.java b/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/GetInspectTemplateRequest.java index 8fd3488ab0f4..753f429085ed 100644 --- a/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/GetInspectTemplateRequest.java +++ b/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/GetInspectTemplateRequest.java @@ -59,7 +59,7 @@ private GetInspectTemplateRequest( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -183,10 +183,9 @@ public boolean equals(final java.lang.Object obj) { com.google.privacy.dlp.v2.GetInspectTemplateRequest other = (com.google.privacy.dlp.v2.GetInspectTemplateRequest) obj; - boolean result = true; - result = result && getName().equals(other.getName()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getName().equals(other.getName())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -379,35 +378,35 @@ public com.google.privacy.dlp.v2.GetInspectTemplateRequest 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 @@ -563,7 +562,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/GetJobTriggerRequest.java b/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/GetJobTriggerRequest.java index 18d19c044f96..832fffe4cead 100644 --- a/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/GetJobTriggerRequest.java +++ b/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/GetJobTriggerRequest.java @@ -59,7 +59,7 @@ private GetJobTriggerRequest( } 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.GetJobTriggerRequest other = (com.google.privacy.dlp.v2.GetJobTriggerRequest) 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.GetJobTriggerRequest buildPartial() { @java.lang.Override public Builder clone() { - return (Builder) super.clone(); + return super.clone(); } @java.lang.Override public Builder setField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.setField(field, value); + return super.setField(field, value); } @java.lang.Override public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) { - return (Builder) super.clearField(field); + return super.clearField(field); } @java.lang.Override public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) { - return (Builder) super.clearOneof(oneof); + return super.clearOneof(oneof); } @java.lang.Override public Builder setRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) { - return (Builder) super.setRepeatedField(field, index, value); + return super.setRepeatedField(field, index, value); } @java.lang.Override public Builder addRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.addRepeatedField(field, value); + return super.addRepeatedField(field, value); } @java.lang.Override @@ -554,7 +553,7 @@ public Builder setNameBytes(com.google.protobuf.ByteString value) { @java.lang.Override public final Builder setUnknownFields(final com.google.protobuf.UnknownFieldSet unknownFields) { - return super.setUnknownFieldsProto3(unknownFields); + return super.setUnknownFields(unknownFields); } @java.lang.Override diff --git a/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/GetStoredInfoTypeRequest.java b/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/GetStoredInfoTypeRequest.java index 7db753c152db..ed8b261ffc6f 100644 --- a/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/GetStoredInfoTypeRequest.java +++ b/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/GetStoredInfoTypeRequest.java @@ -59,7 +59,7 @@ private GetStoredInfoTypeRequest( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -183,10 +183,9 @@ public boolean equals(final java.lang.Object obj) { com.google.privacy.dlp.v2.GetStoredInfoTypeRequest other = (com.google.privacy.dlp.v2.GetStoredInfoTypeRequest) obj; - boolean result = true; - result = result && getName().equals(other.getName()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getName().equals(other.getName())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -379,35 +378,35 @@ public com.google.privacy.dlp.v2.GetStoredInfoTypeRequest 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 @@ -563,7 +562,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/ImageLocation.java b/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/ImageLocation.java index a73acce8bf43..bca52e15a180 100644 --- a/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/ImageLocation.java +++ b/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/ImageLocation.java @@ -52,7 +52,7 @@ private ImageLocation( break; case 10: { - if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) { + if (!((mutable_bitField0_ & 0x00000001) != 0)) { boundingBoxes_ = new java.util.ArrayList(); mutable_bitField0_ |= 0x00000001; } @@ -63,7 +63,7 @@ private ImageLocation( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -75,7 +75,7 @@ private ImageLocation( } 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)) { boundingBoxes_ = java.util.Collections.unmodifiableList(boundingBoxes_); } this.unknownFields = unknownFields.build(); @@ -206,10 +206,9 @@ public boolean equals(final java.lang.Object obj) { } com.google.privacy.dlp.v2.ImageLocation other = (com.google.privacy.dlp.v2.ImageLocation) obj; - boolean result = true; - result = result && getBoundingBoxesList().equals(other.getBoundingBoxesList()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getBoundingBoxesList().equals(other.getBoundingBoxesList())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -405,7 +404,7 @@ public com.google.privacy.dlp.v2.ImageLocation buildPartial() { new com.google.privacy.dlp.v2.ImageLocation(this); int from_bitField0_ = bitField0_; if (boundingBoxesBuilder_ == null) { - if (((bitField0_ & 0x00000001) == 0x00000001)) { + if (((bitField0_ & 0x00000001) != 0)) { boundingBoxes_ = java.util.Collections.unmodifiableList(boundingBoxes_); bitField0_ = (bitField0_ & ~0x00000001); } @@ -419,35 +418,35 @@ public com.google.privacy.dlp.v2.ImageLocation 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 @@ -524,7 +523,7 @@ public Builder mergeFrom( java.util.Collections.emptyList(); private void ensureBoundingBoxesIsMutable() { - if (!((bitField0_ & 0x00000001) == 0x00000001)) { + if (!((bitField0_ & 0x00000001) != 0)) { boundingBoxes_ = new java.util.ArrayList(boundingBoxes_); bitField0_ |= 0x00000001; @@ -865,7 +864,7 @@ public com.google.privacy.dlp.v2.BoundingBox.Builder addBoundingBoxesBuilder(int com.google.privacy.dlp.v2.BoundingBox.Builder, com.google.privacy.dlp.v2.BoundingBoxOrBuilder>( boundingBoxes_, - ((bitField0_ & 0x00000001) == 0x00000001), + ((bitField0_ & 0x00000001) != 0), getParentForChildren(), isClean()); boundingBoxes_ = null; @@ -875,7 +874,7 @@ public com.google.privacy.dlp.v2.BoundingBox.Builder addBoundingBoxesBuilder(int @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/InfoType.java b/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/InfoType.java index 0a1a15f57412..26b6ad485eb2 100644 --- a/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/InfoType.java +++ b/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/InfoType.java @@ -59,7 +59,7 @@ private InfoType( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -186,10 +186,9 @@ public boolean equals(final java.lang.Object obj) { } com.google.privacy.dlp.v2.InfoType other = (com.google.privacy.dlp.v2.InfoType) 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 @@ -380,35 +379,35 @@ public com.google.privacy.dlp.v2.InfoType 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 @@ -572,7 +571,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/InfoTypeDescription.java b/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/InfoTypeDescription.java index 8434a19c1eeb..b596b976ec00 100644 --- a/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/InfoTypeDescription.java +++ b/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/InfoTypeDescription.java @@ -70,7 +70,7 @@ private InfoTypeDescription( case 24: { int rawValue = input.readEnum(); - if (!((mutable_bitField0_ & 0x00000004) == 0x00000004)) { + if (!((mutable_bitField0_ & 0x00000004) != 0)) { supportedBy_ = new java.util.ArrayList(); mutable_bitField0_ |= 0x00000004; } @@ -83,7 +83,7 @@ private InfoTypeDescription( int oldLimit = input.pushLimit(length); while (input.getBytesUntilLimit() > 0) { int rawValue = input.readEnum(); - if (!((mutable_bitField0_ & 0x00000004) == 0x00000004)) { + if (!((mutable_bitField0_ & 0x00000004) != 0)) { supportedBy_ = new java.util.ArrayList(); mutable_bitField0_ |= 0x00000004; } @@ -101,7 +101,7 @@ private InfoTypeDescription( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -113,7 +113,7 @@ private InfoTypeDescription( } 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)) { supportedBy_ = java.util.Collections.unmodifiableList(supportedBy_); } this.unknownFields = unknownFields.build(); @@ -426,13 +426,12 @@ public boolean equals(final java.lang.Object obj) { com.google.privacy.dlp.v2.InfoTypeDescription other = (com.google.privacy.dlp.v2.InfoTypeDescription) obj; - boolean result = true; - result = result && getName().equals(other.getName()); - result = result && getDisplayName().equals(other.getDisplayName()); - result = result && supportedBy_.equals(other.supportedBy_); - result = result && getDescription().equals(other.getDescription()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getName().equals(other.getName())) return false; + if (!getDisplayName().equals(other.getDisplayName())) return false; + if (!supportedBy_.equals(other.supportedBy_)) return false; + if (!getDescription().equals(other.getDescription())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -636,7 +635,7 @@ public com.google.privacy.dlp.v2.InfoTypeDescription buildPartial() { int to_bitField0_ = 0; result.name_ = name_; result.displayName_ = displayName_; - if (((bitField0_ & 0x00000004) == 0x00000004)) { + if (((bitField0_ & 0x00000004) != 0)) { supportedBy_ = java.util.Collections.unmodifiableList(supportedBy_); bitField0_ = (bitField0_ & ~0x00000004); } @@ -649,35 +648,35 @@ public com.google.privacy.dlp.v2.InfoTypeDescription 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 @@ -936,7 +935,7 @@ public Builder setDisplayNameBytes(com.google.protobuf.ByteString value) { private java.util.List supportedBy_ = java.util.Collections.emptyList(); private void ensureSupportedByIsMutable() { - if (!((bitField0_ & 0x00000004) == 0x00000004)) { + if (!((bitField0_ & 0x00000004) != 0)) { supportedBy_ = new java.util.ArrayList(supportedBy_); bitField0_ |= 0x00000004; } @@ -1221,7 +1220,7 @@ public Builder setDescriptionBytes(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/InfoTypeStats.java b/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/InfoTypeStats.java index 6c671777b5f1..8298b5e85872 100644 --- a/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/InfoTypeStats.java +++ b/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/InfoTypeStats.java @@ -22,9 +22,7 @@ private InfoTypeStats(com.google.protobuf.GeneratedMessageV3.Builder builder) super(builder); } - private InfoTypeStats() { - count_ = 0L; - } + private InfoTypeStats() {} @java.lang.Override public final com.google.protobuf.UnknownFieldSet getUnknownFields() { @@ -72,7 +70,7 @@ private InfoTypeStats( } 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.InfoTypeStats other = (com.google.privacy.dlp.v2.InfoTypeStats) 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 && (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.InfoTypeStats 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.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, @@ -728,7 +725,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/java/com/google/privacy/dlp/v2/InfoTypeTransformations.java b/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/InfoTypeTransformations.java index ef0b350f59ee..f82d3cd34d7a 100644 --- a/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/InfoTypeTransformations.java +++ b/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/InfoTypeTransformations.java @@ -55,7 +55,7 @@ private InfoTypeTransformations( break; case 10: { - if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) { + if (!((mutable_bitField0_ & 0x00000001) != 0)) { transformations_ = new java.util.ArrayList< com.google.privacy.dlp.v2.InfoTypeTransformations.InfoTypeTransformation>(); @@ -70,7 +70,7 @@ private InfoTypeTransformations( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -82,7 +82,7 @@ private InfoTypeTransformations( } 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)) { transformations_ = java.util.Collections.unmodifiableList(transformations_); } this.unknownFields = unknownFields.build(); @@ -254,7 +254,7 @@ private InfoTypeTransformation( break; case 10: { - if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) { + if (!((mutable_bitField0_ & 0x00000001) != 0)) { infoTypes_ = new java.util.ArrayList(); mutable_bitField0_ |= 0x00000001; } @@ -282,7 +282,7 @@ private InfoTypeTransformation( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -294,7 +294,7 @@ private InfoTypeTransformation( } 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(); @@ -489,14 +489,13 @@ public boolean equals(final java.lang.Object obj) { com.google.privacy.dlp.v2.InfoTypeTransformations.InfoTypeTransformation other = (com.google.privacy.dlp.v2.InfoTypeTransformations.InfoTypeTransformation) obj; - boolean result = true; - result = result && getInfoTypesList().equals(other.getInfoTypesList()); - result = result && (hasPrimitiveTransformation() == other.hasPrimitiveTransformation()); + if (!getInfoTypesList().equals(other.getInfoTypesList())) return false; + if (hasPrimitiveTransformation() != other.hasPrimitiveTransformation()) return false; if (hasPrimitiveTransformation()) { - result = result && getPrimitiveTransformation().equals(other.getPrimitiveTransformation()); + if (!getPrimitiveTransformation().equals(other.getPrimitiveTransformation())) return false; } - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -719,7 +718,7 @@ public com.google.privacy.dlp.v2.InfoTypeTransformations.InfoTypeTransformation int from_bitField0_ = bitField0_; int to_bitField0_ = 0; if (infoTypesBuilder_ == null) { - if (((bitField0_ & 0x00000001) == 0x00000001)) { + if (((bitField0_ & 0x00000001) != 0)) { infoTypes_ = java.util.Collections.unmodifiableList(infoTypes_); bitField0_ = (bitField0_ & ~0x00000001); } @@ -739,23 +738,23 @@ public com.google.privacy.dlp.v2.InfoTypeTransformations.InfoTypeTransformation @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 @@ -763,13 +762,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 @@ -857,7 +856,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; } @@ -1231,16 +1230,13 @@ public java.util.List getInfoTypesBu com.google.privacy.dlp.v2.InfoType, com.google.privacy.dlp.v2.InfoType.Builder, com.google.privacy.dlp.v2.InfoTypeOrBuilder>( - infoTypes_, - ((bitField0_ & 0x00000001) == 0x00000001), - getParentForChildren(), - isClean()); + infoTypes_, ((bitField0_ & 0x00000001) != 0), getParentForChildren(), isClean()); infoTypes_ = null; } return infoTypesBuilder_; } - private com.google.privacy.dlp.v2.PrimitiveTransformation primitiveTransformation_ = null; + private com.google.privacy.dlp.v2.PrimitiveTransformation primitiveTransformation_; private com.google.protobuf.SingleFieldBuilderV3< com.google.privacy.dlp.v2.PrimitiveTransformation, com.google.privacy.dlp.v2.PrimitiveTransformation.Builder, @@ -1430,7 +1426,7 @@ public Builder clearPrimitiveTransformation() { @java.lang.Override public final Builder setUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { - return super.setUnknownFieldsProto3(unknownFields); + return super.setUnknownFields(unknownFields); } @java.lang.Override @@ -1613,10 +1609,9 @@ public boolean equals(final java.lang.Object obj) { com.google.privacy.dlp.v2.InfoTypeTransformations other = (com.google.privacy.dlp.v2.InfoTypeTransformations) obj; - boolean result = true; - result = result && getTransformationsList().equals(other.getTransformationsList()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getTransformationsList().equals(other.getTransformationsList())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -1815,7 +1810,7 @@ public com.google.privacy.dlp.v2.InfoTypeTransformations buildPartial() { new com.google.privacy.dlp.v2.InfoTypeTransformations(this); int from_bitField0_ = bitField0_; if (transformationsBuilder_ == null) { - if (((bitField0_ & 0x00000001) == 0x00000001)) { + if (((bitField0_ & 0x00000001) != 0)) { transformations_ = java.util.Collections.unmodifiableList(transformations_); bitField0_ = (bitField0_ & ~0x00000001); } @@ -1829,35 +1824,35 @@ public com.google.privacy.dlp.v2.InfoTypeTransformations 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 @@ -1936,7 +1931,7 @@ public Builder mergeFrom( transformations_ = java.util.Collections.emptyList(); private void ensureTransformationsIsMutable() { - if (!((bitField0_ & 0x00000001) == 0x00000001)) { + if (!((bitField0_ & 0x00000001) != 0)) { transformations_ = new java.util.ArrayList< com.google.privacy.dlp.v2.InfoTypeTransformations.InfoTypeTransformation>( @@ -2358,7 +2353,7 @@ public Builder removeTransformations(int index) { com.google.privacy.dlp.v2.InfoTypeTransformations.InfoTypeTransformation.Builder, com.google.privacy.dlp.v2.InfoTypeTransformations.InfoTypeTransformationOrBuilder>( transformations_, - ((bitField0_ & 0x00000001) == 0x00000001), + ((bitField0_ & 0x00000001) != 0), getParentForChildren(), isClean()); transformations_ = null; @@ -2368,7 +2363,7 @@ public Builder removeTransformations(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/InspectConfig.java b/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/InspectConfig.java index f44dc437dcb0..a71c47c58202 100644 --- a/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/InspectConfig.java +++ b/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/InspectConfig.java @@ -27,8 +27,6 @@ private InspectConfig(com.google.protobuf.GeneratedMessageV3.Builder builder) private InspectConfig() { infoTypes_ = java.util.Collections.emptyList(); minLikelihood_ = 0; - includeQuote_ = false; - excludeInfoTypes_ = false; customInfoTypes_ = java.util.Collections.emptyList(); contentOptions_ = java.util.Collections.emptyList(); ruleSet_ = java.util.Collections.emptyList(); @@ -60,7 +58,7 @@ private InspectConfig( break; case 10: { - if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) { + if (!((mutable_bitField0_ & 0x00000001) != 0)) { infoTypes_ = new java.util.ArrayList(); mutable_bitField0_ |= 0x00000001; } @@ -105,7 +103,7 @@ private InspectConfig( } case 50: { - if (!((mutable_bitField0_ & 0x00000020) == 0x00000020)) { + if (!((mutable_bitField0_ & 0x00000020) != 0)) { customInfoTypes_ = new java.util.ArrayList(); mutable_bitField0_ |= 0x00000020; @@ -118,7 +116,7 @@ private InspectConfig( case 64: { int rawValue = input.readEnum(); - if (!((mutable_bitField0_ & 0x00000040) == 0x00000040)) { + if (!((mutable_bitField0_ & 0x00000040) != 0)) { contentOptions_ = new java.util.ArrayList(); mutable_bitField0_ |= 0x00000040; } @@ -131,7 +129,7 @@ private InspectConfig( int oldLimit = input.pushLimit(length); while (input.getBytesUntilLimit() > 0) { int rawValue = input.readEnum(); - if (!((mutable_bitField0_ & 0x00000040) == 0x00000040)) { + if (!((mutable_bitField0_ & 0x00000040) != 0)) { contentOptions_ = new java.util.ArrayList(); mutable_bitField0_ |= 0x00000040; } @@ -142,7 +140,7 @@ private InspectConfig( } case 82: { - if (!((mutable_bitField0_ & 0x00000080) == 0x00000080)) { + if (!((mutable_bitField0_ & 0x00000080) != 0)) { ruleSet_ = new java.util.ArrayList(); mutable_bitField0_ |= 0x00000080; } @@ -153,7 +151,7 @@ private InspectConfig( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -165,16 +163,16 @@ private InspectConfig( } 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_); } - if (((mutable_bitField0_ & 0x00000020) == 0x00000020)) { + if (((mutable_bitField0_ & 0x00000020) != 0)) { customInfoTypes_ = java.util.Collections.unmodifiableList(customInfoTypes_); } - if (((mutable_bitField0_ & 0x00000040) == 0x00000040)) { + if (((mutable_bitField0_ & 0x00000040) != 0)) { contentOptions_ = java.util.Collections.unmodifiableList(contentOptions_); } - if (((mutable_bitField0_ & 0x00000080) == 0x00000080)) { + if (((mutable_bitField0_ & 0x00000080) != 0)) { ruleSet_ = java.util.Collections.unmodifiableList(ruleSet_); } this.unknownFields = unknownFields.build(); @@ -307,8 +305,6 @@ private FindingLimits(com.google.protobuf.GeneratedMessageV3.Builder builder) } private FindingLimits() { - maxFindingsPerItem_ = 0; - maxFindingsPerRequest_ = 0; maxFindingsPerInfoType_ = java.util.Collections.emptyList(); } @@ -348,7 +344,7 @@ private FindingLimits( } case 26: { - if (!((mutable_bitField0_ & 0x00000004) == 0x00000004)) { + if (!((mutable_bitField0_ & 0x00000004) != 0)) { maxFindingsPerInfoType_ = new java.util.ArrayList< com.google.privacy.dlp.v2.InspectConfig.FindingLimits.InfoTypeLimit>(); @@ -363,7 +359,7 @@ private FindingLimits( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -375,7 +371,7 @@ private FindingLimits( } 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)) { maxFindingsPerInfoType_ = java.util.Collections.unmodifiableList(maxFindingsPerInfoType_); } this.unknownFields = unknownFields.build(); @@ -474,9 +470,7 @@ private InfoTypeLimit(com.google.protobuf.GeneratedMessageV3.Builder builder) super(builder); } - private InfoTypeLimit() { - maxFindings_ = 0; - } + private InfoTypeLimit() {} @java.lang.Override public final com.google.protobuf.UnknownFieldSet getUnknownFields() { @@ -525,7 +519,7 @@ private InfoTypeLimit( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -674,14 +668,13 @@ public boolean equals(final java.lang.Object obj) { com.google.privacy.dlp.v2.InspectConfig.FindingLimits.InfoTypeLimit other = (com.google.privacy.dlp.v2.InspectConfig.FindingLimits.InfoTypeLimit) 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 && (getMaxFindings() == other.getMaxFindings()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (getMaxFindings() != other.getMaxFindings()) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -900,23 +893,23 @@ public com.google.privacy.dlp.v2.InspectConfig.FindingLimits.InfoTypeLimit build @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 @@ -924,13 +917,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 @@ -987,7 +980,7 @@ public Builder mergeFrom( return this; } - 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, @@ -1242,7 +1235,7 @@ public Builder clearMaxFindings() { @java.lang.Override public final Builder setUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { - return super.setUnknownFieldsProto3(unknownFields); + return super.setUnknownFields(unknownFields); } @java.lang.Override @@ -1469,13 +1462,12 @@ public boolean equals(final java.lang.Object obj) { com.google.privacy.dlp.v2.InspectConfig.FindingLimits other = (com.google.privacy.dlp.v2.InspectConfig.FindingLimits) obj; - boolean result = true; - result = result && (getMaxFindingsPerItem() == other.getMaxFindingsPerItem()); - result = result && (getMaxFindingsPerRequest() == other.getMaxFindingsPerRequest()); - result = - result && getMaxFindingsPerInfoTypeList().equals(other.getMaxFindingsPerInfoTypeList()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (getMaxFindingsPerItem() != other.getMaxFindingsPerItem()) return false; + if (getMaxFindingsPerRequest() != other.getMaxFindingsPerRequest()) return false; + if (!getMaxFindingsPerInfoTypeList().equals(other.getMaxFindingsPerInfoTypeList())) + return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -1677,7 +1669,7 @@ public com.google.privacy.dlp.v2.InspectConfig.FindingLimits buildPartial() { result.maxFindingsPerItem_ = maxFindingsPerItem_; result.maxFindingsPerRequest_ = maxFindingsPerRequest_; if (maxFindingsPerInfoTypeBuilder_ == null) { - if (((bitField0_ & 0x00000004) == 0x00000004)) { + if (((bitField0_ & 0x00000004) != 0)) { maxFindingsPerInfoType_ = java.util.Collections.unmodifiableList(maxFindingsPerInfoType_); bitField0_ = (bitField0_ & ~0x00000004); @@ -1693,23 +1685,23 @@ public com.google.privacy.dlp.v2.InspectConfig.FindingLimits 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 @@ -1717,13 +1709,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 @@ -1911,7 +1903,7 @@ public Builder clearMaxFindingsPerRequest() { maxFindingsPerInfoType_ = java.util.Collections.emptyList(); private void ensureMaxFindingsPerInfoTypeIsMutable() { - if (!((bitField0_ & 0x00000004) == 0x00000004)) { + if (!((bitField0_ & 0x00000004) != 0)) { maxFindingsPerInfoType_ = new java.util.ArrayList< com.google.privacy.dlp.v2.InspectConfig.FindingLimits.InfoTypeLimit>( @@ -2315,7 +2307,7 @@ public Builder removeMaxFindingsPerInfoType(int index) { com.google.privacy.dlp.v2.InspectConfig.FindingLimits.InfoTypeLimit.Builder, com.google.privacy.dlp.v2.InspectConfig.FindingLimits.InfoTypeLimitOrBuilder>( maxFindingsPerInfoType_, - ((bitField0_ & 0x00000004) == 0x00000004), + ((bitField0_ & 0x00000004) != 0), getParentForChildren(), isClean()); maxFindingsPerInfoType_ = null; @@ -2326,7 +2318,7 @@ public Builder removeMaxFindingsPerInfoType(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 @@ -2895,20 +2887,19 @@ public boolean equals(final java.lang.Object obj) { } com.google.privacy.dlp.v2.InspectConfig other = (com.google.privacy.dlp.v2.InspectConfig) obj; - boolean result = true; - result = result && getInfoTypesList().equals(other.getInfoTypesList()); - result = result && minLikelihood_ == other.minLikelihood_; - result = result && (hasLimits() == other.hasLimits()); + if (!getInfoTypesList().equals(other.getInfoTypesList())) return false; + if (minLikelihood_ != other.minLikelihood_) return false; + if (hasLimits() != other.hasLimits()) return false; if (hasLimits()) { - result = result && getLimits().equals(other.getLimits()); - } - result = result && (getIncludeQuote() == other.getIncludeQuote()); - result = result && (getExcludeInfoTypes() == other.getExcludeInfoTypes()); - result = result && getCustomInfoTypesList().equals(other.getCustomInfoTypesList()); - result = result && contentOptions_.equals(other.contentOptions_); - result = result && getRuleSetList().equals(other.getRuleSetList()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getLimits().equals(other.getLimits())) return false; + } + if (getIncludeQuote() != other.getIncludeQuote()) return false; + if (getExcludeInfoTypes() != other.getExcludeInfoTypes()) return false; + if (!getCustomInfoTypesList().equals(other.getCustomInfoTypesList())) return false; + if (!contentOptions_.equals(other.contentOptions_)) return false; + if (!getRuleSetList().equals(other.getRuleSetList())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -3157,7 +3148,7 @@ public com.google.privacy.dlp.v2.InspectConfig buildPartial() { int from_bitField0_ = bitField0_; int to_bitField0_ = 0; if (infoTypesBuilder_ == null) { - if (((bitField0_ & 0x00000001) == 0x00000001)) { + if (((bitField0_ & 0x00000001) != 0)) { infoTypes_ = java.util.Collections.unmodifiableList(infoTypes_); bitField0_ = (bitField0_ & ~0x00000001); } @@ -3174,7 +3165,7 @@ public com.google.privacy.dlp.v2.InspectConfig buildPartial() { result.includeQuote_ = includeQuote_; result.excludeInfoTypes_ = excludeInfoTypes_; if (customInfoTypesBuilder_ == null) { - if (((bitField0_ & 0x00000020) == 0x00000020)) { + if (((bitField0_ & 0x00000020) != 0)) { customInfoTypes_ = java.util.Collections.unmodifiableList(customInfoTypes_); bitField0_ = (bitField0_ & ~0x00000020); } @@ -3182,13 +3173,13 @@ public com.google.privacy.dlp.v2.InspectConfig buildPartial() { } else { result.customInfoTypes_ = customInfoTypesBuilder_.build(); } - if (((bitField0_ & 0x00000040) == 0x00000040)) { + if (((bitField0_ & 0x00000040) != 0)) { contentOptions_ = java.util.Collections.unmodifiableList(contentOptions_); bitField0_ = (bitField0_ & ~0x00000040); } result.contentOptions_ = contentOptions_; if (ruleSetBuilder_ == null) { - if (((bitField0_ & 0x00000080) == 0x00000080)) { + if (((bitField0_ & 0x00000080) != 0)) { ruleSet_ = java.util.Collections.unmodifiableList(ruleSet_); bitField0_ = (bitField0_ & ~0x00000080); } @@ -3203,35 +3194,35 @@ public com.google.privacy.dlp.v2.InspectConfig 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 @@ -3384,7 +3375,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; } @@ -3884,10 +3875,7 @@ public java.util.List getInfoTypesBu com.google.privacy.dlp.v2.InfoType, com.google.privacy.dlp.v2.InfoType.Builder, com.google.privacy.dlp.v2.InfoTypeOrBuilder>( - infoTypes_, - ((bitField0_ & 0x00000001) == 0x00000001), - getParentForChildren(), - isClean()); + infoTypes_, ((bitField0_ & 0x00000001) != 0), getParentForChildren(), isClean()); infoTypes_ = null; } return infoTypesBuilder_; @@ -3979,7 +3967,7 @@ public Builder clearMinLikelihood() { return this; } - private com.google.privacy.dlp.v2.InspectConfig.FindingLimits limits_ = null; + private com.google.privacy.dlp.v2.InspectConfig.FindingLimits limits_; private com.google.protobuf.SingleFieldBuilderV3< com.google.privacy.dlp.v2.InspectConfig.FindingLimits, com.google.privacy.dlp.v2.InspectConfig.FindingLimits.Builder, @@ -4184,7 +4172,7 @@ public Builder clearExcludeInfoTypes() { java.util.Collections.emptyList(); private void ensureCustomInfoTypesIsMutable() { - if (!((bitField0_ & 0x00000020) == 0x00000020)) { + if (!((bitField0_ & 0x00000020) != 0)) { customInfoTypes_ = new java.util.ArrayList(customInfoTypes_); bitField0_ |= 0x00000020; @@ -4545,7 +4533,7 @@ public com.google.privacy.dlp.v2.CustomInfoType.Builder addCustomInfoTypesBuilde com.google.privacy.dlp.v2.CustomInfoType.Builder, com.google.privacy.dlp.v2.CustomInfoTypeOrBuilder>( customInfoTypes_, - ((bitField0_ & 0x00000020) == 0x00000020), + ((bitField0_ & 0x00000020) != 0), getParentForChildren(), isClean()); customInfoTypes_ = null; @@ -4556,7 +4544,7 @@ public com.google.privacy.dlp.v2.CustomInfoType.Builder addCustomInfoTypesBuilde private java.util.List contentOptions_ = java.util.Collections.emptyList(); private void ensureContentOptionsIsMutable() { - if (!((bitField0_ & 0x00000040) == 0x00000040)) { + if (!((bitField0_ & 0x00000040) != 0)) { contentOptions_ = new java.util.ArrayList(contentOptions_); bitField0_ |= 0x00000040; } @@ -4756,7 +4744,7 @@ public Builder addAllContentOptionsValue(java.lang.Iterable v java.util.Collections.emptyList(); private void ensureRuleSetIsMutable() { - if (!((bitField0_ & 0x00000080) == 0x00000080)) { + if (!((bitField0_ & 0x00000080) != 0)) { ruleSet_ = new java.util.ArrayList(ruleSet_); bitField0_ |= 0x00000080; } @@ -5131,10 +5119,7 @@ public com.google.privacy.dlp.v2.InspectionRuleSet.Builder addRuleSetBuilder(int com.google.privacy.dlp.v2.InspectionRuleSet, com.google.privacy.dlp.v2.InspectionRuleSet.Builder, com.google.privacy.dlp.v2.InspectionRuleSetOrBuilder>( - ruleSet_, - ((bitField0_ & 0x00000080) == 0x00000080), - getParentForChildren(), - isClean()); + ruleSet_, ((bitField0_ & 0x00000080) != 0), getParentForChildren(), isClean()); ruleSet_ = null; } return ruleSetBuilder_; @@ -5142,7 +5127,7 @@ public com.google.privacy.dlp.v2.InspectionRuleSet.Builder addRuleSetBuilder(int @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/InspectContentRequest.java b/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/InspectContentRequest.java index f70e958710fb..844de6c28d20 100644 --- a/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/InspectContentRequest.java +++ b/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/InspectContentRequest.java @@ -99,7 +99,7 @@ private InspectContentRequest( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -371,19 +371,18 @@ public boolean equals(final java.lang.Object obj) { com.google.privacy.dlp.v2.InspectContentRequest other = (com.google.privacy.dlp.v2.InspectContentRequest) 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 && (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 && unknownFields.equals(other.unknownFields); - return result; + if (!getInspectTemplateName().equals(other.getInspectTemplateName())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -611,35 +610,35 @@ public com.google.privacy.dlp.v2.InspectContentRequest 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 @@ -792,7 +791,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, @@ -983,7 +982,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, @@ -1276,7 +1275,7 @@ public Builder setInspectTemplateNameBytes(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/InspectContentResponse.java b/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/InspectContentResponse.java index 6c83fe93a4e4..0b97615919fa 100644 --- a/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/InspectContentResponse.java +++ b/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/InspectContentResponse.java @@ -66,7 +66,7 @@ private InspectContentResponse( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -182,13 +182,12 @@ public boolean equals(final java.lang.Object obj) { com.google.privacy.dlp.v2.InspectContentResponse other = (com.google.privacy.dlp.v2.InspectContentResponse) obj; - boolean result = true; - result = result && (hasResult() == other.hasResult()); + if (hasResult() != other.hasResult()) return false; if (hasResult()) { - result = result && getResult().equals(other.getResult()); + if (!getResult().equals(other.getResult())) return false; } - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -391,35 +390,35 @@ public com.google.privacy.dlp.v2.InspectContentResponse 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 @@ -467,7 +466,7 @@ public Builder mergeFrom( return this; } - private com.google.privacy.dlp.v2.InspectResult result_ = null; + private com.google.privacy.dlp.v2.InspectResult result_; private com.google.protobuf.SingleFieldBuilderV3< com.google.privacy.dlp.v2.InspectResult, com.google.privacy.dlp.v2.InspectResult.Builder, @@ -650,7 +649,7 @@ public com.google.privacy.dlp.v2.InspectResultOrBuilder getResultOrBuilder() { @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/InspectDataSourceDetails.java b/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/InspectDataSourceDetails.java index 9c6d3877e932..5f4769d303f1 100644 --- a/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/InspectDataSourceDetails.java +++ b/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/InspectDataSourceDetails.java @@ -85,7 +85,7 @@ private InspectDataSourceDetails( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -234,7 +234,7 @@ private RequestedOptions( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -381,17 +381,16 @@ public boolean equals(final java.lang.Object obj) { com.google.privacy.dlp.v2.InspectDataSourceDetails.RequestedOptions other = (com.google.privacy.dlp.v2.InspectDataSourceDetails.RequestedOptions) obj; - boolean result = true; - result = result && (hasSnapshotInspectTemplate() == other.hasSnapshotInspectTemplate()); + if (hasSnapshotInspectTemplate() != other.hasSnapshotInspectTemplate()) return false; if (hasSnapshotInspectTemplate()) { - result = result && getSnapshotInspectTemplate().equals(other.getSnapshotInspectTemplate()); + if (!getSnapshotInspectTemplate().equals(other.getSnapshotInspectTemplate())) return false; } - result = result && (hasJobConfig() == other.hasJobConfig()); + if (hasJobConfig() != other.hasJobConfig()) return false; if (hasJobConfig()) { - result = result && getJobConfig().equals(other.getJobConfig()); + if (!getJobConfig().equals(other.getJobConfig())) return false; } - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -608,23 +607,23 @@ public com.google.privacy.dlp.v2.InspectDataSourceDetails.RequestedOptions build @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 @@ -632,13 +631,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 @@ -694,7 +693,7 @@ public Builder mergeFrom( return this; } - private com.google.privacy.dlp.v2.InspectTemplate snapshotInspectTemplate_ = null; + private com.google.privacy.dlp.v2.InspectTemplate snapshotInspectTemplate_; private com.google.protobuf.SingleFieldBuilderV3< com.google.privacy.dlp.v2.InspectTemplate, com.google.privacy.dlp.v2.InspectTemplate.Builder, @@ -886,7 +885,7 @@ public com.google.privacy.dlp.v2.InspectTemplate.Builder getSnapshotInspectTempl return snapshotInspectTemplateBuilder_; } - private com.google.privacy.dlp.v2.InspectJobConfig jobConfig_ = null; + private com.google.privacy.dlp.v2.InspectJobConfig jobConfig_; private com.google.protobuf.SingleFieldBuilderV3< com.google.privacy.dlp.v2.InspectJobConfig, com.google.privacy.dlp.v2.InspectJobConfig.Builder, @@ -999,7 +998,7 @@ public com.google.privacy.dlp.v2.InspectJobConfigOrBuilder getJobConfigOrBuilder @java.lang.Override public final Builder setUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { - return super.setUnknownFieldsProto3(unknownFields); + return super.setUnknownFields(unknownFields); } @java.lang.Override @@ -1135,7 +1134,15 @@ public interface ResultOrBuilder */ com.google.privacy.dlp.v2.InfoTypeStatsOrBuilder getInfoTypeStatsOrBuilder(int index); } - /** Protobuf type {@code google.privacy.dlp.v2.InspectDataSourceDetails.Result} */ + /** + * + * + * 
+   * 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(); mutable_bitField0_ |= 0x00000004; @@ -1200,7 +1205,7 @@ private Result( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -1212,7 +1217,7 @@ private Result( } 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)) { infoTypeStats_ = java.util.Collections.unmodifiableList(infoTypeStats_); } this.unknownFields = unknownFields.build(); @@ -1392,12 +1397,11 @@ public boolean equals(final java.lang.Object obj) { com.google.privacy.dlp.v2.InspectDataSourceDetails.Result other = (com.google.privacy.dlp.v2.InspectDataSourceDetails.Result) obj; - boolean result = true; - result = result && (getProcessedBytes() == other.getProcessedBytes()); - result = result && (getTotalEstimatedBytes() == other.getTotalEstimatedBytes()); - result = result && getInfoTypeStatsList().equals(other.getInfoTypeStatsList()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (getProcessedBytes() != other.getProcessedBytes()) return false; + if (getTotalEstimatedBytes() != other.getTotalEstimatedBytes()) return false; + if (!getInfoTypeStatsList().equals(other.getInfoTypeStatsList())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -1517,7 +1521,15 @@ protected Builder newBuilderForType( Builder builder = new Builder(parent); return builder; } - /** Protobuf type {@code google.privacy.dlp.v2.InspectDataSourceDetails.Result} */ + /** + * + * + * 
+     * 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 implements @@ -1599,7 +1611,7 @@ public com.google.privacy.dlp.v2.InspectDataSourceDetails.Result buildPartial() result.processedBytes_ = processedBytes_; result.totalEstimatedBytes_ = totalEstimatedBytes_; if (infoTypeStatsBuilder_ == null) { - if (((bitField0_ & 0x00000004) == 0x00000004)) { + if (((bitField0_ & 0x00000004) != 0)) { infoTypeStats_ = java.util.Collections.unmodifiableList(infoTypeStats_); bitField0_ = (bitField0_ & ~0x00000004); } @@ -1614,23 +1626,23 @@ public com.google.privacy.dlp.v2.InspectDataSourceDetails.Result 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 @@ -1638,13 +1650,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 @@ -1817,7 +1829,7 @@ public Builder clearTotalEstimatedBytes() { java.util.Collections.emptyList(); private void ensureInfoTypeStatsIsMutable() { - if (!((bitField0_ & 0x00000004) == 0x00000004)) { + if (!((bitField0_ & 0x00000004) != 0)) { infoTypeStats_ = new java.util.ArrayList(infoTypeStats_); bitField0_ |= 0x00000004; @@ -2177,7 +2189,7 @@ public com.google.privacy.dlp.v2.InfoTypeStats.Builder addInfoTypeStatsBuilder(i com.google.privacy.dlp.v2.InfoTypeStats.Builder, com.google.privacy.dlp.v2.InfoTypeStatsOrBuilder>( infoTypeStats_, - ((bitField0_ & 0x00000004) == 0x00000004), + ((bitField0_ & 0x00000004) != 0), getParentForChildren(), isClean()); infoTypeStats_ = null; @@ -2188,7 +2200,7 @@ public com.google.privacy.dlp.v2.InfoTypeStats.Builder addInfoTypeStatsBuilder(i @java.lang.Override public final Builder setUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { - return super.setUnknownFieldsProto3(unknownFields); + return super.setUnknownFields(unknownFields); } @java.lang.Override @@ -2374,17 +2386,16 @@ public boolean equals(final java.lang.Object obj) { com.google.privacy.dlp.v2.InspectDataSourceDetails other = (com.google.privacy.dlp.v2.InspectDataSourceDetails) obj; - boolean result = true; - result = result && (hasRequestedOptions() == other.hasRequestedOptions()); + if (hasRequestedOptions() != other.hasRequestedOptions()) return false; if (hasRequestedOptions()) { - result = result && getRequestedOptions().equals(other.getRequestedOptions()); + if (!getRequestedOptions().equals(other.getRequestedOptions())) return false; } - result = result && (hasResult() == other.hasResult()); + if (hasResult() != other.hasResult()) return false; if (hasResult()) { - result = result && getResult().equals(other.getResult()); + if (!getResult().equals(other.getResult())) return false; } - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -2602,35 +2613,35 @@ public com.google.privacy.dlp.v2.InspectDataSourceDetails 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 @@ -2682,8 +2693,7 @@ public Builder mergeFrom( return this; } - private com.google.privacy.dlp.v2.InspectDataSourceDetails.RequestedOptions requestedOptions_ = - null; + private com.google.privacy.dlp.v2.InspectDataSourceDetails.RequestedOptions requestedOptions_; private com.google.protobuf.SingleFieldBuilderV3< com.google.privacy.dlp.v2.InspectDataSourceDetails.RequestedOptions, com.google.privacy.dlp.v2.InspectDataSourceDetails.RequestedOptions.Builder, @@ -2883,7 +2893,7 @@ public Builder clearRequestedOptions() { return requestedOptionsBuilder_; } - private com.google.privacy.dlp.v2.InspectDataSourceDetails.Result result_ = null; + private com.google.privacy.dlp.v2.InspectDataSourceDetails.Result result_; private com.google.protobuf.SingleFieldBuilderV3< com.google.privacy.dlp.v2.InspectDataSourceDetails.Result, com.google.privacy.dlp.v2.InspectDataSourceDetails.Result.Builder, @@ -3067,7 +3077,7 @@ public com.google.privacy.dlp.v2.InspectDataSourceDetails.ResultOrBuilder getRes @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/InspectJobConfig.java b/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/InspectJobConfig.java index b6253fc0d618..a0fe5fe12eda 100644 --- a/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/InspectJobConfig.java +++ b/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/InspectJobConfig.java @@ -84,7 +84,7 @@ private InspectJobConfig( } case 34: { - if (!((mutable_bitField0_ & 0x00000008) == 0x00000008)) { + if (!((mutable_bitField0_ & 0x00000008) != 0)) { actions_ = new java.util.ArrayList(); mutable_bitField0_ |= 0x00000008; } @@ -94,7 +94,7 @@ private InspectJobConfig( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -106,7 +106,7 @@ private InspectJobConfig( } 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)) { actions_ = java.util.Collections.unmodifiableList(actions_); } this.unknownFields = unknownFields.build(); @@ -391,19 +391,18 @@ public boolean equals(final java.lang.Object obj) { com.google.privacy.dlp.v2.InspectJobConfig other = (com.google.privacy.dlp.v2.InspectJobConfig) obj; - boolean result = true; - result = result && (hasStorageConfig() == other.hasStorageConfig()); + if (hasStorageConfig() != other.hasStorageConfig()) return false; if (hasStorageConfig()) { - result = result && getStorageConfig().equals(other.getStorageConfig()); + if (!getStorageConfig().equals(other.getStorageConfig())) 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 && getInspectTemplateName().equals(other.getInspectTemplateName()); - result = result && getActionsList().equals(other.getActionsList()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getInspectTemplateName().equals(other.getInspectTemplateName())) return false; + if (!getActionsList().equals(other.getActionsList())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -627,7 +626,7 @@ public com.google.privacy.dlp.v2.InspectJobConfig buildPartial() { } result.inspectTemplateName_ = inspectTemplateName_; if (actionsBuilder_ == null) { - if (((bitField0_ & 0x00000008) == 0x00000008)) { + if (((bitField0_ & 0x00000008) != 0)) { actions_ = java.util.Collections.unmodifiableList(actions_); bitField0_ = (bitField0_ & ~0x00000008); } @@ -642,35 +641,35 @@ public com.google.privacy.dlp.v2.InspectJobConfig 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 @@ -753,7 +752,7 @@ public Builder mergeFrom( private int bitField0_; - private com.google.privacy.dlp.v2.StorageConfig storageConfig_ = null; + private com.google.privacy.dlp.v2.StorageConfig storageConfig_; private com.google.protobuf.SingleFieldBuilderV3< com.google.privacy.dlp.v2.StorageConfig, com.google.privacy.dlp.v2.StorageConfig.Builder, @@ -935,7 +934,7 @@ public com.google.privacy.dlp.v2.StorageConfigOrBuilder getStorageConfigOrBuilde return storageConfigBuilder_; } - 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, @@ -1225,7 +1224,7 @@ public Builder setInspectTemplateNameBytes(com.google.protobuf.ByteString value) java.util.Collections.emptyList(); private void ensureActionsIsMutable() { - if (!((bitField0_ & 0x00000008) == 0x00000008)) { + if (!((bitField0_ & 0x00000008) != 0)) { actions_ = new java.util.ArrayList(actions_); bitField0_ |= 0x00000008; } @@ -1579,10 +1578,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_ & 0x00000008) == 0x00000008), - getParentForChildren(), - isClean()); + actions_, ((bitField0_ & 0x00000008) != 0), getParentForChildren(), isClean()); actions_ = null; } return actionsBuilder_; @@ -1590,7 +1586,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/InspectResult.java b/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/InspectResult.java index 8500aac53c88..a3c8a769bd54 100644 --- a/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/InspectResult.java +++ b/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/InspectResult.java @@ -24,7 +24,6 @@ private InspectResult(com.google.protobuf.GeneratedMessageV3.Builder builder) private InspectResult() { findings_ = java.util.Collections.emptyList(); - findingsTruncated_ = false; } @java.lang.Override @@ -53,7 +52,7 @@ private InspectResult( break; case 10: { - if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) { + if (!((mutable_bitField0_ & 0x00000001) != 0)) { findings_ = new java.util.ArrayList(); mutable_bitField0_ |= 0x00000001; } @@ -68,7 +67,7 @@ private InspectResult( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -80,7 +79,7 @@ private InspectResult( } 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)) { findings_ = java.util.Collections.unmodifiableList(findings_); } this.unknownFields = unknownFields.build(); @@ -238,11 +237,10 @@ public boolean equals(final java.lang.Object obj) { } com.google.privacy.dlp.v2.InspectResult other = (com.google.privacy.dlp.v2.InspectResult) obj; - boolean result = true; - result = result && getFindingsList().equals(other.getFindingsList()); - result = result && (getFindingsTruncated() == other.getFindingsTruncated()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getFindingsList().equals(other.getFindingsList())) return false; + if (getFindingsTruncated() != other.getFindingsTruncated()) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -443,7 +441,7 @@ public com.google.privacy.dlp.v2.InspectResult buildPartial() { int from_bitField0_ = bitField0_; int to_bitField0_ = 0; if (findingsBuilder_ == null) { - if (((bitField0_ & 0x00000001) == 0x00000001)) { + if (((bitField0_ & 0x00000001) != 0)) { findings_ = java.util.Collections.unmodifiableList(findings_); bitField0_ = (bitField0_ & ~0x00000001); } @@ -459,35 +457,35 @@ public com.google.privacy.dlp.v2.InspectResult 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 @@ -567,7 +565,7 @@ public Builder mergeFrom( java.util.Collections.emptyList(); private void ensureFindingsIsMutable() { - if (!((bitField0_ & 0x00000001) == 0x00000001)) { + if (!((bitField0_ & 0x00000001) != 0)) { findings_ = new java.util.ArrayList(findings_); bitField0_ |= 0x00000001; } @@ -905,10 +903,7 @@ public java.util.List getFindingsBuil com.google.privacy.dlp.v2.Finding, com.google.privacy.dlp.v2.Finding.Builder, com.google.privacy.dlp.v2.FindingOrBuilder>( - findings_, - ((bitField0_ & 0x00000001) == 0x00000001), - getParentForChildren(), - isClean()); + findings_, ((bitField0_ & 0x00000001) != 0), getParentForChildren(), isClean()); findings_ = null; } return findingsBuilder_; @@ -975,7 +970,7 @@ public Builder clearFindingsTruncated() { @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/InspectTemplate.java b/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/InspectTemplate.java index 5cc9219dce46..22c1b22da78a 100644 --- a/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/InspectTemplate.java +++ b/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/InspectTemplate.java @@ -124,7 +124,7 @@ private InspectTemplate( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -485,24 +485,23 @@ public boolean equals(final java.lang.Object obj) { com.google.privacy.dlp.v2.InspectTemplate other = (com.google.privacy.dlp.v2.InspectTemplate) obj; - boolean result = true; - result = result && getName().equals(other.getName()); - result = result && getDisplayName().equals(other.getDisplayName()); - result = result && getDescription().equals(other.getDescription()); - result = result && (hasCreateTime() == other.hasCreateTime()); + if (!getName().equals(other.getName())) return false; + if (!getDisplayName().equals(other.getDisplayName())) return false; + if (!getDescription().equals(other.getDescription())) 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 && (hasUpdateTime() == other.hasUpdateTime()); + if (hasUpdateTime() != other.hasUpdateTime()) return false; if (hasUpdateTime()) { - result = result && getUpdateTime().equals(other.getUpdateTime()); + if (!getUpdateTime().equals(other.getUpdateTime())) 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 && unknownFields.equals(other.unknownFields); - return result; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -753,35 +752,35 @@ public com.google.privacy.dlp.v2.InspectTemplate 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 @@ -1143,7 +1142,7 @@ public Builder setDescriptionBytes(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, @@ -1322,7 +1321,7 @@ public com.google.protobuf.TimestampOrBuilder getCreateTimeOrBuilder() { return createTimeBuilder_; } - private com.google.protobuf.Timestamp updateTime_ = null; + private com.google.protobuf.Timestamp updateTime_; private com.google.protobuf.SingleFieldBuilderV3< com.google.protobuf.Timestamp, com.google.protobuf.Timestamp.Builder, @@ -1501,7 +1500,7 @@ public com.google.protobuf.TimestampOrBuilder getUpdateTimeOrBuilder() { return updateTimeBuilder_; } - 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, @@ -1685,7 +1684,7 @@ public com.google.privacy.dlp.v2.InspectConfigOrBuilder getInspectConfigOrBuilde @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/InspectionRule.java b/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/InspectionRule.java index 3f7d7422e710..2c31149435ce 100644 --- a/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/InspectionRule.java +++ b/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/InspectionRule.java @@ -88,7 +88,7 @@ private InspectionRule( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -304,21 +304,19 @@ public boolean equals(final java.lang.Object obj) { } com.google.privacy.dlp.v2.InspectionRule other = (com.google.privacy.dlp.v2.InspectionRule) 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 2: - result = result && getExclusionRule().equals(other.getExclusionRule()); + if (!getExclusionRule().equals(other.getExclusionRule())) 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 @@ -536,35 +534,35 @@ public com.google.privacy.dlp.v2.InspectionRule 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 @@ -1063,7 +1061,7 @@ public com.google.privacy.dlp.v2.ExclusionRuleOrBuilder getExclusionRuleOrBuilde @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/InspectionRuleSet.java b/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/InspectionRuleSet.java index e27c9b361e7e..4a5b722c2733 100644 --- a/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/InspectionRuleSet.java +++ b/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/InspectionRuleSet.java @@ -54,7 +54,7 @@ private InspectionRuleSet( break; case 10: { - if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) { + if (!((mutable_bitField0_ & 0x00000001) != 0)) { infoTypes_ = new java.util.ArrayList(); mutable_bitField0_ |= 0x00000001; } @@ -65,7 +65,7 @@ private InspectionRuleSet( } case 18: { - if (!((mutable_bitField0_ & 0x00000002) == 0x00000002)) { + if (!((mutable_bitField0_ & 0x00000002) != 0)) { rules_ = new java.util.ArrayList(); mutable_bitField0_ |= 0x00000002; } @@ -76,7 +76,7 @@ private InspectionRuleSet( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -88,10 +88,10 @@ private InspectionRuleSet( } 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_); } - if (((mutable_bitField0_ & 0x00000002) == 0x00000002)) { + if (((mutable_bitField0_ & 0x00000002) != 0)) { rules_ = java.util.Collections.unmodifiableList(rules_); } this.unknownFields = unknownFields.build(); @@ -293,11 +293,10 @@ public boolean equals(final java.lang.Object obj) { com.google.privacy.dlp.v2.InspectionRuleSet other = (com.google.privacy.dlp.v2.InspectionRuleSet) obj; - boolean result = true; - result = result && getInfoTypesList().equals(other.getInfoTypesList()); - result = result && getRulesList().equals(other.getRulesList()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getInfoTypesList().equals(other.getInfoTypesList())) return false; + if (!getRulesList().equals(other.getRulesList())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -505,7 +504,7 @@ public com.google.privacy.dlp.v2.InspectionRuleSet buildPartial() { new com.google.privacy.dlp.v2.InspectionRuleSet(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); } @@ -514,7 +513,7 @@ public com.google.privacy.dlp.v2.InspectionRuleSet buildPartial() { result.infoTypes_ = infoTypesBuilder_.build(); } if (rulesBuilder_ == null) { - if (((bitField0_ & 0x00000002) == 0x00000002)) { + if (((bitField0_ & 0x00000002) != 0)) { rules_ = java.util.Collections.unmodifiableList(rules_); bitField0_ = (bitField0_ & ~0x00000002); } @@ -528,35 +527,35 @@ public com.google.privacy.dlp.v2.InspectionRuleSet 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 @@ -660,7 +659,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; } @@ -998,10 +997,7 @@ public java.util.List getInfoTypesBu com.google.privacy.dlp.v2.InfoType, com.google.privacy.dlp.v2.InfoType.Builder, com.google.privacy.dlp.v2.InfoTypeOrBuilder>( - infoTypes_, - ((bitField0_ & 0x00000001) == 0x00000001), - getParentForChildren(), - isClean()); + infoTypes_, ((bitField0_ & 0x00000001) != 0), getParentForChildren(), isClean()); infoTypes_ = null; } return infoTypesBuilder_; @@ -1011,7 +1007,7 @@ public java.util.List getInfoTypesBu java.util.Collections.emptyList(); private void ensureRulesIsMutable() { - if (!((bitField0_ & 0x00000002) == 0x00000002)) { + if (!((bitField0_ & 0x00000002) != 0)) { rules_ = new java.util.ArrayList(rules_); bitField0_ |= 0x00000002; } @@ -1349,10 +1345,7 @@ public java.util.List getRules com.google.privacy.dlp.v2.InspectionRule, com.google.privacy.dlp.v2.InspectionRule.Builder, com.google.privacy.dlp.v2.InspectionRuleOrBuilder>( - rules_, - ((bitField0_ & 0x00000002) == 0x00000002), - getParentForChildren(), - isClean()); + rules_, ((bitField0_ & 0x00000002) != 0), getParentForChildren(), isClean()); rules_ = null; } return rulesBuilder_; @@ -1360,7 +1353,7 @@ public java.util.List getRules @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/JobTrigger.java b/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/JobTrigger.java index 6a08cdd47a28..dd175de41e1a 100644 --- a/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/JobTrigger.java +++ b/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/JobTrigger.java @@ -95,7 +95,7 @@ private JobTrigger( } case 42: { - if (!((mutable_bitField0_ & 0x00000010) == 0x00000010)) { + if (!((mutable_bitField0_ & 0x00000010) != 0)) { triggers_ = new java.util.ArrayList(); mutable_bitField0_ |= 0x00000010; } @@ -106,7 +106,7 @@ private JobTrigger( } case 50: { - if (!((mutable_bitField0_ & 0x00000020) == 0x00000020)) { + if (!((mutable_bitField0_ & 0x00000020) != 0)) { errors_ = new java.util.ArrayList(); mutable_bitField0_ |= 0x00000020; } @@ -168,7 +168,7 @@ private JobTrigger( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -180,10 +180,10 @@ private JobTrigger( } catch (java.io.IOException e) { throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this); } finally { - if (((mutable_bitField0_ & 0x00000010) == 0x00000010)) { + if (((mutable_bitField0_ & 0x00000010) != 0)) { triggers_ = java.util.Collections.unmodifiableList(triggers_); } - if (((mutable_bitField0_ & 0x00000020) == 0x00000020)) { + if (((mutable_bitField0_ & 0x00000020) != 0)) { errors_ = java.util.Collections.unmodifiableList(errors_); } this.unknownFields = unknownFields.build(); @@ -461,7 +461,7 @@ private Trigger( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -621,18 +621,16 @@ public boolean equals(final java.lang.Object obj) { com.google.privacy.dlp.v2.JobTrigger.Trigger other = (com.google.privacy.dlp.v2.JobTrigger.Trigger) obj; - boolean result = true; - result = result && getTriggerCase().equals(other.getTriggerCase()); - if (!result) return false; + if (!getTriggerCase().equals(other.getTriggerCase())) return false; switch (triggerCase_) { case 1: - result = result && getSchedule().equals(other.getSchedule()); + if (!getSchedule().equals(other.getSchedule())) 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 @@ -840,23 +838,23 @@ public com.google.privacy.dlp.v2.JobTrigger.Trigger 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 @@ -864,13 +862,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 @@ -1141,7 +1139,7 @@ public com.google.privacy.dlp.v2.ScheduleOrBuilder getScheduleOrBuilder() { @java.lang.Override public final Builder setUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { - return super.setUnknownFieldsProto3(unknownFields); + return super.setUnknownFields(unknownFields); } @java.lang.Override @@ -1781,36 +1779,34 @@ public boolean equals(final java.lang.Object obj) { } com.google.privacy.dlp.v2.JobTrigger other = (com.google.privacy.dlp.v2.JobTrigger) obj; - boolean result = true; - result = result && getName().equals(other.getName()); - result = result && getDisplayName().equals(other.getDisplayName()); - result = result && getDescription().equals(other.getDescription()); - result = result && getTriggersList().equals(other.getTriggersList()); - result = result && getErrorsList().equals(other.getErrorsList()); - result = result && (hasCreateTime() == other.hasCreateTime()); + if (!getName().equals(other.getName())) return false; + if (!getDisplayName().equals(other.getDisplayName())) return false; + if (!getDescription().equals(other.getDescription())) return false; + if (!getTriggersList().equals(other.getTriggersList())) return false; + if (!getErrorsList().equals(other.getErrorsList())) 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 && (hasUpdateTime() == other.hasUpdateTime()); + if (hasUpdateTime() != other.hasUpdateTime()) return false; if (hasUpdateTime()) { - result = result && getUpdateTime().equals(other.getUpdateTime()); + if (!getUpdateTime().equals(other.getUpdateTime())) return false; } - result = result && (hasLastRunTime() == other.hasLastRunTime()); + if (hasLastRunTime() != other.hasLastRunTime()) return false; if (hasLastRunTime()) { - result = result && getLastRunTime().equals(other.getLastRunTime()); + if (!getLastRunTime().equals(other.getLastRunTime())) return false; } - result = result && status_ == other.status_; - result = result && getJobCase().equals(other.getJobCase()); - if (!result) return false; + if (status_ != other.status_) return false; + if (!getJobCase().equals(other.getJobCase())) return false; switch (jobCase_) { case 4: - result = result && getInspectJob().equals(other.getInspectJob()); + if (!getInspectJob().equals(other.getInspectJob())) 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 @@ -2083,7 +2079,7 @@ public com.google.privacy.dlp.v2.JobTrigger buildPartial() { } } if (triggersBuilder_ == null) { - if (((bitField0_ & 0x00000010) == 0x00000010)) { + if (((bitField0_ & 0x00000010) != 0)) { triggers_ = java.util.Collections.unmodifiableList(triggers_); bitField0_ = (bitField0_ & ~0x00000010); } @@ -2092,7 +2088,7 @@ public com.google.privacy.dlp.v2.JobTrigger buildPartial() { result.triggers_ = triggersBuilder_.build(); } if (errorsBuilder_ == null) { - if (((bitField0_ & 0x00000020) == 0x00000020)) { + if (((bitField0_ & 0x00000020) != 0)) { errors_ = java.util.Collections.unmodifiableList(errors_); bitField0_ = (bitField0_ & ~0x00000020); } @@ -2124,35 +2120,35 @@ public com.google.privacy.dlp.v2.JobTrigger 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 @@ -2727,7 +2723,7 @@ public com.google.privacy.dlp.v2.InspectJobConfigOrBuilder getInspectJobOrBuilde java.util.Collections.emptyList(); private void ensureTriggersIsMutable() { - if (!((bitField0_ & 0x00000010) == 0x00000010)) { + if (!((bitField0_ & 0x00000010) != 0)) { triggers_ = new java.util.ArrayList(triggers_); bitField0_ |= 0x00000010; @@ -3104,10 +3100,7 @@ public com.google.privacy.dlp.v2.JobTrigger.Trigger.Builder addTriggersBuilder(i com.google.privacy.dlp.v2.JobTrigger.Trigger, com.google.privacy.dlp.v2.JobTrigger.Trigger.Builder, com.google.privacy.dlp.v2.JobTrigger.TriggerOrBuilder>( - triggers_, - ((bitField0_ & 0x00000010) == 0x00000010), - getParentForChildren(), - isClean()); + triggers_, ((bitField0_ & 0x00000010) != 0), getParentForChildren(), isClean()); triggers_ = null; } return triggersBuilder_; @@ -3117,7 +3110,7 @@ public com.google.privacy.dlp.v2.JobTrigger.Trigger.Builder addTriggersBuilder(i java.util.Collections.emptyList(); private void ensureErrorsIsMutable() { - if (!((bitField0_ & 0x00000020) == 0x00000020)) { + if (!((bitField0_ & 0x00000020) != 0)) { errors_ = new java.util.ArrayList(errors_); bitField0_ |= 0x00000020; } @@ -3507,16 +3500,13 @@ 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_ & 0x00000020) == 0x00000020), - getParentForChildren(), - isClean()); + errors_, ((bitField0_ & 0x00000020) != 0), getParentForChildren(), isClean()); errors_ = null; } return errorsBuilder_; } - 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, @@ -3695,7 +3685,7 @@ public com.google.protobuf.TimestampOrBuilder getCreateTimeOrBuilder() { return createTimeBuilder_; } - private com.google.protobuf.Timestamp updateTime_ = null; + private com.google.protobuf.Timestamp updateTime_; private com.google.protobuf.SingleFieldBuilderV3< com.google.protobuf.Timestamp, com.google.protobuf.Timestamp.Builder, @@ -3874,7 +3864,7 @@ public com.google.protobuf.TimestampOrBuilder getUpdateTimeOrBuilder() { return updateTimeBuilder_; } - private com.google.protobuf.Timestamp lastRunTime_ = null; + private com.google.protobuf.Timestamp lastRunTime_; private com.google.protobuf.SingleFieldBuilderV3< com.google.protobuf.Timestamp, com.google.protobuf.Timestamp.Builder, @@ -4133,7 +4123,7 @@ public Builder clearStatus() { @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/Key.java b/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/Key.java index fe55ba1907f3..b9a599ae7848 100644 --- a/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/Key.java +++ b/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/Key.java @@ -71,7 +71,7 @@ private Key( } case 18: { - if (!((mutable_bitField0_ & 0x00000002) == 0x00000002)) { + if (!((mutable_bitField0_ & 0x00000002) != 0)) { path_ = new java.util.ArrayList(); mutable_bitField0_ |= 0x00000002; } @@ -82,7 +82,7 @@ private Key( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -94,7 +94,7 @@ private Key( } catch (java.io.IOException e) { throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this); } finally { - if (((mutable_bitField0_ & 0x00000002) == 0x00000002)) { + if (((mutable_bitField0_ & 0x00000002) != 0)) { path_ = java.util.Collections.unmodifiableList(path_); } this.unknownFields = unknownFields.build(); @@ -261,7 +261,7 @@ private PathElement( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -518,22 +518,20 @@ public boolean equals(final java.lang.Object obj) { com.google.privacy.dlp.v2.Key.PathElement other = (com.google.privacy.dlp.v2.Key.PathElement) obj; - boolean result = true; - result = result && getKind().equals(other.getKind()); - result = result && getIdTypeCase().equals(other.getIdTypeCase()); - if (!result) return false; + if (!getKind().equals(other.getKind())) return false; + if (!getIdTypeCase().equals(other.getIdTypeCase())) return false; switch (idTypeCase_) { case 2: - result = result && (getId() == other.getId()); + if (getId() != other.getId()) return false; break; case 3: - result = result && getName().equals(other.getName()); + if (!getName().equals(other.getName())) return false; break; case 0: default: } - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -751,23 +749,23 @@ public com.google.privacy.dlp.v2.Key.PathElement buildPartial() { @java.lang.Override public Builder clone() { - return (Builder) super.clone(); + return super.clone(); } @java.lang.Override public Builder setField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.setField(field, value); + return super.setField(field, value); } @java.lang.Override public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) { - return (Builder) super.clearField(field); + return super.clearField(field); } @java.lang.Override public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) { - return (Builder) super.clearOneof(oneof); + return super.clearOneof(oneof); } @java.lang.Override @@ -775,13 +773,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 @@ -1147,7 +1145,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 @@ -1393,14 +1391,13 @@ public boolean equals(final java.lang.Object obj) { } com.google.privacy.dlp.v2.Key other = (com.google.privacy.dlp.v2.Key) obj; - boolean result = true; - result = result && (hasPartitionId() == other.hasPartitionId()); + if (hasPartitionId() != other.hasPartitionId()) return false; if (hasPartitionId()) { - result = result && getPartitionId().equals(other.getPartitionId()); + if (!getPartitionId().equals(other.getPartitionId())) return false; } - result = result && getPathList().equals(other.getPathList()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getPathList().equals(other.getPathList())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -1612,7 +1609,7 @@ public com.google.privacy.dlp.v2.Key buildPartial() { result.partitionId_ = partitionIdBuilder_.build(); } if (pathBuilder_ == null) { - if (((bitField0_ & 0x00000002) == 0x00000002)) { + if (((bitField0_ & 0x00000002) != 0)) { path_ = java.util.Collections.unmodifiableList(path_); bitField0_ = (bitField0_ & ~0x00000002); } @@ -1627,35 +1624,35 @@ public com.google.privacy.dlp.v2.Key buildPartial() { @java.lang.Override public Builder clone() { - return (Builder) super.clone(); + return super.clone(); } @java.lang.Override public Builder setField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.setField(field, value); + return super.setField(field, value); } @java.lang.Override public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) { - return (Builder) super.clearField(field); + return super.clearField(field); } @java.lang.Override public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) { - return (Builder) super.clearOneof(oneof); + return super.clearOneof(oneof); } @java.lang.Override public Builder setRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) { - return (Builder) super.setRepeatedField(field, index, value); + return super.setRepeatedField(field, index, value); } @java.lang.Override public Builder addRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.addRepeatedField(field, value); + return super.addRepeatedField(field, value); } @java.lang.Override @@ -1731,7 +1728,7 @@ public Builder mergeFrom( private int bitField0_; - private com.google.privacy.dlp.v2.PartitionId partitionId_ = null; + private com.google.privacy.dlp.v2.PartitionId partitionId_; private com.google.protobuf.SingleFieldBuilderV3< com.google.privacy.dlp.v2.PartitionId, com.google.privacy.dlp.v2.PartitionId.Builder, @@ -1934,7 +1931,7 @@ public com.google.privacy.dlp.v2.PartitionIdOrBuilder getPartitionIdOrBuilder() java.util.Collections.emptyList(); private void ensurePathIsMutable() { - if (!((bitField0_ & 0x00000002) == 0x00000002)) { + if (!((bitField0_ & 0x00000002) != 0)) { path_ = new java.util.ArrayList(path_); bitField0_ |= 0x00000002; } @@ -2398,10 +2395,7 @@ public java.util.List getPath com.google.privacy.dlp.v2.Key.PathElement, com.google.privacy.dlp.v2.Key.PathElement.Builder, com.google.privacy.dlp.v2.Key.PathElementOrBuilder>( - path_, - ((bitField0_ & 0x00000002) == 0x00000002), - getParentForChildren(), - isClean()); + path_, ((bitField0_ & 0x00000002) != 0), getParentForChildren(), isClean()); path_ = null; } return pathBuilder_; @@ -2409,7 +2403,7 @@ public java.util.List getPath @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/KindExpression.java b/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/KindExpression.java index a7ec37f7f4de..de4de11e55da 100644 --- a/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/KindExpression.java +++ b/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/KindExpression.java @@ -59,7 +59,7 @@ private KindExpression( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -178,10 +178,9 @@ public boolean equals(final java.lang.Object obj) { } com.google.privacy.dlp.v2.KindExpression other = (com.google.privacy.dlp.v2.KindExpression) obj; - boolean result = true; - result = result && getName().equals(other.getName()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getName().equals(other.getName())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -374,35 +373,35 @@ public com.google.privacy.dlp.v2.KindExpression buildPartial() { @java.lang.Override public Builder clone() { - return (Builder) super.clone(); + return super.clone(); } @java.lang.Override public Builder setField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.setField(field, value); + return super.setField(field, value); } @java.lang.Override public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) { - return (Builder) super.clearField(field); + return super.clearField(field); } @java.lang.Override public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) { - return (Builder) super.clearOneof(oneof); + return super.clearOneof(oneof); } @java.lang.Override public Builder setRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) { - return (Builder) super.setRepeatedField(field, index, value); + return super.setRepeatedField(field, index, value); } @java.lang.Override public Builder addRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.addRepeatedField(field, value); + return super.addRepeatedField(field, value); } @java.lang.Override @@ -546,7 +545,7 @@ public Builder setNameBytes(com.google.protobuf.ByteString value) { @java.lang.Override public final Builder setUnknownFields(final com.google.protobuf.UnknownFieldSet unknownFields) { - return super.setUnknownFieldsProto3(unknownFields); + return super.setUnknownFields(unknownFields); } @java.lang.Override diff --git a/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/KmsWrappedCryptoKey.java b/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/KmsWrappedCryptoKey.java index d133ae7af563..f48d571cff90 100644 --- a/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/KmsWrappedCryptoKey.java +++ b/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/KmsWrappedCryptoKey.java @@ -8,6 +8,7 @@ * * 
  * 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"
       }
     }
   ],