CAMEL-7800: camel-swagger-java example
Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/83261fe6 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/83261fe6 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/83261fe6 Branch: refs/heads/master Commit: 83261fe6c102279051f1c7b605825fc0f037ab98 Parents: 5abb26a Author: Claus Ibsen <davscl...@apache.org> Authored: Thu Sep 17 16:36:34 2015 +0200 Committer: Claus Ibsen <davscl...@apache.org> Committed: Fri Sep 18 16:16:12 2015 +0200 ---------------------------------------------------------------------- examples/camel-example-swagger-java/pom.xml | 4 ++-- .../java/org/apache/camel/example/rest/User.java | 5 +++-- .../org/apache/camel/example/rest/UserService.java | 2 +- .../src/main/webapp/WEB-INF/web.xml | 17 +++++------------ 4 files changed, 11 insertions(+), 17 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/83261fe6/examples/camel-example-swagger-java/pom.xml ---------------------------------------------------------------------- diff --git a/examples/camel-example-swagger-java/pom.xml b/examples/camel-example-swagger-java/pom.xml index ae985e14..1218033 100755 --- a/examples/camel-example-swagger-java/pom.xml +++ b/examples/camel-example-swagger-java/pom.xml @@ -31,9 +31,9 @@ <packaging>war</packaging> <properties> - <swagger-ui.version>2.0.24</swagger-ui.version> + <swagger-ui.version>2.1.2</swagger-ui.version> <logback-version>1.1.3</logback-version> - <swagger.url>https://github.com/swagger-api/swagger-ui/archive/v${swagger-ui.version}</swagger.url> + <swagger.url>https://github.com/swagger-api/swagger-ui/archive</swagger.url> <destDir>target/swagger-ui</destDir> </properties> http://git-wip-us.apache.org/repos/asf/camel/blob/83261fe6/examples/camel-example-swagger-java/src/main/java/org/apache/camel/example/rest/User.java ---------------------------------------------------------------------- diff --git a/examples/camel-example-swagger-java/src/main/java/org/apache/camel/example/rest/User.java b/examples/camel-example-swagger-java/src/main/java/org/apache/camel/example/rest/User.java index ee63727..a1c6b87 100644 --- a/examples/camel-example-swagger-java/src/main/java/org/apache/camel/example/rest/User.java +++ b/examples/camel-example-swagger-java/src/main/java/org/apache/camel/example/rest/User.java @@ -16,8 +16,9 @@ */ package org.apache.camel.example.rest; -import com.wordnik.swagger.annotations.ApiModel; -import com.wordnik.swagger.annotations.ApiModelProperty; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; @ApiModel(description = "Represents an user of the system") public class User { http://git-wip-us.apache.org/repos/asf/camel/blob/83261fe6/examples/camel-example-swagger-java/src/main/java/org/apache/camel/example/rest/UserService.java ---------------------------------------------------------------------- diff --git a/examples/camel-example-swagger-java/src/main/java/org/apache/camel/example/rest/UserService.java b/examples/camel-example-swagger-java/src/main/java/org/apache/camel/example/rest/UserService.java index a94942e..c4a11f3 100644 --- a/examples/camel-example-swagger-java/src/main/java/org/apache/camel/example/rest/UserService.java +++ b/examples/camel-example-swagger-java/src/main/java/org/apache/camel/example/rest/UserService.java @@ -22,7 +22,7 @@ import java.util.Random; import java.util.TreeMap; /** - * A {@link org.apache.camel.example.rest.User} service which we rest enable from the {@link org.apache.camel.example.rest.UserRouteBuilder}. + * A {@link org.apache.camel.example.rest.User} service which we rest enable the routes defined in the XML file. */ public class UserService { http://git-wip-us.apache.org/repos/asf/camel/blob/83261fe6/examples/camel-example-swagger-java/src/main/webapp/WEB-INF/web.xml ---------------------------------------------------------------------- diff --git a/examples/camel-example-swagger-java/src/main/webapp/WEB-INF/web.xml b/examples/camel-example-swagger-java/src/main/webapp/WEB-INF/web.xml index 3cd24b4..17e049f 100755 --- a/examples/camel-example-swagger-java/src/main/webapp/WEB-INF/web.xml +++ b/examples/camel-example-swagger-java/src/main/webapp/WEB-INF/web.xml @@ -25,13 +25,7 @@ <!-- location of Camel Spring xml files --> <context-param> <param-name>contextConfigLocation</param-name> - - <!-- to use Java DSL --> - <param-value>classpath:camel-config.xml</param-value> - - <!-- to use XML DSL, then enable me, and disable Java DSL above <param-value>classpath:camel-config-xml.xml</param-value> - --> </context-param> <!-- the listener that kick-starts Spring --> @@ -51,7 +45,7 @@ <!-- to setup Camel Swagger api servlet --> <servlet> <servlet-name>ApiDeclarationServlet</servlet-name> - <servlet-class>org.apache.camel.component.swagger.DefaultCamelSwaggerServlet</servlet-class> + <servlet-class>org.apache.camel.swagger.DefaultCamelSwaggerServlet</servlet-class> <init-param> <!-- we specify the base.path using relative notation, that means the actual path will be calculated at runtime as http://server:port/contextpath/rest --> @@ -66,7 +60,7 @@ </init-param> <init-param> <param-name>api.version</param-name> - <param-value>1.2.3</param-value> + <param-value>2.0</param-value> </init-param> <init-param> <param-name>api.title</param-name> @@ -92,11 +86,10 @@ <url-pattern>/rest/*</url-pattern> </servlet-mapping> - <!-- START SNIPPET: e2 --> - <!-- enable CORS filter so people can use swagger ui to browse and test the apis --> + <!-- enable CORS filter so people can use swagger ui to browse and test the apis <filter> <filter-name>RestSwaggerCorsFilter</filter-name> - <filter-class>org.apache.camel.component.swagger.RestSwaggerCorsFilter</filter-class> + <filter-class>org.apache.camel.swagger.RestSwaggerCorsFilter</filter-class> </filter> <filter-mapping> @@ -104,7 +97,7 @@ <url-pattern>/api-docs/*</url-pattern> <url-pattern>/rest/*</url-pattern> </filter-mapping> - <!-- END SNIPPET: e2 --> + --> <welcome-file-list> <welcome-file>home.html</welcome-file>
