diff --git a/bin/configs/java-camel-petstore-new.yaml b/bin/configs/java-camel-petstore-new.yaml index 7d80dc2338af..9368da56da06 100644 --- a/bin/configs/java-camel-petstore-new.yaml +++ b/bin/configs/java-camel-petstore-new.yaml @@ -3,13 +3,11 @@ outputDir: samples/server/petstore/java-camel inputSpec: modules/openapi-generator/src/test/resources/3_0/petstore.yaml templateDir: modules/openapi-generator/src/main/resources/java-camel-server additionalProperties: - oas3: "true" hideGenerationTimestamp: true camelRestBindingMode: "auto" performBeanValidation: true #dateLibrary: "java8-localdatetime" camelDataformatProperties: "json.out.disableFeatures=WRITE_DATES_AS_TIMESTAMPS" - library: "spring-boot" withXml: true jackson: true camelUseDefaultValidationErrorProcessor: true diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavaCamelServerCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavaCamelServerCodegen.java index df4659d4aaf8..831c083aa0b1 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavaCamelServerCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavaCamelServerCodegen.java @@ -72,7 +72,7 @@ public JavaCamelServerCodegen() { templateDir = "java-camel-server"; addCliOptions(); artifactId = "openapi-camel"; - super.library = ""; + annotationLibrary = AnnotationLibrary.SWAGGER2; } @Override 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 aa73b170bfdd..a3434e641caa 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 @@ -118,18 +118,20 @@ Do not edit the class manually. jackson-databind-nullable 0.2.8 + {{#swagger1AnnotationLibrary}} io.swagger swagger-annotations 1.6.3 - {{#oas3}} + {{/swagger1AnnotationLibrary}} + {{#swagger2AnnotationLibrary}} io.swagger.core.v3 swagger-annotations 2.2.8 - {{/oas3}} + {{/swagger2AnnotationLibrary}} {{#jackson}} com.fasterxml.jackson.datatype diff --git a/samples/server/petstore/java-camel/pom.xml b/samples/server/petstore/java-camel/pom.xml index 74f47a4dcd63..adf36ebde4b4 100644 --- a/samples/server/petstore/java-camel/pom.xml +++ b/samples/server/petstore/java-camel/pom.xml @@ -118,11 +118,6 @@ Do not edit the class manually. jackson-databind-nullable 0.2.8 - - io.swagger - swagger-annotations - 1.6.3 - io.swagger.core.v3 swagger-annotations