Merge remote-tracking branch 'main/master' into jmaster

This commit is contained in:
Tommy Alander
2016-03-03 09:23:50 +01:00
5 changed files with 109 additions and 1 deletions

View File

@@ -8,6 +8,7 @@ public class CodegenModel {
public String parent, parentSchema;
public String name, classname, description, classVarName, modelJson, dataType;
public String unescapedDescription;
public String discriminator;
public String defaultValue;
public List<CodegenProperty> vars = new ArrayList<CodegenProperty>();
public List<String> allowableValues;

View File

@@ -881,6 +881,10 @@ public class DefaultCodegen {
m.externalDocs = model.getExternalDocs();
m.vendorExtensions = model.getVendorExtensions();
if (model instanceof ModelImpl) {
m.discriminator = ((ModelImpl) model).getDiscriminator();
}
if (model instanceof ArrayModel) {
ArrayModel am = (ArrayModel) model;