diff --git a/bin/configs/java-camel-petstore-new.yaml b/bin/configs/java-camel-petstore-new.yaml index 7984a5a57ae..7d80dc2338a 100644 --- a/bin/configs/java-camel-petstore-new.yaml +++ b/bin/configs/java-camel-petstore-new.yaml @@ -15,3 +15,4 @@ additionalProperties: camelUseDefaultValidationErrorProcessor: true camelRestClientRequestValidation: true camelSecurityDefinitions: true + implicitHeaders: true diff --git a/modules/openapi-generator/src/main/resources/java-camel-server/api.mustache b/modules/openapi-generator/src/main/resources/java-camel-server/api.mustache index 6e6e769904f..b90a99de3fe 100644 --- a/modules/openapi-generator/src/main/resources/java-camel-server/api.mustache +++ b/modules/openapi-generator/src/main/resources/java-camel-server/api.mustache @@ -75,7 +75,13 @@ public class {{classname}} extends RouteBuilder { .type(RestParamType.header) .required({{required}}){{#description}} .description("{{{.}}}"){{/description}} - .endParam(){{/headerParams}}{{#bodyParams}} + .endParam(){{/headerParams}}{{#implicitHeadersParams}} + .param() + .name("{{baseName}}") + .type(RestParamType.header) + .required({{required}}){{#description}} + .description("{{{.}}}"){{/description}} + .endParam(){{/implicitHeadersParams}}{{#bodyParams}} .param() .name("{{paramName}}") .type(RestParamType.body) diff --git a/modules/openapi-generator/src/main/resources/java-camel-server/pom.mustache b/modules/openapi-generator/src/main/resources/java-camel-server/pom.mustache index 79d481ac75b..60911b44bcb 100644 --- a/modules/openapi-generator/src/main/resources/java-camel-server/pom.mustache +++ b/modules/openapi-generator/src/main/resources/java-camel-server/pom.mustache @@ -39,8 +39,8 @@ Do not edit the class manually. UTF-8 - 2.6.2 - 3.14.0 + 2.7.8 + 3.20.1 @@ -74,10 +74,9 @@ Do not edit the class manually. org.apache.maven.plugins maven-compiler-plugin - 3.8.0 + 3.10.1 - 1.8 - 1.8 + 11 @@ -117,7 +116,7 @@ Do not edit the class manually. org.openapitools jackson-databind-nullable - 0.2.1 + 0.2.4 io.swagger @@ -128,19 +127,19 @@ Do not edit the class manually. io.swagger.core.v3 swagger-annotations - 2.2.7 + 2.2.8 {{/oas3}} {{#jackson}} com.fasterxml.jackson.datatype jackson-datatype-jsr310 - 2.13.0 + 2.14.2 com.fasterxml.jackson.datatype jackson-datatype-jdk8 - 2.13.0 + 2.14.2 org.apache.camel diff --git a/modules/openapi-generator/src/main/resources/java-camel-server/restConfiguration.mustache b/modules/openapi-generator/src/main/resources/java-camel-server/restConfiguration.mustache index 44af274af40..48c3e7b7765 100644 --- a/modules/openapi-generator/src/main/resources/java-camel-server/restConfiguration.mustache +++ b/modules/openapi-generator/src/main/resources/java-camel-server/restConfiguration.mustache @@ -14,6 +14,8 @@ public class RestConfiguration extends RouteBuilder { @Override public void configure() throws Exception { restConfiguration() + .scheme("{{scheme}}") + .host("{{host}}") .component("{{camelRestComponent}}") .bindingMode(RestBindingMode.{{camelRestBindingMode}}){{#camelDataformatProperties}} .dataFormatProperty("{{key}}", "{{value}}"){{/camelDataformatProperties}} diff --git a/modules/openapi-generator/src/main/resources/java-camel-server/routesImpl.mustache b/modules/openapi-generator/src/main/resources/java-camel-server/routesImpl.mustache index 427aa3021d7..661723f34f7 100644 --- a/modules/openapi-generator/src/main/resources/java-camel-server/routesImpl.mustache +++ b/modules/openapi-generator/src/main/resources/java-camel-server/routesImpl.mustache @@ -28,7 +28,7 @@ public class {{classname}}RoutesImpl extends RouteBuilder { .log(LoggingLevel.INFO, "HEADERS: ${headers}"){{#hasProduces}}{{#examples}}{{#-first}}{{^isArray}}{{^isMap}}{{^isPrimitiveType}} .setBody(constant({{>exampleString}})) .unmarshal().json(JsonLibrary.Jackson, {{returnType}}.class){{/isPrimitiveType}}{{/isMap}}{{/isArray}}{{#isArray}} - .setBody(constant({{>exampleStringArray}})) + .setBody(constant({{>exampleString}})) .unmarshal().json(JsonLibrary.Jackson, {{returnBaseType}}[].class){{/isArray}}{{/-first}}{{/examples}}{{/hasProduces}};{{/operation}}{{/operations}} } } diff --git a/samples/server/petstore/java-camel/pom.xml b/samples/server/petstore/java-camel/pom.xml index af5577468a2..a2752deb31c 100644 --- a/samples/server/petstore/java-camel/pom.xml +++ b/samples/server/petstore/java-camel/pom.xml @@ -39,8 +39,8 @@ Do not edit the class manually. UTF-8 - 2.6.2 - 3.14.0 + 2.7.8 + 3.20.1 @@ -74,10 +74,9 @@ Do not edit the class manually. org.apache.maven.plugins maven-compiler-plugin - 3.8.0 + 3.10.1 - 1.8 - 1.8 + 11 @@ -117,7 +116,7 @@ Do not edit the class manually. org.openapitools jackson-databind-nullable - 0.2.1 + 0.2.4 io.swagger @@ -127,17 +126,17 @@ Do not edit the class manually. io.swagger.core.v3 swagger-annotations - 2.2.7 + 2.2.8 com.fasterxml.jackson.datatype jackson-datatype-jsr310 - 2.13.0 + 2.14.2 com.fasterxml.jackson.datatype jackson-datatype-jdk8 - 2.13.0 + 2.14.2 org.apache.camel diff --git a/samples/server/petstore/java-camel/src/main/java/org/openapitools/RestConfiguration.java b/samples/server/petstore/java-camel/src/main/java/org/openapitools/RestConfiguration.java index 205d2f9e3a8..a483cfe8707 100644 --- a/samples/server/petstore/java-camel/src/main/java/org/openapitools/RestConfiguration.java +++ b/samples/server/petstore/java-camel/src/main/java/org/openapitools/RestConfiguration.java @@ -14,6 +14,8 @@ public class RestConfiguration extends RouteBuilder { @Override public void configure() throws Exception { restConfiguration() + .scheme("http") + .host("petstore.swagger.io") .component("servlet") .bindingMode(RestBindingMode.auto) .dataFormatProperty("json.out.disableFeatures", "WRITE_DATES_AS_TIMESTAMPS") diff --git a/samples/server/petstore/java-camel/src/main/java/org/openapitools/api/PetApi.java b/samples/server/petstore/java-camel/src/main/java/org/openapitools/api/PetApi.java index 8e87d2249d2..5fbcfe8ed47 100644 --- a/samples/server/petstore/java-camel/src/main/java/org/openapitools/api/PetApi.java +++ b/samples/server/petstore/java-camel/src/main/java/org/openapitools/api/PetApi.java @@ -74,7 +74,7 @@ public class PetApi extends RouteBuilder { .description("Pet id to delete") .endParam() .param() - .name("apiKey") + .name("api_key") .type(RestParamType.header) .required(false) .endParam() diff --git a/samples/server/petstore/java-camel/src/main/java/org/openapitools/api/PetApiRoutesImpl.java b/samples/server/petstore/java-camel/src/main/java/org/openapitools/api/PetApiRoutesImpl.java index dfd665f6c0a..08ef0ab134a 100644 --- a/samples/server/petstore/java-camel/src/main/java/org/openapitools/api/PetApiRoutesImpl.java +++ b/samples/server/petstore/java-camel/src/main/java/org/openapitools/api/PetApiRoutesImpl.java @@ -48,7 +48,7 @@ public class PetApiRoutesImpl extends RouteBuilder { .log(LoggingLevel.INFO, "BODY TYPE: ${body.getClass().getName()}") .end() .log(LoggingLevel.INFO, "HEADERS: ${headers}") - .setBody(constant("[[ { \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ], \"name\" : \"doggie\", \"id\" : 0, \"category\" : { \"name\" : \"name\", \"id\" : 6 }, \"tags\" : [ { \"name\" : \"name\", \"id\" : 1 }, { \"name\" : \"name\", \"id\" : 1 } ], \"status\" : \"available\" }, { \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ], \"name\" : \"doggie\", \"id\" : 0, \"category\" : { \"name\" : \"name\", \"id\" : 6 }, \"tags\" : [ { \"name\" : \"name\", \"id\" : 1 }, { \"name\" : \"name\", \"id\" : 1 } ], \"status\" : \"available\" } ]]")) + .setBody(constant("[ { \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ], \"name\" : \"doggie\", \"id\" : 0, \"category\" : { \"name\" : \"name\", \"id\" : 6 }, \"tags\" : [ { \"name\" : \"name\", \"id\" : 1 }, { \"name\" : \"name\", \"id\" : 1 } ], \"status\" : \"available\" }, { \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ], \"name\" : \"doggie\", \"id\" : 0, \"category\" : { \"name\" : \"name\", \"id\" : 6 }, \"tags\" : [ { \"name\" : \"name\", \"id\" : 1 }, { \"name\" : \"name\", \"id\" : 1 } ], \"status\" : \"available\" } ]")) .unmarshal().json(JsonLibrary.Jackson, Pet[].class); /** GET /pet/findByTags : Finds Pets by tags @@ -60,7 +60,7 @@ public class PetApiRoutesImpl extends RouteBuilder { .log(LoggingLevel.INFO, "BODY TYPE: ${body.getClass().getName()}") .end() .log(LoggingLevel.INFO, "HEADERS: ${headers}") - .setBody(constant("[[ { \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ], \"name\" : \"doggie\", \"id\" : 0, \"category\" : { \"name\" : \"name\", \"id\" : 6 }, \"tags\" : [ { \"name\" : \"name\", \"id\" : 1 }, { \"name\" : \"name\", \"id\" : 1 } ], \"status\" : \"available\" }, { \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ], \"name\" : \"doggie\", \"id\" : 0, \"category\" : { \"name\" : \"name\", \"id\" : 6 }, \"tags\" : [ { \"name\" : \"name\", \"id\" : 1 }, { \"name\" : \"name\", \"id\" : 1 } ], \"status\" : \"available\" } ]]")) + .setBody(constant("[ { \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ], \"name\" : \"doggie\", \"id\" : 0, \"category\" : { \"name\" : \"name\", \"id\" : 6 }, \"tags\" : [ { \"name\" : \"name\", \"id\" : 1 }, { \"name\" : \"name\", \"id\" : 1 } ], \"status\" : \"available\" }, { \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ], \"name\" : \"doggie\", \"id\" : 0, \"category\" : { \"name\" : \"name\", \"id\" : 6 }, \"tags\" : [ { \"name\" : \"name\", \"id\" : 1 }, { \"name\" : \"name\", \"id\" : 1 } ], \"status\" : \"available\" } ]")) .unmarshal().json(JsonLibrary.Jackson, Pet[].class); /** GET /pet/{petId} : Find pet by ID