Eclipse
/
jetty.project
mirror of https://github.com/jetty/jetty.project.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merged branch 'jetty-11.0.x' into 'jetty-12.0.x'. 

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
This commit is contained in:
Simone Bordet 2023-09-28 11:41:34 +02:00
parent d53e69b822 f58e82e45c
commit 5be34089ef
No known key found for this signature in database
GPG Key ID: 1677D141BCF3584D
4 changed files with 49 additions and 95 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
jetty-core/jetty-websocket/jetty-websocket-core-client/src/main/java/org/eclipse/jetty/websocket/core/client/WebSocketCoreClient.java
View File

@ -36,7 +36,7 @@ public class WebSocketCoreClient extends ContainerLifeCycle
public static final String WEBSOCKET_CORECLIENT_ATTRIBUTE = WebSocketCoreClient.class.getName();
private static final Logger LOG = LoggerFactory.getLogger(WebSocketCoreClient.class);
private final HttpClient httpClient;
private final HttpClient client;
private final WebSocketComponents components;
private ClassLoader classLoader;
@ -52,16 +52,25 @@ public class WebSocketCoreClient extends ContainerLifeCycle
public WebSocketCoreClient(HttpClient httpClient, WebSocketComponents webSocketComponents)
{
if (httpClient == null)
httpClient = Objects.requireNonNull(HttpClientProvider.get());
if (httpClient.getExecutor() == null)
httpClient.setExecutor(webSocketComponents.getExecutor());
this.classLoader = Thread.currentThread().getContextClassLoader();
this.httpClient = httpClient;
this.components = webSocketComponents;
addBean(httpClient);
addBean(webSocketComponents);
client = Objects.requireNonNullElse(httpClient, HttpClientProvider.get());
addBean(client);
if (webSocketComponents == null)
{
if (client.isStarted())
webSocketComponents = new WebSocketComponents(null, null, client.getByteBufferPool(), null, null, client.getExecutor());
else
webSocketComponents = new WebSocketComponents();
}
components = webSocketComponents;
addBean(components);
if (!client.isStarted())
{
if (client.getByteBufferPool() == null)
client.setByteBufferPool(components.getByteBufferPool());
if (client.getExecutor() == null)
client.setExecutor(components.getExecutor());
}
classLoader = Thread.currentThread().getContextClassLoader();
}
public ClassLoader getClassLoader()
@ -112,7 +121,7 @@ public class WebSocketCoreClient extends ContainerLifeCycle
public HttpClient getHttpClient()
{
return httpClient;
return client;
}
public DecoratedObjectFactory getObjectFactory()

51
jetty-core/jetty-websocket/jetty-websocket-jetty-client/src/main/java/org/eclipse/jetty/websocket/client/WebSocketClient.java
View File

