#19 Use collectMap instead of collectList in collectCountResults

turms-im · Oct 28, 2019 · 3c56241 · 3c56241
1 parent 57ffbc3
commit 3c56241
Showing 1 changed file with 4 additions and 8 deletions.
diff --git a/src/main/java/im/turms/turms/access/web/util/ResponseFactory.java b/src/main/java/im/turms/turms/access/web/util/ResponseFactory.java
@@ -30,6 +30,7 @@
 
 import javax.validation.constraints.NotNull;
 import java.util.*;
+import java.util.function.Function;
 
 import static im.turms.turms.common.Constants.*;
 
@@ -243,14 +244,9 @@ public static ResponseEntity authenticated(Boolean data) {
 
     public static <T> Mono<ResponseEntity> collectCountResults(List<Mono<Pair<String, T>>> counts) {
         Mono<Map<String, T>> resultMono = Flux.merge(counts)
-                .collectList()
-                .map(pairs -> {
-                    Map<String, T> resultMap = new HashMap<>(counts.size());
-                    for (Pair<String, T> pair : pairs) {
-                        resultMap.put(pair.getLeft(), pair.getRight());
-                    }
-                    return resultMap;
-                });
+                .collectMap(
+                        (Function<? super Pair<String, T>, String>) Pair::getLeft,
+                        (Function<? super Pair<String, T>, T>) Pair::getRight);
         return okWhenTruthy(resultMono);
     }
 }