Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Issue #5828 - allow HttpClient to be used with JavaxWebSocketClientContainerProvider #5952

Merged

Conversation

lachlan-roberts
Copy link
Contributor

closes #5828

…ntainerProvider

Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
{
try
{
clientContainer.start();
container.start();
}
catch (Exception e)
{
throw new RuntimeException("Unable to start Client Container", e);
}
}
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can you replace this block with LifeCycle.start(container)?

@@ -50,31 +51,43 @@ public static void stop(WebSocketContainer container) throws Exception
* </p>
*/
@Override
protected WebSocketContainer getContainer()
public WebSocketContainer getContainer()
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why did you open it from protected to public?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Because with the new method we are setting the precedent that you can call these methods directly on the JavaxWebSocketClientContainer and not always go though the ServiceLoader using ContainerProvider.getWebSocketContainer().

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This break people that override this method -- they will have protected in their code that will appear to restrict accessibility. Not many will override it, but still.


// See: https://github.com/eclipse-ee4j/websocket-api/issues/212
private WebSocketContainer registerShutdown(JavaxWebSocketClientContainer container)
{
// Register as JVM runtime shutdown hook?
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can you remove the question mark at the end of this comment?

JavaxWebSocketClientContainer clientContainer = new JavaxWebSocketClientContainer();
registerShutdown(clientContainer);
return clientContainer;
}
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Don't duplicate this code... can you call getContainer(null) instead?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The implementations are slightly different, new JavaxWebSocketClientContainer() will set the name of the HttpClient but new JavaxWebSocketClientContainer(null) won't do this.

But I don't think we should be doing this because it is done by the HttpClientProvider.

Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
…lientContainer

Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
Copy link
Contributor

@sbordet sbordet left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM apart the small nibble of opening a protected method.
You can restore it back to protected or leave it public and accept the risk 😃

@@ -50,31 +51,43 @@ public static void stop(WebSocketContainer container) throws Exception
* </p>
*/
@Override
protected WebSocketContainer getContainer()
public WebSocketContainer getContainer()
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This break people that override this method -- they will have protected in their code that will appear to restrict accessibility. Not many will override it, but still.

…ected.

Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
@lachlan-roberts lachlan-roberts merged commit 4d67b30 into jetty-10.0.x Feb 21, 2021
@lachlan-roberts lachlan-roberts deleted the jetty-10.0.x-5828-JavaxWebSocketHttpClient branch February 21, 2021 22:41
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Allow to create a WebSocketContainer passing HttpClient
2 participants