Enhanced definition validation checking the instance of the actual de…

…finition before validating required properties (as might throw a class cast exception if the actual definition is not of type ModelImpl)
RobWin · Apr 20, 2018 · e4bf37e · e4bf37e
1 parent eb13a1f
commit e4bf37e
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/src/main/java/io/github/robwin/swagger/test/ConsumerDrivenValidator.java b/src/main/java/io/github/robwin/swagger/test/ConsumerDrivenValidator.java
@@ -155,7 +155,7 @@ private void validateDefinition(String definitionName, Model actualDefinition, M
                                          schemaObjectResolver.resolvePropertiesFromExpected(expectedDefinition),
                                          definitionName);
 
-            if (expectedDefinition instanceof ModelImpl) {
+            if (expectedDefinition instanceof ModelImpl && actualDefinition instanceof ModelImpl) {
                 validateDefinitionRequiredProperties(((ModelImpl) actualDefinition).getRequired(),
                                                      ((ModelImpl) expectedDefinition).getRequired(),
                                                        definitionName);

diff --git a/src/main/java/io/github/robwin/swagger/test/DocumentationDrivenValidator.java b/src/main/java/io/github/robwin/swagger/test/DocumentationDrivenValidator.java
@@ -154,7 +154,7 @@ private void validateDefinition(String definitionName, Model actualDefinition, M
                                          schemaObjectResolver.resolvePropertiesFromExpected(expectedDefinition),
                                          definitionName);
 
-            if (expectedDefinition instanceof ModelImpl) {
+            if (expectedDefinition instanceof ModelImpl && actualDefinition instanceof ModelImpl) {
                 validateDefinitionRequiredProperties(((ModelImpl) actualDefinition).getRequired(),
                                                      ((ModelImpl) expectedDefinition).getRequired(),
                                                        definitionName);