Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add PageCollectors into Util #2490

Open
wants to merge 11 commits into
base: main
Choose a base branch
from
Open

Add PageCollectors into Util #2490

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
8a74215
Add PageCollector
zorglube Oct 25, 2021
e654ed0
Add PageCollectors
zorglube Oct 25, 2021
153f1c0
Merge branch 'add-page-collectors' of https://github.com/zorglube/spr…
zorglube Oct 25, 2021
6d4bd38
Rename and add `toSimplePage`
zorglube Oct 26, 2021
1c51eeb
Formatter
zorglube Oct 26, 2021
5a25dff
Improve javadoc
zorglube Oct 26, 2021
89f53fc
Factorized, use Stream.
zorglube Oct 26, 2021
7b9bf41
add toSimplePage(Pageable p)
zorglube Oct 26, 2021
ca0ad33
Formating
zorglube Oct 26, 2021
d72a31a
Complete Unit Testing
zorglube Oct 26, 2021
aabad92
Vars visibility
zorglube Oct 26, 2021
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
Prev Previous commit
Next Next commit
Factorized, use Stream. 
Signed-off-by: Zorglube <[email protected]>
  • Loading branch information
@zorglube
zorglube committed Oct 26, 2021
commit 89f53fcf63a2f34a5f2dfbfa7e0c5498c3e6b8bb
26 changes: 6 additions & 20 deletions src/main/java/org/springframework/data/util/PageCollectors.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
package org.springframework.data.util;

import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
import java.util.Comparator;
import java.util.List;
Expand Down Expand Up @@ -86,10 +87,7 @@ public BiConsumer<List<T>, T> accumulator() {

@Override
public BinaryOperator<List<T>> combiner() {
return (left, right) -> {
left.addAll(right);
return left;
};
return (left, right) -> Stream.of(left, right).flatMap(Collection::stream).collect(Collectors.toList());
}

@Override
Expand Down Expand Up @@ -135,10 +133,7 @@ public BiConsumer<List<T>, T> accumulator() {

@Override
public BinaryOperator<List<T>> combiner() {
return (left, right) -> {
left.addAll(right);
return left;
};
return (left, right) -> Stream.of(left, right).flatMap(Collection::stream).collect(Collectors.toList());
}

@Override
Expand Down Expand Up @@ -193,10 +188,7 @@ public BiConsumer<List<T>, T> accumulator() {

@Override
public BinaryOperator<List<T>> combiner() {
return (left, right) -> {
left.addAll(right);
return left;
};
return (left, right) -> Stream.of(left, right).flatMap(Collection::stream).collect(Collectors.toList());
}

@Override
Expand Down Expand Up @@ -255,10 +247,7 @@ public BiConsumer<List<T>, T> accumulator() {

@Override
public BinaryOperator<List<T>> combiner() {
return (left, right) -> {
left.addAll(right);
return left;
};
return (left, right) -> Stream.of(left, right).flatMap(Collection::stream).collect(Collectors.toList());
}

@Override
Expand Down Expand Up @@ -319,10 +308,7 @@ public BiConsumer<List<T>, T> accumulator() {

@Override
public BinaryOperator<List<T>> combiner() {
return (left, right) -> {
left.addAll(right);
return left;
};
return (left, right) -> Stream.of(left, right).flatMap(Collection::stream).collect(Collectors.toList());
}

@Override
Expand Down
2 changes: 1 addition & 1 deletion src/test/java/org/springframework/data/util/PageCollectorToSimplePageTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
import org.springframework.data.domain.Page;

/**
* Test methods for {@link PageCollectors}s.
* Test methods for {@link PageCollectors}.
*
* @author Bertrand Moreau
*/
Expand Down
2 changes: 1 addition & 1 deletion src/test/java/org/springframework/data/util/PageCollectorsToFilteredPageTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
import org.springframework.data.domain.Pageable;

/**
* Test methods for {@link PageCollectors}s.
* Test methods for {@link PageCollectors}.
*
* @author Bertrand Moreau
*/
Expand Down
2 changes: 1 addition & 1 deletion src/test/java/org/springframework/data/util/PageCollectorsToFilteredSortedPageTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
import org.springframework.data.domain.Pageable;

/**
* Test methods for {@link PageCollectors}s.
* Test methods for {@link PageCollectors}.
*
* @author Bertrand Moreau
*/
Expand Down
2 changes: 1 addition & 1 deletion src/test/java/org/springframework/data/util/PageCollectorsToPageTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
import org.springframework.data.domain.Pageable;

/**
* Test methods for {@link PageCollectors}s.
* Test methods for {@link PageCollectors}.
*
* @author Bertrand Moreau
*/
Expand Down
2 changes: 1 addition & 1 deletion src/test/java/org/springframework/data/util/PageCollectorsToSortedPageTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
import org.springframework.data.domain.Pageable;

/**
* Test methods for {@link PageCollectors}s.
* Test methods for {@link PageCollectors}.
*
* @author Bertrand Moreau
*/
Expand Down