This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/master by this push:
new a39f32b CAMEL-15025 camel-restdsl-openapi-plugin: fix 'modelWithXml'
parameter (#3809)
a39f32b is described below
commit a39f32b230a9a0f60a2edc7816c732ac0f84bee5
Author: Alexey Markevich <[email protected]>
AuthorDate: Thu May 7 14:22:11 2020 +0300
CAMEL-15025 camel-restdsl-openapi-plugin: fix 'modelWithXml' parameter
(#3809)
propagation
---
.../src/main/docs/camel-restdsl-openapi-plugin.adoc | 4 ++--
.../apache/camel/maven/generator/openapi/AbstractGenerateMojo.java | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git
a/tooling/maven/camel-restdsl-openapi-plugin/src/main/docs/camel-restdsl-openapi-plugin.adoc
b/tooling/maven/camel-restdsl-openapi-plugin/src/main/docs/camel-restdsl-openapi-plugin.adoc
index 943fef0..53091cd 100644
---
a/tooling/maven/camel-restdsl-openapi-plugin/src/main/docs/camel-restdsl-openapi-plugin.adoc
+++
b/tooling/maven/camel-restdsl-openapi-plugin/src/main/docs/camel-restdsl-openapi-plugin.adoc
@@ -114,7 +114,7 @@ The plugin supports the following *additional* options
| `modelPackage` | `io.swagger.client.model` | The package to use for
generated model objects/classes
| `modelNamePrefix` | | Sets the pre- or suffix for model classes and enums
| `modelNameSuffix` | | Sets the pre- or suffix for model classes and enums
-| `modelWithXml` | true | Enable XML annotations inside the generated models
(only works with ibraries that provide support for JSON and XML)
+| `modelWithXml` | false | Enable XML annotations inside the generated models
(only works with ibraries that provide support for JSON and XML)
| `configOptions` | | Pass a map of language-specific parameters to
`swagger-codegen-maven-plugin`
|========================================
@@ -181,7 +181,7 @@ The plugin supports the following *additional* options
| `modelPackage` | `io.swagger.client.model` | The package to use for
generated model objects/classes
| `modelNamePrefix` | | Sets the pre- or suffix for model classes and enums
| `modelNameSuffix` | | Sets the pre- or suffix for model classes and enums
-| `modelWithXml` | true | Enable XML annotations inside the generated models
(only works with ibraries that provide support for JSON and XML)
+| `modelWithXml` | false | Enable XML annotations inside the generated models
(only works with ibraries that provide support for JSON and XML)
| `configOptions` | | Pass a map of language-specific parameters to
`swagger-codegen-maven-plugin`
|========================================
diff --git
a/tooling/maven/camel-restdsl-openapi-plugin/src/main/java/org/apache/camel/maven/generator/openapi/AbstractGenerateMojo.java
b/tooling/maven/camel-restdsl-openapi-plugin/src/main/java/org/apache/camel/maven/generator/openapi/AbstractGenerateMojo.java
index 21dc061..24bb158 100644
---
a/tooling/maven/camel-restdsl-openapi-plugin/src/main/java/org/apache/camel/maven/generator/openapi/AbstractGenerateMojo.java
+++
b/tooling/maven/camel-restdsl-openapi-plugin/src/main/java/org/apache/camel/maven/generator/openapi/AbstractGenerateMojo.java
@@ -84,7 +84,7 @@ abstract class AbstractGenerateMojo extends AbstractMojo {
@Parameter
String modelPackage;
- @Parameter(defaultValue = "true")
+ @Parameter(defaultValue = "false")
String modelWithXml;
@Parameter(defaultValue = "${project}")
@@ -182,7 +182,7 @@ abstract class AbstractGenerateMojo extends AbstractMojo {
elements.add(new MojoExecutor.Element("modelNameSuffix",
modelNameSuffix));
}
if (modelWithXml != null) {
- elements.add(new MojoExecutor.Element("withXml", modelPackage));
+ elements.add(new MojoExecutor.Element("withXml", modelWithXml));
}
if (configOptions != null) {
elements.add(new MojoExecutor.Element("configOptions",
configOptions.entrySet().stream()