Skip to content

Commit 0b3c06f

Browse files
committed
edit
1 parent aa84fa4 commit 0b3c06f

File tree

2 files changed

+7
-11
lines changed

2 files changed

+7
-11
lines changed

src/main/java/org/usf/jquery/core/ColumnSingleFilter.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66

77
import java.util.Collection;
88

9-
import lombok.AccessLevel;
109
import lombok.RequiredArgsConstructor;
1110

1211
/**

src/main/java/org/usf/jquery/core/Nested.java

Lines changed: 7 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,8 @@
11
package org.usf.jquery.core;
22

3-
import static java.util.function.Function.identity;
43
import static org.usf.jquery.core.Utils.isEmpty;
54

65
import java.util.Collection;
7-
import java.util.function.BiConsumer;
8-
import java.util.function.BiFunction;
96
import java.util.function.Consumer;
107
import java.util.function.Function;
118
import java.util.function.Predicate;
@@ -49,21 +46,21 @@ static boolean tryResolve(Object o, QueryBuilder builder) {
4946

5047

5148
static <T extends Nested> void viewsOfNested(Collection<DBView> views, T[] arr) {
52-
viewsOfNested(views, arr, identity());
49+
viewsOfAll(arr, o-> o.views(views));
5350
}
5451

5552
static <T, N extends Nested> void viewsOfNested(Collection<DBView> views, T[] arr, Function<T, N> fn) {
56-
if(!isEmpty(arr)) {
57-
for(var o : arr) {
58-
fn.apply(o).views(views);
59-
}
60-
}
53+
viewsOfAll(arr, o-> fn.apply(o).views(views));
6154
}
6255

6356
static void viewsOfAll(Collection<DBView> views, Object[] arr) {
57+
viewsOfAll(arr, o-> viewsOf(views, o));
58+
}
59+
60+
static <T> void viewsOfAll(T[] arr, Consumer<? super T> cons) {
6461
if(!isEmpty(arr)) {
6562
for(var o : arr) {
66-
viewsOf(views, o);
63+
cons.accept(o);
6764
}
6865
}
6966
}

0 commit comments

Comments
 (0)