remove future to else block.

apache · May 13, 2022 · 68021a9 · 68021a9
1 parent de6454d
commit 68021a9
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/pulsar-broker-common/src/main/java/org/apache/pulsar/broker/resources/TenantResources.java b/pulsar-broker-common/src/main/java/org/apache/pulsar/broker/resources/TenantResources.java
@@ -117,13 +117,12 @@ public CompletableFuture<List<String>> getListOfNamespacesAsync(String tenant) {
                 .thenCompose(clusterOrNamespaces -> clusterOrNamespaces.stream().map(key ->
                         getChildrenAsync(joinPath(BASE_POLICIES_PATH, tenant, key))
                                 .thenCompose(children -> {
-                                    CompletableFuture<List<String>> ret = new CompletableFuture();
                                     if (children == null || children.isEmpty()) {
                                         String namespace = NamespaceName.get(tenant, key).toString();
                                         // if the length is 0 then this is probably a leftover cluster from namespace
                                         // created with the v1 admin format (prop/cluster/ns) and then deleted, so no
                                         // need to add it to the list
-                                        ret = getAsync(joinPath(BASE_POLICIES_PATH, namespace))
+                                        return getAsync(joinPath(BASE_POLICIES_PATH, namespace))
                                            .thenApply(opt -> opt.isPresent() ? Collections.singletonList(namespace)
                                                    : new ArrayList<String>())
                                            .exceptionally(ex -> {
@@ -135,10 +134,11 @@ public CompletableFuture<List<String>> getListOfNamespacesAsync(String tenant) {
                                                 throw FutureUtil.wrapToCompletionException(ex);
                                             });
                                     } else {
+                                        CompletableFuture<List<String>> ret = new CompletableFuture();
                                         ret.complete(children.stream().map(ns -> NamespaceName.get(tenant, key, ns)
                                                 .toString()).collect(Collectors.toList()));
+                                        return ret;
                                     }
-                                    return ret;
                                 })).reduce(CompletableFuture.completedFuture(new ArrayList<>()),
                                         (accumulator, n) -> accumulator.thenCompose(namespaces -> n.thenCompose(m -> {
                                             namespaces.addAll(m);