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

Fix for issue #6094 (#6121)

Browse Source
This commit is contained in:
Jean-François Côté
2017-07-20 03:42:56 -04:00
committed by wing328
parent f00e6b349e
commit bca35f6645
192 changed files with 17831 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
modules/swagger-codegen/src/main/resources/JavaPlayFramework/model.mustache
View File

@@ -6,9 +6,9 @@ import java.util.Objects;
{{#serializableModel}}
import java.io.Serializable;
{{/serializableModel}}
import com.fasterxml.jackson.annotation.*;
{{#useBeanValidation}}
import javax.validation.constraints.*;
import com.fasterxml.jackson.annotation.*;
{{/useBeanValidation}}
{{#models}}
{{#model}}

10
modules/swagger-codegen/src/main/resources/JavaPlayFramework/newApiController.mustache
View File

@@ -27,12 +27,12 @@ import swagger.SwaggerUtils.ApiAction;
{{#operations}}
public class {{classname}}Controller extends Controller {
private final {{classname}}ControllerImp imp;
{{^controllerOnly}}private final {{classname}}ControllerImp imp;{{/controllerOnly}}
private final ObjectMapper mapper;
@Inject
private {{classname}}Controller({{classname}}ControllerImp imp) {
this.imp = imp;
private {{classname}}Controller({{^controllerOnly}}{{classname}}ControllerImp imp{{/controllerOnly}}) {
{{^controllerOnly}}this.imp = imp;{{/controllerOnly}}
mapper = new ObjectMapper();
}
@@ -129,10 +129,12 @@ public class {{classname}}Controller extends Controller {
}{{/required}}
{{/collectionFormat}}
{{/headerParams}}
{{^controllerOnly}}
{{#returnType}}{{>returnTypesNoVoid}} obj = {{/returnType}}imp.{{operationId}}({{#allParams}}{{paramName}}{{#hasMore}}, {{/hasMore}}{{/allParams}});
{{#returnType}}{{^isResponseFile}}JsonNode result = mapper.valueToTree(obj);
return ok(result);{{/isResponseFile}}{{#isResponseFile}}return ok(obj);{{/isResponseFile}}{{/returnType}}
{{^returnType}}return ok();{{/returnType}}
{{^returnType}}return ok();{{/returnType}}{{/controllerOnly}}
{{#controllerOnly}}return ok();{{/controllerOnly}}
}
{{/operation}}
}

4
modules/swagger-codegen/src/main/resources/JavaPlayFramework/swaggerUtils.mustache
View File

@@ -11,13 +11,13 @@ import java.util.*;
public class SwaggerUtils {
{{#handleExceptions}}
{{#wrapCalls}}
@With(ApiCall.class)
@Target({ ElementType.TYPE, ElementType.METHOD })
@Retention(RetentionPolicy.RUNTIME)
public @interface ApiAction {
}
{{/handleExceptions}}
{{/wrapCalls}}
public static List<String> parametersToList(String collectionFormat, String[] values){
List<String> params = new ArrayList<>();