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/03/21 17:01:22 UTC
[1/7] camel git commit: CAMEL-9732: camel-swagger-java - Issue in
appendModels in the reader
Repository: camel
Updated Branches:
refs/heads/camel-2.16.x 7a8c632ee -> 7578430a5
refs/heads/camel-2.17.x 3bad74239 -> 2e9fb045a
refs/heads/master 50de2af27 -> 4a923fa62
CAMEL-9732: camel-swagger-java - Issue in appendModels in the reader
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/c32bd083
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/c32bd083
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/c32bd083
Branch: refs/heads/master
Commit: c32bd083e9605a20ca0683cef64086d4b899e780
Parents: 50de2af
Author: Claus Ibsen <da...@apache.org>
Authored: Mon Mar 21 16:52:43 2016 +0100
Committer: Claus Ibsen <da...@apache.org>
Committed: Mon Mar 21 16:55:56 2016 +0100
----------------------------------------------------------------------
.../java/org/apache/camel/swagger/RestSwaggerReader.java | 11 ++++++++++-
1 file changed, 10 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/c32bd083/components/camel-swagger-java/src/main/java/org/apache/camel/swagger/RestSwaggerReader.java
----------------------------------------------------------------------
diff --git a/components/camel-swagger-java/src/main/java/org/apache/camel/swagger/RestSwaggerReader.java b/components/camel-swagger-java/src/main/java/org/apache/camel/swagger/RestSwaggerReader.java
index 08c0a2d..dc7bfeb 100644
--- a/components/camel-swagger-java/src/main/java/org/apache/camel/swagger/RestSwaggerReader.java
+++ b/components/camel-swagger-java/src/main/java/org/apache/camel/swagger/RestSwaggerReader.java
@@ -506,7 +506,16 @@ public class RestSwaggerReader {
RestModelConverters converters = new RestModelConverters();
final Map<String, Model> models = converters.readClass(clazz);
for (Map.Entry<String, Model> entry : models.entrySet()) {
- swagger.model(entry.getKey(), entry.getValue());
+
+ // favor keeping any existing model that has the vendor extension in the model
+ boolean oldExt = false;
+ if (swagger.getDefinitions() != null && swagger.getDefinitions().get(entry.getKey()) != null) {
+ oldExt = swagger.getDefinitions().get(entry.getKey()).getVendorExtensions().get("x-className") == null;
+ }
+
+ if (!oldExt) {
+ swagger.model(entry.getKey(), entry.getValue());
+ }
}
}
[4/7] camel git commit: CAMEL-9732: camel-swagger-java - Issue in
appendModels in the reader
Posted by da...@apache.org.
CAMEL-9732: camel-swagger-java - Issue in appendModels in the reader
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/ca1c36aa
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/ca1c36aa
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/ca1c36aa
Branch: refs/heads/camel-2.16.x
Commit: ca1c36aa9466905f8dffcd948d4d105690ff073c
Parents: 7a8c632
Author: Claus Ibsen <da...@apache.org>
Authored: Mon Mar 21 16:52:43 2016 +0100
Committer: Claus Ibsen <da...@apache.org>
Committed: Mon Mar 21 16:56:53 2016 +0100
----------------------------------------------------------------------
.../java/org/apache/camel/swagger/RestSwaggerReader.java | 11 ++++++++++-
1 file changed, 10 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/ca1c36aa/components/camel-swagger-java/src/main/java/org/apache/camel/swagger/RestSwaggerReader.java
----------------------------------------------------------------------
diff --git a/components/camel-swagger-java/src/main/java/org/apache/camel/swagger/RestSwaggerReader.java b/components/camel-swagger-java/src/main/java/org/apache/camel/swagger/RestSwaggerReader.java
index e2de95a..4d9b256 100644
--- a/components/camel-swagger-java/src/main/java/org/apache/camel/swagger/RestSwaggerReader.java
+++ b/components/camel-swagger-java/src/main/java/org/apache/camel/swagger/RestSwaggerReader.java
@@ -393,7 +393,16 @@ public class RestSwaggerReader {
RestModelConverters converters = new RestModelConverters();
final Map<String, Model> models = converters.readClass(clazz);
for (Map.Entry<String, Model> entry : models.entrySet()) {
- swagger.model(entry.getKey(), entry.getValue());
+
+ // favor keeping any existing model that has the vendor extension in the model
+ boolean oldExt = false;
+ if (swagger.getDefinitions() != null && swagger.getDefinitions().get(entry.getKey()) != null) {
+ oldExt = swagger.getDefinitions().get(entry.getKey()).getVendorExtensions().get("x-className") == null;
+ }
+
+ if (!oldExt) {
+ swagger.model(entry.getKey(), entry.getValue());
+ }
}
}
[2/7] camel git commit: Use correct json content-type
Posted by da...@apache.org.
Use correct json content-type
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/9dcb0216
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/9dcb0216
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/9dcb0216
Branch: refs/heads/camel-2.17.x
Commit: 9dcb02161705b8147c708e2e6b6bf4240aa506bc
Parents: 3bad742
Author: Claus Ibsen <da...@apache.org>
Authored: Mon Mar 21 08:22:25 2016 +0100
Committer: Claus Ibsen <da...@apache.org>
Committed: Mon Mar 21 16:56:28 2016 +0100
----------------------------------------------------------------------
.../main/java/org/apache/camel/swagger/RestSwaggerSupport.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/9dcb0216/components/camel-swagger-java/src/main/java/org/apache/camel/swagger/RestSwaggerSupport.java
----------------------------------------------------------------------
diff --git a/components/camel-swagger-java/src/main/java/org/apache/camel/swagger/RestSwaggerSupport.java b/components/camel-swagger-java/src/main/java/org/apache/camel/swagger/RestSwaggerSupport.java
index 0cef5b5..24f4164 100644
--- a/components/camel-swagger-java/src/main/java/org/apache/camel/swagger/RestSwaggerSupport.java
+++ b/components/camel-swagger-java/src/main/java/org/apache/camel/swagger/RestSwaggerSupport.java
@@ -202,7 +202,7 @@ public class RestSwaggerSupport {
List<RestDefinition> rests = getRestDefinitions(contextId);
if (rests != null) {
if (json) {
- response.setHeader(Exchange.CONTENT_TYPE, "text/json");
+ response.setHeader(Exchange.CONTENT_TYPE, "application/json");
// read the rest-dsl into swagger model
Swagger swagger = reader.read(rests, route, swaggerConfig, contextId, classResolver);
@@ -276,7 +276,7 @@ public class RestSwaggerSupport {
StringBuffer sb = new StringBuffer();
if (json) {
- response.setHeader(Exchange.CONTENT_TYPE, "text/json");
+ response.setHeader(Exchange.CONTENT_TYPE, "application/json");
sb.append("[\n");
for (int i = 0; i < contexts.size(); i++) {
[6/7] camel git commit: CAMEL-9732: camel-swagger-java - Issue in
appendModels in the reader
Posted by da...@apache.org.
CAMEL-9732: camel-swagger-java - Issue in appendModels in the reader
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/2e9fb045
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/2e9fb045
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/2e9fb045
Branch: refs/heads/camel-2.17.x
Commit: 2e9fb045af880a72311013c5d7f20c325805918f
Parents: 9735a52
Author: Claus Ibsen <da...@apache.org>
Authored: Mon Mar 21 17:00:20 2016 +0100
Committer: Claus Ibsen <da...@apache.org>
Committed: Mon Mar 21 17:00:57 2016 +0100
----------------------------------------------------------------------
.../main/java/org/apache/camel/swagger/RestSwaggerReader.java | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/2e9fb045/components/camel-swagger-java/src/main/java/org/apache/camel/swagger/RestSwaggerReader.java
----------------------------------------------------------------------
diff --git a/components/camel-swagger-java/src/main/java/org/apache/camel/swagger/RestSwaggerReader.java b/components/camel-swagger-java/src/main/java/org/apache/camel/swagger/RestSwaggerReader.java
index dc7bfeb..5bcbcfe 100644
--- a/components/camel-swagger-java/src/main/java/org/apache/camel/swagger/RestSwaggerReader.java
+++ b/components/camel-swagger-java/src/main/java/org/apache/camel/swagger/RestSwaggerReader.java
@@ -510,7 +510,10 @@ public class RestSwaggerReader {
// favor keeping any existing model that has the vendor extension in the model
boolean oldExt = false;
if (swagger.getDefinitions() != null && swagger.getDefinitions().get(entry.getKey()) != null) {
- oldExt = swagger.getDefinitions().get(entry.getKey()).getVendorExtensions().get("x-className") == null;
+ Model oldModel = swagger.getDefinitions().get(entry.getKey());
+ if (oldModel.getVendorExtensions() != null) {
+ oldExt = oldModel.getVendorExtensions().get("x-className") == null;
+ }
}
if (!oldExt) {
[7/7] camel git commit: CAMEL-9732: camel-swagger-java - Issue in
appendModels in the reader
Posted by da...@apache.org.
CAMEL-9732: camel-swagger-java - Issue in appendModels in the reader
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/7578430a
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/7578430a
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/7578430a
Branch: refs/heads/camel-2.16.x
Commit: 7578430a5c847a6a010f90cdf3194827ac149f6d
Parents: ca1c36a
Author: Claus Ibsen <da...@apache.org>
Authored: Mon Mar 21 17:00:20 2016 +0100
Committer: Claus Ibsen <da...@apache.org>
Committed: Mon Mar 21 17:01:10 2016 +0100
----------------------------------------------------------------------
.../main/java/org/apache/camel/swagger/RestSwaggerReader.java | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/7578430a/components/camel-swagger-java/src/main/java/org/apache/camel/swagger/RestSwaggerReader.java
----------------------------------------------------------------------
diff --git a/components/camel-swagger-java/src/main/java/org/apache/camel/swagger/RestSwaggerReader.java b/components/camel-swagger-java/src/main/java/org/apache/camel/swagger/RestSwaggerReader.java
index 4d9b256..37cc1e1 100644
--- a/components/camel-swagger-java/src/main/java/org/apache/camel/swagger/RestSwaggerReader.java
+++ b/components/camel-swagger-java/src/main/java/org/apache/camel/swagger/RestSwaggerReader.java
@@ -397,7 +397,10 @@ public class RestSwaggerReader {
// favor keeping any existing model that has the vendor extension in the model
boolean oldExt = false;
if (swagger.getDefinitions() != null && swagger.getDefinitions().get(entry.getKey()) != null) {
- oldExt = swagger.getDefinitions().get(entry.getKey()).getVendorExtensions().get("x-className") == null;
+ Model oldModel = swagger.getDefinitions().get(entry.getKey());
+ if (oldModel.getVendorExtensions() != null) {
+ oldExt = oldModel.getVendorExtensions().get("x-className") == null;
+ }
}
if (!oldExt) {
[5/7] camel git commit: CAMEL-9732: camel-swagger-java - Issue in
appendModels in the reader
Posted by da...@apache.org.
CAMEL-9732: camel-swagger-java - Issue in appendModels in the reader
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/4a923fa6
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/4a923fa6
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/4a923fa6
Branch: refs/heads/master
Commit: 4a923fa62e73de7e9b192ace271d4a8a3ea00000
Parents: c32bd08
Author: Claus Ibsen <da...@apache.org>
Authored: Mon Mar 21 17:00:20 2016 +0100
Committer: Claus Ibsen <da...@apache.org>
Committed: Mon Mar 21 17:00:20 2016 +0100
----------------------------------------------------------------------
.../main/java/org/apache/camel/swagger/RestSwaggerReader.java | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/4a923fa6/components/camel-swagger-java/src/main/java/org/apache/camel/swagger/RestSwaggerReader.java
----------------------------------------------------------------------
diff --git a/components/camel-swagger-java/src/main/java/org/apache/camel/swagger/RestSwaggerReader.java b/components/camel-swagger-java/src/main/java/org/apache/camel/swagger/RestSwaggerReader.java
index dc7bfeb..5bcbcfe 100644
--- a/components/camel-swagger-java/src/main/java/org/apache/camel/swagger/RestSwaggerReader.java
+++ b/components/camel-swagger-java/src/main/java/org/apache/camel/swagger/RestSwaggerReader.java
@@ -510,7 +510,10 @@ public class RestSwaggerReader {
// favor keeping any existing model that has the vendor extension in the model
boolean oldExt = false;
if (swagger.getDefinitions() != null && swagger.getDefinitions().get(entry.getKey()) != null) {
- oldExt = swagger.getDefinitions().get(entry.getKey()).getVendorExtensions().get("x-className") == null;
+ Model oldModel = swagger.getDefinitions().get(entry.getKey());
+ if (oldModel.getVendorExtensions() != null) {
+ oldExt = oldModel.getVendorExtensions().get("x-className") == null;
+ }
}
if (!oldExt) {
[3/7] camel git commit: CAMEL-9732: camel-swagger-java - Issue in
appendModels in the reader
Posted by da...@apache.org.
CAMEL-9732: camel-swagger-java - Issue in appendModels in the reader
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/9735a523
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/9735a523
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/9735a523
Branch: refs/heads/camel-2.17.x
Commit: 9735a523dfb8e72bdf5ddd1be15143c7c0ca2c24
Parents: 9dcb021
Author: Claus Ibsen <da...@apache.org>
Authored: Mon Mar 21 16:52:43 2016 +0100
Committer: Claus Ibsen <da...@apache.org>
Committed: Mon Mar 21 16:56:35 2016 +0100
----------------------------------------------------------------------
.../java/org/apache/camel/swagger/RestSwaggerReader.java | 11 ++++++++++-
1 file changed, 10 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/9735a523/components/camel-swagger-java/src/main/java/org/apache/camel/swagger/RestSwaggerReader.java
----------------------------------------------------------------------
diff --git a/components/camel-swagger-java/src/main/java/org/apache/camel/swagger/RestSwaggerReader.java b/components/camel-swagger-java/src/main/java/org/apache/camel/swagger/RestSwaggerReader.java
index 08c0a2d..dc7bfeb 100644
--- a/components/camel-swagger-java/src/main/java/org/apache/camel/swagger/RestSwaggerReader.java
+++ b/components/camel-swagger-java/src/main/java/org/apache/camel/swagger/RestSwaggerReader.java
@@ -506,7 +506,16 @@ public class RestSwaggerReader {
RestModelConverters converters = new RestModelConverters();
final Map<String, Model> models = converters.readClass(clazz);
for (Map.Entry<String, Model> entry : models.entrySet()) {
- swagger.model(entry.getKey(), entry.getValue());
+
+ // favor keeping any existing model that has the vendor extension in the model
+ boolean oldExt = false;
+ if (swagger.getDefinitions() != null && swagger.getDefinitions().get(entry.getKey()) != null) {
+ oldExt = swagger.getDefinitions().get(entry.getKey()).getVendorExtensions().get("x-className") == null;
+ }
+
+ if (!oldExt) {
+ swagger.model(entry.getKey(), entry.getValue());
+ }
}
}