Skip to content

Commit 61b2d21

Browse files
wing328wing328
committed
Merge branch 'jencodingatwork-master'
2 parents b97cedb + 2d24e99 commit 61b2d21

File tree

10 files changed

+480
-455
lines changed

10 files changed

+480
-455
lines changed

‎modules/swagger-codegen/src/main/resources/JavaJaxRS/api.mustache‎

Lines changed: 55 additions & 55 deletions
Original file line numberDiff line numberDiff line change
@@ -1,55 +1,55 @@
1-
package {{package}};
2-
3-
import {{modelPackage}}.*;
4-
import {{package}}.{{classname}}Service;
5-
import {{package}}.factories.{{classname}}ServiceFactory;
6-
7-
import io.swagger.annotations.ApiParam;
8-
9-
{{#imports}}import {{import}};
10-
{{/imports}}
11-
12-
import java.util.List;
13-
import {{package}}.NotFoundException;
14-
15-
import java.io.InputStream;
16-
17-
import org.glassfish.jersey.media.multipart.FormDataContentDisposition;
18-
import org.glassfish.jersey.media.multipart.FormDataParam;
19-
20-
import javax.ws.rs.core.Context;
21-
import javax.ws.rs.core.Response;
22-
import javax.ws.rs.core.SecurityContext;
23-
import javax.ws.rs.*;
24-
25-
@Path("/{{baseName}}")
26-
{{#hasConsumes}}@Consumes({ {{#consumes}}"{{{mediaType}}}"{{#hasMore}}, {{/hasMore}}{{/consumes}} }){{/hasConsumes}}
27-
{{#hasProduces}}@Produces({ {{#produces}}"{{{mediaType}}}"{{#hasMore}}, {{/hasMore}}{{/produces}} }){{/hasProduces}}
28-
@io.swagger.annotations.Api(description = "the {{baseName}} API")
29-
{{>generatedAnnotation}}
30-
{{#operations}}
31-
public class {{classname}} {
32-
private final {{classname}}Service delegate = {{classname}}ServiceFactory.get{{classname}}();
33-
34-
{{#operation}}
35-
@{{httpMethod}}
36-
{{#subresourceOperation}}@Path("{{path}}"){{/subresourceOperation}}
37-
{{#hasConsumes}}@Consumes({ {{#consumes}}"{{{mediaType}}}"{{#hasMore}}, {{/hasMore}}{{/consumes}} }){{/hasConsumes}}
38-
{{#hasProduces}}@Produces({ {{#produces}}"{{{mediaType}}}"{{#hasMore}}, {{/hasMore}}{{/produces}} }){{/hasProduces}}
39-
@io.swagger.annotations.ApiOperation(value = "{{{summary}}}", notes = "{{{notes}}}", response = {{{returnType}}}.class{{#returnContainer}}, responseContainer = "{{{returnContainer}}}"{{/returnContainer}}{{#hasAuthMethods}}, authorizations = {
40-
{{#authMethods}}@io.swagger.annotations.Authorization(value = "{{name}}"{{#isOAuth}}, scopes = {
41-
{{#scopes}}@io.swagger.annotations.AuthorizationScope(scope = "{{scope}}", description = "{{description}}"){{#hasMore}},
42-
{{/hasMore}}{{/scopes}}
43-
}{{/isOAuth}}){{#hasMore}},
44-
{{/hasMore}}{{/authMethods}}
45-
}{{/hasAuthMethods}}, tags={ {{#vendorExtensions.x-tags}}"{{tag}}",{{/vendorExtensions.x-tags}} })
46-
@io.swagger.annotations.ApiResponses(value = { {{#responses}}
47-
@io.swagger.annotations.ApiResponse(code = {{{code}}}, message = "{{{message}}}", response = {{{returnType}}}.class{{#returnContainer}}, responseContainer = "{{{returnContainer}}}"{{/returnContainer}}){{#hasMore}},
48-
{{/hasMore}}{{/responses}} })
49-
public Response {{nickname}}({{#allParams}}{{>queryParams}}{{>pathParams}}{{>headerParams}}{{>bodyParams}}{{>formParams}},{{/allParams}}@Context SecurityContext securityContext)
50-
throws NotFoundException {
51-
return delegate.{{nickname}}({{#allParams}}{{#isFile}}inputStream, fileDetail{{/isFile}}{{^isFile}}{{paramName}}{{/isFile}},{{/allParams}}securityContext);
52-
}
53-
{{/operation}}
54-
}
55-
{{/operations}}
1+
package {{package}};
2+
3+
import {{modelPackage}}.*;
4+
import {{package}}.{{classname}}Service;
5+
import {{package}}.factories.{{classname}}ServiceFactory;
6+
7+
import io.swagger.annotations.ApiParam;
8+
9+
{{#imports}}import {{import}};
10+
{{/imports}}
11+
12+
import java.util.List;
13+
import {{package}}.NotFoundException;
14+
15+
import java.io.InputStream;
16+
17+
import org.glassfish.jersey.media.multipart.FormDataContentDisposition;
18+
import org.glassfish.jersey.media.multipart.FormDataParam;
19+
20+
import javax.ws.rs.core.Context;
21+
import javax.ws.rs.core.Response;
22+
import javax.ws.rs.core.SecurityContext;
23+
import javax.ws.rs.*;
24+
25+
@Path("/{{baseName}}")
26+
{{#hasConsumes}}@Consumes({ {{#consumes}}"{{{mediaType}}}"{{#hasMore}}, {{/hasMore}}{{/consumes}} }){{/hasConsumes}}
27+
{{#hasProduces}}@Produces({ {{#produces}}"{{{mediaType}}}"{{#hasMore}}, {{/hasMore}}{{/produces}} }){{/hasProduces}}
28+
@io.swagger.annotations.Api(description = "the {{baseName}} API")
29+
{{>generatedAnnotation}}
30+
{{#operations}}
31+
public class {{classname}} {
32+
private final {{classname}}Service delegate = {{classname}}ServiceFactory.get{{classname}}();
33+
34+
{{#operation}}
35+
@{{httpMethod}}
36+
{{#subresourceOperation}}@Path("{{path}}"){{/subresourceOperation}}
37+
{{#hasConsumes}}@Consumes({ {{#consumes}}"{{{mediaType}}}"{{#hasMore}}, {{/hasMore}}{{/consumes}} }){{/hasConsumes}}
38+
{{#hasProduces}}@Produces({ {{#produces}}"{{{mediaType}}}"{{#hasMore}}, {{/hasMore}}{{/produces}} }){{/hasProduces}}
39+
@io.swagger.annotations.ApiOperation(value = "{{{summary}}}", notes = "{{{notes}}}", response = {{{returnType}}}.class{{#returnContainer}}, responseContainer = "{{{returnContainer}}}"{{/returnContainer}}{{#hasAuthMethods}}, authorizations = {
40+
{{#authMethods}}@io.swagger.annotations.Authorization(value = "{{name}}"{{#isOAuth}}, scopes = {
41+
{{#scopes}}@io.swagger.annotations.AuthorizationScope(scope = "{{scope}}", description = "{{description}}"){{#hasMore}},
42+
{{/hasMore}}{{/scopes}}
43+
}{{/isOAuth}}){{#hasMore}},
44+
{{/hasMore}}{{/authMethods}}
45+
}{{/hasAuthMethods}}, tags={ {{#vendorExtensions.x-tags}}"{{tag}}",{{/vendorExtensions.x-tags}} })
46+
@io.swagger.annotations.ApiResponses(value = { {{#responses}}
47+
@io.swagger.annotations.ApiResponse(code = {{{code}}}, message = "{{{message}}}", response = {{{returnType}}}.class{{#returnContainer}}, responseContainer = "{{{returnContainer}}}"{{/returnContainer}}){{#hasMore}},
48+
{{/hasMore}}{{/responses}} })
49+
public Response {{nickname}}({{#allParams}}{{>queryParams}}{{>pathParams}}{{>headerParams}}{{>bodyParams}}{{>formParams}},{{/allParams}}@Context SecurityContext securityContext)
50+
throws NotFoundException {
51+
return delegate.{{nickname}}({{#allParams}}{{#isFile}}{{paramName}}InputStream, {{paramName}}Detail{{/isFile}}{{^isFile}}{{paramName}}{{/isFile}},{{/allParams}}securityContext);
52+
}
53+
{{/operation}}
54+
}
55+
{{/operations}}

‎modules/swagger-codegen/src/main/resources/JavaJaxRS/formParams.mustache‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
{{#isFormParam}}{{#notFile}}@ApiParam(value = "{{{description}}}"{{#required}}, required=true{{/required}}{{#allowableValues}}, {{> allowableValues }}{{/allowableValues}}{{#defaultValue}}, defaultValue="{{{defaultValue}}}"{{/defaultValue}}){{#vendorExtensions.x-multipart}}@FormDataParam("{{paramName}}") {{{dataType}}} {{paramName}}{{/vendorExtensions.x-multipart}}{{^vendorExtensions.x-multipart}}@FormParam("{{baseName}}") {{{dataType}}} {{paramName}}{{/vendorExtensions.x-multipart}}{{/notFile}}{{#isFile}}
2-
@FormDataParam("file") InputStream inputStream,
3-
@FormDataParam("file") FormDataContentDisposition fileDetail{{/isFile}}{{/isFormParam}}
2+
@FormDataParam("{{paramName}}") InputStream {{paramName}}InputStream,
3+
@FormDataParam("{{paramName}}") FormDataContentDisposition {{paramName}}Detail{{/isFile}}{{/isFormParam}}

‎modules/swagger-codegen/src/main/resources/JavaJaxRS/serviceFormParams.mustache‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
{{#isFormParam}}{{#notFile}}{{{dataType}}} {{paramName}}{{/notFile}}{{#isFile}}InputStream inputStream, FormDataContentDisposition fileDetail{{/isFile}}{{/isFormParam}}
1+
{{#isFormParam}}{{#notFile}}{{{dataType}}} {{paramName}}{{/notFile}}{{#isFile}}InputStream {{paramName}}InputStream, FormDataContentDisposition {{paramName}}Detail{{/isFile}}{{/isFormParam}}

‎samples/server/petstore/jaxrs/jersey1/src/gen/java/io/swagger/api/PetApiService.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,6 @@ public abstract Response updatePet(Pet body,SecurityContext securityContext)
3636
throws NotFoundException;
3737
public abstract Response updatePetWithForm(Long petId,String name,String status,SecurityContext securityContext)
3838
throws NotFoundException;
39-
public abstract Response uploadFile(Long petId,String additionalMetadata,InputStream inputStream, FormDataContentDisposition fileDetail,SecurityContext securityContext)
39+
public abstract Response uploadFile(Long petId,String additionalMetadata,InputStream fileInputStream, FormDataContentDisposition fileDetail,SecurityContext securityContext)
4040
throws NotFoundException;
4141
}

‎samples/server/petstore/jaxrs/jersey1/src/main/java/io/swagger/api/impl/PetApiServiceImpl.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ public Response updatePetWithForm(Long petId, String name, String status, Securi
6565
return Response.ok().entity(new ApiResponseMessage(ApiResponseMessage.OK, "magic!")).build();
6666
}
6767
@Override
68-
public Response uploadFile(Long petId, String additionalMetadata, InputStream inputStream, FormDataContentDisposition fileDetail, SecurityContext securityContext)
68+
public Response uploadFile(Long petId, String additionalMetadata, InputStream fileInputStream, FormDataContentDisposition fileDetail, SecurityContext securityContext)
6969
throws NotFoundException {
7070
// do some magic!
7171
return Response.ok().entity(new ApiResponseMessage(ApiResponseMessage.OK, "magic!")).build();

0 commit comments

Comments
 (0)