Skip to content

Commit a0b4a07

Browse files
wing328wing328
committed
Merge pull request #1960 from dilipkrish/master
Updated the code generation for spring mvc
2 parents 3086bb6 + dd62040 commit a0b4a07

File tree

20 files changed

+221
-256
lines changed

20 files changed

+221
-256
lines changed

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

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ import {{modelPackage}}.*;
88
import io.swagger.annotations.Api;
99
import io.swagger.annotations.ApiOperation;
1010
import io.swagger.annotations.ApiParam;
11-
import io.swagger.annotations.ApiResponse;
1211
import io.swagger.annotations.ApiResponses;
1312
import io.swagger.annotations.Authorization;
1413
import io.swagger.annotations.AuthorizationScope;
@@ -44,8 +43,8 @@ public class {{classname}} {
4443
}{{/isOAuth}}){{#hasMore}},
4544
{{/hasMore}}{{/authMethods}}
4645
}{{/hasAuthMethods}})
47-
@ApiResponses(value = { {{#responses}}
48-
@ApiResponse(code = {{{code}}}, message = "{{{message}}}"){{#hasMore}},{{/hasMore}}{{/responses}} })
46+
@io.swagger.annotations.ApiResponses(value = { {{#responses}}
47+
@io.swagger.annotations.ApiResponse(code = {{{code}}}, message = "{{{message}}}"){{#hasMore}},{{/hasMore}}{{/responses}} })
4948
@RequestMapping(value = "{{path}}",
5049
{{#hasProduces}}produces = { {{#produces}}"{{mediaType}}"{{#hasMore}}, {{/hasMore}}{{/produces}} }, {{/hasProduces}}
5150
{{#hasConsumes}}consumes = { {{#consumes}}"{{mediaType}}"{{#hasMore}}, {{/hasMore}}{{/consumes}} },{{/hasConsumes}}

‎modules/swagger-codegen/src/main/resources/JavaSpringMVC/pom.mustache

Lines changed: 3 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -75,31 +75,6 @@
7575
<artifactId>slf4j-log4j12</artifactId>
7676
<version>${slf4j-version}</version>
7777
</dependency>
78-
<dependency>
79-
<groupId>com.sun.jersey</groupId>
80-
<artifactId>jersey-core</artifactId>
81-
<version>${jersey-version}</version>
82-
</dependency>
83-
<dependency>
84-
<groupId>com.sun.jersey</groupId>
85-
<artifactId>jersey-json</artifactId>
86-
<version>${jersey-version}</version>
87-
</dependency>
88-
<dependency>
89-
<groupId>com.sun.jersey</groupId>
90-
<artifactId>jersey-servlet</artifactId>
91-
<version>${jersey-version}</version>
92-
</dependency>
93-
<dependency>
94-
<groupId>com.sun.jersey.contribs</groupId>
95-
<artifactId>jersey-multipart</artifactId>
96-
<version>${jersey-version}</version>
97-
</dependency>
98-
<dependency>
99-
<groupId>com.sun.jersey</groupId>
100-
<artifactId>jersey-server</artifactId>
101-
<version>${jersey-version}</version>
102-
</dependency>
10378

10479
<!--Spring dependencies -->
10580
<dependency>
@@ -142,22 +117,14 @@
142117
<version>${servlet-api-version}</version>
143118
</dependency>
144119
</dependencies>
145-
<repositories>
146-
<repository>
147-
<id>jcenter-snapshots</id>
148-
<name>jcenter</name>
149-
<url>http://oss.jfrog.org/artifactory/oss-snapshot-local/</url>
150-
</repository>
151-
</repositories>
152120
<properties>
153-
<swagger-core-version>1.5.4</swagger-core-version>
121+
<swagger-core-version>1.5.6</swagger-core-version>
154122
<jetty-version>9.2.9.v20150224</jetty-version>
155123
<jersey-version>1.13</jersey-version>
156124
<slf4j-version>1.6.3</slf4j-version>
157-
<scala-test-version>1.6.1</scala-test-version>
158125
<junit-version>4.8.1</junit-version>
159126
<servlet-api-version>2.5</servlet-api-version>
160-
<springfox-version>2.0.4-SNAPSHOT</springfox-version>
161-
<spring-version>4.0.9.RELEASE</spring-version>
127+
<springfox-version>2.3.1</springfox-version>
128+
<spring-version>4.1.8.RELEASE</spring-version>
162129
</properties>
163130
</project>

‎samples/server/petstore/spring-mvc/pom.xml

Lines changed: 3 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -75,31 +75,6 @@
7575
<artifactId>slf4j-log4j12</artifactId>
7676
<version>${slf4j-version}</version>
7777
</dependency>
78-
<dependency>
79-
<groupId>com.sun.jersey</groupId>
80-
<artifactId>jersey-core</artifactId>
81-
<version>${jersey-version}</version>
82-
</dependency>
83-
<dependency>
84-
<groupId>com.sun.jersey</groupId>
85-
<artifactId>jersey-json</artifactId>
86-
<version>${jersey-version}</version>
87-
</dependency>
88-
<dependency>
89-
<groupId>com.sun.jersey</groupId>
90-
<artifactId>jersey-servlet</artifactId>
91-
<version>${jersey-version}</version>
92-
</dependency>
93-
<dependency>
94-
<groupId>com.sun.jersey.contribs</groupId>
95-
<artifactId>jersey-multipart</artifactId>
96-
<version>${jersey-version}</version>
97-
</dependency>
98-
<dependency>
99-
<groupId>com.sun.jersey</groupId>
100-
<artifactId>jersey-server</artifactId>
101-
<version>${jersey-version}</version>
102-
</dependency>
10378

10479
<!--Spring dependencies -->
10580
<dependency>
@@ -142,22 +117,14 @@
142117
<version>${servlet-api-version}</version>
143118
</dependency>
144119
</dependencies>
145-
<repositories>
146-
<repository>
147-
<id>jcenter-snapshots</id>
148-
<name>jcenter</name>
149-
<url>http://oss.jfrog.org/artifactory/oss-snapshot-local/</url>
150-
</repository>
151-
</repositories>
152120
<properties>
153-
<swagger-core-version>1.5.4</swagger-core-version>
121+
<swagger-core-version>1.5.6</swagger-core-version>
154122
<jetty-version>9.2.9.v20150224</jetty-version>
155123
<jersey-version>1.13</jersey-version>
156124
<slf4j-version>1.6.3</slf4j-version>
157-
<scala-test-version>1.6.1</scala-test-version>
158125
<junit-version>4.8.1</junit-version>
159126
<servlet-api-version>2.5</servlet-api-version>
160-
<springfox-version>2.0.4-SNAPSHOT</springfox-version>
161-
<spring-version>4.0.9.RELEASE</spring-version>
127+
<springfox-version>2.3.1</springfox-version>
128+
<spring-version>4.1.8.RELEASE</spring-version>
162129
</properties>
163130
</project>

‎samples/server/petstore/spring-mvc/src/main/java/io/swagger/api/ApiException.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package io.swagger.api;
22

3-
@javax.annotation.Generated(value = "class io.swagger.codegen.languages.SpringMVCServerCodegen", date = "2016-01-19T23:33:00.911+08:00")
3+
@javax.annotation.Generated(value = "class io.swagger.codegen.languages.SpringMVCServerCodegen", date = "2016-01-22T15:27:38.634-06:00")
44
public class ApiException extends Exception{
55
private int code;
66
public ApiException (int code, String msg) {

‎samples/server/petstore/spring-mvc/src/main/java/io/swagger/api/ApiOriginFilter.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
import javax.servlet.*;
66
import javax.servlet.http.HttpServletResponse;
77

8-
@javax.annotation.Generated(value = "class io.swagger.codegen.languages.SpringMVCServerCodegen", date = "2016-01-19T23:33:00.911+08:00")
8+
@javax.annotation.Generated(value = "class io.swagger.codegen.languages.SpringMVCServerCodegen", date = "2016-01-22T15:27:38.634-06:00")
99
public class ApiOriginFilter implements javax.servlet.Filter {
1010
@Override
1111
public void doFilter(ServletRequest request, ServletResponse response,

‎samples/server/petstore/spring-mvc/src/main/java/io/swagger/api/ApiResponseMessage.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
import javax.xml.bind.annotation.XmlTransient;
44

55
@javax.xml.bind.annotation.XmlRootElement
6-
@javax.annotation.Generated(value = "class io.swagger.codegen.languages.SpringMVCServerCodegen", date = "2016-01-19T23:33:00.911+08:00")
6+
@javax.annotation.Generated(value = "class io.swagger.codegen.languages.SpringMVCServerCodegen", date = "2016-01-22T15:27:38.634-06:00")
77
public class ApiResponseMessage {
88
public static final int ERROR = 1;
99
public static final int WARNING = 2;

‎samples/server/petstore/spring-mvc/src/main/java/io/swagger/api/NotFoundException.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package io.swagger.api;
22

3-
@javax.annotation.Generated(value = "class io.swagger.codegen.languages.SpringMVCServerCodegen", date = "2016-01-19T23:33:00.911+08:00")
3+
@javax.annotation.Generated(value = "class io.swagger.codegen.languages.SpringMVCServerCodegen", date = "2016-01-22T15:27:38.634-06:00")
44
public class NotFoundException extends ApiException {
55
private int code;
66
public NotFoundException (int code, String msg) {

0 commit comments

Comments
 (0)