Skip to content
This repository has been archived by the owner on Sep 27, 2023. It is now read-only.

feat: add CSV and TSV to file types #232

Merged
merged 1 commit into from
Jul 10, 2020
Merged

feat: add CSV and TSV to file types #232

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
375 changes: 294 additions & 81 deletions google-cloud-dlp/src/main/java/com/google/cloud/dlp/v2/DlpServiceClient.java
View file
Open in desktop

Large diffs are not rendered by default.

12 changes: 6 additions & 6 deletions google-cloud-dlp/src/main/java/com/google/cloud/dlp/v2/stub/DlpServiceStubSettings.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1141,8 +1141,8 @@ private static Builder initDefaults(Builder builder) {

builder
.hybridInspectJobTriggerSettings()
.setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("retry_policy_1_codes"))
.setRetrySettings(RETRY_PARAM_DEFINITIONS.get("retry_policy_1_params"));
.setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("no_retry_1_codes"))
.setRetrySettings(RETRY_PARAM_DEFINITIONS.get("no_retry_1_params"));

builder
.getJobTriggerSettings()
Expand Down Expand Up @@ -1211,13 +1211,13 @@ private static Builder initDefaults(Builder builder) {

builder
.hybridInspectDlpJobSettings()
.setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("retry_policy_1_codes"))
.setRetrySettings(RETRY_PARAM_DEFINITIONS.get("retry_policy_1_params"));
.setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("no_retry_1_codes"))
.setRetrySettings(RETRY_PARAM_DEFINITIONS.get("no_retry_1_params"));

builder
.finishDlpJobSettings()
.setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("retry_policy_1_codes"))
.setRetrySettings(RETRY_PARAM_DEFINITIONS.get("retry_policy_1_params"));
.setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("no_retry_1_codes"))
.setRetrySettings(RETRY_PARAM_DEFINITIONS.get("no_retry_1_params"));

