[pulsar] branch branch-2.10 updated: [fix][broker] Fix test and checkstyle

[xiangying]

This is an automated email from the ASF dual-hosted git repository.

xiangying pushed a commit to branch branch-2.10
in repository https://gitbox.apache.org/repos/asf/pulsar.git


The following commit(s) were added to refs/heads/branch-2.10 by this push:
     new f8729c00535 [fix][broker] Fix test and checkstyle
f8729c00535 is described below

commit f8729c005357c8676fae2e4b35c118f2a39eb5ec
Author: xiangying <1984997...@qq.com>
AuthorDate: Tue Jul 11 15:05:25 2023 +0800

    [fix][broker] Fix test and checkstyle
---
 .../src/main/java/org/apache/pulsar/broker/service/BrokerService.java | 4 +---
 .../NonPersistentStickyKeyDispatcherMultipleConsumersTest.java        | 4 ++--
 .../main/java/org/apache/pulsar/client/impl/ConnectionHandler.java    | 2 +-
 3 files changed, 4 insertions(+), 6 deletions(-)

diff --git 
a/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/BrokerService.java
 
b/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/BrokerService.java
index 8376cffd446..cac70f6896e 100644
--- 
a/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/BrokerService.java
+++ 
b/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/BrokerService.java
@@ -72,7 +72,6 @@ import java.util.concurrent.locks.ReadWriteLock;
 import java.util.concurrent.locks.ReentrantReadWriteLock;
 import java.util.function.Consumer;
 import java.util.function.Predicate;
-import javax.ws.rs.core.Response;
 import lombok.AccessLevel;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
@@ -162,7 +161,6 @@ import org.apache.pulsar.common.stats.Metrics;
 import org.apache.pulsar.common.util.FieldParser;
 import org.apache.pulsar.common.util.FutureUtil;
 import org.apache.pulsar.common.util.RateLimiter;
-import org.apache.pulsar.common.util.RestException;
 import org.apache.pulsar.common.util.collections.ConcurrentOpenHashMap;
 import org.apache.pulsar.common.util.collections.ConcurrentOpenHashSet;
 import org.apache.pulsar.common.util.netty.ChannelFutures;
@@ -3104,7 +3102,7 @@ public class BrokerService implements Closeable {
                                         log.error("Failed to create persistent 
topic {}, "
                                                 + "exceed maximum number of 
topics in namespace", topicName);
                                         return FutureUtil.failedFuture(
-                                                new 
RestException(Response.Status.PRECONDITION_FAILED,
+                                                new NotAllowedException(
                                                         "Exceed maximum number 
of topics in namespace."));
                                     } else {
                                         return 
CompletableFuture.completedFuture(null);
diff --git 
a/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/nonpersistent/NonPersistentStickyKeyDispatcherMultipleConsumersTest.java
 
b/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/nonpersistent/NonPersistentStickyKeyDispatcherMultipleConsumersTest.java
index c3a858201dd..12e52b68744 100644
--- 
a/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/nonpersistent/NonPersistentStickyKeyDispatcherMultipleConsumersTest.java
+++ 
b/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/nonpersistent/NonPersistentStickyKeyDispatcherMultipleConsumersTest.java
@@ -104,9 +104,9 @@ public class 
NonPersistentStickyKeyDispatcherMultipleConsumersTest {
                             anyString(),
                             any(DispatchRateLimiter.Type.class)))
                     .thenReturn(false);
+            selector = new HashRangeAutoSplitStickyKeyConsumerSelector();
             nonpersistentDispatcher = new 
NonPersistentStickyKeyDispatcherMultipleConsumers(
-                    topicMock, subscriptionMock,
-                    new HashRangeAutoSplitStickyKeyConsumerSelector());
+                    topicMock, subscriptionMock, selector);
         }
     }
 
diff --git 
a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/ConnectionHandler.java
 
b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/ConnectionHandler.java
index 211e44a1fcd..32a1b0d8240 100644
--- 
a/pulsar-client/src/main/java/org/apache/pulsar/client/impl/ConnectionHandler.java
+++ 
b/pulsar-client/src/main/java/org/apache/pulsar/client/impl/ConnectionHandler.java
@@ -84,7 +84,7 @@ public class ConnectionHandler {
 
         try {
             state.client.getConnection(state.topic) //
-                    .thenAccept(cnx -> connection.connectionOpened(cnx)) //
+                    .thenCompose(cnx -> connection.connectionOpened(cnx)) //
                     .thenAccept(__ -> duringConnect.set(false))
                     .exceptionally(this::handleConnectionError);
         } catch (Throwable t) {