Skip to content

Commit b4aa571

Browse files
sdelamoyawkat
sdelamo
and
yawkat
authored
Update AWS to Core 4.8.x (#2297)
* core 4.8.3 * test 4.7.0 * groovy 4.6.0 * logging 1.6.0 * serde 2.14.0 * servlet 5.1.0 * views 5.7.0 * validation 4.9.0 * Use AvailableByteArrayBody from Core * don’t use jetty version from servlet * Use AvailableByteArrayBody from core * tck: remove fixed tests from suites * tck: ignore ErrorHandlerFluxTest test testErrorHandlerWithFluxChunkedSignaledDelayedError fails * tck: ignore FormsJacksonAnnotationsTest ignore test httpClientFormSubmissionsDoesNotSupportJacksonAnnotations * tck: ignore FiltersTest CrossOriginTest * fix tck * logging 1.6.1 --------- Co-authored-by: yawkat <[email protected]>
1 parent 26bebd1 commit b4aa571

File tree

8 files changed

+27
-34
lines changed

8 files changed

+27
-34
lines changed

‎function-aws-api-proxy-test/build.gradle.kts

-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ plugins {
55
dependencies {
66
api(mn.micronaut.http.server)
77
api(projects.micronautFunctionAwsApiProxy)
8-
implementation(platform(mnServlet.boms.jetty))
98
implementation(libs.jetty.server)
109
testImplementation(mn.micronaut.http.client)
1110
testImplementation(mn.micronaut.jackson.databind)

‎function-aws-api-proxy-test/src/main/java/io/micronaut/function/aws/proxy/test/DefaultServletToAwsProxyResponseAdapter.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ public void handle(@NonNull ConversionService conversionService,
5050
populateHeaders(conversionService, awsProxyResponse, response);
5151
response.setStatus(awsProxyResponse.getStatusCode());
5252
HttpMethod httpMethod = HttpMethod.parse(request.getMethod());
53-
if (httpMethod != HttpMethod.HEAD && httpMethod != HttpMethod.OPTIONS) {
53+
if (httpMethod != HttpMethod.HEAD) {
5454

5555
byte[] bodyAsBytes = parseBodyAsBytes(awsProxyResponse);
5656
if (bodyAsBytes != null) {

‎function-aws-api-proxy/src/main/java/io/micronaut/function/aws/proxy/ApiGatewayServletRequest.java

+5-4
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@
2222
import io.micronaut.core.convert.value.MutableConvertibleValues;
2323
import io.micronaut.core.convert.value.MutableConvertibleValuesMap;
2424
import io.micronaut.core.execution.ExecutionFlow;
25+
import io.micronaut.core.io.buffer.ByteArrayBufferFactory;
2526
import io.micronaut.core.io.buffer.ByteBuffer;
2627
import io.micronaut.core.type.Argument;
2728
import io.micronaut.core.util.ArrayUtils;
@@ -37,16 +38,16 @@
3738
import io.micronaut.http.MutableHttpRequest;
3839
import io.micronaut.http.ServerHttpRequest;
3940
import io.micronaut.http.body.ByteBody;
41+
import io.micronaut.http.body.stream.AvailableByteArrayBody;
4042
import io.micronaut.http.cookie.Cookie;
4143
import io.micronaut.http.cookie.Cookies;
4244
import io.micronaut.http.uri.UriBuilder;
45+
import io.micronaut.servlet.http.ByteArrayByteBuffer;
4346
import io.micronaut.servlet.http.MutableServletHttpRequest;
4447
import io.micronaut.servlet.http.BodyBuilder;
4548
import io.micronaut.servlet.http.ServletExchange;
4649
import io.micronaut.servlet.http.ServletHttpRequest;
4750
import io.micronaut.servlet.http.ParsedBodyHolder;
48-
import io.micronaut.servlet.http.ByteArrayByteBuffer;
49-
import io.micronaut.servlet.http.body.AvailableByteArrayBody;
5051
import org.slf4j.Logger;
5152

5253
import java.io.BufferedReader;
@@ -115,9 +116,9 @@ protected ApiGatewayServletRequest(
115116
@Override
116117
public @NonNull ByteBody byteBody() {
117118
try {
118-
return new AvailableByteArrayBody(getBodyBytes());
119+
return AvailableByteArrayBody.create(ByteArrayBufferFactory.INSTANCE, getBodyBytes());
119120
} catch (EmptyBodyException e) {
120-
return new AvailableByteArrayBody(ArrayUtils.EMPTY_BYTE_ARRAY);
121+
return AvailableByteArrayBody.create(ByteArrayBufferFactory.INSTANCE, ArrayUtils.EMPTY_BYTE_ARRAY);
121122
}
122123
}
123124

‎gradle/libs.versions.toml

+10-9
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,26 @@
11
[versions]
2-
micronaut = "4.7.9"
2+
micronaut = "4.8.3"
33
micronaut-docs = "2.0.0"
4-
micronaut-test = "4.5.0"
4+
micronaut-test = "4.7.0"
55
groovy = "4.0.22"
66
spock = "2.3-groovy-4.0"
7+
jetty = '11.0.24'
78

89
bouncycastle = '1.70'
910
fileupload = '0.0.6'
1011
logback-json-classic = '0.1.5'
1112

1213
micronaut-discovery = "4.5.2"
13-
micronaut-groovy = "4.5.0"
14-
micronaut-logging = "1.5.1"
14+
micronaut-groovy = "4.6.0"
15+
micronaut-logging = "1.6.1"
1516
micronaut-mongodb = "5.5.0"
1617
micronaut-reactor = "3.7.0"
1718
micronaut-security = "4.12.0"
18-
micronaut-serde = "2.13.1"
19-
micronaut-servlet = "4.12.0"
19+
micronaut-serde = "2.14.0"
20+
micronaut-servlet = "5.1.0"
2021
micronaut-test-resources="2.7.3"
21-
micronaut-views = "5.6.0"
22-
micronaut-validation = "4.8.1"
22+
micronaut-views = "5.7.0"
23+
micronaut-validation = "4.9.0"
2324

2425
managed-alexa-ask-sdk = "2.86.0"
2526
managed-aws-java-sdk-v1 = '1.12.781'
@@ -90,7 +91,7 @@ bouncycastle-provider = { module = 'org.bouncycastle:bcprov-jdk15on', version.re
9091
fileupload = { module = 'org.javadelight:delight-fileupload', version.ref = 'fileupload' }
9192
graal-sdk = { module = 'org.graalvm.sdk:graal-sdk', version.ref = 'graal' }
9293
jackson-afterburner = { module = 'com.fasterxml.jackson.module:jackson-module-afterburner' }
93-
jetty-server = { module = 'org.eclipse.jetty:jetty-server' }
94+
jetty-server = { module = 'org.eclipse.jetty:jetty-server', version.ref = 'jetty' }
9495
jcl-over-slf4j = { module = 'org.slf4j:jcl-over-slf4j', version.ref = 'slf4j' }
9596
junit-jupiter-engine = { module = 'org.junit.jupiter:junit-jupiter-engine' }
9697
junit-jupiter-api = { module = 'org.junit.jupiter:junit-jupiter-api' }

‎test-suite-http-server-tck-function-aws-api-gateway-proxy-alb/src/test/java/io/micronaut/http/server/tck/lambda/tests/ApplicationLoadBalancerTckTestSuite.java

+3-5
Original file line numberDiff line numberDiff line change
@@ -11,13 +11,11 @@
1111
"io.micronaut.http.server.tck.lambda.tests"
1212
})
1313
@ExcludeClassNamePatterns({
14-
"io.micronaut.http.server.tck.tests.jsonview.JsonViewsTest", // https://github.com/micronaut-projects/micronaut-servlet/pull/826
1514
"io.micronaut.http.server.tck.tests.hateoas.JsonErrorTest",
1615
"io.micronaut.http.server.tck.tests.hateoas.VndErrorTest",
17-
"io.micronaut.http.server.tck.tests.FilterProxyTest", // Immmutable request
18-
"io.micronaut.http.server.tck.tests.filter.options.OptionsFilterTest",
19-
"io.micronaut.http.server.tck.tests.hateoas.JsonErrorTest",
20-
"io.micronaut.http.server.tck.tests.hateoas.VndErrorTest"
16+
"io.micronaut.http.server.tck.tests.FilterProxyTest", // Immmutable request
17+
"io.micronaut.http.server.tck.tests.ErrorHandlerFluxTest", // test fails testErrorHandlerWithFluxChunkedSignaledDelayedError
18+
"io.micronaut.http.server.tck.tests.forms.FormsJacksonAnnotationsTest", // test fails httpClientFormSubmissionsDoesNotSupportJacksonAnnotations"
2119
})
2220
@SuiteDisplayName("HTTP Server TCK for Function AWS API Gateway Proxy Application Load Balancer Event")
2321
public class ApplicationLoadBalancerTckTestSuite {

‎test-suite-http-server-tck-function-aws-api-gateway-proxy-payloadv1/src/test/java/io/micronaut/http/server/tck/lambda/tests/FunctionAwsApiGatewayProxyV1HttpServerTestSuite.java

+2-4
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,11 @@
88
"io.micronaut.http.server.tck.lambda.tests"
99
})
1010
@ExcludeClassNamePatterns({
11-
"io.micronaut.http.server.tck.tests.jsonview.JsonViewsTest", // https://github.com/micronaut-projects/micronaut-servlet/pull/826
1211
"io.micronaut.http.server.tck.tests.hateoas.JsonErrorTest",
1312
"io.micronaut.http.server.tck.tests.hateoas.VndErrorTest",
14-
"io.micronaut.http.server.tck.tests.filter.options.OptionsFilterTest",
1513
"io.micronaut.http.server.tck.tests.FilterProxyTest", // Immmutable request
16-
"io.micronaut.http.server.tck.tests.hateoas.JsonErrorTest",
17-
"io.micronaut.http.server.tck.tests.hateoas.VndErrorTest"
14+
"io.micronaut.http.server.tck.tests.ErrorHandlerFluxTest", // test fails testErrorHandlerWithFluxChunkedSignaledDelayedError
15+
"io.micronaut.http.server.tck.tests.forms.FormsJacksonAnnotationsTest", // test fails httpClientFormSubmissionsDoesNotSupportJacksonAnnotations"
1816
})
1917
@SuiteDisplayName("HTTP Server TCK for Function AWS API Gateway Proxy v1 Event model")
2018
public class FunctionAwsApiGatewayProxyV1HttpServerTestSuite {

‎test-suite-http-server-tck-function-aws-api-gateway-proxy-payloadv2/src/test/java/io/micronaut/http/server/tck/lambda/tests/FunctionAwsApiGatewayProxyV2HttpServerTestSuite.java

+5-7
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,11 @@
88
"io.micronaut.http.server.tck.lambda.tests"
99
})
1010
@ExcludeClassNamePatterns({
11-
"io.micronaut.http.server.tck.tests.jsonview.JsonViewsTest", // https://github.com/micronaut-projects/micronaut-servlet/pull/826
12-
"io.micronaut.http.server.tck.tests.hateoas.JsonErrorTest",
13-
"io.micronaut.http.server.tck.tests.hateoas.VndErrorTest",
14-
"io.micronaut.http.server.tck.tests.filter.options.OptionsFilterTest",
15-
"io.micronaut.http.server.tck.tests.FilterProxyTest", // Immmutable request
16-
"io.micronaut.http.server.tck.tests.hateoas.JsonErrorTest",
17-
"io.micronaut.http.server.tck.tests.hateoas.VndErrorTest"
11+
"io.micronaut.http.server.tck.tests.hateoas.JsonErrorTest",
12+
"io.micronaut.http.server.tck.tests.hateoas.VndErrorTest",
13+
"io.micronaut.http.server.tck.tests.FilterProxyTest", // Immmutable request
14+
"io.micronaut.http.server.tck.tests.ErrorHandlerFluxTest", // test fails testErrorHandlerWithFluxChunkedSignaledDelayedError
15+
"io.micronaut.http.server.tck.tests.forms.FormsJacksonAnnotationsTest", // test fails httpClientFormSubmissionsDoesNotSupportJacksonAnnotations"
1816
})
1917
@SuiteDisplayName("HTTP Server TCK for Function AWS API Gateway Proxy v2 Event model")
2018
public class FunctionAwsApiGatewayProxyV2HttpServerTestSuite {

‎test-suite-http-server-tck-function-aws-api-proxy-test/src/test/java/io/micronaut/http/server/tck/lambda/tests/MicronautLambdaHandlerHttpServerTestSuite.java

+1-3
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,9 @@
1212
})
1313
@ExcludeClassNamePatterns({
1414
"io.micronaut.http.server.tck.tests.forms.FormUrlEncodedBodyInRequestFilterTest",
15-
"io.micronaut.http.server.tck.tests.jsonview.JsonViewsTest", // https://github.com/micronaut-projects/micronaut-servlet/pull/826
1615
"io.micronaut.http.server.tck.tests.forms.FormsSubmissionsWithListsTest",
1716
"io.micronaut.http.server.tck.tests.filter.options.OptionsFilterTest",
18-
"io.micronaut.http.server.tck.tests.LocalErrorReadingBodyTest", // Binding body different type (e.g. a String in error handler)
19-
"io.micronaut.http.server.tck.tests.FilterProxyTest" // Immmutable request
17+
"io.micronaut.http.server.tck.tests.FilterProxyTest", // Immmutable request
2018
})
2119
@SuiteDisplayName("HTTP Server TCK for Function AWS API Proxy Test")
2220
public class MicronautLambdaHandlerHttpServerTestSuite {

0 commit comments

Comments
 (0)