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/12/14 15:31:47 UTC
[2/2] camel git commit: CAMEL-10597 - Allow addition of x-className
to empty VendorExtensions
CAMEL-10597 - Allow addition of x-className to empty VendorExtensions
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/51b0e22d
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/51b0e22d
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/51b0e22d
Branch: refs/heads/camel-2.18.x
Commit: 51b0e22df8100b2e638223d2e64d59e15022d2f8
Parents: f91d100
Author: Bob Paulin <bo...@apache.org>
Authored: Wed Dec 14 08:55:07 2016 -0600
Committer: Claus Ibsen <da...@apache.org>
Committed: Wed Dec 14 16:31:34 2016 +0100
----------------------------------------------------------------------
.../main/java/org/apache/camel/swagger/RestSwaggerReader.java | 2 +-
.../camel/swagger/RestSwaggerReaderModelBookOrderTest.java | 5 +++--
2 files changed, 4 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/51b0e22d/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 994452f..eada214 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
@@ -522,7 +522,7 @@ public class RestSwaggerReader {
boolean oldExt = false;
if (swagger.getDefinitions() != null && swagger.getDefinitions().get(entry.getKey()) != null) {
Model oldModel = swagger.getDefinitions().get(entry.getKey());
- if (oldModel.getVendorExtensions() != null) {
+ if (oldModel.getVendorExtensions() != null && !oldModel.getVendorExtensions().isEmpty()) {
oldExt = oldModel.getVendorExtensions().get("x-className") == null;
}
}
http://git-wip-us.apache.org/repos/asf/camel/blob/51b0e22d/components/camel-swagger-java/src/test/java/org/apache/camel/swagger/RestSwaggerReaderModelBookOrderTest.java
----------------------------------------------------------------------
diff --git a/components/camel-swagger-java/src/test/java/org/apache/camel/swagger/RestSwaggerReaderModelBookOrderTest.java b/components/camel-swagger-java/src/test/java/org/apache/camel/swagger/RestSwaggerReaderModelBookOrderTest.java
index 0c534a1..ade3f84 100644
--- a/components/camel-swagger-java/src/test/java/org/apache/camel/swagger/RestSwaggerReaderModelBookOrderTest.java
+++ b/components/camel-swagger-java/src/test/java/org/apache/camel/swagger/RestSwaggerReaderModelBookOrderTest.java
@@ -49,6 +49,8 @@ public class RestSwaggerReaderModelBookOrderTest extends CamelTestSupport {
.get("/{id}").description("Find order by id").outType(BookOrder.class)
.responseMessage().message("The order returned").endResponseMessage()
.param().name("id").type(RestParamType.path).description("The id of the order to get").dataType("integer").endParam()
+ .to("bean:bookService?method=getOrder(${header.id})")
+ .get("/books/{id}/line/{lineNum}").outType(LineItem.class)
.to("bean:bookService?method=getOrder(${header.id})");
}
};
@@ -83,8 +85,7 @@ public class RestSwaggerReaderModelBookOrderTest extends CamelTestSupport {
assertTrue(json.contains("\"$ref\" : \"#/definitions/LineItem\""));
assertTrue(json.contains("\"x-className\""));
assertTrue(json.contains("\"format\" : \"org.apache.camel.swagger.BookOrder\""));
- // TODO: we do not yet have the classname of nested types
- // assertTrue(json.contains("\"format\" : \"org.apache.camel.swagger.LineItem\""));
+ assertTrue(json.contains("\"format\" : \"org.apache.camel.swagger.LineItem\""));
context.stop();
}