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

Merge pull request #341 from martoe/responseheaders

Browse Source 
Make response headers available to the code generator
This commit is contained in:
Tony Tam 2014-12-07 21:30:57 -08:00
commit c010b4c9c6
2 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -19,7 +19,7 @@ public class CodegenOperation {
public List<CodegenParameter> formParams = new ArrayList<CodegenParameter>(); public List<CodegenParameter> formParams = new ArrayList<CodegenParameter>();
public List<String> tags; public List<String> tags;
public List<CodegenResponse> responses = new ArrayList<CodegenResponse>(); public List<CodegenResponse> responses = new ArrayList<CodegenResponse>();
public final List<CodegenProperty> responseHeaders = new ArrayList<CodegenProperty>();
public Set<String> imports = new HashSet<String>(); public Set<String> imports = new HashSet<String>();
public List<Map<String, String>> examples; public List<Map<String, String>> examples;
public ExternalDocs externalDocs; public ExternalDocs externalDocs;

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

@ -605,7 +605,8 @@ public class DefaultCodegen {
} }
} }
if(methodResponse != null && methodResponse.getSchema() != null) { if(methodResponse != null) {
if (methodResponse.getSchema() != null) {
CodegenProperty cm = fromProperty("response", methodResponse.getSchema()); CodegenProperty cm = fromProperty("response", methodResponse.getSchema());
Property responseProperty = methodResponse.getSchema(); Property responseProperty = methodResponse.getSchema();
@ -631,6 +632,8 @@ public class DefaultCodegen {
op.returnSimpleType = true; op.returnSimpleType = true;
if (languageSpecificPrimitives().contains(op.returnBaseType) || op.returnBaseType == null) if (languageSpecificPrimitives().contains(op.returnBaseType) || op.returnBaseType == null)
op.returnTypeIsPrimitive = true; op.returnTypeIsPrimitive = true;
}
addHeaders(methodResponse, op.responseHeaders);
} }
if(op.returnBaseType == null) { if(op.returnBaseType == null) {
@ -807,6 +810,14 @@ public class DefaultCodegen {
return output; return output;
} }
private void addHeaders(Response response, List<CodegenProperty> target) {
if (response.getHeaders() != null) {
for (Map.Entry<String, Property> headers : response.getHeaders().entrySet()) {
target.add(fromProperty(headers.getKey(), headers.getValue()));
}
}
}
private List<CodegenParameter> addHasMore(List<CodegenParameter> objs) { private List<CodegenParameter> addHasMore(List<CodegenParameter> objs) {
if(objs != null) { if(objs != null) {
for(int i = 0; i < objs.size(); i++) { for(int i = 0; i < objs.size(); i++) {