Change SSE to use the OkHttp public API only #8141
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
swankjesse
force-pushed
the
jwilson.1216.okio370
branch
2 times, most recently
from
384f648 to
0d23e7b
Compare
swankjesse
force-pushed
the
jwilson.1216.realcall
branch
from
18074ca to
87ec2b3
Compare
JakeWharton
approved these changes
Dec 17, 2023
yschimke
approved these changes
Dec 17, 2023
| @@ -64,7 +58,7 @@ internal class RealEventSource( | |||
| } | |||
|
|
|||
| // This is a long-lived response. Cancel full-call timeouts. | |||
| call?.timeoutEarlyExit() | |||
| call?.timeout()?.cancel() | |||
| listener.assertEvent(null, null, "hey"); | ||
| listener.assertClose(); | ||
|
|
||
| assertThat(eventListener.recordedEventTypes()).containsExactly( |
There was a problem hiding this comment.
Yeah, this seems reasonable, if not particularly useful.
Previously we prevented end-users from using their own implementations of Call.Factory because we casted down to RealCall in RealEventSource. With this change we're implementing SSE without depending on any OkHttp implementation details. This also introduces a new function in EventSources to create an EventSource.Factory from a Call.Factory, and hides the previous implementation that required a concrete OkHttpClient. Finally this fixes SSE to publish the same EventListener events as regular HTTP calls.
swankjesse
force-pushed
the
jwilson.1216.realcall
branch
from
87ec2b3 to
4d2c11c
Compare
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.
Previously we prevented end-users from using their own implementations of Call.Factory because we casted down to RealCall in RealEventSource.
With this change we're implementing SSE without depending on any OkHttp implementation details.
This also introduces a new function in EventSources to create an EventSource.Factory from a Call.Factory, and hides the previous implementation that required a concrete OkHttpClient.
Finally this fixes SSE to publish the same EventListener events as regular HTTP calls.