loafle/openapi-generator
3
0
Fork 0
forked from loafle/openapi-generator-original
Code Pull Requests Activity

Merge branch 'develop_2.0' of github.com:swagger-api/swagger-codegen into develop_2.0

Browse Source
This commit is contained in:
Tony Tam 2014-11-10 13:15:36 -08:00
commit 5adb82f6f6
4 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/main/java/com/wordnik/swagger/codegen/CodegenModel.java
View File

@ -12,4 +12,5 @@ public class CodegenModel {
public List<CodegenProperty> vars = new ArrayList<CodegenProperty>();
public Set<String> imports = new HashSet<String>();
public Boolean hasVars, emptyVars, hasMoreModels;
public ExternalDocs externalDocs;
}

2
src/main/java/com/wordnik/swagger/codegen/CodegenOperation.java
View File

@ -1,7 +1,6 @@
package com.wordnik.swagger.codegen;
import com.wordnik.swagger.models.*;
import com.wordnik.swagger.models.properties.*;
import java.util.*;
@ -23,6 +22,7 @@ public class CodegenOperation {
public Set<String> imports = new HashSet<String>();
public List<Map<String, String>> examples;
public ExternalDocs externalDocs;
// legacy support
public String nickname;

3
src/main/java/com/wordnik/swagger/codegen/DefaultCodegen.java
View File

@ -335,6 +335,7 @@ public class DefaultCodegen {
m.classname = toModelName(name);
m.classVarName = toVarName(name);
m.modelJson = Json.pretty(model);
m.externalDocs = model.getExternalDocs();
int count = 0;
if(model instanceof ArrayModel) {
ArrayModel am = (ArrayModel) model;
@ -785,7 +786,7 @@ public class DefaultCodegen {
if(op.allParams.size() > 0)
op.hasParams = true;
op.externalDocs = operation.getExternalDocs();
return op;
}

4
src/main/java/com/wordnik/swagger/codegen/DefaultGenerator.java
View File

@ -136,7 +136,9 @@ public class DefaultGenerator implements Generator {
bundle.put("models", allModels);
bundle.put("apiFolder", config.apiPackage().replaceAll("\\.", "/"));
bundle.put("modelPackage", config.modelPackage());
if (swagger.getExternalDocs() != null) {
bundle.put("externalDocs", swagger.getExternalDocs());
}
for(int i = 0; i < allModels.size() - 1; i++) {
HashMap<String, CodegenModel> cm = (HashMap<String, CodegenModel>) allModels.get(i);
CodegenModel m = cm.get("model");