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 <davscl...@apache.org> Authored: Mon Mar 21 16:52:43 2016 +0100 Committer: Claus Ibsen <davscl...@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()); + } } }
