Upstream/PlotSquared
1
0
Fork 0
mirror of https://github.com/IntellectualSites/PlotSquared.git synced 2024-11-25 12:25:46 +01:00
Code Issues Packages Projects Releases Wiki Activity

refactor: simplify timeout logic in uuid pipeline (#3760)

Browse Source 
simplify timeout logic
This commit is contained in:
Hannes Greule 2022-08-06 16:32:11 +02:00 committed by GitHub
parent c0bfa297bb
commit 7669e79da1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
Core/src/main/java/com/plotsquared/core/uuid/UUIDPipeline.java
View File

@ -41,13 +41,10 @@ import java.util.UUID;
import java.util.concurrent.CompletableFuture; import java.util.concurrent.CompletableFuture;
import java.util.concurrent.ExecutionException; import java.util.concurrent.ExecutionException;
import java.util.concurrent.Executor; import java.util.concurrent.Executor;
import java.util.concurrent.Executors;
import java.util.concurrent.ScheduledExecutorService;
import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeUnit;
import java.util.concurrent.TimeoutException; import java.util.concurrent.TimeoutException;
import java.util.function.BiConsumer; import java.util.function.BiConsumer;
import java.util.function.Consumer; import java.util.function.Consumer;
import java.util.function.Function;
/** /**
* An UUID pipeline is essentially an ordered list of * An UUID pipeline is essentially an ordered list of
@ -65,7 +62,6 @@ public class UUIDPipeline {
private final Executor executor; private final Executor executor;
private final List<UUIDService> serviceList; private final List<UUIDService> serviceList;
private final List<Consumer<List<UUIDMapping>>> consumerList; private final List<Consumer<List<UUIDMapping>>> consumerList;
private final ScheduledExecutorService timeoutExecutor;
/** /**
* Construct a new UUID pipeline * Construct a new UUID pipeline
@ -77,7 +73,6 @@ public class UUIDPipeline {
this.executor = executor; this.executor = executor;
this.serviceList = Lists.newLinkedList(); this.serviceList = Lists.newLinkedList();
this.consumerList = Lists.newLinkedList(); this.consumerList = Lists.newLinkedList();
this.timeoutExecutor = Executors.newSingleThreadScheduledExecutor();
} }
/** /**
@ -207,10 +202,8 @@ public class UUIDPipeline {
* @param uuid UUID consumer * @param uuid UUID consumer
*/ */
public void getSingle(final @NonNull String username, final @NonNull BiConsumer<@Nullable UUID, @Nullable Throwable> uuid) { public void getSingle(final @NonNull String username, final @NonNull BiConsumer<@Nullable UUID, @Nullable Throwable> uuid) {
this.getUUIDs(Collections.singletonList(username)).applyToEither( this.getUUIDs(Collections.singletonList(username))
timeoutAfter(Settings.UUID.NON_BLOCKING_TIMEOUT), .orTimeout(Settings.UUID.NON_BLOCKING_TIMEOUT, TimeUnit.MILLISECONDS)
Function.identity()
)
.whenComplete((uuids, throwable) -> { .whenComplete((uuids, throwable) -> {
if (throwable != null) { if (throwable != null) {
uuid.accept(null, throwable); uuid.accept(null, throwable);
@ -231,10 +224,8 @@ public class UUIDPipeline {
* @param username Username consumer * @param username Username consumer
*/ */
public void getSingle(final @NonNull UUID uuid, final @NonNull BiConsumer<@Nullable String, @Nullable Throwable> username) { public void getSingle(final @NonNull UUID uuid, final @NonNull BiConsumer<@Nullable String, @Nullable Throwable> username) {
this.getNames(Collections.singletonList(uuid)).applyToEither( this.getNames(Collections.singletonList(uuid))
timeoutAfter(Settings.UUID.NON_BLOCKING_TIMEOUT), .orTimeout(Settings.UUID.NON_BLOCKING_TIMEOUT, TimeUnit.MILLISECONDS)
Function.identity()
)
.whenComplete((uuids, throwable) -> { .whenComplete((uuids, throwable) -> {
if (throwable != null) { if (throwable != null) {
username.accept(null, throwable); username.accept(null, throwable);
@ -262,7 +253,7 @@ public class UUIDPipeline {
final @NonNull Collection<@NonNull UUID> requests, final @NonNull Collection<@NonNull UUID> requests,
final long timeout final long timeout
) { ) {
return this.getNames(requests).applyToEither(timeoutAfter(timeout), Function.identity()); return this.getNames(requests).orTimeout(timeout, TimeUnit.MILLISECONDS);
} }
/** /**
@ -279,13 +270,7 @@ public class UUIDPipeline {
final @NonNull Collection<String> requests, final @NonNull Collection<String> requests,
final long timeout final long timeout
) { ) {
return this.getUUIDs(requests).applyToEither(timeoutAfter(timeout), Function.identity()); return this.getUUIDs(requests).orTimeout(timeout, TimeUnit.MILLISECONDS);
}
private @NonNull CompletableFuture<@NonNull List<@NonNull UUIDMapping>> timeoutAfter(final long timeout) {
final CompletableFuture<List<UUIDMapping>> result = new CompletableFuture<>();
this.timeoutExecutor.schedule(() -> result.completeExceptionally(new TimeoutException()), timeout, TimeUnit.MILLISECONDS);
return result;
} }
/** /**