Issue #5044 - rename the ClientUpgradeRequest to CoreClientUpgradeReq…

…uest Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
jetty · Jul 30, 2020 · 9027e17 · 9027e17
1 parent 414a0f3
commit 9027e17
Show file tree

Hide file tree

Showing 16 changed files with 62 additions and 63 deletions.
diff --git a/...ket/core/client/ClientUpgradeRequest.java → ...core/client/CoreClientUpgradeRequest.java b/...ket/core/client/ClientUpgradeRequest.java → ...core/client/CoreClientUpgradeRequest.java
@@ -61,11 +61,11 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-public abstract class ClientUpgradeRequest extends HttpRequest implements Response.CompleteListener, HttpUpgrader.Factory
+public abstract class CoreClientUpgradeRequest extends HttpRequest implements Response.CompleteListener, HttpUpgrader.Factory
 {
-    public static ClientUpgradeRequest from(WebSocketCoreClient webSocketClient, URI requestURI, FrameHandler frameHandler)
+    public static CoreClientUpgradeRequest from(WebSocketCoreClient webSocketClient, URI requestURI, FrameHandler frameHandler)
     {
-        return new ClientUpgradeRequest(webSocketClient, requestURI)
+        return new CoreClientUpgradeRequest(webSocketClient, requestURI)
         {
             @Override
             public FrameHandler getFrameHandler()
@@ -75,15 +75,15 @@ public FrameHandler getFrameHandler()
         };
     }
 
-    private static final Logger LOG = LoggerFactory.getLogger(ClientUpgradeRequest.class);
+    private static final Logger LOG = LoggerFactory.getLogger(CoreClientUpgradeRequest.class);
     protected final CompletableFuture<CoreSession> futureCoreSession;
     private final WebSocketCoreClient wsClient;
     private FrameHandler frameHandler;
     private final Configuration.ConfigurationCustomizer customizer = new Configuration.ConfigurationCustomizer();
     private final List<UpgradeListener> upgradeListeners = new ArrayList<>();
     private List<ExtensionConfig> requestedExtensions = new ArrayList<>();
 
-    public ClientUpgradeRequest(WebSocketCoreClient webSocketClient, URI requestURI)
+    public CoreClientUpgradeRequest(WebSocketCoreClient webSocketClient, URI requestURI)
     {
         super(webSocketClient.getHttpClient(), new HttpConversation(), requestURI);
 

diff --git a/...re-client/src/main/java/org/eclipse/jetty/websocket/core/client/HttpUpgraderOverHTTP.java b/...re-client/src/main/java/org/eclipse/jetty/websocket/core/client/HttpUpgraderOverHTTP.java
@@ -43,9 +43,9 @@ public class HttpUpgraderOverHTTP implements HttpUpgrader
     private static final PreEncodedHttpField WS_CONNECTION_FIELD = new PreEncodedHttpField(HttpHeader.CONNECTION, "Upgrade");
     private static final PreEncodedHttpField PRAGMA_NO_CACHE_FIELD = new PreEncodedHttpField(HttpHeader.PRAGMA, "no-cache");
     private static final PreEncodedHttpField CACHE_CONTROL_NO_CACHE_FIELD = new PreEncodedHttpField(HttpHeader.CACHE_CONTROL, "no-cache");
-    private final ClientUpgradeRequest clientUpgradeRequest;
+    private final CoreClientUpgradeRequest clientUpgradeRequest;
 
-    public HttpUpgraderOverHTTP(ClientUpgradeRequest clientUpgradeRequest)
+    public HttpUpgraderOverHTTP(CoreClientUpgradeRequest clientUpgradeRequest)
     {
         this.clientUpgradeRequest = clientUpgradeRequest;
     }

diff --git a/...e-client/src/main/java/org/eclipse/jetty/websocket/core/client/HttpUpgraderOverHTTP2.java b/...e-client/src/main/java/org/eclipse/jetty/websocket/core/client/HttpUpgraderOverHTTP2.java
@@ -31,9 +31,9 @@
 public class HttpUpgraderOverHTTP2 implements HttpUpgrader
 {
     private static final PreEncodedHttpField WS_VERSION_FIELD = new PreEncodedHttpField(HttpHeader.SEC_WEBSOCKET_VERSION, WebSocketConstants.SPEC_VERSION_STRING);
-    private final ClientUpgradeRequest clientUpgradeRequest;
+    private final CoreClientUpgradeRequest clientUpgradeRequest;
 
-    public HttpUpgraderOverHTTP2(ClientUpgradeRequest clientUpgradeRequest)
+    public HttpUpgraderOverHTTP2(CoreClientUpgradeRequest clientUpgradeRequest)
     {
         this.clientUpgradeRequest = clientUpgradeRequest;
     }

diff --git a/...ore-client/src/main/java/org/eclipse/jetty/websocket/core/client/WebSocketCoreClient.java b/...ore-client/src/main/java/org/eclipse/jetty/websocket/core/client/WebSocketCoreClient.java
@@ -71,11 +71,11 @@ public WebSocketCoreClient(HttpClient httpClient, WebSocketComponents webSocketC
 
     public CompletableFuture<CoreSession> connect(FrameHandler frameHandler, URI wsUri) throws IOException
     {
-        ClientUpgradeRequest request = ClientUpgradeRequest.from(this, wsUri, frameHandler);
+        CoreClientUpgradeRequest request = CoreClientUpgradeRequest.from(this, wsUri, frameHandler);
         return connect(request);
     }
 
-    public CompletableFuture<CoreSession> connect(ClientUpgradeRequest request) throws IOException
+    public CompletableFuture<CoreSession> connect(CoreClientUpgradeRequest request) throws IOException
     {
         if (!isStarted())
             throw new IllegalStateException(WebSocketCoreClient.class.getSimpleName() + "@" + this.hashCode() + " is not started");

diff --git a/...websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/AutoFragmentTest.java b/...websocket-core-tests/src/test/java/org/eclipse/jetty/websocket/core/AutoFragmentTest.java
@@ -29,7 +29,7 @@
 
 import org.eclipse.jetty.util.BufferUtil;
 import org.eclipse.jetty.util.Callback;
-import org.eclipse.jetty.websocket.core.client.ClientUpgradeRequest;
+import org.eclipse.jetty.websocket.core.client.CoreClientUpgradeRequest;
 import org.eclipse.jetty.websocket.core.client.WebSocketCoreClient;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
@@ -165,7 +165,7 @@ public void testIncomingAutoFragmentToMaxFrameSize() throws Exception
     public void testIncomingAutoFragmentWithPermessageDeflate() throws Exception
     {
         TestFrameHandler clientHandler = new TestFrameHandler();
-        ClientUpgradeRequest upgradeRequest = ClientUpgradeRequest.from(client, serverUri, clientHandler);
+        CoreClientUpgradeRequest upgradeRequest = CoreClientUpgradeRequest.from(client, serverUri, clientHandler);
         upgradeRequest.addExtensions("permessage-deflate");
         CompletableFuture<CoreSession> connect = client.connect(upgradeRequest);
         connect.get(5, TimeUnit.SECONDS);
@@ -218,7 +218,7 @@ public void testIncomingAutoFragmentWithPermessageDeflate() throws Exception
     public void testGzipBomb() throws Exception
     {
         TestFrameHandler clientHandler = new TestFrameHandler();
-        ClientUpgradeRequest upgradeRequest = ClientUpgradeRequest.from(client, serverUri, clientHandler);
+        CoreClientUpgradeRequest upgradeRequest = CoreClientUpgradeRequest.from(client, serverUri, clientHandler);
         upgradeRequest.addExtensions("permessage-deflate");
         CompletableFuture<CoreSession> connect = client.connect(upgradeRequest);
         connect.get(5, TimeUnit.SECONDS);
@@ -281,7 +281,7 @@ public void testOutgoingAutoFragmentWithPermessageDeflate() throws Exception
 
         // Connect to server with permessage-deflate enabled.
         TestFrameHandler clientHandler = new TestFrameHandler();
-        ClientUpgradeRequest upgradeRequest = ClientUpgradeRequest.from(client, serverUri, clientHandler);
+        CoreClientUpgradeRequest upgradeRequest = CoreClientUpgradeRequest.from(client, serverUri, clientHandler);
         upgradeRequest.addExtensions("permessage-deflate");
         CompletableFuture<CoreSession> connect = client.connect(upgradeRequest);
         connect.get(5, TimeUnit.SECONDS);

diff --git a/...t-core-tests/src/test/java/org/eclipse/jetty/websocket/core/WebSocketNegotiationTest.java b/...t-core-tests/src/test/java/org/eclipse/jetty/websocket/core/WebSocketNegotiationTest.java
@@ -37,7 +37,7 @@
 import org.eclipse.jetty.server.HttpChannel;
 import org.eclipse.jetty.util.Callback;
 import org.eclipse.jetty.util.StringUtil;
-import org.eclipse.jetty.websocket.core.client.ClientUpgradeRequest;
+import org.eclipse.jetty.websocket.core.client.CoreClientUpgradeRequest;
 import org.eclipse.jetty.websocket.core.client.UpgradeListener;
 import org.eclipse.jetty.websocket.core.client.WebSocketCoreClient;
 import org.eclipse.jetty.websocket.core.exception.UpgradeException;
@@ -146,7 +146,7 @@ public void testExtensionSelection() throws Exception
     {
         TestFrameHandler clientHandler = new TestFrameHandler();
 
-        ClientUpgradeRequest upgradeRequest = ClientUpgradeRequest.from(client, server.getUri(), clientHandler);
+        CoreClientUpgradeRequest upgradeRequest = CoreClientUpgradeRequest.from(client, server.getUri(), clientHandler);
         upgradeRequest.setSubProtocols("testExtensionSelection");
         upgradeRequest.addExtensions("permessage-deflate;server_no_context_takeover", "permessage-deflate;client_no_context_takeover");
 
@@ -177,7 +177,7 @@ public void testNotOfferedParameter() throws Exception
     {
         TestFrameHandler clientHandler = new TestFrameHandler();
 
-        ClientUpgradeRequest upgradeRequest = ClientUpgradeRequest.from(client, server.getUri(), clientHandler);
+        CoreClientUpgradeRequest upgradeRequest = CoreClientUpgradeRequest.from(client, server.getUri(), clientHandler);
         upgradeRequest.setSubProtocols("testNotOfferedParameter");
         upgradeRequest.addExtensions("permessage-deflate;client_no_context_takeover");
 
@@ -207,7 +207,7 @@ public void testInvalidExtensionParameter() throws Exception
     {
         TestFrameHandler clientHandler = new TestFrameHandler();
 
-        ClientUpgradeRequest upgradeRequest = ClientUpgradeRequest.from(client, server.getUri(), clientHandler);
+        CoreClientUpgradeRequest upgradeRequest = CoreClientUpgradeRequest.from(client, server.getUri(), clientHandler);
         upgradeRequest.setSubProtocols("testInvalidExtensionParameter");
         upgradeRequest.addExtensions("permessage-deflate;invalid_parameter");
 
@@ -223,7 +223,7 @@ public void testNotAcceptingExtensions() throws Exception
     {
         TestFrameHandler clientHandler = new TestFrameHandler();
 
-        ClientUpgradeRequest upgradeRequest = ClientUpgradeRequest.from(client, server.getUri(), clientHandler);
+        CoreClientUpgradeRequest upgradeRequest = CoreClientUpgradeRequest.from(client, server.getUri(), clientHandler);
         upgradeRequest.setSubProtocols("testNotAcceptingExtensions");
         upgradeRequest.addExtensions("permessage-deflate;server_no_context_takeover", "permessage-deflate;client_no_context_takeover");
 
@@ -271,7 +271,7 @@ public void testAcceptTwoExtensionsOfSameName() throws Exception
     {
         TestFrameHandler clientHandler = new TestFrameHandler();
 
-        ClientUpgradeRequest upgradeRequest = ClientUpgradeRequest.from(client, server.getUri(), clientHandler);
+        CoreClientUpgradeRequest upgradeRequest = CoreClientUpgradeRequest.from(client, server.getUri(), clientHandler);
         upgradeRequest.setSubProtocols("testAcceptTwoExtensionsOfSameName");
         upgradeRequest.addExtensions("permessage-deflate;server_no_context_takeover", "permessage-deflate;client_no_context_takeover");
 
@@ -302,7 +302,7 @@ public void testSubProtocolNotOffered() throws Exception
     {
         TestFrameHandler clientHandler = new TestFrameHandler();
 
-        ClientUpgradeRequest upgradeRequest = ClientUpgradeRequest.from(client, server.getUri(), clientHandler);
+        CoreClientUpgradeRequest upgradeRequest = CoreClientUpgradeRequest.from(client, server.getUri(), clientHandler);
 
         try (StacklessLogging stacklessLogging = new StacklessLogging(HttpChannel.class))
         {
@@ -317,7 +317,7 @@ public void testSubProtocolNotOffered() throws Exception
     public void testNoSubProtocolSelected() throws Exception
     {
         TestFrameHandler clientHandler = new TestFrameHandler();
-        ClientUpgradeRequest upgradeRequest = ClientUpgradeRequest.from(client, server.getUri(), clientHandler);
+        CoreClientUpgradeRequest upgradeRequest = CoreClientUpgradeRequest.from(client, server.getUri(), clientHandler);
         upgradeRequest.setSubProtocols("testNoSubProtocolSelected");
         CompletableFuture<HttpFields> headers = new CompletableFuture<>();
         upgradeRequest.addListener(new UpgradeListener()
@@ -378,7 +378,7 @@ public void testListenerExtensionSelection() throws Exception
     {
         TestFrameHandler clientHandler = new TestFrameHandler();
 
-        ClientUpgradeRequest upgradeRequest = ClientUpgradeRequest.from(client, server.getUri(), clientHandler);
+        CoreClientUpgradeRequest upgradeRequest = CoreClientUpgradeRequest.from(client, server.getUri(), clientHandler);
         upgradeRequest.setSubProtocols("test");
 
         CompletableFuture<String> extensionHeader = new CompletableFuture<>();
@@ -409,7 +409,7 @@ public void onHandshakeResponse(HttpRequest request, HttpResponse response)
     public void testListenerExtensionSelectionError() throws Exception
     {
         TestFrameHandler clientHandler = new TestFrameHandler();
-        ClientUpgradeRequest upgradeRequest = ClientUpgradeRequest.from(client, server.getUri(), clientHandler);
+        CoreClientUpgradeRequest upgradeRequest = CoreClientUpgradeRequest.from(client, server.getUri(), clientHandler);
         upgradeRequest.setSubProtocols("test");
         upgradeRequest.addExtensions("permessage-deflate;server_no_context_takeover");
 
@@ -467,7 +467,7 @@ public void testClientRequestedInternalExtensions(String reqExts, String negExts
 
         TestFrameHandler clientHandler = new TestFrameHandler();
         CompletableFuture<String> extensionHeader = new CompletableFuture<>();
-        ClientUpgradeRequest upgradeRequest = ClientUpgradeRequest.from(client, server.getUri(), clientHandler);
+        CoreClientUpgradeRequest upgradeRequest = CoreClientUpgradeRequest.from(client, server.getUri(), clientHandler);
         upgradeRequest.setSubProtocols("test");
         if (!StringUtil.isEmpty(reqExts))
             upgradeRequest.addExtensions(reqExts.split(","));

diff --git a/...t-core-tests/src/test/java/org/eclipse/jetty/websocket/core/chat/ChatWebSocketClient.java b/...t-core-tests/src/test/java/org/eclipse/jetty/websocket/core/chat/ChatWebSocketClient.java
@@ -29,7 +29,7 @@
 
 import org.eclipse.jetty.util.Callback;
 import org.eclipse.jetty.websocket.core.MessageHandler;
-import org.eclipse.jetty.websocket.core.client.ClientUpgradeRequest;
+import org.eclipse.jetty.websocket.core.client.CoreClientUpgradeRequest;
 import org.eclipse.jetty.websocket.core.client.WebSocketCoreClient;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -51,7 +51,7 @@ public ChatWebSocketClient(String hostname, int port) throws Exception
 
         URI wsUri = baseWebsocketUri.resolve("/chat");
         handler = MessageHandler.from(this::onText, null);
-        ClientUpgradeRequest request = ClientUpgradeRequest.from(client, wsUri, handler);
+        CoreClientUpgradeRequest request = CoreClientUpgradeRequest.from(client, wsUri, handler);
         request.setSubProtocols("chat");
         client.connect(request).get(5, TimeUnit.SECONDS);
         handler.sendText("[" + name + ": has joined the room]", Callback.NOOP, false);

diff --git a/...st/java/org/eclipse/jetty/websocket/core/extensions/PerMessageDeflaterBufferSizeTest.java b/...st/java/org/eclipse/jetty/websocket/core/extensions/PerMessageDeflaterBufferSizeTest.java
@@ -34,7 +34,7 @@
 import org.eclipse.jetty.websocket.core.FrameHandler;
 import org.eclipse.jetty.websocket.core.TestFrameHandler;
 import org.eclipse.jetty.websocket.core.WebSocketServer;
-import org.eclipse.jetty.websocket.core.client.ClientUpgradeRequest;
+import org.eclipse.jetty.websocket.core.client.CoreClientUpgradeRequest;
 import org.eclipse.jetty.websocket.core.client.UpgradeListener;
 import org.eclipse.jetty.websocket.core.client.WebSocketCoreClient;
 import org.eclipse.jetty.websocket.core.server.Negotiation;
@@ -103,7 +103,7 @@ public void testClientDeflateBufferSize() throws Exception
     {
         int deflateBufferSize = 6;
         TestFrameHandler clientHandler = new TestFrameHandler();
-        ClientUpgradeRequest upgradeRequest = ClientUpgradeRequest.from(client, serverUri, clientHandler);
+        CoreClientUpgradeRequest upgradeRequest = CoreClientUpgradeRequest.from(client, serverUri, clientHandler);
         upgradeRequest.addExtensions("permessage-deflate; @deflate_buffer_size=" + deflateBufferSize);
 
         CompletableFuture<HttpFields> futureRequestHeaders = new CompletableFuture<>();
@@ -157,7 +157,7 @@ public void testClientInflateBufferSize() throws Exception
     {
         int inflateBufferSize = 6;
         TestFrameHandler clientHandler = new TestFrameHandler();
-        ClientUpgradeRequest upgradeRequest = ClientUpgradeRequest.from(client, serverUri, clientHandler);
+        CoreClientUpgradeRequest upgradeRequest = CoreClientUpgradeRequest.from(client, serverUri, clientHandler);
         upgradeRequest.addExtensions("permessage-deflate; @inflate_buffer_size=" + inflateBufferSize);
 
         CompletableFuture<HttpFields> futureRequestHeaders = new CompletableFuture<>();
@@ -212,7 +212,7 @@ public void testServerDeflateBufferSize() throws Exception
     {
         testNegotiator.deflateBufferSize = 6;
         TestFrameHandler clientHandler = new TestFrameHandler();
-        ClientUpgradeRequest upgradeRequest = ClientUpgradeRequest.from(client, serverUri, clientHandler);
+        CoreClientUpgradeRequest upgradeRequest = CoreClientUpgradeRequest.from(client, serverUri, clientHandler);
         upgradeRequest.addExtensions("permessage-deflate");
 
         CompletableFuture<HttpFields> futureResponseHeaders = new CompletableFuture<>();
@@ -267,7 +267,7 @@ public void testServerInflateBufferSize() throws Exception
     {
         testNegotiator.inflateBufferSize = 6;
         TestFrameHandler clientHandler = new TestFrameHandler();
-        ClientUpgradeRequest upgradeRequest = ClientUpgradeRequest.from(client, serverUri, clientHandler);
+        CoreClientUpgradeRequest upgradeRequest = CoreClientUpgradeRequest.from(client, serverUri, clientHandler);
         upgradeRequest.addExtensions("permessage-deflate");
 
         CompletableFuture<HttpFields> futureResponseHeaders = new CompletableFuture<>();