Skip to content

Commit c8f29e7

Browse files
athakorathakor
authored
test(samples): flakey snippets RiskAnalysisTests#testLDiversity test + Dlp samples format's (#278)
* fix: flakey snippets tests * build: fix ci lint * fix: sample failures
1 parent f0d8162 commit c8f29e7

38 files changed

+824
-748
lines changed

‎dlp/snippets/snippets/src/main/java/dlp/snippets/DeIdentifyTableBucketing.java‎

Lines changed: 25 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -39,26 +39,30 @@ public class DeIdentifyTableBucketing {
3939
public static void deIdentifyTableBucketing() throws IOException {
4040
// TODO(developer): Replace these variables before running the sample.
4141
String projectId = "your-project-id";
42-
Table tableToDeIdentify = Table.newBuilder()
43-
.addHeaders(FieldId.newBuilder().setName("AGE").build())
44-
.addHeaders(FieldId.newBuilder().setName("PATIENT").build())
45-
.addHeaders(FieldId.newBuilder().setName("HAPPINESS SCORE").build())
46-
.addRows(Row.newBuilder()
47-
.addValues(Value.newBuilder().setStringValue("101").build())
48-
.addValues(Value.newBuilder().setStringValue("Charles Dickens").build())
49-
.addValues(Value.newBuilder().setStringValue("95").build())
50-
.build())
51-
.addRows(Row.newBuilder()
52-
.addValues(Value.newBuilder().setStringValue("22").build())
53-
.addValues(Value.newBuilder().setStringValue("Jane Austen").build())
54-
.addValues(Value.newBuilder().setStringValue("21").build())
55-
.build())
56-
.addRows(Row.newBuilder()
57-
.addValues(Value.newBuilder().setStringValue("55").build())
58-
.addValues(Value.newBuilder().setStringValue("Mark Twain").build())
59-
.addValues(Value.newBuilder().setStringValue("75").build())
60-
.build())
61-
.build();
42+
Table tableToDeIdentify =
43+
Table.newBuilder()
44+
.addHeaders(FieldId.newBuilder().setName("AGE").build())
45+
.addHeaders(FieldId.newBuilder().setName("PATIENT").build())
46+
.addHeaders(FieldId.newBuilder().setName("HAPPINESS SCORE").build())
47+
.addRows(
48+
Row.newBuilder()
49+
.addValues(Value.newBuilder().setStringValue("101").build())
50+
.addValues(Value.newBuilder().setStringValue("Charles Dickens").build())
51+
.addValues(Value.newBuilder().setStringValue("95").build())
52+
.build())
53+
.addRows(
54+
Row.newBuilder()
55+
.addValues(Value.newBuilder().setStringValue("22").build())
56+
.addValues(Value.newBuilder().setStringValue("Jane Austen").build())
57+
.addValues(Value.newBuilder().setStringValue("21").build())
58+
.build())
59+
.addRows(
60+
Row.newBuilder()
61+
.addValues(Value.newBuilder().setStringValue("55").build())
62+
.addValues(Value.newBuilder().setStringValue("Mark Twain").build())
63+
.addValues(Value.newBuilder().setStringValue("75").build())
64+
.build())
65+
.build();
6266

6367
deIdentifyTableBucketing(projectId, tableToDeIdentify);
6468
}
@@ -111,8 +115,7 @@ public static Table deIdentifyTableBucketing(String projectId, Table tableToDeId
111115
DeidentifyContentResponse response = dlp.deidentifyContent(request);
112116

113117
// Print the results.
114-
System.out.println(
115-
"Table after de-identification: " + response.getItem().getTable());
118+
System.out.println("Table after de-identification: " + response.getItem().getTable());
116119

117120
return response.getItem().getTable();
118121
}

‎dlp/snippets/snippets/src/main/java/dlp/snippets/DeIdentifyTableConditionInfoTypes.java‎

Lines changed: 58 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -50,32 +50,41 @@ public class DeIdentifyTableConditionInfoTypes {
5050
public static void deIdentifyTableConditionInfoTypes() throws IOException {
5151
// TODO(developer): Replace these variables before running the sample.
5252
String projectId = "your-project-id";
53-
Table tableToDeIdentify = Table.newBuilder()
54-
.addHeaders(FieldId.newBuilder().setName("AGE").build())
55-
.addHeaders(FieldId.newBuilder().setName("PATIENT").build())
56-
.addHeaders(FieldId.newBuilder().setName("HAPPINESS SCORE").build())
57-
.addHeaders(FieldId.newBuilder().setName("FACTOID").build())
58-
.addRows(Row.newBuilder()
59-
.addValues(Value.newBuilder().setStringValue("101").build())
60-
.addValues(Value.newBuilder().setStringValue("Charles Dickens").build())
61-
.addValues(Value.newBuilder().setStringValue("95").build())
62-
.addValues(Value.newBuilder().setStringValue(
63-
"Charles Dickens name was a curse, possibly invented by Shakespeare.").build())
64-
.build())
65-
.addRows(Row.newBuilder()
66-
.addValues(Value.newBuilder().setStringValue("22").build())
67-
.addValues(Value.newBuilder().setStringValue("Jane Austen").build())
68-
.addValues(Value.newBuilder().setStringValue("21").build())
69-
.addValues(Value.newBuilder().setStringValue(
70-
"There are 14 kisses in Jane Austen's novels.").build())
71-
.build())
72-
.addRows(Row.newBuilder()
73-
.addValues(Value.newBuilder().setStringValue("55").build())
74-
.addValues(Value.newBuilder().setStringValue("Mark Twain").build())
75-
.addValues(Value.newBuilder().setStringValue("75").build())
76-
.addValues(Value.newBuilder().setStringValue("Mark Twain loved cats.").build())
77-
.build())
78-
.build();
53+
Table tableToDeIdentify =
54+
Table.newBuilder()
55+
.addHeaders(FieldId.newBuilder().setName("AGE").build())
56+
.addHeaders(FieldId.newBuilder().setName("PATIENT").build())
57+
.addHeaders(FieldId.newBuilder().setName("HAPPINESS SCORE").build())
58+
.addHeaders(FieldId.newBuilder().setName("FACTOID").build())
59+
.addRows(
60+
Row.newBuilder()
61+
.addValues(Value.newBuilder().setStringValue("101").build())
62+
.addValues(Value.newBuilder().setStringValue("Charles Dickens").build())
63+
.addValues(Value.newBuilder().setStringValue("95").build())
64+
.addValues(
65+
Value.newBuilder()
66+
.setStringValue(
67+
"Charles Dickens name was a curse invented by Shakespeare.")
68+
.build())
69+
.build())
70+
.addRows(
71+
Row.newBuilder()
72+
.addValues(Value.newBuilder().setStringValue("22").build())
73+
.addValues(Value.newBuilder().setStringValue("Jane Austen").build())
74+
.addValues(Value.newBuilder().setStringValue("21").build())
75+
.addValues(
76+
Value.newBuilder()
77+
.setStringValue("There are 14 kisses in Jane Austen's novels.")
78+
.build())
79+
.build())
80+
.addRows(
81+
Row.newBuilder()
82+
.addValues(Value.newBuilder().setStringValue("55").build())
83+
.addValues(Value.newBuilder().setStringValue("Mark Twain").build())
84+
.addValues(Value.newBuilder().setStringValue("75").build())
85+
.addValues(Value.newBuilder().setStringValue("Mark Twain loved cats.").build())
86+
.build())
87+
.build();
7988

8089
deIdentifyTableConditionInfoTypes(projectId, tableToDeIdentify);
8190
}
@@ -95,38 +104,40 @@ public static Table deIdentifyTableConditionInfoTypes(String projectId, Table ta
95104
// Specify that findings should be replaced with corresponding info type name.
96105
ReplaceWithInfoTypeConfig replaceWithInfoTypeConfig =
97106
ReplaceWithInfoTypeConfig.getDefaultInstance();
98-
PrimitiveTransformation primitiveTransformation = PrimitiveTransformation.newBuilder()
99-
.setReplaceWithInfoTypeConfig(replaceWithInfoTypeConfig).build();
107+
PrimitiveTransformation primitiveTransformation =
108+
PrimitiveTransformation.newBuilder()
109+
.setReplaceWithInfoTypeConfig(replaceWithInfoTypeConfig)
110+
.build();
100111
// Associate info type with the replacement strategy
101112
InfoTypeTransformation infoTypeTransformation =
102113
InfoTypeTransformation.newBuilder()
103114
.addInfoTypes(infoType)
104115
.setPrimitiveTransformation(primitiveTransformation)
105116
.build();
106117
InfoTypeTransformations infoTypeTransformations =
107-
InfoTypeTransformations.newBuilder()
108-
.addTransformations(infoTypeTransformation)
109-
.build();
118+
InfoTypeTransformations.newBuilder().addTransformations(infoTypeTransformation).build();
110119

111120
// Specify fields to be de-identified.
112-
List<FieldId> fieldIds = Stream.of("PATIENT", "FACTOID")
113-
.map(id -> FieldId.newBuilder().setName(id).build())
114-
.collect(Collectors.toList());
121+
List<FieldId> fieldIds =
122+
Stream.of("PATIENT", "FACTOID")
123+
.map(id -> FieldId.newBuilder().setName(id).build())
124+
.collect(Collectors.toList());
115125

116126
// Specify when the above fields should be de-identified.
117-
Condition condition = Condition.newBuilder()
118-
.setField(FieldId.newBuilder().setName("AGE").build())
119-
.setOperator(RelationalOperator.GREATER_THAN)
120-
.setValue(Value.newBuilder().setIntegerValue(89).build())
121-
.build();
127+
Condition condition =
128+
Condition.newBuilder()
129+
.setField(FieldId.newBuilder().setName("AGE").build())
130+
.setOperator(RelationalOperator.GREATER_THAN)
131+
.setValue(Value.newBuilder().setIntegerValue(89).build())
132+
.build();
122133
// Apply the condition to records
123-
RecordCondition recordCondition = RecordCondition.newBuilder()
124-
.setExpressions(Expressions.newBuilder()
125-
.setConditions(Conditions.newBuilder()
126-
.addConditions(condition)
127-
.build())
128-
.build())
129-
.build();
134+
RecordCondition recordCondition =
135+
RecordCondition.newBuilder()
136+
.setExpressions(
137+
Expressions.newBuilder()
138+
.setConditions(Conditions.newBuilder().addConditions(condition).build())
139+
.build())
140+
.build();
130141

131142
// Associate the de-identification and conditions with the specified fields.
132143
FieldTransformation fieldTransformation =
@@ -153,8 +164,7 @@ public static Table deIdentifyTableConditionInfoTypes(String projectId, Table ta
153164
DeidentifyContentResponse response = dlp.deidentifyContent(request);
154165

155166
// Print the results.
156-
System.out.println(
157-
"Table after de-identification: " + response.getItem().getTable());
167+
System.out.println("Table after de-identification: " + response.getItem().getTable());
158168

159169
return response.getItem().getTable();
160170
}

‎dlp/snippets/snippets/src/main/java/dlp/snippets/DeIdentifyTableConditionMasking.java‎

Lines changed: 40 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -44,26 +44,30 @@ public class DeIdentifyTableConditionMasking {
4444
public static void deIdentifyTableConditionMasking() throws IOException {
4545
// TODO(developer): Replace these variables before running the sample.
4646
String projectId = "your-project-id";
47-
Table tableToDeIdentify = Table.newBuilder()
48-
.addHeaders(FieldId.newBuilder().setName("AGE").build())
49-
.addHeaders(FieldId.newBuilder().setName("PATIENT").build())
50-
.addHeaders(FieldId.newBuilder().setName("HAPPINESS SCORE").build())
51-
.addRows(Row.newBuilder()
52-
.addValues(Value.newBuilder().setStringValue("101").build())
53-
.addValues(Value.newBuilder().setStringValue("Charles Dickens").build())
54-
.addValues(Value.newBuilder().setStringValue("95").build())
55-
.build())
56-
.addRows(Row.newBuilder()
57-
.addValues(Value.newBuilder().setStringValue("22").build())
58-
.addValues(Value.newBuilder().setStringValue("Jane Austen").build())
59-
.addValues(Value.newBuilder().setStringValue("21").build())
60-
.build())
61-
.addRows(Row.newBuilder()
62-
.addValues(Value.newBuilder().setStringValue("55").build())
63-
.addValues(Value.newBuilder().setStringValue("Mark Twain").build())
64-
.addValues(Value.newBuilder().setStringValue("75").build())
65-
.build())
66-
.build();
47+
Table tableToDeIdentify =
48+
Table.newBuilder()
49+
.addHeaders(FieldId.newBuilder().setName("AGE").build())
50+
.addHeaders(FieldId.newBuilder().setName("PATIENT").build())
51+
.addHeaders(FieldId.newBuilder().setName("HAPPINESS SCORE").build())
52+
.addRows(
53+
Row.newBuilder()
54+
.addValues(Value.newBuilder().setStringValue("101").build())
55+
.addValues(Value.newBuilder().setStringValue("Charles Dickens").build())
56+
.addValues(Value.newBuilder().setStringValue("95").build())
57+
.build())
58+
.addRows(
59+
Row.newBuilder()
60+
.addValues(Value.newBuilder().setStringValue("22").build())
61+
.addValues(Value.newBuilder().setStringValue("Jane Austen").build())
62+
.addValues(Value.newBuilder().setStringValue("21").build())
63+
.build())
64+
.addRows(
65+
Row.newBuilder()
66+
.addValues(Value.newBuilder().setStringValue("55").build())
67+
.addValues(Value.newBuilder().setStringValue("Mark Twain").build())
68+
.addValues(Value.newBuilder().setStringValue("75").build())
69+
.build())
70+
.build();
6771

6872
deIdentifyTableConditionMasking(projectId, tableToDeIdentify);
6973
}
@@ -79,31 +83,28 @@ public static Table deIdentifyTableConditionMasking(String projectId, Table tabl
7983

8084
// Specify how the content should be de-identified.
8185
CharacterMaskConfig characterMaskConfig =
82-
CharacterMaskConfig.newBuilder()
83-
.setMaskingCharacter("*")
84-
.build();
86+
CharacterMaskConfig.newBuilder().setMaskingCharacter("*").build();
8587
PrimitiveTransformation primitiveTransformation =
86-
PrimitiveTransformation.newBuilder()
87-
.setCharacterMaskConfig(characterMaskConfig)
88-
.build();
88+
PrimitiveTransformation.newBuilder().setCharacterMaskConfig(characterMaskConfig).build();
8989

9090
// Specify field to be de-identified.
9191
FieldId fieldId = FieldId.newBuilder().setName("HAPPINESS SCORE").build();
9292

9393
// Specify when the above field should be de-identified.
94-
Condition condition = Condition.newBuilder()
95-
.setField(FieldId.newBuilder().setName("AGE").build())
96-
.setOperator(RelationalOperator.GREATER_THAN)
97-
.setValue(Value.newBuilder().setIntegerValue(89).build())
98-
.build();
94+
Condition condition =
95+
Condition.newBuilder()
96+
.setField(FieldId.newBuilder().setName("AGE").build())
97+
.setOperator(RelationalOperator.GREATER_THAN)
98+
.setValue(Value.newBuilder().setIntegerValue(89).build())
99+
.build();
99100
// Apply the condition to records
100-
RecordCondition recordCondition = RecordCondition.newBuilder()
101-
.setExpressions(Expressions.newBuilder()
102-
.setConditions(Conditions.newBuilder()
103-
.addConditions(condition)
104-
.build())
105-
.build())
106-
.build();
101+
RecordCondition recordCondition =
102+
RecordCondition.newBuilder()
103+
.setExpressions(
104+
Expressions.newBuilder()
105+
.setConditions(Conditions.newBuilder().addConditions(condition).build())
106+
.build())
107+
.build();
107108

108109
// Associate the de-identification and conditions with the specified field.
109110
FieldTransformation fieldTransformation =
@@ -130,8 +131,7 @@ public static Table deIdentifyTableConditionMasking(String projectId, Table tabl
130131
DeidentifyContentResponse response = dlp.deidentifyContent(request);
131132

132133
// Print the results.
133-
System.out.println(
134-
"Table after de-identification: " + response.getItem().getTable());
134+
System.out.println("Table after de-identification: " + response.getItem().getTable());
135135

136136
return response.getItem().getTable();
137137
}

0 commit comments

Comments
 (0)