@@ -35,8 +35,7 @@ static <R extends HasMetadata, P extends HasMetadata> Matcher<R, P> matcherFor(
35
35
@ Override
36
36
public Result <R > match (R actualResource , P primary , Context <P > context ) {
37
37
var desired = dependentResource .desired (primary , context );
38
- return match (desired , actualResource , true , false ,
39
- false , Collections .emptyList ());
38
+ return match (desired , actualResource , true , false , false );
40
39
}
41
40
42
41
public static <R extends HasMetadata > Result <R > match (R desired , R actualResource ,
@@ -70,25 +69,24 @@ public static <R extends HasMetadata> Result<R> match(R desired, R actualResourc
70
69
*/
71
70
public static <R extends HasMetadata > Result <R > match (R desired , R actualResource ,
72
71
boolean considerMetadata , boolean equality ) {
73
- return match (desired , actualResource , considerMetadata , false , equality ,
74
- Collections .emptyList ());
72
+ return match (desired , actualResource , considerMetadata , false , equality );
75
73
}
76
74
77
75
public static <R extends HasMetadata > Result <R > match (R desired , R actualResource ,
78
76
boolean considerMetadata , String ... ignoreList ) {
79
- return match (desired , actualResource , considerMetadata , false , false ,
80
- Arrays .asList (ignoreList ));
77
+ return match (desired , actualResource , considerMetadata , false , false , ignoreList );
81
78
}
82
79
83
80
public static <R extends HasMetadata > Result <R > match (R desired , R actualResource ,
84
81
boolean considerMetadata , boolean metadataEquality , String ... ignoreList ) {
85
- return match (desired , actualResource , considerMetadata , metadataEquality , false ,
86
- Arrays .asList (ignoreList ));
82
+ return match (desired , actualResource , considerMetadata , metadataEquality , false ,ignoreList );
87
83
}
88
84
89
85
private static <R extends HasMetadata > Result <R > match (R desired , R actualResource ,
90
86
boolean considerMetadata , boolean metadataEquality , boolean specEquality ,
91
- List <String > ignoreList ) {
87
+ String ... ignoredPaths ) {
88
+ final List <String > ignoreList = ignoredPaths != null && ignoredPaths .length > 0 ?
89
+ Arrays .asList (ignoredPaths ) : Collections .emptyList ();
92
90
93
91
if (specEquality && !ignoreList .isEmpty ()) {
94
92
throw new IllegalArgumentException (
@@ -195,15 +193,18 @@ private static String getPath(JsonNode n) {
195
193
196
194
private static List <JsonNode > getDiffsImpactingPathsWithPrefixes (JsonNode diffJsonPatch ,
197
195
String ... prefixes ) {
198
- var res = new ArrayList <JsonNode >();
199
- var prefixList = Arrays .asList (prefixes );
200
- for (int i = 0 ; i < diffJsonPatch .size (); i ++) {
201
- var node = diffJsonPatch .get (i );
202
- if (nodeIsChildOf (node , prefixList )) {
203
- res .add (node );
196
+ if (prefixes != null && prefixes .length > 0 ) {
197
+ var res = new ArrayList <JsonNode >();
198
+ var prefixList = Arrays .asList (prefixes );
199
+ for (int i = 0 ; i < diffJsonPatch .size (); i ++) {
200
+ var node = diffJsonPatch .get (i );
201
+ if (nodeIsChildOf (node , prefixList )) {
202
+ res .add (node );
203
+ }
204
204
}
205
+ return res ;
205
206
}
206
- return res ;
207
+ return Collections . emptyList () ;
207
208
}
208
209
209
210
/**
@@ -272,19 +273,11 @@ public static <R extends HasMetadata, P extends HasMetadata> Result<R> match(
272
273
return match (desired , actualResource , considerMetadata , metadataEquality , ignorePaths );
273
274
}
274
275
275
- public static <R extends HasMetadata , P extends HasMetadata > Result <R > match (
276
- KubernetesDependentResource <R , P > dependentResource , R actualResource , P primary ,
277
- Context <P > context , boolean considerMetadata ) {
278
- final var desired = dependentResource .desired (primary , context );
279
- return match (desired , actualResource , considerMetadata , false );
280
- }
281
-
282
276
public static <R extends HasMetadata , P extends HasMetadata > Result <R > match (
283
277
KubernetesDependentResource <R , P > dependentResource , R actualResource , P primary ,
284
278
Context <P > context , boolean considerMetadata , boolean metadataEquality ,
285
279
boolean strongEquality ) {
286
280
final var desired = dependentResource .desired (primary , context );
287
- return match (desired , actualResource , considerMetadata , metadataEquality , strongEquality ,
288
- Collections .emptyList ());
281
+ return match (desired , actualResource , considerMetadata , metadataEquality , strongEquality );
289
282
}
290
283
}
0 commit comments