Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

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

Merged
merged 2 commits into from
Feb 10, 2018
Merged

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

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8b363c4
Checking for null configOptions
Feb 7, 2018
62037f3
Inline configOptions check
Feb 8, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 13 additions & 10 deletions ...les/swagger-codegen-maven-plugin/src/main/java/io/swagger/codegen/plugin/CodeGenMojo.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,12 @@

/*
* Copyright 2001-2005 The Apache Software Foundation.
*
*
* Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
* in compliance with the License. You may obtain a copy of the License at
*
*
* http://www.apache.org/licenses/LICENSE-2.0
*
*
* Unless required by applicable law or agreed to in writing, software distributed under the License
* is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
* or implied. See the License for the specific language governing permissions and limitations under
Expand Down Expand Up @@ -210,6 +210,9 @@ public class CodeGenMojo extends AbstractMojo {

/**
* A map of additional properties that can be referenced by the mustache templates
* <additionalProperties>
* <additionalProperty>key=value</additionalProperty>
* </additionalProperties>
*/
@Parameter(name = "additionalProperties")
private List<String> additionalProperties;
Expand All @@ -218,7 +221,7 @@ public class CodeGenMojo extends AbstractMojo {
* A map of reserved names and how they should be escaped
*/
@Parameter(name = "reservedWordsMappings")
private List<String> reservedWordsMappings;
private List<String> reservedWordsMappings;

/**
* Generate the apis
Expand Down Expand Up @@ -466,32 +469,32 @@ public void execute() throws MojoExecutionException {
}

//Apply Instantiation Types
if (instantiationTypes != null && !configOptions.containsKey("instantiation-types")) {
if (instantiationTypes != null && (configOptions == null || !configOptions.containsKey("instantiation-types"))) {
applyInstantiationTypesKvpList(instantiationTypes, configurator);
}

//Apply Import Mappings
if (importMappings != null && !configOptions.containsKey("import-mappings")) {
if (importMappings != null && (configOptions == null || !configOptions.containsKey("import-mappings"))) {
applyImportMappingsKvpList(importMappings, configurator);
}

//Apply Type Mappings
if (typeMappings != null && !configOptions.containsKey("type-mappings")) {
if (typeMappings != null && (configOptions == null || !configOptions.containsKey("type-mappings"))) {
applyTypeMappingsKvpList(typeMappings, configurator);
}

//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);
}

//Apply Additional Properties
if (additionalProperties != null && !configOptions.containsKey("additional-properties")) {
if (additionalProperties != null && (configOptions == null || !configOptions.containsKey("additional-properties"))) {
applyAdditionalPropertiesKvpList(additionalProperties, configurator);
}

//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);
}

Expand Down