JarvisBigBalls/Mineplex2018-withcommit
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Refactor unbox optional collection to utility class

Browse Source
This commit is contained in:
Keir Nellyer 2016-09-26 11:01:27 +01:00
parent f42681c390
commit 1543b539ba
2 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilCollections.java
View File

@ -4,10 +4,12 @@ import java.util.Arrays;
import java.util.Collection;
import java.util.Iterator;
import java.util.List;
import java.util.Optional;
import java.util.Random;
import java.util.function.BiConsumer;
import java.util.function.Consumer;
import java.util.function.Function;
import java.util.stream.Collectors;
import com.google.common.collect.Lists;
@ -275,4 +277,8 @@ public class UtilCollections
return total.toString();
}
public static <T> List<T> unboxPresent(Collection<Optional<T>> optionalList)
{
return optionalList.stream().filter(Optional::isPresent).map(Optional::get).collect(Collectors.toList());
}
}

3
Plugins/Mineplex.Core/src/mineplex/core/report/ReportManager.java
View File

@ -28,6 +28,7 @@ import mineplex.core.common.jsonchat.JsonMessage;
import mineplex.core.common.util.BukkitFuture;
import mineplex.core.common.util.C;
import mineplex.core.common.util.F;
import mineplex.core.common.util.UtilCollections;
import mineplex.core.common.util.UtilFuture;
import mineplex.core.common.util.UtilPlayer;
import mineplex.core.incognito.IncognitoManager;
@ -554,7 +555,7 @@ public class ReportManager
CompletableFuture<Optional<Report>> future = _reportRepository.getReportsHandling(accountId).thenApply(reportIds ->
reportIds.stream().map(_reportRepository::getReport).collect(Collectors.toList())
).thenCompose(UtilFuture::sequence)
.thenApply(reportOptionals -> reportOptionals.stream().filter(Optional::isPresent).map(Optional::get).collect(Collectors.toList()))
.thenApply(UtilCollections::unboxPresent)
.thenCompose(reports -> UtilFuture.filter(reports, this::isActiveReport)).thenApply(reports ->
{
Report report = null;