loafle/openapi-generator-original
3
0
Fork 1
mirror of https://github.com/OpenAPITools/openapi-generator.git synced 2025-07-04 22:50:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

Copy properties of parent model to model with allOf

Browse Source 
Also fix #936
This commit is contained in:
xhh 2015-07-02 17:48:58 +08:00
parent aba755d3de
commit b61a400d91
3 changed files with 28 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
modules/swagger-codegen/src/main/java/io/swagger/codegen/CodegenConfig.java
View File

@ -65,6 +65,8 @@ public interface CodegenConfig {
CodegenModel fromModel(String name, Model model); CodegenModel fromModel(String name, Model model);
CodegenModel fromModel(String name, Model model, Map<String, Model> allDefinitions);
CodegenOperation fromOperation(String resourcePath, String httpMethod, Operation operation, Map<String, Model> definitions); CodegenOperation fromOperation(String resourcePath, String httpMethod, Operation operation, Map<String, Model> definitions);
List<CodegenSecurity> fromSecurity(Map<String, SecuritySchemeDefinition> schemes); List<CodegenSecurity> fromSecurity(Map<String, SecuritySchemeDefinition> schemes);

28
modules/swagger-codegen/src/main/java/io/swagger/codegen/DefaultCodegen.java
View File

@ -506,6 +506,10 @@ public class DefaultCodegen {
} }
public CodegenModel fromModel(String name, Model model) { public CodegenModel fromModel(String name, Model model) {
return fromModel(name, model, null);
}
public CodegenModel fromModel(String name, Model model, Map<String, Model> allDefinitions) {
CodegenModel m = CodegenModelFactory.newInstance(CodegenModelType.MODEL); CodegenModel m = CodegenModelFactory.newInstance(CodegenModelType.MODEL);
if (reservedWords.contains(name)) { if (reservedWords.contains(name)) {
m.name = escapeReservedWord(name); m.name = escapeReservedWord(name);
@ -526,11 +530,25 @@ public class DefaultCodegen {
} else if (model instanceof ComposedModel) { } else if (model instanceof ComposedModel) {
final ComposedModel composed = (ComposedModel) model; final ComposedModel composed = (ComposedModel) model;
final RefModel parent = (RefModel) composed.getParent(); final RefModel parent = (RefModel) composed.getParent();
final String parentModel = toModelName(parent.getSimpleRef()); if (parent != null) {
m.parent = parentModel; final String parentRef = toModelName(parent.getSimpleRef());
addImport(m, parentModel); final Model parentModel = allDefinitions.get(parentRef);
final ModelImpl child = (ModelImpl) composed.getChild(); if (parentModel instanceof ModelImpl) {
addVars(m, child.getProperties(), child.getRequired()); final ModelImpl _parent = (ModelImpl) parentModel;
m.parent = parentRef;
addImport(m, parentRef);
addVars(m, _parent.getProperties(), _parent.getRequired());
}
}
Model child = composed.getChild();
if (child != null && child instanceof RefModel) {
final String childRef = ((RefModel) child).getSimpleRef();
child = allDefinitions.get(childRef);
}
if (child != null && child instanceof ModelImpl) {
final ModelImpl _child = (ModelImpl) child;
addVars(m, _child.getProperties(), _child.getRequired());
}
} else { } else {
ModelImpl impl = (ModelImpl) model; ModelImpl impl = (ModelImpl) model;
if (impl.getAdditionalProperties() != null) { if (impl.getAdditionalProperties() != null) {

6
modules/swagger-codegen/src/main/java/io/swagger/codegen/DefaultGenerator.java
View File

@ -122,7 +122,7 @@ public class DefaultGenerator extends AbstractGenerator implements Generator {
Model model = definitions.get(name); Model model = definitions.get(name);
Map<String, Model> modelMap = new HashMap<String, Model>(); Map<String, Model> modelMap = new HashMap<String, Model>();
modelMap.put(name, model); modelMap.put(name, model);
Map<String, Object> models = processModels(config, modelMap); Map<String, Object> models = processModels(config, modelMap, definitions);
models.putAll(config.additionalProperties()); models.putAll(config.additionalProperties());
allModels.add(((List<Object>) models.get("models")).get(0)); allModels.add(((List<Object>) models.get("models")).get(0));
@ -442,14 +442,14 @@ public class DefaultGenerator extends AbstractGenerator implements Generator {
return operations; return operations;
} }
public Map<String, Object> processModels(CodegenConfig config, Map<String, Model> definitions) { public Map<String, Object> processModels(CodegenConfig config, Map<String, Model> definitions, Map<String, Model> allDefinitions) {
Map<String, Object> objs = new HashMap<String, Object>(); Map<String, Object> objs = new HashMap<String, Object>();
objs.put("package", config.modelPackage()); objs.put("package", config.modelPackage());
List<Object> models = new ArrayList<Object>(); List<Object> models = new ArrayList<Object>();
Set<String> allImports = new LinkedHashSet<String>(); Set<String> allImports = new LinkedHashSet<String>();
for (String key : definitions.keySet()) { for (String key : definitions.keySet()) {
Model mm = definitions.get(key); Model mm = definitions.get(key);
CodegenModel cm = config.fromModel(key, mm); CodegenModel cm = config.fromModel(key, mm, allDefinitions);
Map<String, Object> mo = new HashMap<String, Object>(); Map<String, Object> mo = new HashMap<String, Object>();
mo.put("model", cm); mo.put("model", cm);
mo.put("importPath", config.toModelImport(key)); mo.put("importPath", config.toModelImport(key));