Skip children when InvalidObject is found in list

unbroken-dome · May 23, 2021 · cbdbc94 · cbdbc94
1 parent d84eabd
commit cbdbc94
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 1 deletion.
diff --git a/src/main/java/org/unbrokendome/jackson/beanvalidation/BeanValidationModule.java b/src/main/java/org/unbrokendome/jackson/beanvalidation/BeanValidationModule.java
@@ -1,7 +1,9 @@
 package org.unbrokendome.jackson.beanvalidation;
 
+import com.fasterxml.jackson.core.JsonParser;
 import com.fasterxml.jackson.core.Version;
 import com.fasterxml.jackson.databind.DeserializationContext;
+import com.fasterxml.jackson.databind.JsonDeserializer;
 import com.fasterxml.jackson.databind.Module;
 import com.fasterxml.jackson.databind.deser.DeserializationProblemHandler;
 
@@ -83,6 +85,19 @@ public Object handleInstantiationProblem(DeserializationContext ctxt, Class<?> i
                     return super.handleInstantiationProblem(ctxt, instClass, argument, t);
                 }
             }
+
+            @Override
+            public boolean handleUnknownProperty(
+                    DeserializationContext ctxt, JsonParser p, JsonDeserializer<?> deserializer,
+                    Object beanOrClass, String propertyName
+            ) throws IOException {
+
+                if (beanOrClass instanceof InvalidObject) {
+                    p.skipChildren();
+                    return true;
+                }
+                return super.handleUnknownProperty(ctxt, p, deserializer, beanOrClass, propertyName);
+            }
         });
     }
 }
diff --git a/src/test/kotlin/org/unbrokendome/jackson/beanvalidation/KotlinValidationTest.kt b/src/test/kotlin/org/unbrokendome/jackson/beanvalidation/KotlinValidationTest.kt
@@ -144,7 +144,7 @@ class KotlinValidationTest : AbstractValidationTest() {
 
     private class NestedListArgumentsProvider : ArgumentsProvider {
         override fun provideArguments(context: ExtensionContext): Stream<Arguments> = Stream.of(
-                Arguments.of("nested[0].value", """{ "nested": [{}] }"""),
+                Arguments.of("nested[0].value", """{ "nested": [{}, {"value":"v1"}] }"""),
                 Arguments.of("nested[1].value", """{ "nested": [{"value":"test"},{}] }"""),
                 Arguments.of("nested[2].value", """{ "nested": [{"value":"1"},{"value":"2"},{}] }""")
         )