Skip to content

Commit de2af1e

Browse files
alexsuperdevalexsuperdev
committed
updated dependencies to swagger-annotations(2.1.1) in pom mustache of java libs updated annotations according to swagger-annotations 2.1.1 in pojo, and api mustache of java libs
1 parent 175d36a commit de2af1e

File tree

45 files changed

+127
-70
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

45 files changed

+127
-70
lines changed

‎modules/openapi-generator/src/main/resources/Java/libraries/feign/pom.mustache

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -194,7 +194,7 @@
194194

195195
<dependencies>
196196
<dependency>
197-
<groupId>io.swagger</groupId>
197+
<groupId>io.swagger.core.v3</groupId>
198198
<artifactId>swagger-annotations</artifactId>
199199
<version>${swagger-annotations-version}</version>
200200
</dependency>
@@ -311,7 +311,7 @@
311311
<java.version>{{#supportJava6}}1.6{{/supportJava6}}{{^supportJava6}}{{#java8}}1.8{{/java8}}{{^java8}}1.7{{/java8}}{{/supportJava6}}</java.version>
312312
<maven.compiler.source>${java.version}</maven.compiler.source>
313313
<maven.compiler.target>${java.version}</maven.compiler.target>
314-
<swagger-annotations-version>1.5.21</swagger-annotations-version>
314+
<swagger-annotations-version>2.1.1</swagger-annotations-version>
315315
<feign-version>{{#useFeign10}}10.7.4{{/useFeign10}}{{^useFeign10}}9.7.0{{/useFeign10}}</feign-version>
316316
<feign-form-version>{{#useFeign10}}3.8.0{{/useFeign10}}{{^useFeign10}}2.1.0{{/useFeign10}}</feign-form-version>
317317
<jackson-version>2.10.1</jackson-version>

‎modules/openapi-generator/src/main/resources/Java/libraries/google-api-client/pom.mustache

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -215,7 +215,7 @@
215215

216216
<dependencies>
217217
<dependency>
218-
<groupId>io.swagger</groupId>
218+
<groupId>io.swagger.core.v3</groupId>
219219
<artifactId>swagger-annotations</artifactId>
220220
<version>${swagger-annotations-version}</version>
221221
</dependency>
@@ -303,7 +303,7 @@
303303
</dependencies>
304304
<properties>
305305
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
306-
<swagger-annotations-version>1.5.22</swagger-annotations-version>
306+
<swagger-annotations-version>2.1.1</swagger-annotations-version>
307307
<google-api-client-version>1.30.2</google-api-client-version>
308308
<jersey-common-version>2.25.1</jersey-common-version>
309309
<jackson-version>2.10.1</jackson-version>

‎modules/openapi-generator/src/main/resources/Java/libraries/jersey2/pom.mustache

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -224,7 +224,7 @@
224224

225225
<dependencies>
226226
<dependency>
227-
<groupId>io.swagger</groupId>
227+
<groupId>io.swagger.core.v3</groupId>
228228
<artifactId>swagger-annotations</artifactId>
229229
<version>${swagger-annotations-version}</version>
230230
</dependency>
@@ -351,7 +351,7 @@
351351
</dependencies>
352352
<properties>
353353
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
354-
<swagger-annotations-version>1.5.22</swagger-annotations-version>
354+
<swagger-annotations-version>2.1.1</swagger-annotations-version>
355355
{{^supportJava6}}
356356
<jersey-version>2.27</jersey-version>
357357
{{/supportJava6}}

‎modules/openapi-generator/src/main/resources/Java/libraries/native/pom.mustache

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -162,7 +162,7 @@
162162

163163
<dependencies>
164164
<dependency>
165-
<groupId>io.swagger</groupId>
165+
<groupId>io.swagger.core.v3</groupId>
166166
<artifactId>swagger-annotations</artifactId>
167167
<version>${swagger-annotations-version}</version>
168168
</dependency>
@@ -211,7 +211,7 @@
211211
</dependencies>
212212
<properties>
213213
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
214-
<swagger-annotations-version>1.5.22</swagger-annotations-version>
214+
<swagger-annotations-version>2.1.1</swagger-annotations-version>
215215
<maven.compiler.source>11</maven.compiler.source>
216216
<maven.compiler.target>11</maven.compiler.target>
217217
<jackson-version>2.9.9</jackson-version>

‎modules/openapi-generator/src/main/resources/Java/libraries/okhttp-gson/pom.mustache

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -203,7 +203,7 @@
203203

204204
<dependencies>
205205
<dependency>
206-
<groupId>io.swagger</groupId>
206+
<groupId>io.swagger.core.v3</groupId>
207207
<artifactId>swagger-annotations</artifactId>
208208
<version>${swagger-core-version}</version>
209209
</dependency>
@@ -308,7 +308,7 @@
308308
<maven.compiler.source>${java.version}</maven.compiler.source>
309309
<maven.compiler.target>${java.version}</maven.compiler.target>
310310
<gson-fire-version>1.8.3</gson-fire-version>
311-
<swagger-core-version>1.5.22</swagger-core-version>
311+
<swagger-core-version>2.1.1</swagger-core-version>
312312
<okhttp-version>3.14.2</okhttp-version>
313313
<gson-version>2.8.5</gson-version>
314314
<commons-lang3-version>3.9</commons-lang3-version>

‎modules/openapi-generator/src/main/resources/Java/libraries/rest-assured/pom.mustache

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -202,7 +202,7 @@
202202

203203
<dependencies>
204204
<dependency>
205-
<groupId>io.swagger</groupId>
205+
<groupId>io.swagger.core.v3</groupId>
206206
<artifactId>swagger-annotations</artifactId>
207207
<version>${swagger-annotations-version}</version>
208208
</dependency>
@@ -311,7 +311,7 @@
311311
</dependencies>
312312
<properties>
313313
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
314-
<swagger-annotations-version>1.5.21</swagger-annotations-version>
314+
<swagger-annotations-version>2.1.1</swagger-annotations-version>
315315
<rest-assured.version>4.0.0</rest-assured.version>
316316
<gson-version>2.8.5</gson-version>
317317
<gson-fire-version>1.8.3</gson-fire-version>

‎modules/openapi-generator/src/main/resources/Java/libraries/resteasy/pom.mustache

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -175,7 +175,7 @@
175175
</build>
176176
<dependencies>
177177
<dependency>
178-
<groupId>io.swagger</groupId>
178+
<groupId>io.swagger.core.v3</groupId>
179179
<artifactId>swagger-annotations</artifactId>
180180
<version>${swagger-annotations-version}</version>
181181
</dependency>
@@ -292,7 +292,7 @@
292292
</dependencies>
293293
<properties>
294294
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
295-
<swagger-annotations-version>1.5.22</swagger-annotations-version>
295+
<swagger-annotations-version>2.1.1</swagger-annotations-version>
296296
<resteasy-version>3.1.3.Final</resteasy-version>
297297
<jackson-version>2.10.1</jackson-version>
298298
<jackson-databind-version>2.10.1</jackson-databind-version>

‎modules/openapi-generator/src/main/resources/Java/libraries/resttemplate/pom.mustache

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -307,7 +307,7 @@
307307
</dependencies>
308308
<properties>
309309
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
310-
<swagger-annotations-version>1.5.22</swagger-annotations-version>
310+
<swagger-annotations-version>2.1.1</swagger-annotations-version>
311311
<spring-web-version>4.3.9.RELEASE</spring-web-version>
312312
<jackson-version>2.10.1</jackson-version>
313313
<jackson-databind-version>2.10.1</jackson-databind-version>

‎modules/openapi-generator/src/main/resources/Java/libraries/retrofit/pom.mustache

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -215,7 +215,7 @@
215215

216216
<dependencies>
217217
<dependency>
218-
<groupId>io.swagger</groupId>
218+
<groupId>io.swagger.core.v3</groupId>
219219
<artifactId>swagger-annotations</artifactId>
220220
<version>${swagger-annotations-version}</version>
221221
</dependency>
@@ -271,7 +271,7 @@
271271
</dependencies>
272272
<properties>
273273
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
274-
<swagger-annotations-version>1.5.21</swagger-annotations-version>
274+
<swagger-annotations-version>2.1.1</swagger-annotations-version>
275275
<retrofit-version>1.9.0</retrofit-version>
276276
<okhttp-version>2.7.5</okhttp-version>
277277
<jodatime-version>2.9.9</jodatime-version>

‎modules/openapi-generator/src/main/resources/Java/libraries/retrofit2/pom.mustache

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -194,7 +194,7 @@
194194

195195
<dependencies>
196196
<dependency>
197-
<groupId>io.swagger</groupId>
197+
<groupId>io.swagger.core.v3</groupId>
198198
<artifactId>swagger-annotations</artifactId>
199199
<version>${swagger-annotations-version}</version>
200200
</dependency>
@@ -373,7 +373,7 @@
373373
<maven.compiler.source>${java.version}</maven.compiler.source>
374374
<maven.compiler.target>${java.version}</maven.compiler.target>
375375
<gson-fire-version>1.8.3</gson-fire-version>
376-
<swagger-annotations-version>1.5.22</swagger-annotations-version>
376+
<swagger-annotations-version>2.1.1</swagger-annotations-version>
377377
{{#usePlayWS}}
378378
<jackson-databind-version>2.10.1</jackson-databind-version>
379379
{{#play24}}

‎modules/openapi-generator/src/main/resources/Java/libraries/vertx/pom.mustache

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -203,7 +203,7 @@
203203

204204
<dependencies>
205205
<dependency>
206-
<groupId>io.swagger</groupId>
206+
<groupId>io.swagger.core.v3</groupId>
207207
<artifactId>swagger-annotations</artifactId>
208208
<version>${swagger-annotations-version}</version>
209209
</dependency>
@@ -288,7 +288,7 @@
288288
<properties>
289289
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
290290
<vertx-version>3.4.2</vertx-version>
291-
<swagger-annotations-version>1.5.22</swagger-annotations-version>
291+
<swagger-annotations-version>2.1.1</swagger-annotations-version>
292292
<jackson-version>2.10.1</jackson-version>
293293
<jackson-databind>2.10.1</jackson-databind>
294294
<jackson-databind-nullable-version>0.2.1</jackson-databind-nullable-version>

‎modules/openapi-generator/src/main/resources/Java/libraries/webclient/pom.mustache

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@
6868

6969
<dependencies>
7070
<dependency>
71-
<groupId>io.swagger</groupId>
71+
<groupId>io.swagger.core.v3</groupId>
7272
<artifactId>swagger-annotations</artifactId>
7373
<version>${swagger-annotations-version}</version>
7474
</dependency>
@@ -141,7 +141,7 @@
141141
</dependencies>
142142
<properties>
143143
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
144-
<swagger-annotations-version>1.5.22</swagger-annotations-version>
144+
<swagger-annotations-version>2.1.1</swagger-annotations-version>
145145
<spring-web-version>5.0.16.RELEASE</spring-web-version>
146146
<jackson-version>2.10.1</jackson-version>
147147
<jackson-databind-version>2.10.1</jackson-databind-version>

‎modules/openapi-generator/src/main/resources/JavaJaxRS/cxf-cdi/api.mustache

Lines changed: 18 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,14 @@ import javax.ws.rs.core.SecurityContext;
1111
import javax.enterprise.context.RequestScoped;
1212
import javax.inject.Inject;
1313

14-
import io.swagger.annotations.*;
14+
import io.swagger.v3.oas.annotations.*;
15+
import io.swagger.v3.oas.annotations.enums.ParameterIn;
16+
import io.swagger.v3.oas.annotations.media.*;
17+
import io.swagger.v3.oas.annotations.responses.ApiResponse;
18+
import io.swagger.v3.oas.annotations.responses.ApiResponses;
19+
import io.swagger.v3.oas.annotations.security.SecurityRequirement;
20+
import io.swagger.v3.oas.annotations.tags.Tag;
21+
1522
import java.io.InputStream;
1623

1724
import org.apache.cxf.jaxrs.ext.multipart.Attachment;
@@ -25,7 +32,7 @@ import javax.validation.constraints.*;
2532
@Path("/{{{baseName}}}")
2633
@RequestScoped
2734

28-
@Api(description = "the {{{baseName}}} API")
35+
@Tag(name = "the {{{baseName}}} API")
2936
{{#hasConsumes}}@Consumes({ {{#consumes}}"{{{mediaType}}}"{{#hasMore}}, {{/hasMore}}{{/consumes}} }){{/hasConsumes}}
3037
{{#hasProduces}}@Produces({ {{#produces}}"{{{mediaType}}}"{{#hasMore}}, {{/hasMore}}{{/produces}} }){{/hasProduces}}
3138
{{>generatedAnnotation}}
@@ -43,15 +50,16 @@ public class {{classname}} {
4350
{{#subresourceOperation}}@Path("{{{path}}}"){{/subresourceOperation}}
4451
{{#hasConsumes}}@Consumes({ {{#consumes}}"{{{mediaType}}}"{{#hasMore}}, {{/hasMore}}{{/consumes}} }){{/hasConsumes}}
4552
{{#hasProduces}}@Produces({ {{#produces}}"{{{mediaType}}}"{{#hasMore}}, {{/hasMore}}{{/produces}} }){{/hasProduces}}
46-
@ApiOperation(value = "{{{summary}}}", notes = "{{{notes}}}", response = {{{returnBaseType}}}.class{{#returnContainer}}, responseContainer = "{{{returnContainer}}}"{{/returnContainer}}{{#hasAuthMethods}}, authorizations = {
47-
{{#authMethods}}@Authorization(value = "{{name}}"{{#isOAuth}}, scopes = {
48-
{{#scopes}}@AuthorizationScope(scope = "{{scope}}", description = "{{description}}"){{#hasMore}},
53+
@Operation(summary = "{{{summary}}}", description = "{{{notes}}}" {{#hasAuthMethods}}
54+
{{#authMethods}}
55+
, security = {
56+
{{#scopes}} @SecurityRequirement(name = "{{description}}", scopes ={"{{scope}}"}){{#hasMore}},
4957
{{/hasMore}}{{/scopes}}
50-
}{{/isOAuth}}){{#hasMore}},
51-
{{/hasMore}}{{/authMethods}}
52-
}{{/hasAuthMethods}}, tags={ {{#vendorExtensions.x-tags}}"{{tag}}"{{#hasMore}}, {{/hasMore}}{{/vendorExtensions.x-tags}} })
53-
@ApiResponses(value = { {{#responses}}
54-
@ApiResponse(code = {{{code}}}, message = "{{{message}}}", response = {{{baseType}}}.class{{#containerType}}, responseContainer = "{{{containerType}}}"{{/containerType}}){{#hasMore}},{{/hasMore}}{{/responses}} })
58+
{{#hasMore}},
59+
{{/hasMore}}}{{/authMethods}}
60+
{{/hasAuthMethods}}, tags={ {{#vendorExtensions.x-tags}}"{{tag}}"{{#hasMore}}, {{/hasMore}}{{/vendorExtensions.x-tags}} },
61+
responses = { {{#responses}}
62+
@ApiResponse(responseCode = "{{{code}}}", description = "{{{message}}}" {{#baseType}}, content = { @Content( {{#containerType}}schema = @Schema(implementation = {{{baseType}}}.class){{/containerType}}{{^containerType}} array = @ArraySchema(schema = @Schema(implementation = {{{baseType}}}.class)) {{/containerType}} )} {{/baseType}} ){{#hasMore}} ,{{/hasMore}} {{/responses}} })
5563
public Response {{nickname}}({{#allParams}}{{>queryParams}}{{>pathParams}}{{>headerParams}}{{>bodyParams}}{{>formParams}}{{#hasMore}}, {{/hasMore}}{{/allParams}}) {
5664
return delegate.{{nickname}}({{#allParams}}{{#isFile}}{{paramName}}InputStream, {{paramName}}Detail{{/isFile}}{{^isFile}}{{paramName}}{{/isFile}}, {{/allParams}}securityContext);
5765
}

‎modules/openapi-generator/src/main/resources/JavaJaxRS/cxf-cdi/bodyParams.mustache

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
{{#isBodyParam}}@ApiParam(value = "{{{description}}}" {{#required}},required=true{{/required}}{{#allowableValues}}, {{> allowableValues }}{{/allowableValues}}{{#defaultValue}}, defaultValue="{{{defaultValue}}}"{{/defaultValue}}) {{{dataType}}} {{paramName}}{{/isBodyParam}}
1+
{{#isBodyParam}}@Parameter(description = "{{{description}}}" {{#required}},required=true{{/required}}{{#allowableValues}}, {{> allowableValues }}{{/allowableValues}}{{#defaultValue}}, defaultValue="{{{defaultValue}}}"{{/defaultValue}}) {{{dataType}}} {{paramName}}{{/isBodyParam}}

‎modules/openapi-generator/src/main/resources/JavaJaxRS/cxf-cdi/headerParams.mustache

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
{{#isHeaderParam}}{{#useBeanValidation}}{{>beanValidationHeaderParams}}{{/useBeanValidation}} @ApiParam(value = "{{{description}}}" {{#required}},required=true{{/required}}{{#allowableValues}}, {{> allowableValues }}{{/allowableValues}}{{#defaultValue}}, defaultValue="{{{defaultValue}}}"{{/defaultValue}})@HeaderParam("{{baseName}}") {{{dataType}}} {{paramName}}{{/isHeaderParam}}
1+
{{#isHeaderParam}}{{#useBeanValidation}}{{>beanValidationHeaderParams}}{{/useBeanValidation}}@Schema(description = "{{{description}}}" {{#required}},required=true{{/required}}{{#allowableValues}}, {{> allowableValues }}{{/allowableValues}}{{#defaultValue}}, defaultValue="{{{defaultValue}}}"{{/defaultValue}})@HeaderParam("{{baseName}}") {{{dataType}}} {{paramName}}{{/isHeaderParam}}

‎modules/openapi-generator/src/main/resources/JavaJaxRS/cxf-cdi/pathParams.mustache

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
{{#isPathParam}}{{#useBeanValidation}}{{>beanValidationPathParams}}{{/useBeanValidation}}@ApiParam(value = "{{{description}}}"{{#required}},required=true{{/required}}{{#allowableValues}}, {{> allowableValues }}{{/allowableValues}}{{#defaultValue}}, defaultValue="{{{defaultValue}}}"{{/defaultValue}}) @PathParam("{{baseName}}") {{{dataType}}} {{paramName}}{{/isPathParam}}
1+
{{#isPathParam}}{{#useBeanValidation}}{{>beanValidationPathParams}}{{/useBeanValidation}}@Parameter(in = ParameterIn.PATH,description = "{{{description}}}"{{#required}},required=true{{/required}}{{#allowableValues}}, {{> allowableValues }}{{/allowableValues}}{{#defaultValue}}, defaultValue="{{{defaultValue}}}"{{/defaultValue}}) @PathParam("{{baseName}}") {{{dataType}}} {{paramName}}{{/isPathParam}}

‎modules/openapi-generator/src/main/resources/JavaJaxRS/cxf-cdi/pojo.mustache

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
import io.swagger.annotations.*;
1+
import io.swagger.v3.oas.annotations.media.Schema;
22
import java.util.Objects;
33

44
import javax.xml.bind.annotation.*;
55

6-
{{#description}}@ApiModel(description = "{{{description}}}"){{/description}}{{>additionalModelTypeAnnotations}}{{#discriminator}}{{>typeInfoAnnotation}}{{/discriminator}}
6+
{{#description}}@Schema(description = "{{{description}}}"){{/description}}{{>additionalModelTypeAnnotations}}{{#discriminator}}{{>typeInfoAnnotation}}{{/discriminator}}
77
public class {{classname}} {{#parent}}extends {{{parent}}}{{/parent}} {{#serializableModel}}implements Serializable{{/serializableModel}} {
88
{{#vars}}{{#isEnum}}{{^isContainer}}
99

@@ -35,7 +35,7 @@ public class {{classname}} {{#parent}}extends {{{parent}}}{{/parent}} {{#seriali
3535
}
3636

3737
{{#vendorExtensions.x-extra-annotation}}{{{vendorExtensions.x-extra-annotation}}}{{/vendorExtensions.x-extra-annotation}}
38-
@ApiModelProperty({{#example}}example = "{{{example}}}", {{/example}}{{#required}}required = {{required}}, {{/required}}value = "{{{description}}}")
38+
@Schema({{#example}}example = "{{{example}}}", {{/example}}{{#required}}required = {{required}}, {{/required}}description = "{{{description}}}")
3939
@JsonProperty("{{baseName}}")
4040
{{#useBeanValidation}}{{>beanValidation}}{{/useBeanValidation}} public {{{datatypeWithEnum}}} {{getter}}() {
4141
return {{name}};

‎modules/openapi-generator/src/main/resources/JavaJaxRS/cxf-cdi/queryParams.mustache

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
{{#isQueryParam}}{{#useBeanValidation}}{{>beanValidationQueryParams}}{{/useBeanValidation}}@ApiParam(value = "{{{description}}}"{{#required}},required=true{{/required}}{{^isContainer}}{{#allowableValues}}, {{> allowableValues }}{{/allowableValues}}{{#defaultValue}}, defaultValue={{^isString}}"{{/isString}}{{#isString}}{{#isEnum}}"{{/isEnum}}{{/isString}}{{{defaultValue}}}{{^isString}}"{{/isString}}{{#isString}}{{#isEnum}}"{{/isEnum}}{{/isString}}{{/defaultValue}}{{/isContainer}}) {{^isContainer}}{{#defaultValue}}@DefaultValue({{^isString}}"{{/isString}}{{#isString}}{{#isEnum}}"{{/isEnum}}{{/isString}}{{{defaultValue}}}{{^isString}}"{{/isString}}{{#isString}}{{#isEnum}}"{{/isEnum}}{{/isString}}) {{/defaultValue}}{{/isContainer}} @QueryParam("{{baseName}}") {{{dataType}}} {{paramName}}{{/isQueryParam}}
1+
{{#isQueryParam}}{{#useBeanValidation}}{{>beanValidationQueryParams}}{{/useBeanValidation}}@Schema(description = "{{{description}}}"{{#required}},required=true{{/required}}{{^isContainer}}{{#allowableValues}}, {{> allowableValues }}{{/allowableValues}}{{#defaultValue}}, defaultValue={{^isString}}"{{/isString}}{{#isString}}{{#isEnum}}"{{/isEnum}}{{/isString}}{{{defaultValue}}}{{^isString}}"{{/isString}}{{#isString}}{{#isEnum}}"{{/isEnum}}{{/isString}}{{/defaultValue}}{{/isContainer}}) {{^isContainer}}{{#defaultValue}}@DefaultValue({{^isString}}"{{/isString}}{{#isString}}{{#isEnum}}"{{/isEnum}}{{/isString}}{{{defaultValue}}}{{^isString}}"{{/isString}}{{#isString}}{{#isEnum}}"{{/isEnum}}{{/isString}}) {{/defaultValue}}{{/isContainer}} @QueryParam("{{baseName}}") {{{dataType}}} {{paramName}}{{/isQueryParam}}

‎modules/openapi-generator/src/main/resources/JavaJaxRS/cxf-ext/pom.mustache

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -97,6 +97,11 @@
9797
<scope>compile</scope>
9898
<version>${swagger-core-version}</version>
9999
</dependency>
100+
<dependency>
101+
<groupId>io.swagger.core.v3</groupId>
102+
<artifactId>swagger-annotations</artifactId>
103+
<version>2.1.1</version>
104+
</dependency>
100105
<dependency>
101106
<groupId>ch.qos.logback</groupId>
102107
<artifactId>logback-classic</artifactId>

‎modules/openapi-generator/src/main/resources/JavaJaxRS/cxf-ext/server/pom.mustache

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -119,6 +119,11 @@
119119
</exclusion>
120120
</exclusions>
121121
</dependency>
122+
<dependency>
123+
<groupId>io.swagger.core.v3</groupId>
124+
<artifactId>swagger-annotations</artifactId>
125+
<version>2.1.1</version>
126+
</dependency>
122127
<dependency>
123128
<groupId>ch.qos.logback</groupId>
124129
<artifactId>logback-classic</artifactId>
@@ -326,7 +331,7 @@
326331
<java.version>{{#supportJava6}}1.6{{/supportJava6}}{{^supportJava6}}{{^java8}}1.7{{/java8}}{{#java8}}1.8{{/java8}}{{/supportJava6}}</java.version>
327332
<maven.compiler.source>${java.version}</maven.compiler.source>
328333
<maven.compiler.target>${java.version}</maven.compiler.target>
329-
<swagger-core-version>1.5.18</swagger-core-version>
334+
<swagger-core-version>2.1.1</swagger-core-version>
330335
<jetty-version>9.2.9.v20150224</jetty-version>
331336
{{#useBeanValidation}}
332337
<beanvalidation-version>1.1.0.Final</beanvalidation-version>

0 commit comments

Comments
 (0)