Upstream/Ascension
1
0
Fork 0
mirror of https://github.com/DiscordSRV/Ascension.git synced 2024-11-01 08:39:31 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix error in AbstractGameMessageModule

Browse Source
This commit is contained in:
Vankka 2024-07-20 15:15:02 +03:00
parent c6526fea3f
commit bc79ee96d1
No known key found for this signature in database
GPG Key ID: 62E48025ED4E7EBB
2 changed files with 19 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
common/src/main/java/com/discordsrv/common/future/util/CompletableFutureUtil.java
View File

@ -21,6 +21,7 @@ package com.discordsrv.common.future.util;
import com.discordsrv.common.DiscordSRV; import com.discordsrv.common.DiscordSRV;
import com.discordsrv.common.function.CheckedRunnable; import com.discordsrv.common.function.CheckedRunnable;
import com.discordsrv.common.function.CheckedSupplier; import com.discordsrv.common.function.CheckedSupplier;
import org.jetbrains.annotations.NotNull;
import java.time.Duration; import java.time.Duration;
import java.util.ArrayList; import java.util.ArrayList;
@ -38,24 +39,28 @@ public final class CompletableFutureUtil {
/** /**
* Same as {@link CompletableFuture#completedFuture(Object)} but for failing. * Same as {@link CompletableFuture#completedFuture(Object)} but for failing.
*/ */
public static <T> CompletableFuture<T> failed(Throwable throwable) { @NotNull
public static <T> CompletableFuture<T> failed(@NotNull Throwable throwable) {
CompletableFuture<T> future = new CompletableFuture<>(); CompletableFuture<T> future = new CompletableFuture<>();
future.completeExceptionally(throwable); future.completeExceptionally(throwable);
return future; return future;
} }
@SuppressWarnings("unchecked") @SuppressWarnings("unchecked")
public static <T> CompletableFuture<List<T>> combine(Collection<CompletableFuture<T>> futures) { @NotNull
public static <T> CompletableFuture<List<T>> combine(@NotNull Collection<@NotNull CompletableFuture<T>> futures) {
return combine(futures.toArray(new CompletableFuture[0])); return combine(futures.toArray(new CompletableFuture[0]));
} }
@SuppressWarnings("unchecked") @SuppressWarnings("unchecked")
public static <T> CompletableFuture<List<T>> combineGeneric(Collection<CompletableFuture<? extends T>> futures) { @NotNull
public static <T> CompletableFuture<List<T>> combineGeneric(@NotNull Collection<@NotNull CompletableFuture<? extends T>> futures) {
return combine(futures.toArray(new CompletableFuture[0])); return combine(futures.toArray(new CompletableFuture[0]));
} }
@SafeVarargs @SafeVarargs
public static <T> CompletableFuture<List<T>> combine(CompletableFuture<T>... futures) { @NotNull
public static <T> CompletableFuture<List<T>> combine(@NotNull CompletableFuture<@NotNull T>... futures) {
return CompletableFuture.allOf(futures).thenApply(v -> { return CompletableFuture.allOf(futures).thenApply(v -> {
List<T> results = new ArrayList<>(); List<T> results = new ArrayList<>();
for (CompletableFuture<T> aFuture : futures) { for (CompletableFuture<T> aFuture : futures) {
@ -65,7 +70,8 @@ public final class CompletableFutureUtil {
}); });
} }
public static <T> CompletableFuture<T> timeout(DiscordSRV discordSRV, CompletableFuture<T> future, Duration timeout) { @NotNull
public static <T> CompletableFuture<T> timeout(@NotNull DiscordSRV discordSRV, @NotNull CompletableFuture<T> future, @NotNull Duration timeout) {
ScheduledFuture<?> scheduledFuture = discordSRV.scheduler().runLater(() -> { ScheduledFuture<?> scheduledFuture = discordSRV.scheduler().runLater(() -> {
if (!future.isDone()) { if (!future.isDone()) {
future.completeExceptionally(new TimeoutException()); future.completeExceptionally(new TimeoutException());
@ -78,7 +84,8 @@ public final class CompletableFutureUtil {
}); });
} }
public static <T> CompletableFuture<T> supplyAsync(CheckedSupplier<T> supplier, Executor executor) { @NotNull
public static <T> CompletableFuture<T> supplyAsync(@NotNull CheckedSupplier<T> supplier, @NotNull Executor executor) {
CompletableFuture<T> future = new CompletableFuture<>(); CompletableFuture<T> future = new CompletableFuture<>();
executor.execute(() -> { executor.execute(() -> {
if (future.isCancelled()) { if (future.isCancelled()) {
@ -95,7 +102,8 @@ public final class CompletableFutureUtil {
return future; return future;
} }
public static CompletableFuture<Void> runAsync(CheckedRunnable runnable, Executor executor) { @NotNull
public static CompletableFuture<Void> runAsync(@NotNull CheckedRunnable runnable, @NotNull Executor executor) {
return supplyAsync(() -> { return supplyAsync(() -> {
runnable.run(); runnable.run();
return null; return null;

5
common/src/main/java/com/discordsrv/common/messageforwarding/game/AbstractGameMessageModule.java
View File

@ -100,7 +100,10 @@ public abstract class AbstractGameMessageModule<T extends IMessageConfig, E exte
// Send to all channels due to lack of specified channel // Send to all channels due to lack of specified channel
List<CompletableFuture<Void>> futures = new ArrayList<>(); List<CompletableFuture<Void>> futures = new ArrayList<>();
for (BaseChannelConfig channelConfig : discordSRV.channelConfig().getAllChannels()) { for (BaseChannelConfig channelConfig : discordSRV.channelConfig().getAllChannels()) {
futures.add(forwardToChannel(event, srvPlayer, channelConfig)); CompletableFuture<Void> future = forwardToChannel(event, srvPlayer, channelConfig);
if (future != null) {
futures.add(future);
}
} }
return CompletableFutureUtil.combine(futures); return CompletableFutureUtil.combine(futures);
} }