@ -45,7 +45,6 @@ import org.eclipse.jetty.websocket.common.JettyWebSocketFrameHandlerFactory;
import org.eclipse.jetty.websocket.common.SessionTracker;
import org.eclipse.jetty.websocket.core.Configuration;
import org.eclipse.jetty.websocket.core.CoreSession;
import org.eclipse.jetty.websocket.core.WebSocketComponents;
import org.eclipse.jetty.websocket.core.client.UpgradeListener;
import org.eclipse.jetty.websocket.core.client.WebSocketCoreClient;
import org.slf4j.Logger;
@ -60,12 +59,11 @@ public class WebSocketClient extends ContainerLifeCycle implements Configurable,
private final List<WebSocketSessionListener> sessionListeners = new CopyOnWriteArrayList<>();
private final SessionTracker sessionTracker = new SessionTracker();
private final Configuration.ConfigurationCustomizer configurationCustomizer = new Configuration.ConfigurationCustomizer();
private final WebSocketComponents components;
private boolean stopAtShutdown = false;
private long _stopTimeout = Long.MAX_VALUE;
/**
* Instantiate a WebSocketClient with defaults
* Instantiates a WebSocketClient with a default {@link HttpClient}.
*/
public WebSocketClient()
{
@ -73,48 +71,15 @@ public class WebSocketClient extends ContainerLifeCycle implements Configurable,
}
/**
* <p>
* Instantiate a WebSocketClient.
* </p>
* <p>Instantiates a WebSocketClient with the given {@link HttpClient}.</p>
*
* <p>
* HTTP behaviors of the WebSocket upgrade are taken from the HttpClient configuration.
* </p>
*
* @param httpClient the HttpClient to base internal defaults off of
* @param httpClient the HttpClient to use
*/
public WebSocketClient(HttpClient httpClient)
{
this (httpClient,
new WebSocketComponents(
null,
null,
httpClient != null ? httpClient.getByteBufferPool() : null,
null,
null,
httpClient != null ? httpClient.getExecutor() : null)
);
}
/**
* <p>
* Instantiate a WebSocketClient.
* </p>
*
* <p>
* HTTP behaviors of the WebSocket upgrade are taken from the {@link HttpClient} configuration.
* WebSocket behaviors are taken from the {@link WebSocketComponents} configuration.
* </p>
*
* @param httpClient the HttpClient to use for the HTTP behaviors of WebSocket upgrade
* @param webSocketComponents the WebSocketComponents to use for WebSocket behaviors
*/
public WebSocketClient(HttpClient httpClient, WebSocketComponents webSocketComponents)
{
components = webSocketComponents;
coreClient = new WebSocketCoreClient(httpClient, components);
coreClient = new WebSocketCoreClient(httpClient, null);
addManaged(coreClient);
frameHandlerFactory = new JettyWebSocketFrameHandlerFactory(this, components);
frameHandlerFactory = new JettyWebSocketFrameHandlerFactory(this, coreClient.getWebSocketComponents());
sessionListeners.add(sessionTracker);
addBean(sessionTracker);
}
@ -362,7 +327,7 @@ public class WebSocketClient extends ContainerLifeCycle implements Configurable,
@Override
public Executor getExecutor()
{
return components.getExecutor();
return getHttpClient().getExecutor();
}
public HttpClient getHttpClient()
@ -372,7 +337,7 @@ public class WebSocketClient extends ContainerLifeCycle implements Configurable,
public DecoratedObjectFactory getObjectFactory()
{
return components.getObjectFactory();
return coreClient.getObjectFactory();
}
public Collection<Session> getOpenSessions()
@ -391,6 +356,7 @@ public class WebSocketClient extends ContainerLifeCycle implements Configurable,
/**
* Set JVM shutdown behavior.
*
* @param stop If true, this client instance will be explicitly stopped when the
* JVM is shutdown. Otherwise the application is responsible for maintaining the WebSocketClient lifecycle.
* @see Runtime#addShutdownHook(Thread)
@ -411,6 +377,7 @@ public class WebSocketClient extends ContainerLifeCycle implements Configurable,
/**
* The timeout to allow all remaining open Sessions to be closed gracefully using the close code {@link org.eclipse.jetty.websocket.api.StatusCode#SHUTDOWN}.
*
* @param stopTimeout the time in ms to wait for the graceful close, use a value less than or equal to 0 to not gracefully close.
*/
public void setStopTimeout(long stopTimeout)

56
jetty-core/jetty-websocket/jetty-websocket-jetty-tests/src/test/java/org/eclipse/jetty/websocket/tests/client/WebSocketClientTest.java
View File

