Merge "ValidationResult test: removed unused utility method, fixed setter lookup (no need to do lookup in superclass since we do not deal with dynamic proxies any more)"

Author: Marek Potociar

tests/integration/cdi-beanvalidation-webapp/src/main/java/org/glassfish/jersey/tests/cdi/bv/ValidationResultUtil.java

@@ -136,45 +136,8 @@ public static void updateValidationResultProperty(Object resource, Method getter
             }
             setViolations.invoke(obj, constraints);
 
-            final Method currentSetter = getValidationResultSetter(resource);
-            final Method parentSetter = getValidationResultSetter(resource.getClass().getSuperclass());
-
-            final Method effectiveSetter = (parentSetter != null) ? parentSetter : currentSetter;
-
-            if (effectiveSetter != null) {
-                effectiveSetter.invoke(resource, obj);
-            }
-        } catch (NoSuchMethodException | InvocationTargetException | IllegalAccessException e) {
-            // ignore for now
-        }
-    }
-
-    /**
-     * Updates a {@code javax.mvc.validation.ValidationResult} property. In pseudo-code:
-     * <p/>
-     * obj = getter.invoke(resource);
-     * obj.setViolations(constraints);
-     * setter.invoke(resource, obj);
-     *
-     * @param beanManager bean manager.
-     * @param resource    resource instance.
-     * @param getter      getter to be used.
-     * @param constraints new set of constraints.
-     */
-    public static void updateValidationResultPropertyViaBeanManager(BeanManager beanManager,
-                                                                    Object resource, Method getter,
-                                                      Set<ConstraintViolation<?>> constraints) {
-        try {
-            final Object obj = getter.invoke(resource);
-            Method setViolations;
-            try {
-                setViolations = obj.getClass().getMethod("setViolations", Set.class);
-            } catch (NoSuchMethodException e) {
-                setViolations = obj.getClass().getSuperclass().getMethod("setViolations", Set.class);
-            }
-            setViolations.invoke(obj, constraints);
-
             final Method setter = getValidationResultSetter(resource);
+
             if (setter != null) {
                 setter.invoke(resource, obj);
             }
@@ -259,7 +222,7 @@ private static Method getValidationResultSetter(final Class<?> resourceClass) {
     private static boolean isValidationResultSetter(Method m) {
         return m.getName().startsWith("set") && m.getParameterTypes().length == 1
                 && m.getParameterTypes()[0].getName().equals(VALIDATION_RESULT)
-                && m.getReturnType() == Void.TYPE && Modifier.isPublic(m.getModifiers());
-//                && m.getAnnotation(Inject.class) != null;
+                && m.getReturnType() == Void.TYPE && Modifier.isPublic(m.getModifiers())
+                && m.getAnnotation(Inject.class) != null;
     }
 }