diff --git a/codegen-cli/pom.xml b/codegen-cli/pom.xml index 9fa29857..940db73a 100644 --- a/codegen-cli/pom.xml +++ b/codegen-cli/pom.xml @@ -21,7 +21,7 @@ com.networknt light-codegen - 2.3.1 + 2.3.2-SNAPSHOT ../pom.xml diff --git a/codegen-core/pom.xml b/codegen-core/pom.xml index 56986176..3993df4b 100644 --- a/codegen-core/pom.xml +++ b/codegen-core/pom.xml @@ -21,7 +21,7 @@ com.networknt light-codegen - 2.3.1 + 2.3.2-SNAPSHOT ../pom.xml diff --git a/codegen-fwk/pom.xml b/codegen-fwk/pom.xml index 390ebb60..096e5e53 100644 --- a/codegen-fwk/pom.xml +++ b/codegen-fwk/pom.xml @@ -21,7 +21,7 @@ com.networknt light-codegen - 2.3.1 + 2.3.2-SNAPSHOT ../pom.xml diff --git a/codegen-web/pom.xml b/codegen-web/pom.xml index c34ad0bd..7e60fcc4 100644 --- a/codegen-web/pom.xml +++ b/codegen-web/pom.xml @@ -21,7 +21,7 @@ com.networknt light-codegen - 2.3.1 + 2.3.2-SNAPSHOT ../pom.xml diff --git a/light-graphql-4j/pom.xml b/light-graphql-4j/pom.xml index 09cdfb9a..3be0245b 100644 --- a/light-graphql-4j/pom.xml +++ b/light-graphql-4j/pom.xml @@ -21,7 +21,7 @@ com.networknt light-codegen - 2.3.1 + 2.3.2-SNAPSHOT ../pom.xml diff --git a/light-graphql-4j/src/main/resources/templates/graphql/pom.xml.rocker.raw b/light-graphql-4j/src/main/resources/templates/graphql/pom.xml.rocker.raw index a57e2db0..126c8821 100644 --- a/light-graphql-4j/src/main/resources/templates/graphql/pom.xml.rocker.raw +++ b/light-graphql-4j/src/main/resources/templates/graphql/pom.xml.rocker.raw @@ -12,13 +12,13 @@ 21 UTF-8 com.networknt.server.Server - 2.3.1 + 2.3.2-SNAPSHOT 2.18.3 2.0.17 0.9.6 - 1.5.18 + 1.5.26 5.11.3 - 2.3.18.Final + 2.3.22.Final 22.2 2.1.5 @if(config.get("supportDb").booleanValue() || config.get("supportH2ForTest").booleanValue()){ diff --git a/light-hybrid-4j/pom.xml b/light-hybrid-4j/pom.xml index 6670f375..5bd71926 100644 --- a/light-hybrid-4j/pom.xml +++ b/light-hybrid-4j/pom.xml @@ -21,7 +21,7 @@ com.networknt light-codegen - 2.3.1 + 2.3.2-SNAPSHOT ../pom.xml diff --git a/light-hybrid-4j/src/main/resources/templates/hybrid/server/pom.xml.rocker.raw b/light-hybrid-4j/src/main/resources/templates/hybrid/server/pom.xml.rocker.raw index 45bdaca5..b47149c0 100644 --- a/light-hybrid-4j/src/main/resources/templates/hybrid/server/pom.xml.rocker.raw +++ b/light-hybrid-4j/src/main/resources/templates/hybrid/server/pom.xml.rocker.raw @@ -12,13 +12,13 @@ 21 UTF-8 com.networknt.server.Server - 2.3.1 + 2.3.2-SNAPSHOT 2.18.3 2.0.17 0.9.6 - 1.5.18 + 1.5.26 5.11.3 - 2.3.18.Final + 2.3.22.Final 1.5.1 @if((config.get("supportDb") != null && config.get("supportDb").booleanValue()) || (config.get("supportH2ForTest") != null && config.get("supportH2ForTest").booleanValue())){ 6.2.1 diff --git a/light-hybrid-4j/src/main/resources/templates/hybrid/service/pom.xml.rocker.raw b/light-hybrid-4j/src/main/resources/templates/hybrid/service/pom.xml.rocker.raw index e424e454..d9521bb5 100644 --- a/light-hybrid-4j/src/main/resources/templates/hybrid/service/pom.xml.rocker.raw +++ b/light-hybrid-4j/src/main/resources/templates/hybrid/service/pom.xml.rocker.raw @@ -12,13 +12,13 @@ 21 UTF-8 com.networknt.server.Server - 2.3.1 + 2.3.2-SNAPSHOT 2.18.3 2.0.17 0.9.6 - 1.5.18 + 1.5.26 5.11.3 - 2.3.18.Final + 2.3.22.Final 1.5.1 @if((config.get("supportDb") != null && config.get("supportDb").booleanValue()) || config.get("supportH2ForTest").booleanValue()){ 6.2.1 diff --git a/light-rest-4j/pom.xml b/light-rest-4j/pom.xml index 2436bff2..e890898f 100644 --- a/light-rest-4j/pom.xml +++ b/light-rest-4j/pom.xml @@ -21,7 +21,7 @@ com.networknt light-codegen - 2.3.1 + 2.3.2-SNAPSHOT ../pom.xml diff --git a/light-rest-4j/src/main/resources/templates/lambda/gradleProperties.rocker.raw b/light-rest-4j/src/main/resources/templates/lambda/gradleProperties.rocker.raw index 54142868..01d66cfa 100644 --- a/light-rest-4j/src/main/resources/templates/lambda/gradleProperties.rocker.raw +++ b/light-rest-4j/src/main/resources/templates/lambda/gradleProperties.rocker.raw @@ -1,7 +1,7 @@ # Versions of Frequently used Libraries -light4jVersion=2.3.1 +light4jVersion=2.3.2-SNAPSHOT lambdaCoreVersion=1.2.3 lambdaEventsVersion=3.15.0 jacksonVersion=2.18.3 -logbackVersion=1.5.18 +logbackVersion=1.5.26 junitVersion=5.11.3 diff --git a/light-rest-4j/src/main/resources/templates/lambda/pom.xml.rocker.raw b/light-rest-4j/src/main/resources/templates/lambda/pom.xml.rocker.raw index a61878c6..374d9641 100644 --- a/light-rest-4j/src/main/resources/templates/lambda/pom.xml.rocker.raw +++ b/light-rest-4j/src/main/resources/templates/lambda/pom.xml.rocker.raw @@ -12,10 +12,10 @@ 11 11 UTF-8 - 2.3.1 + 2.3.2-SNAPSHOT 2.18.3 2.0.17 - 1.5.18 + 1.5.26 1.5.1 2.4 1.2.3 diff --git a/light-rest-4j/src/main/resources/templates/lambdanative/gradleProperties.rocker.raw b/light-rest-4j/src/main/resources/templates/lambdanative/gradleProperties.rocker.raw index 0e6f2aaa..86f602ea 100644 --- a/light-rest-4j/src/main/resources/templates/lambdanative/gradleProperties.rocker.raw +++ b/light-rest-4j/src/main/resources/templates/lambdanative/gradleProperties.rocker.raw @@ -4,5 +4,5 @@ lambdaCoreVersion=1.2.3 lambdaEventsVersion=3.15.0 jacksonVersion=2.18.3 slf4jVersion=2.0.17 -logbackVersion=1.5.18 +logbackVersion=1.5.26 junitVersion=5.11.3 diff --git a/light-rest-4j/src/main/resources/templates/lambdanative/pom.xml.rocker.raw b/light-rest-4j/src/main/resources/templates/lambdanative/pom.xml.rocker.raw index 6e1f6f6f..302fa0e9 100644 --- a/light-rest-4j/src/main/resources/templates/lambdanative/pom.xml.rocker.raw +++ b/light-rest-4j/src/main/resources/templates/lambdanative/pom.xml.rocker.raw @@ -15,7 +15,7 @@ 2.1.34-SNAPSHOT 2.18.3 2.0.17 - 1.5.18 + 1.5.26 1.5.1 2.4 1.2.3 diff --git a/light-rest-4j/src/main/resources/templates/rest/handlerTest.rocker.raw b/light-rest-4j/src/main/resources/templates/rest/handlerTest.rocker.raw index 41d4fb60..131d6774 100644 --- a/light-rest-4j/src/main/resources/templates/rest/handlerTest.rocker.raw +++ b/light-rest-4j/src/main/resources/templates/rest/handlerTest.rocker.raw @@ -94,17 +94,8 @@ public class @className { client.restore(connectionToken); } String body = reference.get().getAttachment(Http2Client.RESPONSE_BODY); - Optional contentTypeName = Optional.ofNullable(reference.get().getResponseHeaders().get(Headers.CONTENT_TYPE)); - SchemaValidator schemaValidator = new SchemaValidator(OpenApiHandler.helper.openApi3); - ResponseValidator responseValidator = new ResponseValidator(schemaValidator); int statusCode = reference.get().getResponseCode(); - Status status; - if(contentTypeName.isPresent()) { - status = responseValidator.validateResponseContent(body, requestUri, httpMethod, String.valueOf(statusCode), contentTypeName.get().getFirst()); - } else { - status = responseValidator.validateResponseContent(body, requestUri, httpMethod, String.valueOf(statusCode), JSON_MEDIA_TYPE); - } - assertNotNull(status); + assertNotNull(body); } } } diff --git a/light-rest-4j/src/main/resources/templates/rest/parent/gradleProperties.rocker.raw b/light-rest-4j/src/main/resources/templates/rest/parent/gradleProperties.rocker.raw index aa077c6f..73528665 100644 --- a/light-rest-4j/src/main/resources/templates/rest/parent/gradleProperties.rocker.raw +++ b/light-rest-4j/src/main/resources/templates/rest/parent/gradleProperties.rocker.raw @@ -2,11 +2,11 @@ @args (JsonNode config) # Versions of Frequently used Libraries kafkaVersion=3.9.1 -light4jVersion=2.3.1 +light4jVersion=2.3.2-SNAPSHOT jacksonVersion=2.18.3 slf4jVersion=2.0.17 -undertowVersion=2.3.18.Final -logbackVersion=1.5.18 +undertowVersion=2.3.22.Final +logbackVersion=1.5.26 jsonSchemaValidatorVersion=1.5.1 junitVersion=5.11.3 @if(config.get("supportDb").booleanValue() || config.get("supportH2ForTest").booleanValue()){ diff --git a/light-rest-4j/src/main/resources/templates/rest/parent/pom.xml.rocker.raw b/light-rest-4j/src/main/resources/templates/rest/parent/pom.xml.rocker.raw index abbfc5cc..944b8177 100644 --- a/light-rest-4j/src/main/resources/templates/rest/parent/pom.xml.rocker.raw +++ b/light-rest-4j/src/main/resources/templates/rest/parent/pom.xml.rocker.raw @@ -11,14 +11,14 @@ 21 UTF-8 com.networknt.server.Server - 2.3.1 + 2.3.2-SNAPSHOT 2.18.3 2.0.17 0.9.6 - 1.5.18 + 1.5.26 8.0 5.11.3 - 2.3.18.Final + 2.3.22.Final 1.5.1 @if(config.get("supportDb").booleanValue() || config.get("supportH2ForTest").booleanValue()){ 6.2.1 diff --git a/light-rest-4j/src/main/resources/templates/rest/single/gradleProperties.rocker.raw b/light-rest-4j/src/main/resources/templates/rest/single/gradleProperties.rocker.raw index aa077c6f..73528665 100644 --- a/light-rest-4j/src/main/resources/templates/rest/single/gradleProperties.rocker.raw +++ b/light-rest-4j/src/main/resources/templates/rest/single/gradleProperties.rocker.raw @@ -2,11 +2,11 @@ @args (JsonNode config) # Versions of Frequently used Libraries kafkaVersion=3.9.1 -light4jVersion=2.3.1 +light4jVersion=2.3.2-SNAPSHOT jacksonVersion=2.18.3 slf4jVersion=2.0.17 -undertowVersion=2.3.18.Final -logbackVersion=1.5.18 +undertowVersion=2.3.22.Final +logbackVersion=1.5.26 jsonSchemaValidatorVersion=1.5.1 junitVersion=5.11.3 @if(config.get("supportDb").booleanValue() || config.get("supportH2ForTest").booleanValue()){ diff --git a/light-rest-4j/src/main/resources/templates/rest/single/pom.xml.rocker.raw b/light-rest-4j/src/main/resources/templates/rest/single/pom.xml.rocker.raw index fb2378e6..29098fcd 100644 --- a/light-rest-4j/src/main/resources/templates/rest/single/pom.xml.rocker.raw +++ b/light-rest-4j/src/main/resources/templates/rest/single/pom.xml.rocker.raw @@ -11,14 +11,14 @@ 21 UTF-8 com.networknt.server.Server - 2.3.1 + 2.3.2-SNAPSHOT 2.18.3 2.0.17 0.9.6 - 1.5.18 + 1.5.26 7.0.1 5.11.3 - 2.3.18.Final + 2.3.22.Final 1.5.1 @if(config.get("supportDb").booleanValue() || config.get("supportH2ForTest").booleanValue()){ 6.2.1 diff --git a/light-rest-4j/src/main/resources/templates/restkotlin/gradleProperties.rocker.raw b/light-rest-4j/src/main/resources/templates/restkotlin/gradleProperties.rocker.raw index 899ce68d..0d5a7fc6 100644 --- a/light-rest-4j/src/main/resources/templates/restkotlin/gradleProperties.rocker.raw +++ b/light-rest-4j/src/main/resources/templates/restkotlin/gradleProperties.rocker.raw @@ -2,10 +2,10 @@ @args (JsonNode config) # Versions of Frequently used Libraries kafkaVersion=3.9.1 -light4jVersion=2.3.1 +light4jVersion=2.3.2-SNAPSHOT jacksonVersion=2.18.3 -undertowVersion=2.3.18.Final -logbackVersion=1.5.18 +undertowVersion=2.3.22.Final +logbackVersion=1.5.26 jsonSchemaValidatorVersion=1.5.1 junitVersion=5.3.1 kotlinLoggingVersion=1.6.22 diff --git a/pom.xml b/pom.xml index d2cc2d3f..6c4a2172 100644 --- a/pom.xml +++ b/pom.xml @@ -19,7 +19,7 @@ 4.0.0 com.networknt light-codegen - 2.3.1 + 2.3.2-SNAPSHOT pom Parent POM Light Code Generator @@ -95,7 +95,7 @@ 21 UTF-8 - 2.3.1 + 2.3.2-SNAPSHOT 2.18.3 2.0.17 0.9.6 @@ -104,12 +104,12 @@ 2.18.0 1.18.0 1.3.1 - 1.5.18 + 1.5.26 4.13.2 5.8.1 - 2.3.18.Final + 2.3.22.Final 1.3 - 3.8.0 + 3.27.7 2.2.2 1.5.1 2.4