Merge pull request Azure#821 from jianghaolu/moredev

Fix recursive validation
xingwu1 · Mar 9, 2016 · 5071471 · 5071471
2 parents 1f13aa5 + d75ac2c
commit 5071471
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/client-runtime/src/main/java/com/microsoft/rest/Validator.java b/client-runtime/src/main/java/com/microsoft/rest/Validator.java
@@ -90,7 +90,7 @@ else if (TypeToken.of(Map.class).isAssignableFrom(propertyType)) {
                                 Validator.validate(entry.getValue());
                             }
                         }
-                        else if (parameter.getClass().getDeclaringClass() != propertyType) {
+                        else if (parameterType != propertyType) {
                             Validator.validate(property);
                         }
                     } catch (IllegalArgumentException ex) {

diff --git a/client-runtime/src/test/java/com/microsoft/rest/ValidatorTests.java b/client-runtime/src/test/java/com/microsoft/rest/ValidatorTests.java
@@ -8,6 +8,8 @@
 package com.microsoft.rest;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.databind.node.TextNode;
+
 import org.junit.Assert;
 import org.joda.time.LocalDate;
 import org.junit.Test;
@@ -130,6 +132,12 @@ public void validateObject() throws Exception {
         Validator.validate(product);
     }
 
+    @Test
+    public void validateRecursive() throws Exception {
+        TextNode textNode = new TextNode("\"\"");
+        Validator.validate(textNode);
+    }
+
     public final class IntWrapper {
         @JsonProperty(required = true)
         // CHECKSTYLE IGNORE VisibilityModifier FOR NEXT 2 LINES