JERSEY-2499: Bean validation not working for constraints placed on super classes

 - fix + test

Change-Id: I11ed64c6417ec5f96a6f37a6145b78a2f7212ad0
Signed-off-by: Michal Gajdos <[email protected]>

Author: Michal Gajdos

ext/bean-validation/src/main/java/org/glassfish/jersey/server/validation/internal/ValidateOnExecutionTraversableResolver.java

@@ -41,9 +41,9 @@
 package org.glassfish.jersey.server.validation.internal;
 
 import java.lang.annotation.ElementType;
+import java.lang.reflect.Field;
 import java.lang.reflect.Method;
 import java.security.AccessController;
-import java.security.PrivilegedAction;
 import java.util.concurrent.ConcurrentMap;
 
 import javax.validation.Path;
@@ -99,7 +99,11 @@ public boolean isReachable(final Object traversableObject,
             final String propertyKey = traversableObjectClass.getName() + "#" + propertyName;
 
             if (!propertyToMethod.containsKey(propertyKey)) {
-                propertyToMethod.putIfAbsent(propertyKey, getGetterMethod(traversableObjectClass, propertyName));
+                final Method getter = getGetterMethod(traversableObjectClass, propertyName);
+
+                if (getter != null) {
+                    propertyToMethod.putIfAbsent(propertyKey, getter);
+                }
             }
 
             final Method getter = propertyToMethod.get(propertyKey);
@@ -127,20 +131,12 @@ public boolean isCascadable(final Object traversableObject,
      */
     private Method getGetterMethod(final Class<?> clazz, final String propertyName) {
         // Property type.
-        final Class<?> propertyType = AccessController.doPrivileged(new PrivilegedAction<Class<?>>() {
-
-            @Override
-            public Class<?> run() {
-                try {
-                    return clazz.getDeclaredField(propertyName).getType();
-                } catch (SecurityException ex) {
-                    // NOOP.
-                } catch (NoSuchFieldException nsfe) {
-                    // NOOP.
-                }
-                return null;
+        Class<?> propertyType = null;
+        for (final Field field : AccessController.doPrivileged(ReflectionHelper.getAllFieldsPA(clazz))) {
+            if (field.getName().equals(propertyName)) {
+                propertyType = field.getType();
             }
-        });
+        }
 
         final char[] chars = propertyName.toCharArray();
         chars[0] = Character.toUpperCase(chars[0]);
@@ -149,7 +145,7 @@ public Class<?> run() {
         final String isGetter = "is" + getterPropertyName;
         final String getGetter = "get" + getterPropertyName;
 
-        for (final Method method : AccessController.doPrivileged(ReflectionHelper.getDeclaredMethodsPA(clazz))) {
+        for (final Method method : AccessController.doPrivileged(ReflectionHelper.getMethodsPA(clazz))) {
             final String methodName = method.getName();
 
             if ((methodName.equals(isGetter) || methodName.equals(getGetter))

tests/e2e/src/test/java/org/glassfish/jersey/tests/e2e/server/validation/EntityInheritanceValidationTest.java

@@ -0,0 +1,209 @@
+/*
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+ *
+ * Copyright (c) 2014 Oracle and/or its affiliates. All rights reserved.
+ *
+ * The contents of this file are subject to the terms of either the GNU
+ * General Public License Version 2 only ("GPL") or the Common Development
+ * and Distribution License("CDDL") (collectively, the "License").  You
+ * may not use this file except in compliance with the License.  You can
+ * obtain a copy of the License at
+ * http://glassfish.java.net/public/CDDL+GPL_1_1.html
+ * or packager/legal/LICENSE.txt.  See the License for the specific
+ * language governing permissions and limitations under the License.
+ *
+ * When distributing the software, include this License Header Notice in each
+ * file and include the License file at packager/legal/LICENSE.txt.
+ *
+ * GPL Classpath Exception:
+ * Oracle designates this particular file as subject to the "Classpath"
+ * exception as provided by Oracle in the GPL Version 2 section of the License
+ * file that accompanied this code.
+ *
+ * Modifications:
+ * If applicable, add the following below the License Header, with the fields
+ * enclosed by brackets [] replaced by your own identifying information:
+ * "Portions Copyright [year] [name of copyright owner]"
+ *
+ * Contributor(s):
+ * If you wish your version of this file to be governed by only the CDDL or
+ * only the GPL Version 2, indicate your decision by adding "[Contributor]
+ * elects to include this software in this distribution under the [CDDL or GPL
+ * Version 2] license."  If you don't indicate a single choice of license, a
+ * recipient has the option to distribute your version of this file under
+ * either the CDDL, the GPL Version 2 or to extend the choice of license to
+ * its licensees as provided above.  However, if you add GPL Version 2 code
+ * and therefore, elected the GPL Version 2 license, then the option applies
+ * only if the new code is made subject to such option by the copyright
+ * holder.
+ */
+
+package org.glassfish.jersey.tests.e2e.server.validation;
+
+import javax.ws.rs.POST;
+import javax.ws.rs.Path;
+import javax.ws.rs.core.Application;
+import javax.ws.rs.core.Response;
+
+import javax.validation.Valid;
+import javax.validation.constraints.Max;
+import javax.validation.constraints.Min;
+import javax.validation.constraints.NotNull;
+
+import org.glassfish.jersey.client.ClientConfig;
+import org.glassfish.jersey.jackson.JacksonFeature;
+import org.glassfish.jersey.server.ResourceConfig;
+import org.glassfish.jersey.test.JerseyTest;
+
+import org.hibernate.validator.constraints.NotBlank;
+import org.junit.Test;
+import static org.hamcrest.CoreMatchers.is;
+import static org.hamcrest.MatcherAssert.assertThat;
+
+/**
+ * Tests to ensure that validation constraints on a superclass are validated as well.
+ *
+ * @author Michal Gajdos (michal.gajdos at oracle.com)
+ */
+public class EntityInheritanceValidationTest extends JerseyTest {
+
+    @Path("/")
+    public static class Resource {
+
+        @POST
+        public Entity post(@Valid final Entity entity) {
+            return entity;
+        }
+    }
+
+    public static class AbstractEntity {
+
+        private String text;
+
+        public AbstractEntity() {
+        }
+
+        public AbstractEntity(final String text) {
+            this.text = text;
+        }
+
+        @NotNull
+        @NotBlank
+        public String getText() {
+            return text;
+        }
+
+        public void setText(final String text) {
+            this.text = text;
+        }
+
+        @Override
+        public boolean equals(final Object o) {
+            if (this == o) {
+                return true;
+            }
+            if (o == null || getClass() != o.getClass()) {
+                return false;
+            }
+
+            final AbstractEntity that = (AbstractEntity) o;
+
+            if (!text.equals(that.text)) {
+                return false;
+            }
+
+            return true;
+        }
+
+        @Override
+        public int hashCode() {
+            return text.hashCode();
+        }
+    }
+
+    public static class Entity extends AbstractEntity {
+
+        private Integer number;
+
+        public Entity() {
+        }
+
+        public Entity(final String text, final Integer number) {
+            super(text);
+            this.number = number;
+        }
+
+        @Min(12)
+        @Max(14)
+        @NotNull
+        public Integer getNumber() {
+            return number;
+        }
+
+        public void setNumber(final Integer number) {
+            this.number = number;
+        }
+
+        @Override
+        public boolean equals(final Object o) {
+            if (this == o) {
+                return true;
+            }
+            if (o == null || getClass() != o.getClass()) {
+                return false;
+            }
+            if (!super.equals(o)) {
+                return false;
+            }
+
+            final Entity entity = (Entity) o;
+
+            if (!number.equals(entity.number)) {
+                return false;
+            }
+
+            return true;
+        }
+
+        @Override
+        public int hashCode() {
+            int result = super.hashCode();
+            result = 31 * result + number.hashCode();
+            return result;
+        }
+    }
+
+    @Override
+    protected Application configure() {
+        return new ResourceConfig(Resource.class)
+                .register(JacksonFeature.class);
+    }
+
+    @Override
+    protected void configureClient(final ClientConfig config) {
+        config.register(JacksonFeature.class);
+    }
+
+    @Test
+    public void testEntityInheritance() throws Exception {
+        final Entity entity = new Entity("foo", 13);
+        final Response response = target().request().post(javax.ws.rs.client.Entity.json(entity));
+
+        assertThat(response.getStatus(), is(200));
+        assertThat(response.readEntity(Entity.class), is(entity));
+    }
+
+    @Test
+    public void testEntityInheritanceBlankText() throws Exception {
+        final Response response = target().request().post(javax.ws.rs.client.Entity.json(new Entity("", 13)));
+
+        assertThat(response.getStatus(), is(400));
+    }
+
+    @Test
+    public void testEntityInheritanceInvalidNumber() throws Exception {
+        final Response response = target().request().post(javax.ws.rs.client.Entity.json(new Entity("foo", 23)));
+
+        assertThat(response.getStatus(), is(400));
+    }
+}