@ -42,7 +42,6 @@ import org.eclipse.jetty.websocket.api.UpgradeRequest;
import org.eclipse.jetty.websocket.api.util.WSURI;
import org.eclipse.jetty.websocket.client.ClientUpgradeRequest;
import org.eclipse.jetty.websocket.client.WebSocketClient;
import org.eclipse.jetty.websocket.core.WebSocketComponents;
import org.eclipse.jetty.websocket.server.WebSocketUpgradeHandler;
import org.eclipse.jetty.websocket.tests.AnnoMaxMessageEndpoint;
import org.eclipse.jetty.websocket.tests.CloseTrackingEndpoint;
@ -54,6 +53,8 @@ import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.params.ParameterizedTest;
import org.junit.jupiter.params.provider.ValueSource;
import static org.hamcrest.MatcherAssert.assertThat;
import static org.hamcrest.Matchers.containsString;
@ -62,6 +63,7 @@ import static org.hamcrest.Matchers.is;
import static org.hamcrest.Matchers.not;
import static org.hamcrest.Matchers.notNullValue;
import static org.hamcrest.Matchers.nullValue;
import static org.junit.jupiter.api.Assertions.assertNotNull;
import static org.junit.jupiter.api.Assertions.assertSame;
import static org.junit.jupiter.api.Assertions.assertThrows;
@ -120,49 +122,23 @@ public class WebSocketClientTest
server.stop();
}
@Test
public void testCustomizeExecutorDirectly() throws Exception
@ParameterizedTest
@ValueSource(booleans = {false, true})
public void testCustomizeExecutorDirectly(boolean startHttpClient) throws Exception
{
Executor executor = Executors.newFixedThreadPool(50);
HttpClient httpClient = new HttpClient();
httpClient.setExecutor(executor);
try
{
httpClient.start();
if (startHttpClient)
httpClient.start();
WebSocketClient webSocketClient = new WebSocketClient(httpClient);
try
{
webSocketClient.start();
Executor inuseExecutor = webSocketClient.getExecutor();
assertSame(executor, inuseExecutor);
}
finally
{
webSocketClient.stop();
}
}
finally
{
httpClient.stop();
}
}
@Test
public void testCustomizeWebSocketComponentsExecutor() throws Exception
{
HttpClient httpClient = new HttpClient();
try
{
httpClient.start();
Executor executor = Executors.newFixedThreadPool(50);
WebSocketComponents webSocketComponents = new WebSocketComponents(null, null,
null, null, null, executor);
WebSocketClient webSocketClient = new WebSocketClient(httpClient, webSocketComponents);
try
{
webSocketClient.start();
Executor inuseExecutor = webSocketClient.getExecutor();
assertSame(executor, inuseExecutor);
Executor wsExecutor = webSocketClient.getExecutor();
assertSame(executor, wsExecutor);
}
finally
{
@ -333,6 +309,7 @@ public class WebSocketClientTest
assertThat("Message", received, containsString("Hello World"));
ByteBuffer bufReceived = cliSock.binaryMessageQueue.poll(5, TimeUnit.SECONDS);
assertNotNull(bufReceived);
received = BufferUtil.toUTF8String(bufReceived.slice());
assertThat("Message", received, containsString(parts[0] + parts[1] + parts[2]));
}
@ -407,7 +384,7 @@ public class WebSocketClientTest
request.setSubProtocols("echo");
Future<Session> future = client.connect(cliSock, wsUri, request);
try (Session sess = future.get(5, TimeUnit.SECONDS))
try (Session ignored = future.get(5, TimeUnit.SECONDS))
{
Assertions.assertTrue(cliSock.connectLatch.await(1, TimeUnit.SECONDS));
@ -428,7 +405,7 @@ public class WebSocketClientTest
}
/**
* Ensure that <code>@WebSocket(maxTextMessageSize = 100*1024)</code> behaves as expected.
* Ensure that {@code @WebSocket(maxTextMessageSize = 100*1024)} behaves as expected.
*
* @throws Exception on test failure
*/
@ -459,6 +436,7 @@ public class WebSocketClientTest
// wait for message from server
String received = cliSock.messageQueue.poll(5, TimeUnit.SECONDS);
assertNotNull(received);
assertThat("Message", received.length(), is(size));
}
}
@ -483,9 +461,9 @@ public class WebSocketClientTest
Map<String, List<String>> parameterMap = req.getParameterMap();
assertThat("Parameter Map", parameterMap, notNullValue());
assertThat("Parameter[snack]", parameterMap.get("snack"), is(Arrays.asList(new String[]{"cashews"})));
assertThat("Parameter[amount]", parameterMap.get("amount"), is(Arrays.asList(new String[]{"handful"})));
assertThat("Parameter[brand]", parameterMap.get("brand"), is(Arrays.asList(new String[]{"off"})));
assertThat("Parameter[snack]", parameterMap.get("snack"), is(List.of("cashews")));
assertThat("Parameter[amount]", parameterMap.get("amount"), is(List.of("handful")));
assertThat("Parameter[brand]", parameterMap.get("brand"), is(List.of("off")));
assertThat("Parameter[cost]", parameterMap.get("cost"), nullValue());

4
pom.xml
View File

@ -46,7 +46,7 @@
<build-support.version>1.5</build-support.version>
<checkstyle.version>10.6.0</checkstyle.version>
<commons-codec.version>1.16.0</commons-codec.version>
<commons-compress.version>1.23.0</commons-compress.version>
<commons.compress.version>1.24.0</commons.compress.version>
<commons.io.version>2.13.0</commons.io.version>
<commons-lang3.version>3.13.0</commons-lang3.version>
<conscrypt.version>2.5.2</conscrypt.version>
@ -1010,7 +1010,7 @@
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-compress</artifactId>
<version>${commons-compress.version}</version>
<version>${commons.compress.version}</version>
</dependency>
<dependency>
<groupId>org.apache.avro</groupId>