This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/camel-spring-boot.git
commit 67c4ba9626c6f0595d8e0d5d2a96b11b997f0fa5 Author: Claus Ibsen <[email protected]> AuthorDate: Sun Oct 31 09:29:54 2021 +0100 CAMEL-17061: camel-springdoc-starter -- Integration with Springdoc. --- .../src/main/docs/openapi-java.json | 18 +++++++++++++++++- .../springboot/openapi/OpenApiAutoConfiguration.java | 2 +- .../springdoc/SpringdocAutoConfiguration.java | 2 +- .../spring-boot/examples/json/openapi-java.json | 18 +++++++++++++++++- .../modules/spring-boot/examples/json/springdoc.json | 19 +++++++++++++++++++ 5 files changed, 55 insertions(+), 4 deletions(-) diff --git a/components-starter/camel-openapi-java-starter/src/main/docs/openapi-java.json b/components-starter/camel-openapi-java-starter/src/main/docs/openapi-java.json index da5f5f2..b83a5fe 100644 --- a/components-starter/camel-openapi-java-starter/src/main/docs/openapi-java.json +++ b/components-starter/camel-openapi-java-starter/src/main/docs/openapi-java.json @@ -1,3 +1,19 @@ { - "properties": [] + "groups": [ + { + "name": "camel.openapi", + "type": "org.apache.camel.springboot.openapi.OpenApiConfiguration", + "sourceType": "org.apache.camel.springboot.openapi.OpenApiConfiguration" + } + ], + "properties": [ + { + "name": "camel.openapi.enabled", + "type": "java.lang.Boolean", + "description": "Enables Camel Rest DSL to automatic register its OpenAPI (eg swagger doc) in Spring Boot which allows tooling such as SpringDoc to integrate with Camel.", + "sourceType": "org.apache.camel.springboot.openapi.OpenApiConfiguration", + "defaultValue": true + } + ], + "hints": [] } \ No newline at end of file diff --git a/components-starter/camel-openapi-java-starter/src/main/java/org/apache/camel/springboot/openapi/OpenApiAutoConfiguration.java b/components-starter/camel-openapi-java-starter/src/main/java/org/apache/camel/springboot/openapi/OpenApiAutoConfiguration.java index e9e5998..7142c2f 100644 --- a/components-starter/camel-openapi-java-starter/src/main/java/org/apache/camel/springboot/openapi/OpenApiAutoConfiguration.java +++ b/components-starter/camel-openapi-java-starter/src/main/java/org/apache/camel/springboot/openapi/OpenApiAutoConfiguration.java @@ -134,7 +134,7 @@ public class OpenApiAutoConfiguration { RestConfiguration rc = camelContext.getRestConfiguration(); initOpenApi(bc, info, rc.getApiProperties()); - OasDocument openApi = reader.read(camelContext, rests, "", bc, null, camelContext.getClassResolver()); + OasDocument openApi = reader.read(camelContext, rests, bc, null, camelContext.getClassResolver()); if (!rc.isApiVendorExtension()) { clearVendorExtensions(openApi); } diff --git a/components-starter/camel-springdoc-starter/src/main/java/org/apache/camel/springboot/springdoc/SpringdocAutoConfiguration.java b/components-starter/camel-springdoc-starter/src/main/java/org/apache/camel/springboot/springdoc/SpringdocAutoConfiguration.java index 1ee15c5..45eaf08 100644 --- a/components-starter/camel-springdoc-starter/src/main/java/org/apache/camel/springboot/springdoc/SpringdocAutoConfiguration.java +++ b/components-starter/camel-springdoc-starter/src/main/java/org/apache/camel/springboot/springdoc/SpringdocAutoConfiguration.java @@ -127,7 +127,7 @@ public class SpringdocAutoConfiguration { final RestConfiguration rc = camelContext.getRestConfiguration(); initOpenApi(bc, info, rc.getApiProperties()); - final OasDocument openApi = reader.read(camelContext, rests, "", bc, null, camelContext.getClassResolver()); + final OasDocument openApi = reader.read(camelContext, rests, bc, null, camelContext.getClassResolver()); if (!rc.isApiVendorExtension()) { clearVendorExtensions(openApi); } diff --git a/docs/components/modules/spring-boot/examples/json/openapi-java.json b/docs/components/modules/spring-boot/examples/json/openapi-java.json index da5f5f2..b83a5fe 100644 --- a/docs/components/modules/spring-boot/examples/json/openapi-java.json +++ b/docs/components/modules/spring-boot/examples/json/openapi-java.json @@ -1,3 +1,19 @@ { - "properties": [] + "groups": [ + { + "name": "camel.openapi", + "type": "org.apache.camel.springboot.openapi.OpenApiConfiguration", + "sourceType": "org.apache.camel.springboot.openapi.OpenApiConfiguration" + } + ], + "properties": [ + { + "name": "camel.openapi.enabled", + "type": "java.lang.Boolean", + "description": "Enables Camel Rest DSL to automatic register its OpenAPI (eg swagger doc) in Spring Boot which allows tooling such as SpringDoc to integrate with Camel.", + "sourceType": "org.apache.camel.springboot.openapi.OpenApiConfiguration", + "defaultValue": true + } + ], + "hints": [] } \ No newline at end of file diff --git a/docs/components/modules/spring-boot/examples/json/springdoc.json b/docs/components/modules/spring-boot/examples/json/springdoc.json new file mode 100644 index 0000000..264d94d --- /dev/null +++ b/docs/components/modules/spring-boot/examples/json/springdoc.json @@ -0,0 +1,19 @@ +{ + "groups": [ + { + "name": "camel.springdoc", + "type": "org.apache.camel.springboot.springdoc.SpringdocConfiguration", + "sourceType": "org.apache.camel.springboot.springdoc.SpringdocConfiguration" + } + ], + "properties": [ + { + "name": "camel.springdoc.enabled", + "type": "java.lang.Boolean", + "description": "Enables Camel Rest DSL to automatic register its OpenAPI (eg swagger doc) in Spring Boot which allows tooling such as SpringDoc to integrate with Camel.", + "sourceType": "org.apache.camel.springboot.springdoc.SpringdocConfiguration", + "defaultValue": true + } + ], + "hints": [] +} \ No newline at end of file
