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 <davscl...@apache.org> Authored: Mon Mar 21 17:00:20 2016 +0100 Committer: Claus Ibsen <davscl...@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) {
