Skip to content

Moving instantiationTypes, typeMappings, languageSpecificPrimitives, additionalProperties, and reservedWordsMappings out of configOptions and converting it into a list, rather than being a comma-separated string. #6063

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

Merged
fehguy merged 3 commits into from
Jul 14, 2017
+77 −10
Merged

Moving instantiationTypes, typeMappings, languageSpecificPrimitives, additionalProperties, and reservedWordsMappings out of configOptions and converting it into a list, rather than being a comma-separated string. #6063

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7d82b05
Moving instantiationTypes, typeMappings, languageSpecificPrimitives, …
zmoore-usgs Jul 14, 2017
4e40d37
Switched methods to use the list application functions rather than th…
zmoore-usgs Jul 14, 2017
7e723e4
Updated comments
zmoore-usgs Jul 14, 2017
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
87 changes: 77 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 @@ -20,6 +20,12 @@
import static io.swagger.codegen.config.CodegenConfiguratorUtils.applyLanguageSpecificPrimitivesCsv;
import static io.swagger.codegen.config.CodegenConfiguratorUtils.applyTypeMappingsKvp;
import static io.swagger.codegen.config.CodegenConfiguratorUtils.applyReservedWordsMappingsKvp;
import static io.swagger.codegen.config.CodegenConfiguratorUtils.applyAdditionalPropertiesKvpList;
import static io.swagger.codegen.config.CodegenConfiguratorUtils.applyImportMappingsKvpList;
import static io.swagger.codegen.config.CodegenConfiguratorUtils.applyInstantiationTypesKvpList;
import static io.swagger.codegen.config.CodegenConfiguratorUtils.applyLanguageSpecificPrimitivesCsvList;
import static io.swagger.codegen.config.CodegenConfiguratorUtils.applyTypeMappingsKvpList;
import static io.swagger.codegen.config.CodegenConfiguratorUtils.applyReservedWordsMappingsKvpList;
import static org.apache.commons.lang3.StringUtils.isNotEmpty;

import java.io.File;
Expand Down Expand Up @@ -178,9 +184,42 @@ public class CodeGenMojo extends AbstractMojo {
@Parameter(name = "configOptions")
private Map<?, ?> configOptions;

/**
* A map of types and the types they should be instantiated as
*/
@Parameter(name = "instantiationTypes")
private List<String> instantiationTypes;

/**
* A map of classes and the import that should be used for that class
*/
@Parameter(name = "importMappings")
private List<String> importMappings;

/**
* A map of swagger spec types and the generated code types to use for them
*/
@Parameter(name = "typeMappings")
private List<String> typeMappings;

/**
* A map of additional language specific primitive types
*/
@Parameter(name = "languageSpecificPrimitives")
private List<String> languageSpecificPrimitives;

/**
* A map of additional properties that can be referenced by the mustache templates
*/
@Parameter(name = "additionalProperties")
private List<String> additionalProperties;

/**
* A map of reserved names and how they should be escaped
*/
@Parameter(name = "reservedWordsMappings")
private List<String> reservedWordsMappings;

/**
* Generate the apis
*/
Expand Down Expand Up @@ -390,42 +429,70 @@ public void execute() throws MojoExecutionException {
System.setProperty("withXml", withXml.toString());

if (configOptions != null) {

if (configOptions.containsKey("instantiation-types")) {
// Retained for backwards-compataibility with configOptions -> instantiation-types
if (instantiationTypes == null && configOptions.containsKey("instantiation-types")) {
applyInstantiationTypesKvp(configOptions.get("instantiation-types").toString(),
configurator);
}

// Retained for backwards-compataibility with configOptions -> import-mappings
if (importMappings == null && configOptions.containsKey("import-mappings")) {
applyImportMappingsKvp(configOptions.get("import-mappings").toString(),
configurator);
}

if (configOptions.containsKey("type-mappings")) {
// Retained for backwards-compataibility with configOptions -> type-mappings
if (typeMappings == null && configOptions.containsKey("type-mappings")) {
applyTypeMappingsKvp(configOptions.get("type-mappings").toString(), configurator);
}

if (configOptions.containsKey("language-specific-primitives")) {
// Retained for backwards-compataibility with configOptions -> language-specific-primitives
if (languageSpecificPrimitives == null && configOptions.containsKey("language-specific-primitives")) {
applyLanguageSpecificPrimitivesCsv(configOptions
.get("language-specific-primitives").toString(), configurator);
}

if (configOptions.containsKey("additional-properties")) {
// Retained for backwards-compataibility with configOptions -> additional-properties
if (additionalProperties == null && configOptions.containsKey("additional-properties")) {
applyAdditionalPropertiesKvp(configOptions.get("additional-properties").toString(),
configurator);
}

if (configOptions.containsKey("reserved-words-mappings")) {
// Retained for backwards-compataibility with configOptions -> reserved-words-mappings
if (reservedWordsMappings == null && configOptions.containsKey("reserved-words-mappings")) {
applyReservedWordsMappingsKvp(configOptions.get("reserved-words-mappings")
.toString(), configurator);
}
}

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

//Apply Import Mappings
if (importMappings != null && !configOptions.containsKey("import-mappings")) {
String importMappingsAsString = importMappings.toString();
applyImportMappingsKvp(
importMappingsAsString.substring(0, importMappingsAsString.length() - 1),
configurator);
applyImportMappingsKvpList(importMappings, configurator);
}

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

//Apply Language Specific Primitives
if (languageSpecificPrimitives != null && !configOptions.containsKey("language-specific-primitives")) {
applyLanguageSpecificPrimitivesCsvList(languageSpecificPrimitives, configurator);
}

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

//Apply Reserved Words Mappings
if (reservedWordsMappings != null && !configOptions.containsKey("reserved-words-mappings")) {
applyReservedWordsMappingsKvpList(reservedWordsMappings, configurator);
}

if (environmentVariables != null) {
Expand Down