loafle/openapi-generator
3
0
Fork 0
forked from loafle/openapi-generator-original
Code Pull Requests Activity

[MAVEN PLUGIN] Checking for null configOptions before looking for property (#7613)

Browse Source 
* Checking for null configOptions

* Inline configOptions check
This commit is contained in:
Matthew McGarvey 2018-02-10 02:08:47 -06:00 committed by William Cheng
parent f41683a5ba
commit 0a28aad73b
1 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
modules/swagger-codegen-maven-plugin/src/main/java/io/swagger/codegen/plugin/CodeGenMojo.java
View File

@ -210,6 +210,9 @@ public class CodeGenMojo extends AbstractMojo {
/** /**
* A map of additional properties that can be referenced by the mustache templates * A map of additional properties that can be referenced by the mustache templates
* <additionalProperties>
* <additionalProperty>key=value</additionalProperty>
* </additionalProperties>
*/ */
@Parameter(name = "additionalProperties") @Parameter(name = "additionalProperties")
private List<String> additionalProperties; private List<String> additionalProperties;
@ -466,32 +469,32 @@ public class CodeGenMojo extends AbstractMojo {
} }
//Apply Instantiation Types //Apply Instantiation Types
if (instantiationTypes != null && !configOptions.containsKey("instantiation-types")) { if (instantiationTypes != null && (configOptions == null || !configOptions.containsKey("instantiation-types"))) {
applyInstantiationTypesKvpList(instantiationTypes, configurator); applyInstantiationTypesKvpList(instantiationTypes, configurator);
} }
//Apply Import Mappings //Apply Import Mappings
if (importMappings != null && !configOptions.containsKey("import-mappings")) { if (importMappings != null && (configOptions == null || !configOptions.containsKey("import-mappings"))) {
applyImportMappingsKvpList(importMappings, configurator); applyImportMappingsKvpList(importMappings, configurator);
} }
//Apply Type Mappings //Apply Type Mappings
if (typeMappings != null && !configOptions.containsKey("type-mappings")) { if (typeMappings != null && (configOptions == null || !configOptions.containsKey("type-mappings"))) {
applyTypeMappingsKvpList(typeMappings, configurator); applyTypeMappingsKvpList(typeMappings, configurator);
} }
//Apply Language Specific Primitives //Apply Language Specific Primitives
if (languageSpecificPrimitives != null && !configOptions.containsKey("language-specific-primitives")) { if (languageSpecificPrimitives != null && (configOptions == null || !configOptions.containsKey("language-specific-primitives"))) {
applyLanguageSpecificPrimitivesCsvList(languageSpecificPrimitives, configurator); applyLanguageSpecificPrimitivesCsvList(languageSpecificPrimitives, configurator);
} }
//Apply Additional Properties //Apply Additional Properties
if (additionalProperties != null && !configOptions.containsKey("additional-properties")) { if (additionalProperties != null && (configOptions == null || !configOptions.containsKey("additional-properties"))) {
applyAdditionalPropertiesKvpList(additionalProperties, configurator); applyAdditionalPropertiesKvpList(additionalProperties, configurator);
} }
//Apply Reserved Words Mappings //Apply Reserved Words Mappings
if (reservedWordsMappings != null && !configOptions.containsKey("reserved-words-mappings")) { if (reservedWordsMappings != null && (configOptions == null || !configOptions.containsKey("reserved-words-mappings"))) {
applyReservedWordsMappingsKvpList(reservedWordsMappings, configurator); applyReservedWordsMappingsKvpList(reservedWordsMappings, configurator);
} }