Issue #3730 - Cleaning up Scopes in WebSocketClient #4423
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
+ Introducing HttpContainerScope to track HttpClient specific ByteBufferPool, SslContextFactory, and Executor. + New private WebSocketClient constructor that use HttpContainerScope + Deprecated many constructors as irrelevant now that HttpClient is an option to create a WebSocketClient. Signed-off-by: Joakim Erdfelt <[email protected]>
joakime
commented
Dec 13, 2019
...ocket/websocket-client/src/main/java/org/eclipse/jetty/websocket/client/WebSocketClient.java
Show resolved
Hide resolved
lachlan-roberts
approved these changes
Dec 15, 2019
...ocket/websocket-client/src/main/java/org/eclipse/jetty/websocket/client/WebSocketClient.java
Outdated
Show resolved
Hide resolved
...ocket/websocket-client/src/main/java/org/eclipse/jetty/websocket/client/WebSocketClient.java
Outdated
Show resolved
Hide resolved
sbordet
requested changes
Dec 16, 2019
| this((HttpClient)null); | ||
| this(new HttpContainerScope(HttpClientProvider.get(null))); | ||
| // Add as bean, as HttpClient was created in this class | ||
| addBean(this.httpClient); |
There was a problem hiding this comment.
This call to add the HttpClient as a bean is repeated in every constructor, while it should only be in the newly introduced constructor.
There was a problem hiding this comment.
Nope, that's incorrect, there are 2 paths that have external clients.
Can't do that in the common constructor.
...ocket/websocket-client/src/main/java/org/eclipse/jetty/websocket/client/WebSocketClient.java
Outdated
Show resolved
Hide resolved
Signed-off-by: Joakim Erdfelt <[email protected]>
Signed-off-by: Joakim Erdfelt <[email protected]>
Signed-off-by: Joakim Erdfelt <[email protected]>
Signed-off-by: Joakim Erdfelt <[email protected]>
Signed-off-by: Joakim Erdfelt <[email protected]>
sbordet
approved these changes
Dec 19, 2019
Signed-off-by: Joakim Erdfelt <[email protected]>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Signed-off-by: Joakim Erdfelt [email protected]
Closes #3730