return builder;
}
Expand Down
105 changes: 60 additions & 45 deletions proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/BucketingConfig.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -211,11 +211,12 @@ public interface BucketOrBuilder
*
*
* <pre>
* Replacement value for this bucket. If not provided
* the default behavior will be to hyphenate the min-max range.
* Required. Replacement value for this bucket.
* </pre>
*
* <code>.google.privacy.dlp.v2.Value replacement_value = 3;</code>
* <code>
* .google.privacy.dlp.v2.Value replacement_value = 3 [(.google.api.field_behavior) = REQUIRED];
* </code>
*
* @return Whether the replacementValue field is set.
*/
Expand All @@ -224,11 +225,12 @@ public interface BucketOrBuilder
*
*
* <pre>
* Replacement value for this bucket. If not provided
* the default behavior will be to hyphenate the min-max range.
* Required. Replacement value for this bucket.
* </pre>
*
* <code>.google.privacy.dlp.v2.Value replacement_value = 3;</code>
* <code>
* .google.privacy.dlp.v2.Value replacement_value = 3 [(.google.api.field_behavior) = REQUIRED];
* </code>
*
* @return The replacementValue.
*/
Expand All @@ -237,11 +239,12 @@ public interface BucketOrBuilder
*
*
* <pre>
* Replacement value for this bucket. If not provided
* the default behavior will be to hyphenate the min-max range.
* Required. Replacement value for this bucket.
* </pre>
*
* <code>.google.privacy.dlp.v2.Value replacement_value = 3;</code>
* <code>
* .google.privacy.dlp.v2.Value replacement_value = 3 [(.google.api.field_behavior) = REQUIRED];
* </code>
*/
com.google.privacy.dlp.v2.ValueOrBuilder getReplacementValueOrBuilder();
}
Expand Down Expand Up @@ -475,11 +478,12 @@ public com.google.privacy.dlp.v2.ValueOrBuilder getMaxOrBuilder() {
*
*
* <pre>
* Replacement value for this bucket. If not provided
* the default behavior will be to hyphenate the min-max range.
* Required. Replacement value for this bucket.
* </pre>
*
* <code>.google.privacy.dlp.v2.Value replacement_value = 3;</code>
* <code>
* .google.privacy.dlp.v2.Value replacement_value = 3 [(.google.api.field_behavior) = REQUIRED];
* </code>
*
* @return Whether the replacementValue field is set.
*/
Expand All @@ -491,11 +495,12 @@ public boolean hasReplacementValue() {
*
*
* <pre>
* Replacement value for this bucket. If not provided
* the default behavior will be to hyphenate the min-max range.
* Required. Replacement value for this bucket.
* </pre>
*
* <code>.google.privacy.dlp.v2.Value replacement_value = 3;</code>
* <code>
* .google.privacy.dlp.v2.Value replacement_value = 3 [(.google.api.field_behavior) = REQUIRED];
* </code>
*
* @return The replacementValue.
*/
Expand All @@ -509,11 +514,12 @@ public com.google.privacy.dlp.v2.Value getReplacementValue() {
*
*
* <pre>
* Replacement value for this bucket. If not provided
* the default behavior will be to hyphenate the min-max range.
* Required. Replacement value for this bucket.
* </pre>
*
* <code>.google.privacy.dlp.v2.Value replacement_value = 3;</code>
* <code>
* .google.privacy.dlp.v2.Value replacement_value = 3 [(.google.api.field_behavior) = REQUIRED];
* </code>
*/
@java.lang.Override
public com.google.privacy.dlp.v2.ValueOrBuilder getReplacementValueOrBuilder() {
Expand Down Expand Up @@ -1285,11 +1291,12 @@ public com.google.privacy.dlp.v2.ValueOrBuilder getMaxOrBuilder() {
*
*
* <pre>
* Replacement value for this bucket. If not provided
* the default behavior will be to hyphenate the min-max range.
* Required. Replacement value for this bucket.
* </pre>
*
* <code>.google.privacy.dlp.v2.Value replacement_value = 3;</code>
* <code>
* .google.privacy.dlp.v2.Value replacement_value = 3 [(.google.api.field_behavior) = REQUIRED];
* </code>
*
* @return Whether the replacementValue field is set.
*/
Expand All @@ -1300,11 +1307,12 @@ public boolean hasReplacementValue() {
*
*
* <pre>
* Replacement value for this bucket. If not provided
* the default behavior will be to hyphenate the min-max range.
* Required. Replacement value for this bucket.
* </pre>
*
* <code>.google.privacy.dlp.v2.Value replacement_value = 3;</code>
* <code>
* .google.privacy.dlp.v2.Value replacement_value = 3 [(.google.api.field_behavior) = REQUIRED];
* </code>
*
* @return The replacementValue.
*/
Expand All @@ -1321,11 +1329,12 @@ public com.google.privacy.dlp.v2.Value getReplacementValue() {
*
*
* <pre>
* Replacement value for this bucket. If not provided
* the default behavior will be to hyphenate the min-max range.
* Required. Replacement value for this bucket.
* </pre>
*
* <code>.google.privacy.dlp.v2.Value replacement_value = 3;</code>
* <code>
* .google.privacy.dlp.v2.Value replacement_value = 3 [(.google.api.field_behavior) = REQUIRED];
* </code>
*/
public Builder setReplacementValue(com.google.privacy.dlp.v2.Value value) {
if (replacementValueBuilder_ == null) {
Expand All @@ -1344,11 +1353,12 @@ public Builder setReplacementValue(com.google.privacy.dlp.v2.Value value) {
*
*
* <pre>
* Replacement value for this bucket. If not provided
* the default behavior will be to hyphenate the min-max range.
* Required. Replacement value for this bucket.
* </pre>
*
* <code>.google.privacy.dlp.v2.Value replacement_value = 3;</code>
* <code>
* .google.privacy.dlp.v2.Value replacement_value = 3 [(.google.api.field_behavior) = REQUIRED];
* </code>
*/
public Builder setReplacementValue(com.google.privacy.dlp.v2.Value.Builder builderForValue) {
if (replacementValueBuilder_ == null) {
Expand All @@ -1364,11 +1374,12 @@ public Builder setReplacementValue(com.google.privacy.dlp.v2.Value.Builder build
*
*
* <pre>
* Replacement value for this bucket. If not provided
* the default behavior will be to hyphenate the min-max range.
* Required. Replacement value for this bucket.
* </pre>
*
* <code>.google.privacy.dlp.v2.Value replacement_value = 3;</code>
* <code>
* .google.privacy.dlp.v2.Value replacement_value = 3 [(.google.api.field_behavior) = REQUIRED];
* </code>
*/
public Builder mergeReplacementValue(com.google.privacy.dlp.v2.Value value) {
if (replacementValueBuilder_ == null) {
Expand All @@ -1391,11 +1402,12 @@ public Builder mergeReplacementValue(com.google.privacy.dlp.v2.Value value) {
*
*
* <pre>
* Replacement value for this bucket. If not provided
* the default behavior will be to hyphenate the min-max range.
* Required. Replacement value for this bucket.
* </pre>
*
* <code>.google.privacy.dlp.v2.Value replacement_value = 3;</code>
* <code>
* .google.privacy.dlp.v2.Value replacement_value = 3 [(.google.api.field_behavior) = REQUIRED];
* </code>
*/
public Builder clearReplacementValue() {
if (replacementValueBuilder_ == null) {
Expand All @@ -1412,11 +1424,12 @@ public Builder clearReplacementValue() {
*
*
* <pre>
* Replacement value for this bucket. If not provided
* the default behavior will be to hyphenate the min-max range.
* Required. Replacement value for this bucket.
* </pre>
*
* <code>.google.privacy.dlp.v2.Value replacement_value = 3;</code>
* <code>
* .google.privacy.dlp.v2.Value replacement_value = 3 [(.google.api.field_behavior) = REQUIRED];
* </code>
*/
public com.google.privacy.dlp.v2.Value.Builder getReplacementValueBuilder() {

Expand All @@ -1427,11 +1440,12 @@ public com.google.privacy.dlp.v2.Value.Builder getReplacementValueBuilder() {
*
*
* <pre>
* Replacement value for this bucket. If not provided
* the default behavior will be to hyphenate the min-max range.
* Required. Replacement value for this bucket.
* </pre>
*
* <code>.google.privacy.dlp.v2.Value replacement_value = 3;</code>
* <code>
* .google.privacy.dlp.v2.Value replacement_value = 3 [(.google.api.field_behavior) = REQUIRED];
* </code>
*/
public com.google.privacy.dlp.v2.ValueOrBuilder getReplacementValueOrBuilder() {
if (replacementValueBuilder_ != null) {
Expand All @@ -1446,11 +1460,12 @@ public com.google.privacy.dlp.v2.ValueOrBuilder getReplacementValueOrBuilder() {
*
*
* <pre>
* Replacement value for this bucket. If not provided
* the default behavior will be to hyphenate the min-max range.
* Required. Replacement value for this bucket.
* </pre>
*
* <code>.google.privacy.dlp.v2.Value replacement_value = 3;</code>
* <code>
* .google.privacy.dlp.v2.Value replacement_value = 3 [(.google.api.field_behavior) = REQUIRED];
* </code>
*/
private com.google.protobuf.SingleFieldBuilderV3<
com.google.privacy.dlp.v2.Value,
Expand Down
44 changes: 44 additions & 0 deletions proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/ByteContentItem.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -227,6 +227,26 @@ public enum BytesType implements com.google.protobuf.ProtocolMessageEnum {
* <code>AVRO = 11;</code>
*/
AVRO(11),
/**
*
*
* <pre>
* csv
* </pre>
*
* <code>CSV = 12;</code>
*/
CSV(12),
/**
*
*
* <pre>
* tsv
* </pre>
*
* <code>TSV = 13;</code>
*/
TSV(13),
UNRECOGNIZED(-1),
;

Expand Down Expand Up @@ -330,6 +350,26 @@ public enum BytesType implements com.google.protobuf.ProtocolMessageEnum {
* <code>AVRO = 11;</code>
*/
public static final int AVRO_VALUE = 11;
/**
*
*
* <pre>
* csv
* </pre>
*
* <code>CSV = 12;</code>
*/
public static final int CSV_VALUE = 12;
/**
*
*
* <pre>
* tsv
* </pre>
*
* <code>TSV = 13;</code>
*/
public static final int TSV_VALUE = 13;

public final int getNumber() {
if (this == UNRECOGNIZED) {
Expand Down Expand Up @@ -375,6 +415,10 @@ public static BytesType forNumber(int value) {
return PDF;
case 11:
return AVRO;
case 12:
return CSV;
case 13:
return TSV;
default:
return null;
}
Expand Down
Loading