EpicKnarvik97/PlotSquared
EpicKnarvik97/PlotSquared
1
0
Fork 0
mirror of https://github.com/IntellectualSites/PlotSquared.git synced 2024-11-25 22:56:45 +01:00
Code Issues Projects Releases Wiki Activity

Don't loop services when all mappings have been found

Browse Source
This commit is contained in:
Alexander Söderberg 2020-05-17 18:02:26 +02:00
parent 95df62e59b
commit 49f51f24f7
No known key found for this signature in database
GPG Key ID: C0207FF7EA146678
1 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -140,12 +140,18 @@ public class UUIDPipeline {
*/ */
public CompletableFuture<Collection<UUIDMapping>> getNames( public CompletableFuture<Collection<UUIDMapping>> getNames(
@NotNull final Collection<UUID> requests) { @NotNull final Collection<UUID> requests) {
if (requests.isEmpty()) {
return CompletableFuture.completedFuture(Collections.emptyList());
}
final List<UUIDService> serviceList = this.getServiceListInstance(); final List<UUIDService> serviceList = this.getServiceListInstance();
return CompletableFuture.supplyAsync(() -> { return CompletableFuture.supplyAsync(() -> {
final List<UUIDMapping> mappings = new ArrayList<>(requests.size()); final List<UUIDMapping> mappings = new ArrayList<>(requests.size());
final List<UUID> remainingRequests = new ArrayList<>(requests); final List<UUID> remainingRequests = new ArrayList<>(requests);
for (final UUIDService service : serviceList) { for (final UUIDService service : serviceList) {
if (remainingRequests.isEmpty()) {
break;
}
final List<UUIDMapping> completedRequests = service.getNames(remainingRequests); final List<UUIDMapping> completedRequests = service.getNames(remainingRequests);
for (final UUIDMapping mapping : completedRequests) { for (final UUIDMapping mapping : completedRequests) {
remainingRequests.remove(mapping.getUuid()); remainingRequests.remove(mapping.getUuid());
@ -170,12 +176,18 @@ public class UUIDPipeline {
*/ */
public CompletableFuture<Collection<UUIDMapping>> getUUIDs( public CompletableFuture<Collection<UUIDMapping>> getUUIDs(
@NotNull final Collection<String> requests) { @NotNull final Collection<String> requests) {
if (requests.isEmpty()) {
return CompletableFuture.completedFuture(Collections.emptyList());
}
final List<UUIDService> serviceList = this.getServiceListInstance(); final List<UUIDService> serviceList = this.getServiceListInstance();
return CompletableFuture.supplyAsync(() -> { return CompletableFuture.supplyAsync(() -> {
final List<UUIDMapping> mappings = new ArrayList<>(requests.size()); final List<UUIDMapping> mappings = new ArrayList<>(requests.size());
final List<String> remainingRequests = new ArrayList<>(requests); final List<String> remainingRequests = new ArrayList<>(requests);
for (final UUIDService service : serviceList) { for (final UUIDService service : serviceList) {
if (remainingRequests.isEmpty()) {
break;
}
final List<UUIDMapping> completedRequests = service.getUUIDs(remainingRequests); final List<UUIDMapping> completedRequests = service.getUUIDs(remainingRequests);
for (final UUIDMapping mapping : completedRequests) { for (final UUIDMapping mapping : completedRequests) {
remainingRequests.remove(mapping.getUsername()); remainingRequests.remove(mapping.getUsername());