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

Fix Servlet binding for Publisher types #374

Merged
merged 4 commits into from
Jan 10, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion .github/workflows/graalvm.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,11 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
java: ['11', '17']
java: ['17']
graalvm: ['latest', 'dev']
include:
- java: '11'
graalvm: 'latest'
steps:
# https://github.com/actions/virtual-environments/issues/709
- name: Free disk space
Expand All @@ -42,6 +45,7 @@ jobs:
version: ${{ matrix.graalvm }}
java-version: ${{ matrix.java }}
components: 'native-image'
github-token: ${{secrets.GITHUB_TOKEN}}
- name: Build with Gradle
run: |
if ./gradlew tasks --no-daemon --all | grep -w "testNativeImage"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ import groovy.transform.EqualsAndHashCode
import io.micronaut.context.annotation.Property
import io.micronaut.context.annotation.Requires
import io.micronaut.core.annotation.Introspected
import io.micronaut.core.async.annotation.SingleResult
import io.micronaut.core.type.Argument
import io.micronaut.core.util.StringUtils
import io.micronaut.http.HttpRequest
Expand All @@ -20,6 +21,7 @@ import io.micronaut.http.client.multipart.MultipartBody
import io.micronaut.http.multipart.CompletedFileUpload
import io.micronaut.test.extensions.spock.annotation.MicronautTest
import jakarta.inject.Inject
import org.reactivestreams.Publisher
import spock.lang.Specification

import java.nio.charset.StandardCharsets
Expand Down Expand Up @@ -334,6 +336,38 @@ class JettyHttpPostSpec extends Specification {
val == "multiple mappings"
}

void 'test posting publisher with #desc'() {
when:
String data = client.toBlocking().retrieve(
HttpRequest.POST("/post/publisher", body),
String
)

then:
data == expected

where:
body | expected | desc
'[{"title":"some book","pages":1},{"title":"necronomicon","pages":666}]' | '[{"title":"some book","pages":1},{"title":"necronomicon","pages":666}]' | 'multiple entries'
'{"title":"some book","pages":1}' | '[{"title":"some book","pages":1}]' | 'single entry'
}

void 'test @SingleResult publisher with #desc'() {
when:
String data = client.toBlocking().retrieve(
HttpRequest.POST("/post/single-publisher", body),
String
)

then:
data == expected

where:
body | expected | desc
'[{"title":"some book","pages":1},{"title":"necronomicon","pages":666}]' | '{"title":"some book","pages":1}' | 'multiple entries'
'{"title":"some book","pages":1}' | '{"title":"some book","pages":1}' | 'single entry'
}

@Requires(property = 'spec.name', value = 'JettyHttpPostSpec')
@Controller('/post')
static class PostController {
Expand Down Expand Up @@ -369,6 +403,17 @@ class JettyHttpPostSpec extends Specification {
return contentLength
}

@Post('/publisher')
Publisher<Book> publisher(@Body Publisher<Book> bookPublisher) {
return bookPublisher
}

@Post('/single-publisher')
@SingleResult
Publisher<Book> singlePublisher(@Body Publisher<Book> bookPublisher) {
return bookPublisher
}

@Post('/title/{title}')
Book title(@Body Book book, String title, @Header String contentType, @Header long contentLength, @Header accept, @Header('X-My-Header') custom) {
assert title == book.title
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -170,7 +170,7 @@ public BindingResult bind(ArgumentConversionContext context, HttpRequest source)
MediaType mediaType = servletHttpRequest.getContentType().orElse(MediaType.APPLICATION_JSON_TYPE);
MapperMediaTypeCodec codec = (MapperMediaTypeCodec) mediaTypeCodecRegistry.findCodec(mediaType, javaArgument).orElse(null);
if (codec != null) {
Processor<byte[], io.micronaut.json.tree.JsonNode> jsonProcessor = codec.getJsonMapper().createReactiveParser(servletHttpRequest::subscribe, false);
Processor<byte[], io.micronaut.json.tree.JsonNode> jsonProcessor = codec.getJsonMapper().createReactiveParser(servletHttpRequest::subscribe, true);
Object converted = Publishers.convertPublisher(
Flux.from(jsonProcessor)
.map(jsonNode -> codec.decode(typeArgument, jsonNode)), type);
Expand Down