DBZ-7437: ReselectColumnsPostProcessor filter not use exclude predicate.
This commit is contained in:
parent
e2f0123e51
commit
d96c30ef3f
@ -582,3 +582,4 @@ Peter Hamer
|
|||||||
Artem Shubovych
|
Artem Shubovych
|
||||||
leoloel
|
leoloel
|
||||||
Clifford Cheefoon
|
Clifford Cheefoon
|
||||||
|
Fr0z3Nn
|
@ -252,7 +252,9 @@ public ReselectColumnsPredicateBuilder includeColumns(String columnNames) {
|
|||||||
if (columnNames == null || columnNames.trim().isEmpty()) {
|
if (columnNames == null || columnNames.trim().isEmpty()) {
|
||||||
reselectColumnInclusions = null;
|
reselectColumnInclusions = null;
|
||||||
}
|
}
|
||||||
reselectColumnInclusions = Predicates.includes(columnNames, Pattern.CASE_INSENSITIVE);
|
else {
|
||||||
|
reselectColumnInclusions = Predicates.includes(columnNames, Pattern.CASE_INSENSITIVE);
|
||||||
|
}
|
||||||
return this;
|
return this;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -260,13 +262,20 @@ public ReselectColumnsPredicateBuilder excludeColumns(String columnNames) {
|
|||||||
if (columnNames == null || columnNames.trim().isEmpty()) {
|
if (columnNames == null || columnNames.trim().isEmpty()) {
|
||||||
reselectColumnExclusions = null;
|
reselectColumnExclusions = null;
|
||||||
}
|
}
|
||||||
reselectColumnExclusions = Predicates.excludes(columnNames, Pattern.CASE_INSENSITIVE);
|
else {
|
||||||
|
reselectColumnExclusions = Predicates.excludes(columnNames, Pattern.CASE_INSENSITIVE);
|
||||||
|
}
|
||||||
return this;
|
return this;
|
||||||
}
|
}
|
||||||
|
|
||||||
public Predicate<String> build() {
|
public Predicate<String> build() {
|
||||||
Predicate<String> filter = reselectColumnInclusions != null ? reselectColumnInclusions : reselectColumnExclusions;
|
if (reselectColumnInclusions != null) {
|
||||||
return filter != null ? filter : (x) -> true;
|
return reselectColumnInclusions;
|
||||||
|
}
|
||||||
|
if (reselectColumnExclusions != null) {
|
||||||
|
return reselectColumnExclusions;
|
||||||
|
}
|
||||||
|
return (x) -> true;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -252,3 +252,4 @@ shybovycha,Artem Shubovych
|
|||||||
Liaoyuxing,leoloel
|
Liaoyuxing,leoloel
|
||||||
iankko,Jan Lieskovsky
|
iankko,Jan Lieskovsky
|
||||||
CliffordCheefoon,Clifford Cheefoon
|
CliffordCheefoon,Clifford Cheefoon
|
||||||
|
Fr0z3Nn,Ivanov Sergey Vasilevich
|
Loading…
Reference in New Issue
Block a user