Add a ByteBody-based write API #11078
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
This PR adds a NettyWriteContext.write(HttpResponse, ByteBody) API that, in the long term, should replace all the other write methods (except the headResponse one). The advantage is that we can get rid of reactive code for streaming, and merge some code paths. These are the modifications: - `StreamingNettyByteBody` exposes its `primary` method to allow the HTTP writers direct access to the data using the internal byte streaming API. - `NettyBodyAdapter` is added to transform generic `ByteBody`s to `NettyByteBody`s. - `AvailableByteArrayBody` and `InputStreamByteBody` are moved here from micronaut-servlet and made `@Experimental`. - The `InputStream` based write method is removed from NettyWriteContext and replaced with `InputStreamByteBody`. This gets rid of a bunch of code.
# Conflicts: # http-server-netty/src/main/java/io/micronaut/http/server/netty/body/NettyBodyAdapter.java
sdelamo
requested changes
Aug 13, 2024
...server-netty/src/test/groovy/io/micronaut/http/server/netty/body/NettyBodyAdapterSpec.groovy
Outdated
Show resolved
Hide resolved
sdelamo
approved these changes
Aug 13, 2024
| package io.micronaut.http.body.stream; | ||
|
|
||
| import io.micronaut.core.annotation.Experimental; | ||
| import io.micronaut.core.annotation.NonNull; |
There was a problem hiding this comment.
Suggested change
| import io.micronaut.core.annotation.NonNull; | |
| import io.micronaut.core.annotation.Internal; | |
| import io.micronaut.core.annotation.NonNull; |
http/src/main/java/io/micronaut/http/body/stream/AvailableByteArrayBody.java
Show resolved
Hide resolved
http/src/test/groovy/io/micronaut/http/body/stream/StreamPairSpec.groovy
Outdated
Show resolved
Hide resolved
|
@yawkat can you check the sonar issues? |
…pec.groovy Co-authored-by: Sergio del Amo <sergio.delamo@softamo.com>
|
dstepanov
approved these changes
Aug 13, 2024
dstepanov
reviewed
Aug 13, 2024
| * @since 4.6.0 | ||
| */ | ||
| @Internal | ||
| public final class NettyBodyAdapter implements BufferConsumer.Upstream, Subscriber<ByteBuf> { |
There was a problem hiding this comment.
Can some of those classes be package private?
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.
This PR adds a NettyWriteContext.write(HttpResponse, ByteBody) API that, in the long term, should replace all the other write methods (except the headResponse one). The advantage is that we can get rid of reactive code for streaming, and merge some code paths.
These are the modifications:
StreamingNettyByteBodyexposes itsprimarymethod to allow the HTTP writers direct access to the data using the internal byte streaming API.NettyBodyAdapteris added to transform genericByteBodys toNettyByteBodys.AvailableByteArrayBodyandInputStreamByteBodyare moved here from micronaut-servlet and made@Experimental.InputStreambased write method is removed from NettyWriteContext and replaced withInputStreamByteBody. This gets rid of a bunch of code.