Skip to content

Generator issue 334 #9401

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
merged 6 commits into from
Apr 24, 2019
Merged

Generator issue 334 #9401

Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
f243215
identify oneOf models and add them to definitions map
HugoMario Mar 22, 2019
d51f6e4
added extension to root object in map.
HugoMario Mar 24, 2019
12cf8d8
Merge remote-tracking branch 'origin/3.0.0' into generator-issue-334
HugoMario Apr 7, 2019
79ea8b4
renamed extension for one of schema
HugoMario Apr 13, 2019
3967e6d
check if exists anyOf models to write them.
HugoMario Apr 22, 2019
07e2b7f
Merge remote-tracking branch 'origin/3.0.0' into generator-issue-334
HugoMario Apr 22, 2019
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
76 changes: 76 additions & 0 deletions modules/swagger-codegen/src/main/java/io/swagger/codegen/v3/DefaultGenerator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -350,6 +350,30 @@ public int compare(String o1, String o2) {
models.put("classname", config.toModelName(name));
models.putAll(config.additionalProperties());
allProcessedModels.put(name, models);

final List<Object> modelList = (List<Object>) models.get("models");

if (modelList == null || modelList.isEmpty()) {
continue;
}

for (Object object : modelList) {
Map<String, Object> modelMap = (Map<String, Object>) object;
CodegenModel codegenModel = null;
if (modelMap.containsKey("oneOf-model")) {
codegenModel = (CodegenModel) modelMap.get("oneOf-model");
}
if (modelMap.containsKey("anyOf-model")) {
codegenModel = (CodegenModel) modelMap.get("anyOf-model");
}
if (codegenModel != null) {
models = processModel(codegenModel, config, schemas);
models.put("classname", config.toModelName(codegenModel.name));
models.putAll(config.additionalProperties());
allProcessedModels.put(codegenModel.name, models);
break;
}
}
} catch (Exception e) {
throw new RuntimeException("Could not process model '" + name + "'" + ".Please make sure that your schema is correct!", e);
}
Expand Down Expand Up @@ -965,6 +989,14 @@ private Map<String, Object> processModels(CodegenConfig config, Map<String, Sche
Map<String, Object> mo = new HashMap<>();
mo.put("model", cm);
mo.put("importPath", config.toModelImport(cm.classname));
if (cm.vendorExtensions.containsKey("oneOf-model")) {
CodegenModel oneOfModel = (CodegenModel) cm.vendorExtensions.get("oneOf-model");
mo.put("oneOf-model", oneOfModel);
}
if (cm.vendorExtensions.containsKey("anyOf-model")) {
CodegenModel anyOfModel = (CodegenModel) cm.vendorExtensions.get("anyOf-model");
mo.put("anyOf-model", anyOfModel);
}
models.add(mo);

allImports.addAll(cm.imports);
Expand Down Expand Up @@ -996,6 +1028,50 @@ private Map<String, Object> processModels(CodegenConfig config, Map<String, Sche
return objs;
}

private Map<String, Object> processModel(CodegenModel codegenModel, CodegenConfig config, Map<String, Schema> allDefinitions) {
Map<String, Object> objs = new HashMap<>();
objs.put("package", config.modelPackage());
List<Object> models = new ArrayList<>();

if (codegenModel.vendorExtensions.containsKey("x-is-composed-model")) {
objs.put("x-is-composed-model", codegenModel.vendorExtensions.get("x-is-composed-model"));
}

Map<String, Object> modelObject = new HashMap<>();
modelObject.put("model", codegenModel);
modelObject.put("importPath", config.toModelImport(codegenModel.classname));

Set<String> allImports = new LinkedHashSet<>();
allImports.addAll(codegenModel.imports);
models.add(modelObject);

objs.put("models", models);
Set<String> importSet = new TreeSet<>();
for (String nextImport : allImports) {
String mapping = config.importMapping().get(nextImport);
if (mapping == null) {
mapping = config.toModelImport(nextImport);
}
if (mapping != null && !config.defaultIncludes().contains(mapping)) {
importSet.add(mapping);
}
// add instantiation types
mapping = config.instantiationTypes().get(nextImport);
if (mapping != null && !config.defaultIncludes().contains(mapping)) {
importSet.add(mapping);
}
}
List<Map<String, String>> imports = new ArrayList<>();
for(String s: importSet) {
Map<String, String> item = new HashMap<>();
item.put("import", s);
imports.add(item);
}
objs.put("imports", imports);
config.postProcessModels(objs);
return objs;
}

private Map<String, SecurityScheme> getAuthMethods(List<SecurityRequirement> securities, Map<String, SecurityScheme> securitySchemes) {
if (securities == null || (securitySchemes == null || securitySchemes.isEmpty())) {
return null;
Expand Down