You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2016/02/12 10:50:46 UTC

[1/2] camel git commit: CAMEL-9593: camel-example-swagger-cdi is not producing valid swagger definition. Thanks to Andreas Boss for the patch.

Repository: camel
Updated Branches:
  refs/heads/camel-2.16.x 4c794f8b1 -> b19ae7851


CAMEL-9593: camel-example-swagger-cdi is not producing valid swagger definition. Thanks to Andreas Boss for the patch.


Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/69c57aa7
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/69c57aa7
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/69c57aa7

Branch: refs/heads/camel-2.16.x
Commit: 69c57aa7fe4656cfaadf2f49dd5ec76b04018514
Parents: 4c794f8
Author: Claus Ibsen <da...@apache.org>
Authored: Fri Feb 12 10:41:27 2016 +0100
Committer: Claus Ibsen <da...@apache.org>
Committed: Fri Feb 12 10:50:22 2016 +0100

----------------------------------------------------------------------
 .../java/org/apache/camel/example/cdi/UserRouteBuilder.java     | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/camel/blob/69c57aa7/examples/camel-example-swagger-cdi/src/main/java/org/apache/camel/example/cdi/UserRouteBuilder.java
----------------------------------------------------------------------
diff --git a/examples/camel-example-swagger-cdi/src/main/java/org/apache/camel/example/cdi/UserRouteBuilder.java b/examples/camel-example-swagger-cdi/src/main/java/org/apache/camel/example/cdi/UserRouteBuilder.java
index c746082..28a29e8 100644
--- a/examples/camel-example-swagger-cdi/src/main/java/org/apache/camel/example/cdi/UserRouteBuilder.java
+++ b/examples/camel-example-swagger-cdi/src/main/java/org/apache/camel/example/cdi/UserRouteBuilder.java
@@ -20,6 +20,8 @@ import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.cdi.ContextName;
 import org.apache.camel.model.rest.RestBindingMode;
 
+import java.net.HttpURLConnection;
+
 import static org.apache.camel.model.rest.RestParamType.body;
 import static org.apache.camel.model.rest.RestParamType.path;
 
@@ -50,11 +52,12 @@ public class UserRouteBuilder extends RouteBuilder {
             .consumes("application/json").produces("application/json")
 
             .get("/{id}").description("Find user by id").outType(User.class)
-                .param().name("id").type(path).description("The id of the user to get").dataType("int").endParam()
+                .param().name("id").type(path).description("The id of the user to get").dataType("integer").endParam()
                 .to("bean:userService?method=getUser(${header.id})")
 
             .put().description("Updates or create a user").type(User.class)
                 .param().name("body").type(body).description("The user to update or create").endParam()
+                .responseMessage().code(HttpURLConnection.HTTP_OK).endResponseMessage()
                 .to("bean:userService?method=updateUser")
 
             .get("/findAll").description("Find all users").outTypeList(User.class)


[2/2] camel git commit: CAMEL-9593: camel-example-swagger-cdi is not producing valid swagger definition. Thanks to Andreas Boss for the patch.

Posted by da...@apache.org.
CAMEL-9593: camel-example-swagger-cdi is not producing valid swagger definition. Thanks to Andreas Boss for the patch.


Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/b19ae785
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/b19ae785
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/b19ae785

Branch: refs/heads/camel-2.16.x
Commit: b19ae785153b199983031b0162259dfa0035ce76
Parents: 69c57aa
Author: Claus Ibsen <da...@apache.org>
Authored: Fri Feb 12 10:48:16 2016 +0100
Committer: Claus Ibsen <da...@apache.org>
Committed: Fri Feb 12 10:50:28 2016 +0100

----------------------------------------------------------------------
 .../java/org/apache/camel/example/cdi/UserRouteBuilder.java    | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/camel/blob/b19ae785/examples/camel-example-swagger-cdi/src/main/java/org/apache/camel/example/cdi/UserRouteBuilder.java
----------------------------------------------------------------------
diff --git a/examples/camel-example-swagger-cdi/src/main/java/org/apache/camel/example/cdi/UserRouteBuilder.java b/examples/camel-example-swagger-cdi/src/main/java/org/apache/camel/example/cdi/UserRouteBuilder.java
index 28a29e8..b3441b4 100644
--- a/examples/camel-example-swagger-cdi/src/main/java/org/apache/camel/example/cdi/UserRouteBuilder.java
+++ b/examples/camel-example-swagger-cdi/src/main/java/org/apache/camel/example/cdi/UserRouteBuilder.java
@@ -20,8 +20,6 @@ import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.cdi.ContextName;
 import org.apache.camel.model.rest.RestBindingMode;
 
-import java.net.HttpURLConnection;
-
 import static org.apache.camel.model.rest.RestParamType.body;
 import static org.apache.camel.model.rest.RestParamType.path;
 
@@ -53,14 +51,16 @@ public class UserRouteBuilder extends RouteBuilder {
 
             .get("/{id}").description("Find user by id").outType(User.class)
                 .param().name("id").type(path).description("The id of the user to get").dataType("integer").endParam()
+                .responseMessage().code(200).message("The user").endResponseMessage()
                 .to("bean:userService?method=getUser(${header.id})")
 
             .put().description("Updates or create a user").type(User.class)
                 .param().name("body").type(body).description("The user to update or create").endParam()
-                .responseMessage().code(HttpURLConnection.HTTP_OK).endResponseMessage()
+                .responseMessage().code(200).message("User created or updated").endResponseMessage()
                 .to("bean:userService?method=updateUser")
 
             .get("/findAll").description("Find all users").outTypeList(User.class)
+                .responseMessage().code(200).message("All users").endResponseMessage()
                 .to("bean:userService?method=listUsers");
     }