From 6ffa99299424aa56bf02b375735f31ea1e4226d9 Mon Sep 17 00:00:00 2001 From: gracekarina Date: Wed, 26 Jun 2019 10:04:38 -0500 Subject: [PATCH 1/3] null check in SwaggerDeserializer 915 --- .../java/io/swagger/parser/util/SwaggerDeserializer.java | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/modules/swagger-parser/src/main/java/io/swagger/parser/util/SwaggerDeserializer.java b/modules/swagger-parser/src/main/java/io/swagger/parser/util/SwaggerDeserializer.java index 4556e3f21a..b64b7dbd21 100644 --- a/modules/swagger-parser/src/main/java/io/swagger/parser/util/SwaggerDeserializer.java +++ b/modules/swagger-parser/src/main/java/io/swagger/parser/util/SwaggerDeserializer.java @@ -912,10 +912,12 @@ public Model definition(ObjectNode node, String location, ParseResult result) { if(propertyNode.getNodeType().equals(JsonNodeType.OBJECT)) { ObjectNode on = (ObjectNode) propertyNode; Property property = property(on, location, result); - if("array".equals( property.getType()) && !(property instanceof ArrayProperty && ((ArrayProperty) property).getItems() != null)) { - result.missing(location, "items"); + if (property != null) { + if ("array".equals(property.getType()) && !(property instanceof ArrayProperty && ((ArrayProperty) property).getItems() != null)) { + result.missing(location, "items"); + } + impl.property(propertyName, property); } - impl.property(propertyName, property); } else { result.invalidType(location, "properties", "object", propertyNode); From 41d98a904f3cd79d77605ed127b835d71b543497 Mon Sep 17 00:00:00 2001 From: gracekarina Date: Wed, 26 Jun 2019 10:09:09 -0500 Subject: [PATCH 2/3] leaving the adding property out --- .../main/java/io/swagger/parser/util/SwaggerDeserializer.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/swagger-parser/src/main/java/io/swagger/parser/util/SwaggerDeserializer.java b/modules/swagger-parser/src/main/java/io/swagger/parser/util/SwaggerDeserializer.java index b64b7dbd21..46a9023fee 100644 --- a/modules/swagger-parser/src/main/java/io/swagger/parser/util/SwaggerDeserializer.java +++ b/modules/swagger-parser/src/main/java/io/swagger/parser/util/SwaggerDeserializer.java @@ -916,8 +916,8 @@ public Model definition(ObjectNode node, String location, ParseResult result) { if ("array".equals(property.getType()) && !(property instanceof ArrayProperty && ((ArrayProperty) property).getItems() != null)) { result.missing(location, "items"); } - impl.property(propertyName, property); } + impl.property(propertyName, property); } else { result.invalidType(location, "properties", "object", propertyNode); From a727575450d9b0822f3a175bc8b6ba9483c21430 Mon Sep 17 00:00:00 2001 From: gracekarina Date: Wed, 26 Jun 2019 10:11:16 -0500 Subject: [PATCH 3/3] fixing indent --- .../main/java/io/swagger/parser/util/SwaggerDeserializer.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/swagger-parser/src/main/java/io/swagger/parser/util/SwaggerDeserializer.java b/modules/swagger-parser/src/main/java/io/swagger/parser/util/SwaggerDeserializer.java index 46a9023fee..7be75ddfe6 100644 --- a/modules/swagger-parser/src/main/java/io/swagger/parser/util/SwaggerDeserializer.java +++ b/modules/swagger-parser/src/main/java/io/swagger/parser/util/SwaggerDeserializer.java @@ -917,7 +917,7 @@ public Model definition(ObjectNode node, String location, ParseResult result) { result.missing(location, "items"); } } - impl.property(propertyName, property); + impl.property(propertyName, property); } else { result.invalidType(location, "properties", "object", propertyNode);