From 7170f7fa0143b3348afeec7dc5fbf627e85fcb17 Mon Sep 17 00:00:00 2001 From: Tony Tam Date: Thu, 22 Oct 2015 15:28:49 -0700 Subject: [PATCH] updated supporitng file support --- .../java/io/swagger/codegen/DefaultGenerator.java | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/DefaultGenerator.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/DefaultGenerator.java index b1b7dd4e046..8a017bfc07e 100644 --- a/modules/swagger-codegen/src/main/java/io/swagger/codegen/DefaultGenerator.java +++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/DefaultGenerator.java @@ -62,27 +62,27 @@ public class DefaultGenerator extends AbstractGenerator implements Generator { // allows generating only models by specifying a CSV of models to generate, or empty for all if(System.getProperty("models") != null) { String modelNames = System.getProperty("models"); + generateModels = true; if(!modelNames.isEmpty()) { - generateModels = true; modelsToGenerate = new HashSet(Arrays.asList(modelNames.split(","))); } } if(System.getProperty("apis") != null) { String apiNames = System.getProperty("apis"); + generateApis = true; if(!apiNames.isEmpty()) { - generateApis = true; apisToGenerate = new HashSet(Arrays.asList(apiNames.split(","))); } } if(System.getProperty("supportingFiles") != null) { String supportingFiles = System.getProperty("supportingFiles"); + generateSupportingFiles = true; if(!supportingFiles.isEmpty()) { - generateSupportingFiles = true; supportingFilesToGenerate = new HashSet(Arrays.asList(supportingFiles.split(","))); } } - if(generateApis == null && apisToGenerate == null && supportingFilesToGenerate == null) { + if(generateApis == null && generateModels == null && generateSupportingFiles == null) { // no specifics are set, generate everything generateApis = true; generateModels = true; generateSupportingFiles = true; } @@ -178,7 +178,7 @@ public class DefaultGenerator extends AbstractGenerator implements Generator { List sortedModelKeys = sortModelsByInheritance(definitions); if(generateModels) { - if(modelsToGenerate != null) { + if(modelsToGenerate != null && modelsToGenerate.size() > 0) { List updatedKeys = new ArrayList(); for(String m : sortedModelKeys) { if(modelsToGenerate.contains(m)) { @@ -237,7 +237,7 @@ public class DefaultGenerator extends AbstractGenerator implements Generator { // apis Map> paths = processPaths(swagger.getPaths()); if(generateApis) { - if(apisToGenerate != null) { + if(apisToGenerate != null && apisToGenerate.size() > 0) { Map> updatedPaths = new TreeMap>(); for(String m : paths.keySet()) { if(apisToGenerate.contains(m)) { @@ -359,7 +359,7 @@ public class DefaultGenerator extends AbstractGenerator implements Generator { String templateFile = getFullTemplateFile(config, support.templateFile); boolean shouldGenerate = true; - if(supportingFilesToGenerate != null) { + if(supportingFilesToGenerate != null && supportingFilesToGenerate.size() > 0) { if(supportingFilesToGenerate.contains(support.destinationFilename)) { shouldGenerate = true; }