From 74677d2e7c9ce18be4dbefcaeea862e3e6a19014 Mon Sep 17 00:00:00 2001
From: Deven Phillips <deven.phillips@gmail.com>
Date: Tue, 21 May 2019 11:24:24 -0400
Subject: [PATCH 1/5] Resolves #2962 - Add properties config to Maven
parameters
---
.../openapi-generator-maven-plugin/README.md | 95 ++++++++++---------
.../codegen/plugin/CodeGenMojo.java | 82 ++++++++--------
2 files changed, 91 insertions(+), 86 deletions(-)
diff --git a/modules/openapi-generator-maven-plugin/README.md b/modules/openapi-generator-maven-plugin/README.md
index 27fe12c478e..ad779837257 100644
--- a/modules/openapi-generator-maven-plugin/README.md
+++ b/modules/openapi-generator-maven-plugin/README.md
@@ -39,50 +39,55 @@ mvn clean compile
:bulb: These **general** configurations should be in the same level
-- `inputSpec` - OpenAPI Spec file path
-- `language` - target generation language (deprecated, replaced by `generatorName` as values here don't represent only 'language' any longer)
-- `generatorName` - target generator name
-- `output` - target output path (default is `${project.build.directory}/generated-sources/openapi`. Can also be set globally through the `openapi.generator.maven.plugin.output` property)
-- `templateDirectory` - directory with mustache templates
-- `addCompileSourceRoot` - add the output directory to the project as a source root (`true` by default)
-- `modelPackage` - the package to use for generated model objects/classes
-- `apiPackage` - the package to use for generated api objects/classes
-- `invokerPackage` - the package to use for the generated invoker objects
-- `modelNamePrefix` and `modelNameSuffix` - Sets the pre- or suffix for model classes and enums
-- `withXml` - enable XML annotations inside the generated models and API (only works with Java `language` and libraries that provide support for JSON and XML)
-- `configOptions` - a map of language-specific parameters. To show a full list of generator-specified parameters (options), please use `configHelp` (explained below)
-- `configHelp` - dumps the configuration help for the specified library (generates no sources)
-- `ignoreFileOverride` - specifies the full path to a `.openapi-generator-ignore` used for pattern based overrides of generated outputs
-- `removeOperationIdPrefix` - remove operationId prefix (e.g. user_getName => getName)
-- `logToStderr` - write all log messages (not just errors) to STDOUT
-- `enablePostProcessFile` - enable file post-processing hook
-- `skipValidateSpec` - Whether or not to skip validating the input spec prior to generation. By default, invalid specifications will result in an error.
-- `strictSpec` - Whether or not to treat an input document strictly against the spec. 'MUST' and 'SHALL' wording in OpenAPI spec is strictly adhered to. e.g. when false, no fixes will be applied to documents which pass validation but don't follow the spec.
-- `generateAliasAsModel` - generate alias (array, map) as model
-- `generateApis` - generate the apis (`true` by default)
-- `generateApiTests` - generate the api tests (`true` by default. Only available if `generateApis` is `true`)
-- `generateApiDocumentation` - generate the api documentation (`true` by default. Only available if `generateApis` is `true`)
-- `generateModels` - generate the models (`true` by default)
-- `modelsToGenerate` - A comma separated list of models to generate. All models is the default.
-- `generateModelTests` - generate the model tests (`true` by default. Only available if `generateModels` is `true`)
-- `generateModelDocumentation` - generate the model documentation (`true` by default. Only available if `generateModels` is `true`)
-- `generateSupportingFiles` - generate the supporting files (`true` by default)
-- `supportingFilesToGenerate` - A comma separated list of supporting files to generate. All files is the default.
-- `skip` - skip code generation (`false` by default. Can also be set globally through the `codegen.skip` property)
-- `verbose` - verbose mode (`false` by default)
-- `groupId`, `artifactId` and `artifactVersion` - sets project information in generated pom.xml/build.gradle or other build script. Language-specific conversions occur in non-jvm generators
-- `gitUserId` and `gitRepoId` - sets git information of the project
-- `auth` - adds authorization headers when fetching the OpenAPI definitions remotely. Pass in a URL-encoded string of `name:header` with a comma separating multiple values
-- `configurationFile` - Path to separate json configuration file. File content should be in a json format {"optionKey":"optionValue", "optionKey1":"optionValue1"...} Supported options can be different for each language. Run `config-help -g {generator name}` command for language specific config options
-- `skipOverwrite` - Specifies if the existing files should be overwritten during the generation. (`false` by default)
-- `library` - library template (sub-template)
-- `instantiationTypes` - sets instantiation type mappings in the format of type=instantiatedType,type=instantiatedType. For example (in Java): `array=ArrayList,map=HashMap`. In other words array types will get instantiated as ArrayList in generated code. You can also have multiple occurrences of this option
-- `importMappings` - specifies mappings between a given class and the import that should be used for that class in the format of type=import,type=import. You can also have multiple occurrences of this option
-- `typeMappings` - sets mappings between OpenAPI spec types and generated code types in the format of OpenAPIType=generatedType,OpenAPIType=generatedType. For example: `array=List,map=Map,string=String`. You can also have multiple occurrences of this option
-- `languageSpecificPrimitives` - specifies additional language specific primitive types in the format of type1,type2,type3,type3. For example: `String,boolean,Boolean,Double`. You can also have multiple occurrences of this option
-- `additionalProperties` - sets additional properties that can be referenced by the mustache templates in the format of name=value,name=value. You can also have multiple occurrences of this option
-- `reservedWordsMappings` - specifies how a reserved name should be escaped to. Otherwise, the default `_<name>` is used. For example `id=identifier`. You can also have multiple occurrences of this option
-- `skipIfSpecIsUnchanged` - Skip the execution if the source file is older than the output folder (`false` by default. Can also be set globally through the `codegen.skipIfSpecIsUnchanged` property)
+| Option | `openapi.generator.maven.plugin.` | Property | `openapi.generator.maven.plugin.` | Description |
+|--------|----------|-------------|
+| `inputSpec` | `openapi.generator.maven.plugin.inputSpec` | OpenAPI Spec file path
+| `language` | `openapi.generator.maven.plugin.language` | target generation language (deprecated, replaced by `generatorName` as values here don't represent only 'language' any longer)
+| `generatorName` | `openapi.generator.maven.plugin.generatorName` | target generator name
+| `output` | `openapi.generator.maven.plugin.output` | target output path (default is `${project.build.directory}/generated-sources/openapi`. Can also be set globally through the `openapi.generator.maven.plugin.output` property)
+| `templateDirectory` | `openapi.generator.maven.plugin.templateDirectory` | directory with mustache templates
+| `addCompileSourceRoot` | `openapi.generator.maven.plugin.addCompileSourceRoot` | add the output directory to the project as a source root (`true` by default)
+| `modelPackage` | `openapi.generator.maven.plugin.modelPackage` | the package to use for generated model objects/classes
+| `apiPackage` | `openapi.generator.maven.plugin.apiPackage` | the package to use for generated api objects/classes
+| `invokerPackage` | `openapi.generator.maven.plugin.invokerPackage` | the package to use for the generated invoker objects
+| `modelNamePrefix` | `openapi.generator.maven.plugin.modelNamePrefix` | Sets the prefix for model classes and enums
+| `modelNameSuffix` | `openapi.generator.maven.plugin.modelNameSuffix` | Sets the suffix for model classes and enums
+| `withXml` | `openapi.generator.maven.plugin.withXml` | enable XML annotations inside the generated models and API (only works with Java `language` and libraries that provide support for JSON and XML)
+| `configOptions` | N/A | a map of language-specific parameters. To show a full list of generator-specified parameters (options), please use `configHelp` (explained below)
+| `configHelp` | `codegen.configHelp` | dumps the configuration help for the specified library (generates no sources)
+| `ignoreFileOverride` | `openapi.generator.maven.plugin.ignoreFileOverride` | specifies the full path to a `.openapi-generator-ignore` used for pattern based overrides of generated outputs
+| `removeOperationIdPrefix` | `openapi.generator.maven.plugin.removeOperationIdPrefix` | remove operationId prefix (e.g. user_getName => getName)
+| `logToStderr` | `openapi.generator.maven.plugin.logToStderr` | write all log messages (not just errors) to STDOUT
+| `enablePostProcessFile` | `openapi.generator.maven.plugin.` | enable file post-processing hook
+| `skipValidateSpec` | `openapi.generator.maven.plugin.skipValidateSpec` | Whether or not to skip validating the input spec prior to generation. By default, invalid specifications will result in an error.
+| `strictSpec` | `openapi.generator.maven.plugin.strictSpec` | Whether or not to treat an input document strictly against the spec. 'MUST' and 'SHALL' wording in OpenAPI spec is strictly adhered to. e.g. when false, no fixes will be applied to documents which pass validation but don't follow the spec.
+| `generateAliasAsModel` | `openapi.generator.maven.plugin.generateAliasAsModel` | generate alias (array, map) as model
+| `generateApis` | `openapi.generator.maven.plugin.generateApis` | generate the apis (`true` by default)
+| `generateApiTests` | `openapi.generator.maven.plugin.generateApiTests` | generate the api tests (`true` by default. Only available if `generateApis` is `true`)
+| `generateApiDocumentation` | `openapi.generator.maven.plugin.generateApiDocumentation` | generate the api documentation (`true` by default. Only available if `generateApis` is `true`)
+| `generateModels` | `openapi.generator.maven.plugin.generateModels` | generate the models (`true` by default)
+| `modelsToGenerate` | `openapi.generator.maven.plugin.modelsToGenerate` | A comma separated list of models to generate. All models is the default.
+| `generateModelTests` | `openapi.generator.maven.plugin.generateModelTests` | generate the model tests (`true` by default. Only available if `generateModels` is `true`)
+| `generateModelDocumentation` | `openapi.generator.maven.plugin.generateModelDocumentation` | generate the model documentation (`true` by default. Only available if `generateModels` is `true`)
+| `generateSupportingFiles` | `openapi.generator.maven.plugin.generateSupportingFiles` | generate the supporting files (`true` by default)
+| `supportingFilesToGenerate` | `openapi.generator.maven.plugin.supportingFilesToGenerate` | A comma separated list of supporting files to generate. All files is the default.
+| `skip` | `codegen.skip` | skip code generation (`false` by default. Can also be set globally through the `codegen.skip` property)
+| `verbose` | `openapi.generator.maven.plugin.verbose` | verbose mode (`false` by default)
+| `groupId` | `openapi.generator.maven.plugin.groupId` | sets project information in generated pom.xml/build.gradle or other build script. Language-specific conversions occur in non-jvm generators
+| `artifactId` | `openapi.generator.maven.plugin.artifactId` | sets project information in generated pom.xml/build.gradle or other build script. Language-specific conversions occur in non-jvm generators
+| `artifactVersion` | `openapi.generator.maven.plugin.artifactVersion` | sets project information in generated pom.xml/build.gradle or other build script. Language-specific conversions occur in non-jvm generators
+| `gitUserId` and `gitRepoId` | `openapi.generator.maven.plugin.gitUserId` | sets git information of the project
+| `auth` | `openapi.generator.maven.plugin.auth` | adds authorization headers when fetching the OpenAPI definitions remotely. Pass in a URL-encoded string of `name:header` with a comma separating multiple values
+| `configurationFile` | `openapi.generator.maven.plugin.configurationFile` | Path to separate json configuration file. File content should be in a json format {"optionKey":"optionValue", "optionKey1":"optionValue1"...} Supported options can be different for each language. Run `config-help -g {generator name}` command for language specific config options
+| `skipOverwrite` | `openapi.generator.maven.plugin.skipOverwrite` | Specifies if the existing files should be overwritten during the generation. (`false` by default)
+| `library` | `openapi.generator.maven.plugin.library` | library template (sub-template)
+| `instantiationTypes` | `openapi.generator.maven.plugin.instantiationTypes` | sets instantiation type mappings in the format of type=instantiatedType,type=instantiatedType. For example (in Java): `array=ArrayList,map=HashMap`. In other words array types will get instantiated as ArrayList in generated code. You can also have multiple occurrences of this option
+| `importMappings` | `openapi.generator.maven.plugin.importMappings` | specifies mappings between a given class and the import that should be used for that class in the format of type=import,type=import. You can also have multiple occurrences of this option
+| `typeMappings` | `openapi.generator.maven.plugin.typeMappings` | sets mappings between OpenAPI spec types and generated code types in the format of OpenAPIType=generatedType,OpenAPIType=generatedType. For example: `array=List,map=Map,string=String`. You can also have multiple occurrences of this option
+| `languageSpecificPrimitives` | `openapi.generator.maven.plugin.languageSpecificPrimitives` | specifies additional language specific primitive types in the format of type1,type2,type3,type3. For example: `String,boolean,Boolean,Double`. You can also have multiple occurrences of this option
+| `additionalProperties` | `openapi.generator.maven.plugin.additionalProperties` | sets additional properties that can be referenced by the mustache templates in the format of name=value,name=value. You can also have multiple occurrences of this option
+| `reservedWordsMappings` | `openapi.generator.maven.plugin.reservedWordsMappings` | specifies how a reserved name should be escaped to. Otherwise, the default `_<name>` is used. For example `id=identifier`. You can also have multiple occurrences of this option
+| `skipIfSpecIsUnchanged` | `codegen.skipIfSpecIsUnchanged` | Skip the execution if the source file is older than the output folder (`false` by default. Can also be set globally through the `codegen.skipIfSpecIsUnchanged` property)
### Custom Generator
@@ -101,7 +106,7 @@ Specifying a custom generator is a bit different. It doesn't support the classpa
</goals>
<configuration>
<inputSpec>${project.basedir}/src/main/resources/yaml/yamlfilename.yaml</inputSpec>
- <!-- language file, like e.g. JavaJaxRSCodegen -->
+ <!-| language file, like e.g. JavaJaxRSCodegen -->
<generatorName>com.my.package.for.GeneratorLanguage</generatorName>
<templateDirectory>myTemplateDir</templateDirectory>
diff --git a/modules/openapi-generator-maven-plugin/src/main/java/org/openapitools/codegen/plugin/CodeGenMojo.java b/modules/openapi-generator-maven-plugin/src/main/java/org/openapitools/codegen/plugin/CodeGenMojo.java
index 791c8301418..1fdb50a182c 100644
--- a/modules/openapi-generator-maven-plugin/src/main/java/org/openapitools/codegen/plugin/CodeGenMojo.java
+++ b/modules/openapi-generator-maven-plugin/src/main/java/org/openapitools/codegen/plugin/CodeGenMojo.java
@@ -105,146 +105,146 @@ public class CodeGenMojo extends AbstractMojo {
/**
* Location of the OpenAPI spec, as URL or file.
*/
- @Parameter(name = "inputSpec", required = true)
+ @Parameter(name = "inputSpec", property = "openapi.generator.maven.plugin.inputSpec", required = true)
private String inputSpec;
/**
* Git user ID, e.g. swagger-api.
*/
- @Parameter(name = "gitUserId", required = false)
+ @Parameter(name = "gitUserId", property = "openapi.generator.maven.plugin.gitUserId", required = false)
private String gitUserId;
/**
* Git repo ID, e.g. openapi-generator.
*/
- @Parameter(name = "gitRepoId", required = false)
+ @Parameter(name = "gitRepoId", property = "openapi.generator.maven.plugin.gitRepoId", required = false)
private String gitRepoId;
/**
* Folder containing the template files.
*/
- @Parameter(name = "templateDirectory")
+ @Parameter(name = "templateDirectory", property = "openapi.generator.maven.plugin.templateDirectory")
private File templateDirectory;
/**
* Adds authorization headers when fetching the swagger definitions remotely. " Pass in a
* URL-encoded string of name:header with a comma separating multiple values
*/
- @Parameter(name = "auth")
+ @Parameter(name = "auth", property = "openapi.generator.maven.plugin.auth")
private String auth;
/**
* Path to separate json configuration file.
*/
- @Parameter(name = "configurationFile", required = false)
+ @Parameter(name = "configurationFile", property = "openapi.generator.maven.plugin.configurationFile", required = false)
private String configurationFile;
/**
* Specifies if the existing files should be overwritten during the generation.
*/
- @Parameter(name = "skipOverwrite", required = false)
+ @Parameter(name = "skipOverwrite", property = "openapi.generator.maven.plugin.skipOverwrite", required = false)
private Boolean skipOverwrite;
/**
* The package to use for generated api objects/classes
*/
- @Parameter(name = "apiPackage")
+ @Parameter(name = "apiPackage", property = "openapi.generator.maven.plugin.apiPackage")
private String apiPackage;
/**
* The package to use for generated model objects/classes
*/
- @Parameter(name = "modelPackage")
+ @Parameter(name = "modelPackage", property = "openapi.generator.maven.plugin.modelPackage")
private String modelPackage;
/**
* The package to use for the generated invoker objects
*/
- @Parameter(name = "invokerPackage")
+ @Parameter(name = "invokerPackage", property = "openapi.generator.maven.plugin.invokerPackage")
private String invokerPackage;
/**
* The default package to use for the generated objects
*/
- @Parameter(name = "packageName")
+ @Parameter(name = "packageName", property = "openapi.generator.maven.plugin.packageName")
private String packageName;
/**
* groupId in generated pom.xml
*/
- @Parameter(name = "groupId")
+ @Parameter(name = "groupId", property = "openapi.generator.maven.plugin.groupId")
private String groupId;
/**
* artifactId in generated pom.xml
*/
- @Parameter(name = "artifactId")
+ @Parameter(name = "artifactId", property = "openapi.generator.maven.plugin.artifactId")
private String artifactId;
/**
* artifact version in generated pom.xml
*/
- @Parameter(name = "artifactVersion")
+ @Parameter(name = "artifactVersion", property = "openapi.generator.maven.plugin.artifactVersion")
private String artifactVersion;
/**
* Sets the library
*/
- @Parameter(name = "library", required = false)
+ @Parameter(name = "library", property = "openapi.generator.maven.plugin.library", required = false)
private String library;
/**
* Sets the prefix for model enums and classes
*/
- @Parameter(name = "modelNamePrefix", required = false)
+ @Parameter(name = "modelNamePrefix", property = "openapi.generator.maven.plugin.modelNamePrefix", required = false)
private String modelNamePrefix;
/**
* Sets the suffix for model enums and classes
*/
- @Parameter(name = "modelNameSuffix", required = false)
+ @Parameter(name = "modelNameSuffix", property = "openapi.generator.maven.plugin.modelNameSuffix", required = false)
private String modelNameSuffix;
/**
* Sets an optional ignoreFileOverride path
*/
- @Parameter(name = "ignoreFileOverride", required = false)
+ @Parameter(name = "ignoreFileOverride", property = "openapi.generator.maven.plugin.ignoreFileOverride", required = false)
private String ignoreFileOverride;
/**
* To remove operationId prefix (e.g. user_getName => getName)
*/
- @Parameter(name = "removeOperationIdPrefix", required = false)
+ @Parameter(name = "removeOperationIdPrefix", property = "openapi.generator.maven.plugin.removeOperationIdPrefix", required = false)
private Boolean removeOperationIdPrefix;
/**
* To write all log messages (not just errors) to STDOUT
*/
- @Parameter(name = "logToStderr", required = false)
+ @Parameter(name = "logToStderr", property = "openapi.generator.maven.plugin.logToStderr", required = false)
private Boolean logToStderr;
/**
* To file post-processing hook
*/
- @Parameter(name = "enablePostProcessFile", required = false)
+ @Parameter(name = "enablePostProcessFile", property = "openapi.generator.maven.plugin.enablePostProcessFile", required = false)
private Boolean enablePostProcessFile;
/**
* To skip spec validation
*/
- @Parameter(name = "skipValidateSpec", required = false)
+ @Parameter(name = "skipValidateSpec", property = "openapi.generator.maven.plugin.skipValidateSpec", required = false)
private Boolean skipValidateSpec;
/**
* To treat a document strictly against the spec.
*/
- @Parameter(name = "strictSpec", required = false)
+ @Parameter(name = "strictSpec", property = "openapi.generator.maven.plugin.strictSpec", required = false)
private Boolean strictSpecBehavior;
/**
* To generate alias (array, map) as model
*/
- @Parameter(name = "generateAliasAsModel", required = false)
+ @Parameter(name = "generateAliasAsModel", property = "openapi.generator.maven.plugin.generateAliasAsModel", required = false)
private Boolean generateAliasAsModel;
/**
@@ -256,97 +256,97 @@ public class CodeGenMojo extends AbstractMojo {
/**
* A map of types and the types they should be instantiated as
*/
- @Parameter(name = "instantiationTypes")
+ @Parameter(name = "instantiationTypes", property = "openapi.generator.maven.plugin.instantiationTypes")
private List<String> instantiationTypes;
/**
* A map of classes and the import that should be used for that class
*/
- @Parameter(name = "importMappings")
+ @Parameter(name = "importMappings", property = "openapi.generator.maven.plugin.importMappings")
private List<String> importMappings;
/**
* A map of swagger spec types and the generated code types to use for them
*/
- @Parameter(name = "typeMappings")
+ @Parameter(name = "typeMappings", property = "openapi.generator.maven.plugin.typeMappings")
private List<String> typeMappings;
/**
* A map of additional language specific primitive types
*/
- @Parameter(name = "languageSpecificPrimitives")
+ @Parameter(name = "languageSpecificPrimitives", property = "openapi.generator.maven.plugin.languageSpecificPrimitives")
private List<String> languageSpecificPrimitives;
/**
* A map of additional properties that can be referenced by the mustache templates
*/
- @Parameter(name = "additionalProperties")
+ @Parameter(name = "additionalProperties", property = "openapi.generator.maven.plugin.additionalProperties")
private List<String> additionalProperties;
/**
* A map of reserved names and how they should be escaped
*/
- @Parameter(name = "reservedWordsMappings")
+ @Parameter(name = "reservedWordsMappings", property = "openapi.generator.maven.plugin.reservedWordMappings")
private List<String> reservedWordsMappings;
/**
* Generate the apis
*/
- @Parameter(name = "generateApis", required = false)
+ @Parameter(name = "generateApis", property = "openapi.generator.maven.plugin.generateApis", required = false)
private Boolean generateApis = true;
/**
* Generate the models
*/
- @Parameter(name = "generateModels", required = false)
+ @Parameter(name = "generateModels", property = "openapi.generator.maven.plugin.generateModels", required = false)
private Boolean generateModels = true;
/**
* A comma separated list of models to generate. All models is the default.
*/
- @Parameter(name = "modelsToGenerate", required = false)
+ @Parameter(name = "modelsToGenerate", property = "openapi.generator.maven.plugin.modelsToGenerate", required = false)
private String modelsToGenerate = "";
/**
* Generate the supporting files
*/
- @Parameter(name = "generateSupportingFiles", required = false)
+ @Parameter(name = "generateSupportingFiles", property = "openapi.generator.maven.plugin.generateSupportingFiles", required = false)
private Boolean generateSupportingFiles = true;
/**
* A comma separated list of models to generate. All models is the default.
*/
- @Parameter(name = "supportingFilesToGenerate", required = false)
+ @Parameter(name = "supportingFilesToGenerate", property = "openapi.generator.maven.plugin.supportingFilesToGenerate", required = false)
private String supportingFilesToGenerate = "";
/**
* Generate the model tests
*/
- @Parameter(name = "generateModelTests", required = false)
+ @Parameter(name = "generateModelTests", property = "openapi.generator.maven.plugin.generateModelTests", required = false)
private Boolean generateModelTests = true;
/**
* Generate the model documentation
*/
- @Parameter(name = "generateModelDocumentation", required = false)
+ @Parameter(name = "generateModelDocumentation", property = "openapi.generator.maven.plugin.generateModelDocumentation", required = false)
private Boolean generateModelDocumentation = true;
/**
* Generate the api tests
*/
- @Parameter(name = "generateApiTests", required = false)
+ @Parameter(name = "generateApiTests", property = "openapi.generator.maven.plugin.generateApiTests", required = false)
private Boolean generateApiTests = true;
/**
* Generate the api documentation
*/
- @Parameter(name = "generateApiDocumentation", required = false)
+ @Parameter(name = "generateApiDocumentation", property = "openapi.generator.maven.plugin.generateApiDocumentation", required = false)
private Boolean generateApiDocumentation = true;
/**
* Generate the api documentation
*/
- @Parameter(name = "withXml", required = false)
+ @Parameter(name = "withXml", property = "openapi.generator.maven.plugin.withXml", required = false)
private Boolean withXml = false;
/**
@@ -374,7 +374,7 @@ public class CodeGenMojo extends AbstractMojo {
@Parameter
protected Map<String, String> originalEnvironmentVariables = new HashMap<String, String>();
- @Parameter
+ @Parameter(property = "codegen.configHelp")
private boolean configHelp = false;
/**
--
GitLab
From 46a02ed6eae350fbb082bc1a24ba5eff6874a308 Mon Sep 17 00:00:00 2001
From: Deven Phillips <deven.phillips@gmail.com>
Date: Tue, 21 May 2019 11:42:40 -0400
Subject: [PATCH 2/5] Fixed formatting
---
modules/openapi-generator-maven-plugin/README.md | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/modules/openapi-generator-maven-plugin/README.md b/modules/openapi-generator-maven-plugin/README.md
index ad779837257..026786d6497 100644
--- a/modules/openapi-generator-maven-plugin/README.md
+++ b/modules/openapi-generator-maven-plugin/README.md
@@ -39,7 +39,7 @@ mvn clean compile
:bulb: These **general** configurations should be in the same level
-| Option | `openapi.generator.maven.plugin.` | Property | `openapi.generator.maven.plugin.` | Description |
+| Option | Property | Description |
|--------|----------|-------------|
| `inputSpec` | `openapi.generator.maven.plugin.inputSpec` | OpenAPI Spec file path
| `language` | `openapi.generator.maven.plugin.language` | target generation language (deprecated, replaced by `generatorName` as values here don't represent only 'language' any longer)
--
GitLab
From 5a173b1bdf0e688c39c595c070994607469d00c1 Mon Sep 17 00:00:00 2001
From: Deven Phillips <deven.phillips@gmail.com>
Date: Tue, 21 May 2019 11:43:34 -0400
Subject: [PATCH 3/5] Fixed formatting
---
modules/openapi-generator-maven-plugin/README.md | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/modules/openapi-generator-maven-plugin/README.md b/modules/openapi-generator-maven-plugin/README.md
index 026786d6497..113fdd07d26 100644
--- a/modules/openapi-generator-maven-plugin/README.md
+++ b/modules/openapi-generator-maven-plugin/README.md
@@ -106,7 +106,7 @@ Specifying a custom generator is a bit different. It doesn't support the classpa
</goals>
<configuration>
<inputSpec>${project.basedir}/src/main/resources/yaml/yamlfilename.yaml</inputSpec>
- <!-| language file, like e.g. JavaJaxRSCodegen -->
+ <!- language file, like e.g. JavaJaxRSCodegen -->
<generatorName>com.my.package.for.GeneratorLanguage</generatorName>
<templateDirectory>myTemplateDir</templateDirectory>
--
GitLab
From fd64f6eaaa142972b1a7845757d78a1f2e142193 Mon Sep 17 00:00:00 2001
From: Deven Phillips <deven.phillips@gmail.com>
Date: Wed, 22 May 2019 07:40:41 -0400
Subject: [PATCH 4/5] Fix missing hyphen
---
modules/openapi-generator-maven-plugin/README.md | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/modules/openapi-generator-maven-plugin/README.md b/modules/openapi-generator-maven-plugin/README.md
index 113fdd07d26..05297e377f8 100644
--- a/modules/openapi-generator-maven-plugin/README.md
+++ b/modules/openapi-generator-maven-plugin/README.md
@@ -106,7 +106,7 @@ Specifying a custom generator is a bit different. It doesn't support the classpa
</goals>
<configuration>
<inputSpec>${project.basedir}/src/main/resources/yaml/yamlfilename.yaml</inputSpec>
- <!- language file, like e.g. JavaJaxRSCodegen -->
+ <!-- language file, like e.g. JavaJaxRSCodegen -->
<generatorName>com.my.package.for.GeneratorLanguage</generatorName>
<templateDirectory>myTemplateDir</templateDirectory>
--
GitLab
From bfe3e1da29a953b7efcff52a7114a8291ac72342 Mon Sep 17 00:00:00 2001
From: Deven Phillips <deven.phillips@gmail.com>
Date: Thu, 30 May 2019 09:22:27 -0400
Subject: [PATCH 5/5] Added propery for `engine` parameter
---
.../main/java/org/openapitools/codegen/plugin/CodeGenMojo.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/modules/openapi-generator-maven-plugin/src/main/java/org/openapitools/codegen/plugin/CodeGenMojo.java b/modules/openapi-generator-maven-plugin/src/main/java/org/openapitools/codegen/plugin/CodeGenMojo.java
index d10197bf2f7..7ac66dc4da4 100644
--- a/modules/openapi-generator-maven-plugin/src/main/java/org/openapitools/codegen/plugin/CodeGenMojo.java
+++ b/modules/openapi-generator-maven-plugin/src/main/java/org/openapitools/codegen/plugin/CodeGenMojo.java
@@ -129,7 +129,7 @@ public class CodeGenMojo extends AbstractMojo {
/**
* The name of templating engine to use, "mustache" (default) or "handlebars" (beta)
*/
- @Parameter(name = "engine", defaultValue = "mustache")
+ @Parameter(name = "engine", defaultValue = "mustache", property="openapi.generator.maven.plugin.engine")
private String engine;
/**
--
GitLab