mirror of
https://github.com/OpenAPITools/openapi-generator.git
synced 2025-07-05 15:10:49 +00:00
added null check for simple definitions with no models
This commit is contained in:
parent
caaa753f58
commit
2ed8e10fe4
@ -71,28 +71,30 @@ public class DefaultGenerator implements Generator {
|
|||||||
|
|
||||||
// models
|
// models
|
||||||
Map<String, Model> definitions = swagger.getDefinitions();
|
Map<String, Model> definitions = swagger.getDefinitions();
|
||||||
for(String name: definitions.keySet()) {
|
if(definitions != null) {
|
||||||
Model model = definitions.get(name);
|
for(String name: definitions.keySet()) {
|
||||||
Map<String, Model> modelMap = new HashMap<String, Model>();
|
Model model = definitions.get(name);
|
||||||
modelMap.put(name, model);
|
Map<String, Model> modelMap = new HashMap<String, Model>();
|
||||||
Map<String, Object> models = processModels(config, modelMap);
|
modelMap.put(name, model);
|
||||||
models.putAll(config.additionalProperties());
|
Map<String, Object> models = processModels(config, modelMap);
|
||||||
|
models.putAll(config.additionalProperties());
|
||||||
|
|
||||||
allModels.add(((List<Object>)models.get("models")).get(0));
|
allModels.add(((List<Object>)models.get("models")).get(0));
|
||||||
|
|
||||||
for(String templateName : config.modelTemplateFiles().keySet()) {
|
for(String templateName : config.modelTemplateFiles().keySet()) {
|
||||||
String suffix = config.modelTemplateFiles().get(templateName);
|
String suffix = config.modelTemplateFiles().get(templateName);
|
||||||
String filename = config.modelFileFolder() + File.separator + config.toModelFilename(name) + suffix;
|
String filename = config.modelFileFolder() + File.separator + config.toModelFilename(name) + suffix;
|
||||||
String template = readTemplate(config.templateDir() + File.separator + templateName);
|
String template = readTemplate(config.templateDir() + File.separator + templateName);
|
||||||
Template tmpl = Mustache.compiler()
|
Template tmpl = Mustache.compiler()
|
||||||
.withLoader(new Mustache.TemplateLoader() {
|
.withLoader(new Mustache.TemplateLoader() {
|
||||||
public Reader getTemplate (String name) {
|
public Reader getTemplate (String name) {
|
||||||
return getTemplateReader(config.templateDir() + File.separator + name + ".mustache");
|
return getTemplateReader(config.templateDir() + File.separator + name + ".mustache");
|
||||||
};
|
};
|
||||||
})
|
})
|
||||||
.defaultValue("")
|
.defaultValue("")
|
||||||
.compile(template);
|
.compile(template);
|
||||||
writeToFile(filename, tmpl.execute(models));
|
writeToFile(filename, tmpl.execute(models));
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if(System.getProperty("debugModels") != null) {
|
if(System.getProperty("debugModels") != null) {
|
||||||
|
Loading…
x
Reference in New Issue
Block a user