Skip to content

Commit 24a162c

Browse files
HugoMarioHugoMario
committed
updated jaxrs-jersey templates
1 parent aa2fc02 commit 24a162c

File tree

8 files changed

+59
-20
lines changed

8 files changed

+59
-20
lines changed

‎src/main/resources/handlebars/JavaJaxRS/formParams.mustache

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1 @@
1-
{{#is this 'form-param'}}{{#isNot this 'binary'}}{{#useOas2}}@ApiParam(value = "{{{description}}}"{{#required}}, required=true{{/required}}{{#allowableValues}}, {{> allowableValues }}{{/allowableValues}}{{#defaultValue}}, defaultValue="{{{defaultValue}}}"{{/defaultValue}}){{#vendorExtensions.x-multipart}}@FormDataParam("{{baseName}}") {{{dataType}}} {{paramName}}{{/vendorExtensions.x-multipart}}{{^vendorExtensions.x-multipart}} {{#defaultValue}} @DefaultValue("{{{defaultValue}}}"){{/defaultValue}} @FormParam("{{baseName}}") {{{dataType}}} {{paramName}}{{/vendorExtensions.x-multipart}}{{/useOas2}}{{^useOas2}}@Parameter(description = "{{{description}}}"{{#required}}, required=true{{/required}}{{#allowableValues}}, {{> allowableValues }}{{/allowableValues}}){{#vendorExtensions.x-multipart}}@FormDataParam("{{baseName}}") {{{dataType}}} {{paramName}}{{/vendorExtensions.x-multipart}}{{^vendorExtensions.x-multipart}} {{#defaultValue}} @DefaultValue("{{{defaultValue}}}"){{/defaultValue}} @FormParam("{{baseName}}") {{{dataType}}} {{paramName}}{{/vendorExtensions.x-multipart}}{{/useOas2}}{{/isNot}}{{#is this 'binary'}}@FormDataParam("{{baseName}}") InputStream {{paramName}}InputStream,
2-
@FormDataParam("{{baseName}}") FormDataContentDisposition {{paramName}}Detail{{/is}}{{/is}}
1+
{{#isFormParam}}{{^isBinary}}{{#useOas2}}@ApiParam(value = "{{{description}}}"{{#required}}, required=true{{/required}}{{#allowableValues}}, {{> allowableValues }}{{/allowableValues}}{{#defaultValue}}, defaultValue="{{{defaultValue}}}"{{/defaultValue}}){{#vendorExtensions.x-multipart}}@FormDataParam("{{baseName}}") {{{dataType}}} {{paramName}}{{/vendorExtensions.x-multipart}}{{^vendorExtensions.x-multipart}} {{#defaultValue}} @DefaultValue("{{{defaultValue}}}"){{/defaultValue}} @FormParam("{{baseName}}") {{{dataType}}} {{paramName}}{{/vendorExtensions.x-multipart}}{{/useOas2}}{{^useOas2}}@Parameter(description = "{{{description}}}"{{#required}}, required=true{{/required}}{{#allowableValues}}, {{> allowableValues }}{{/allowableValues}}){{#vendorExtensions.x-multipart}}@FormDataParam("{{baseName}}") {{{dataType}}} {{paramName}}{{/vendorExtensions.x-multipart}}{{^vendorExtensions.x-multipart}} {{#defaultValue}} @DefaultValue("{{{defaultValue}}}"){{/defaultValue}} @FormParam("{{baseName}}") {{{dataType}}} {{paramName}}{{/vendorExtensions.x-multipart}}{{/useOas2}}{{/isBinary}}{{#isBinary}}@FormDataParam("{{baseName}}") InputStream {{paramName}}InputStream, @FormDataParam("{{baseName}}") FormDataContentDisposition {{paramName}}Detail{{/isBinary}}{{/isFormParam}}

‎src/main/resources/handlebars/JavaJaxRS/libraries/jersey1/api.mustache

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -68,10 +68,10 @@ public class {{classname}} {
6868
@io.swagger.annotations.ApiResponses(value = { {{#responses}}
6969
@io.swagger.annotations.ApiResponse(code = {{{code}}}, message = "{{{message}}}", response = {{{baseType}}}.class{{#containerType}}, responseContainer = "{{{containerType}}}"{{/containerType}}){{#hasMore}},{{/hasMore}}{{/responses}} })
7070
public Response {{nickname}}(
71-
{{#parameters}}{{>queryParams}}{{>pathParams}}{{>headerParams}}{{>bodyParams}}{{>formParams}},
71+
{{#parameters}}{{>queryParams}}{{>pathParams}}{{>headerParams}}{{>bodyParams}}{{>formParams}}{{>serviceCookieParams}},
7272
{{/parameters}}@Context SecurityContext securityContext)
7373
throws NotFoundException {
74-
return delegate.{{nickname}}({{#parameters}}{{#isBinary}} {{paramName}}InputStream, {{paramName}}Detail{{/isBinary}}{{^isBinary}}{{paramName}}{{/isBinary}},{{/parameters}}securityContext);
74+
return delegate.{{nickname}}({{#parameters}}{{#isBinary}}{{#isBodyParam}}{{paramName}}{{/isBodyParam}}{{^isBodyParam}}{{paramName}}InputStream, {{paramName}}Detail{{/isBodyParam}}{{/isBinary}}{{^isBinary}}{{paramName}}{{/isBinary}},{{/parameters}}securityContext);
7575
}
7676
{{/contents}}
7777
{{/operation}}

‎src/main/resources/handlebars/JavaJaxRS/libraries/jersey1/apiService.mustache

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ import javax.validation.constraints.*;
3838
public abstract class {{classname}}Service {
3939
{{#operation}}
4040
{{#contents}}
41-
public abstract Response {{nickname}}({{#parameters}}{{>serviceQueryParams}}{{>servicePathParams}}{{>serviceHeaderParams}}{{>serviceBodyParams}}{{>serviceFormParams}},{{/parameters}}SecurityContext securityContext)
41+
public abstract Response {{nickname}}({{#parameters}}{{>serviceQueryParams}}{{>servicePathParams}}{{>serviceHeaderParams}}{{>serviceBodyParams}}{{>serviceFormParams}}{{>serviceCookieParams}},{{/parameters}}SecurityContext securityContext)
4242
throws NotFoundException;
4343
{{/contents}}
4444
{{/operation}}

‎src/main/resources/handlebars/JavaJaxRS/libraries/jersey1/apiServiceImpl.mustache

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ public class {{classname}}ServiceImpl extends {{classname}}Service {
3939
{{#operation}}
4040
{{#contents}}
4141
@Override
42-
public Response {{nickname}}({{#parameters}}{{>serviceQueryParams}}{{>servicePathParams}}{{>serviceHeaderParams}}{{>serviceBodyParams}}{{>serviceFormParams}}, {{/parameters}}SecurityContext securityContext)
42+
public Response {{nickname}}({{#parameters}}{{>serviceQueryParams}}{{>servicePathParams}}{{>serviceHeaderParams}}{{>serviceBodyParams}}{{>serviceFormParams}}{{>serviceCookieParams}}, {{/parameters}}SecurityContext securityContext)
4343
throws NotFoundException {
4444
// do some magic!
4545
return Response.ok().entity(new ApiResponseMessage(ApiResponseMessage.OK, "magic!")).build();

‎src/main/resources/handlebars/JavaJaxRS/libraries/jersey1/formParams.mustache

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1 @@
1-
{{#is this 'form-param'}}{{#isNot this 'binary'}}{{#isNot this 'multipart'}}@ApiParam(value = "{{{description}}}"{{#required}}, required=true{{/required}}{{#allowableValues}}, {{> allowableValues }}{{/allowableValues}}{{#defaultValue}}, defaultValue="{{{defaultValue}}}"{{/defaultValue}}){{/isNot}}{{#is this 'multipart'}}@FormDataParam("{{baseName}}") {{{dataType}}} {{paramName}}{{/is}}{{#isNot this 'multipart'}} {{#defaultValue}} @DefaultValue("{{{defaultValue}}}"){{/defaultValue}} @FormParam("{{baseName}}") {{{dataType}}} {{paramName}}{{/isNot}}{{/isNot}}{{#is this 'binary'}}@FormDataParam("{{baseName}}") InputStream inputStream,
2-
@FormDataParam("{{baseName}}") FormDataContentDisposition fileDetail{{/is}}{{/is}}
1+
{{#isFormParam}}{{^isBinary}}{{#useOas2}}@ApiParam(value = "{{{description}}}"{{#required}}, required=true{{/required}}{{#allowableValues}}, {{> allowableValues }}{{/allowableValues}}{{#defaultValue}}, defaultValue="{{{defaultValue}}}"{{/defaultValue}}){{#vendorExtensions.x-multipart}}@FormDataParam("{{baseName}}") {{{dataType}}} {{paramName}}{{/vendorExtensions.x-multipart}}{{^vendorExtensions.x-multipart}} {{#defaultValue}} @DefaultValue("{{{defaultValue}}}"){{/defaultValue}} @FormParam("{{baseName}}") {{{dataType}}} {{paramName}}{{/vendorExtensions.x-multipart}}{{/useOas2}}{{^useOas2}}@Parameter(description = "{{{description}}}"{{#required}}, required=true{{/required}}{{#allowableValues}}, {{> allowableValues }}{{/allowableValues}}){{#vendorExtensions.x-multipart}}@FormDataParam("{{baseName}}") {{{dataType}}} {{paramName}}{{/vendorExtensions.x-multipart}}{{^vendorExtensions.x-multipart}} {{#defaultValue}} @DefaultValue("{{{defaultValue}}}"){{/defaultValue}} @FormParam("{{baseName}}") {{{dataType}}} {{paramName}}{{/vendorExtensions.x-multipart}}{{/useOas2}}{{/isBinary}}{{#isBinary}}@FormDataParam("{{baseName}}") InputStream {{paramName}}InputStream, @FormDataParam("{{baseName}}") FormDataContentDisposition {{paramName}}Detail{{/isBinary}}{{/isFormParam}}

‎src/main/resources/handlebars/JavaJaxRS/libraries/jersey1/pom.mustache

Lines changed: 26 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -138,20 +138,27 @@
138138
<artifactId>jersey-server</artifactId>
139139
<version>${jersey-version}</version>
140140
</dependency>
141-
{{#jakarta}}
141+
{{#jakarta}}
142142
<dependency>
143143
<groupId>jakarta.servlet</groupId>
144144
<artifactId>jakarta.servlet-api</artifactId>
145145
<version>${servlet-api-version}</version>
146146
</dependency>
147-
{{/jakarta}}
148-
{{^jakarta}}
147+
148+
<dependency>
149+
<groupId>jakarta.platform</groupId>
150+
<artifactId>jakarta.jakartaee-api</artifactId>
151+
<version>10.0.0</version>
152+
<scope>provided</scope>
153+
</dependency>
154+
{{/jakarta}}
155+
{{^jakarta}}
149156
<dependency>
150157
<groupId>javax.servlet</groupId>
151158
<artifactId>servlet-api</artifactId>
152159
<version>${servlet-api-version}</version>
153160
</dependency>
154-
{{/jakarta}}
161+
{{/jakarta}}
155162

156163
<dependency>
157164
<groupId>junit</groupId>
@@ -214,6 +221,20 @@
214221
</dependency>
215222
{{/jakarta}}
216223
{{/useBeanValidation}}
224+
{{#java8}}
225+
<dependency>
226+
<groupId>com.fasterxml.jackson.datatype</groupId>
227+
<artifactId>jackson-datatype-jsr310</artifactId>
228+
<version>${jackson-version}</version>
229+
</dependency>
230+
{{/java8}}
231+
{{^java8}}
232+
<dependency>
233+
<groupId>com.fasterxml.jackson.datatype</groupId>
234+
<artifactId>jackson-datatype-joda</artifactId>
235+
<version>${jackson-version}</version>
236+
</dependency>
237+
{{/java8}}
217238
</dependencies>
218239
<repositories>
219240
<repository>
@@ -231,7 +252,7 @@
231252
<swagger-core-version>1.5.18</swagger-core-version>
232253
<jetty-version>9.2.9.v20150224</jetty-version>
233254
<jersey-version>1.19.1</jersey-version>
234-
<jackson-version>2.8.9</jackson-version>
255+
<jackson-version>2.9.5</jackson-version>
235256
<slf4j-version>1.7.21</slf4j-version>
236257
<junit-version>4.13.1</junit-version>
237258
<servlet-api-version>{{#jakarta}}6.0.0{{/jakarta}}{{^jakarta}}2.5{{/jakarta}}</servlet-api-version>

‎src/main/resources/handlebars/JavaJaxRS/pom.mustache

Lines changed: 26 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,6 @@
5858
<groupId>jakarta.validation</groupId>
5959
<artifactId>jakarta.validation-api</artifactId>
6060
<version>${beanvalidation-version}</version>
61-
<scope>provided</scope>
6261
</dependency>
6362
{{/jakarta}}
6463
{{^jakarta}}
@@ -147,11 +146,27 @@
147146
<version>${junit-version}</version>
148147
<scope>test</scope>
149148
</dependency>
149+
{{#jakarta}}
150150
<dependency>
151-
<groupId>javax.servlet</groupId>
152-
<artifactId>servlet-api</artifactId>
153-
<version>${servlet-api-version}</version>
151+
<groupId>jakarta.servlet</groupId>
152+
<artifactId>jakarta.servlet-api</artifactId>
153+
<version>${servlet-api-version}</version>
154154
</dependency>
155+
156+
<dependency>
157+
<groupId>jakarta.platform</groupId>
158+
<artifactId>jakarta.jakartaee-api</artifactId>
159+
<version>10.0.0</version>
160+
<scope>provided</scope>
161+
</dependency>
162+
{{/jakarta}}
163+
{{^jakarta}}
164+
<dependency>
165+
<groupId>javax.servlet</groupId>
166+
<artifactId>servlet-api</artifactId>
167+
<version>${servlet-api-version}</version>
168+
</dependency>
169+
{{/jakarta}}
155170
<dependency>
156171
<groupId>org.glassfish.jersey.containers</groupId>
157172
<artifactId>jersey-container-servlet-core</artifactId>
@@ -219,7 +234,12 @@
219234
<groupId>jakarta.validation</groupId>
220235
<artifactId>jakarta.validation-api</artifactId>
221236
<version>${beanvalidation-version}</version>
222-
<scope>provided</scope>
237+
</dependency>
238+
239+
<dependency>
240+
<groupId>jakarta.annotation</groupId>
241+
<artifactId>jakarta.annotation-api</artifactId>
242+
<version>2.1.1</version>
223243
</dependency>
224244
{{/jakarta}}
225245
{{^jakarta}}
@@ -261,7 +281,7 @@
261281
{{/supportJava6}}
262282
<junit-version>4.13.1</junit-version>
263283
<logback-version>1.2.9</logback-version>
264-
<servlet-api-version>2.5</servlet-api-version>
284+
<servlet-api-version>{{#jakarta}}6.0.0{{/jakarta}}{{^jakarta}}2.5{{/jakarta}}</servlet-api-version>
265285
{{#useBeanValidation}}
266286
<beanvalidation-version>{{#jakarta}}3.0.2{{/jakarta}}{{^jakarta}}1.1.0.Final{{/jakarta}}</beanvalidation-version>
267287
{{/useBeanValidation}}

‎src/main/resources/handlebars/JavaJaxRS/serviceFormParams.mustache

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
{{#isFormParam}}{{^isBinary}}{{{dataType}}} {{paramName}}{{/isBinary}}{{/isFormParam}}
1+
{{#isFormParam}}{{^isBinary}}{{{dataType}}} {{paramName}}{{/isBinary}}{{#isBinary}}java.io.InputStream {{paramName}}InputStream, FormDataContentDisposition {{paramName}}Detail{{/isBinary}}{{/isFormParam}}

0 commit comments

Comments
 (0)