Fix cherry-pick issue.

apache · Jul 7, 2021 · 6ba062c · 6ba062c
1 parent 341ac71
commit 6ba062c
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 22 deletions.
diff --git a/pulsar-proxy/src/main/java/org/apache/pulsar/proxy/server/ProxyServiceStarter.java b/pulsar-proxy/src/main/java/org/apache/pulsar/proxy/server/ProxyServiceStarter.java
@@ -271,17 +271,10 @@ public static void addWebServerHandlers(WebServer server,
 
     private static ClusterData createClusterData(ProxyConfiguration config) {
         if (isNotBlank(config.getBrokerServiceURL()) || isNotBlank(config.getBrokerServiceURLTLS())) {
-            return ClusterData.builder()
-                    .serviceUrl(config.getBrokerWebServiceURL())
-                    .serviceUrlTls(config.getBrokerWebServiceURLTLS())
-                    .brokerServiceUrl(config.getBrokerServiceURL())
-                    .brokerServiceUrlTls(config.getBrokerServiceURLTLS())
-                    .build();
+            return new ClusterData(config.getBrokerWebServiceURL(), config.getBrokerWebServiceURLTLS(),
+                    config.getBrokerServiceURL(), config.getBrokerServiceURLTLS());
         } else if (isNotBlank(config.getBrokerWebServiceURL()) || isNotBlank(config.getBrokerWebServiceURLTLS())) {
-            return ClusterData.builder()
-                    .serviceUrl(config.getBrokerWebServiceURL())
-                    .serviceUrlTls(config.getBrokerWebServiceURLTLS())
-                    .build();
+            return new ClusterData(config.getBrokerWebServiceURL(), config.getBrokerWebServiceURLTLS());
         } else {
             return null;
         }

diff --git a/pulsar-proxy/src/test/java/org/apache/pulsar/proxy/server/ProxyServiceStarterTest.java b/pulsar-proxy/src/test/java/org/apache/pulsar/proxy/server/ProxyServiceStarterTest.java
@@ -71,18 +71,6 @@ protected void cleanup() throws Exception {
         serviceStarter.close();
     }
 
-    @Test
-    public void testEnableWebSocketServer() throws Exception {
-        HttpClient httpClient = new HttpClient();
-        WebSocketClient webSocketClient = new WebSocketClient(httpClient);
-        webSocketClient.start();
-        MyWebSocket myWebSocket = new MyWebSocket();
-        String webSocketUri = "ws://localhost:8080/ws/pingpong";
-        Future<Session> sessionFuture = webSocketClient.connect(myWebSocket, URI.create(webSocketUri));
-        sessionFuture.get().getRemote().sendPing(ByteBuffer.wrap("ping".getBytes()));
-        assertTrue(myWebSocket.getResponse().contains("ping"));
-    }
-
     @Test
     public void testProducer() throws Exception {
         @Cleanup