This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a commit to branch rest-out in repository https://gitbox.apache.org/repos/asf/camel.git
commit 6217407991b2d6db3187a5b4244ef1406d246bbd Author: Claus Ibsen <[email protected]> AuthorDate: Mon Mar 11 11:21:50 2024 +0100 CAMEL-19284: restdsl-openapi-generator - Add type and outType to Rest DSL --- .../apache/camel/maven/generator/openapi/GenerateMojo.java | 11 +++++++++++ .../camel/maven/generator/openapi/GenerateWithDtoMojo.java | 2 +- .../apache/camel/maven/generator/openapi/GenerateXmlMojo.java | 9 +++++++++ .../camel/maven/generator/openapi/GenerateXmlWithDtoMojo.java | 2 +- .../camel/maven/generator/openapi/GenerateYamlMojo.java | 9 +++++++++ .../maven/generator/openapi/GenerateYamlWithDtoMojo.java | 2 +- 6 files changed, 32 insertions(+), 3 deletions(-) diff --git a/tooling/maven/camel-restdsl-openapi-plugin/src/main/java/org/apache/camel/maven/generator/openapi/GenerateMojo.java b/tooling/maven/camel-restdsl-openapi-plugin/src/main/java/org/apache/camel/maven/generator/openapi/GenerateMojo.java index 3912c0fa334..48d0fccdb6a 100644 --- a/tooling/maven/camel-restdsl-openapi-plugin/src/main/java/org/apache/camel/maven/generator/openapi/GenerateMojo.java +++ b/tooling/maven/camel-restdsl-openapi-plugin/src/main/java/org/apache/camel/maven/generator/openapi/GenerateMojo.java @@ -49,6 +49,10 @@ public class GenerateMojo extends AbstractGenerateMojo { @Override public void execute() throws MojoExecutionException { + execute(false); + } + + protected void execute(boolean dto) throws MojoExecutionException { if (skip) { return; } @@ -87,6 +91,13 @@ public class GenerateMojo extends AbstractGenerateMojo { if (ObjectHelper.isNotEmpty(packageName)) { generator.withPackageName(packageName); } + if (dto) { + if (modelPackage != null) { + generator.withDtoPackageName(modelPackage); + } else { + generator.withDtoPackageName(packageName); + } + } if (ObjectHelper.isNotEmpty(destinationGenerator)) { final DestinationGenerator destinationGeneratorObject = createDestinationGenerator(); diff --git a/tooling/maven/camel-restdsl-openapi-plugin/src/main/java/org/apache/camel/maven/generator/openapi/GenerateWithDtoMojo.java b/tooling/maven/camel-restdsl-openapi-plugin/src/main/java/org/apache/camel/maven/generator/openapi/GenerateWithDtoMojo.java index a238b632dec..a0e72e09332 100644 --- a/tooling/maven/camel-restdsl-openapi-plugin/src/main/java/org/apache/camel/maven/generator/openapi/GenerateWithDtoMojo.java +++ b/tooling/maven/camel-restdsl-openapi-plugin/src/main/java/org/apache/camel/maven/generator/openapi/GenerateWithDtoMojo.java @@ -30,7 +30,7 @@ public class GenerateWithDtoMojo extends GenerateMojo { if (skip) { return; } - super.execute(); + super.execute(true); generateDto("java"); } diff --git a/tooling/maven/camel-restdsl-openapi-plugin/src/main/java/org/apache/camel/maven/generator/openapi/GenerateXmlMojo.java b/tooling/maven/camel-restdsl-openapi-plugin/src/main/java/org/apache/camel/maven/generator/openapi/GenerateXmlMojo.java index 8c0601592d0..c107947f87d 100644 --- a/tooling/maven/camel-restdsl-openapi-plugin/src/main/java/org/apache/camel/maven/generator/openapi/GenerateXmlMojo.java +++ b/tooling/maven/camel-restdsl-openapi-plugin/src/main/java/org/apache/camel/maven/generator/openapi/GenerateXmlMojo.java @@ -47,6 +47,10 @@ public class GenerateXmlMojo extends AbstractGenerateMojo { @Override public void execute() throws MojoExecutionException { + execute(false); + } + + protected void execute(boolean dto) throws MojoExecutionException { if (skip) { return; } @@ -78,6 +82,11 @@ public class GenerateXmlMojo extends AbstractGenerateMojo { if (ObjectHelper.isNotEmpty(filterOperation)) { generator.withOperationFilter(filterOperation); } + if (dto) { + if (modelPackage != null) { + generator.withDtoPackageName(modelPackage); + } + } if (ObjectHelper.isNotEmpty(destinationGenerator)) { final DestinationGenerator destinationGeneratorObject = createDestinationGenerator(); diff --git a/tooling/maven/camel-restdsl-openapi-plugin/src/main/java/org/apache/camel/maven/generator/openapi/GenerateXmlWithDtoMojo.java b/tooling/maven/camel-restdsl-openapi-plugin/src/main/java/org/apache/camel/maven/generator/openapi/GenerateXmlWithDtoMojo.java index 96d777a6dec..d88ef7959e2 100644 --- a/tooling/maven/camel-restdsl-openapi-plugin/src/main/java/org/apache/camel/maven/generator/openapi/GenerateXmlWithDtoMojo.java +++ b/tooling/maven/camel-restdsl-openapi-plugin/src/main/java/org/apache/camel/maven/generator/openapi/GenerateXmlWithDtoMojo.java @@ -30,7 +30,7 @@ public class GenerateXmlWithDtoMojo extends GenerateXmlMojo { if (skip) { return; } - super.execute(); + super.execute(true); generateDto("java"); } diff --git a/tooling/maven/camel-restdsl-openapi-plugin/src/main/java/org/apache/camel/maven/generator/openapi/GenerateYamlMojo.java b/tooling/maven/camel-restdsl-openapi-plugin/src/main/java/org/apache/camel/maven/generator/openapi/GenerateYamlMojo.java index c41f5f3eb3f..e1797d15f46 100644 --- a/tooling/maven/camel-restdsl-openapi-plugin/src/main/java/org/apache/camel/maven/generator/openapi/GenerateYamlMojo.java +++ b/tooling/maven/camel-restdsl-openapi-plugin/src/main/java/org/apache/camel/maven/generator/openapi/GenerateYamlMojo.java @@ -44,6 +44,10 @@ public class GenerateYamlMojo extends AbstractGenerateMojo { @Override public void execute() throws MojoExecutionException { + execute(false); + } + + protected void execute(boolean dto) throws MojoExecutionException { if (skip) { return; } @@ -71,6 +75,11 @@ public class GenerateYamlMojo extends AbstractGenerateMojo { if (ObjectHelper.isNotEmpty(filterOperation)) { generator.withOperationFilter(filterOperation); } + if (dto) { + if (modelPackage != null) { + generator.withDtoPackageName(modelPackage); + } + } if (ObjectHelper.isNotEmpty(destinationGenerator)) { final DestinationGenerator destinationGeneratorObject = createDestinationGenerator(); diff --git a/tooling/maven/camel-restdsl-openapi-plugin/src/main/java/org/apache/camel/maven/generator/openapi/GenerateYamlWithDtoMojo.java b/tooling/maven/camel-restdsl-openapi-plugin/src/main/java/org/apache/camel/maven/generator/openapi/GenerateYamlWithDtoMojo.java index 77f5631119a..29217036934 100644 --- a/tooling/maven/camel-restdsl-openapi-plugin/src/main/java/org/apache/camel/maven/generator/openapi/GenerateYamlWithDtoMojo.java +++ b/tooling/maven/camel-restdsl-openapi-plugin/src/main/java/org/apache/camel/maven/generator/openapi/GenerateYamlWithDtoMojo.java @@ -30,7 +30,7 @@ public class GenerateYamlWithDtoMojo extends GenerateYamlMojo { if (skip) { return; } - super.execute(); + super.execute(true); generateDto("java"); }
