Fix custom validation

Author: rschmitt

src/main/java/com/github/rschmitt/dynamicobject/internal/DynamicObjectInstance.java

@@ -143,11 +143,6 @@ public Object getValueFor(Object key, Type genericReturnType) {
         return Conversions.clojureToJava(val, genericReturnType);
     }
 
-    public D validate(D self) {
-        Validation.validateInstance(this);
-        return self;
-    }
-
     public Object $$noop() {
         return this;
     }

src/main/java/com/github/rschmitt/dynamicobject/internal/InvokeDynamicInvocationHandler.java

@@ -9,15 +9,12 @@
 import java.lang.invoke.MethodType;
 import java.lang.reflect.Method;
 import java.lang.reflect.Type;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.ConcurrentMap;
 
 import com.github.rschmitt.dynamicobject.DynamicObject;
+
 import net.fushizen.invokedynamic.proxy.DynamicInvocationHandler;
 
 public class InvokeDynamicInvocationHandler implements DynamicInvocationHandler {
-    private static final ConcurrentMap<Class, MethodHandle> validateMethodHandleCache = new ConcurrentHashMap<>();
-
     private final Class dynamicObjectType;
 
     public InvokeDynamicInvocationHandler(Class dynamicObjectType) {
@@ -34,22 +31,19 @@ public CallSite handleInvocation(
     ) throws Throwable {
         Class proxyType = methodType.parameterArray()[0];
         MethodHandle mh;
-        if (superMethod != null) {
+        if (superMethod != null && !"validate".equals(methodName)) {
             mh = superMethod.asType(methodType);
-            if ("validate".equals(methodName)) {
-                if (mh.type().returnType().equals(dynamicObjectType))
-                    return new ConstantCallSite(mh);
-                else
-                    validateMethodHandleCache.put(dynamicObjectType, mh);
-            } else return new ConstantCallSite(mh);
+            return new ConstantCallSite(mh);
         }
         if ("validate".equals(methodName)) {
-            mh = lookup.findSpecial(DynamicObjectInstance.class, "$$validate", methodType(Object.class, new Class[]{ }), proxyType).asType(methodType);
+            mh = lookup.findSpecial(DynamicObjectInstance.class, "$$validate", methodType(Object.class, new Class[]{}), proxyType).asType(methodType);
         } else if ("$$customValidate".equals(methodName)) {
-            mh = validateMethodHandleCache.getOrDefault(
-                    dynamicObjectType,
-                    lookup.findSpecial(DynamicObjectInstance.class, "$$noop", methodType(Object.class), proxyType).asType(methodType)
-            );
+            try {
+                mh = lookup.findSpecial(dynamicObjectType, "validate", methodType(dynamicObjectType), proxyType);
+            } catch (NoSuchMethodException ex) {
+                mh = lookup.findSpecial(DynamicObjectInstance.class, "$$noop", methodType(Object.class, new Class[]{}), proxyType);
+            }
+            mh = mh.asType(methodType);
         } else {
             Method method = dynamicObjectType.getMethod(methodName, methodType.dropParameterTypes(0, 1).parameterArray());
 

src/test/java/com/github/rschmitt/dynamicobject/ValidationTest.java

@@ -169,13 +169,29 @@ public void nullRequiredFieldThrowsException() {
         instance.x();
     }
 
-    @Test
+    @Test(expected = IllegalStateException.class)
     public void customValidation() {
         validationSuccess("{:oddsOnly 5, :required 0}", Custom.class);
+        DynamicObject.deserialize("{:oddsOnly 4, :required 0}", Custom.class).validate();
         validationFailure("{:oddsOnly 4, :required 0}", Custom.class);
         validationFailure("{:oddsOnly 5}", Custom.class);
     }
 
+    @Test(expected = IllegalStateException.class)
+    public void customValidationRunsLast() {
+        newInstance(Custom2.class).validate();
+    }
+
+    @Test(expected = CustomException.class)
+    public void customExceptionsArePropagated() {
+        newInstance(Custom2.class).str("value").validate();
+    }
+
+    @Test(expected = CustomException.class)
+    public void customExceptionsArePropagated2() {
+        DynamicObject.deserialize("{:str \"value\"}", Custom2.class).validate();
+    }
+
     private static <D extends DynamicObject<D>> void validationFailure(String edn, Class<D> type) {
         try {
             deserialize(edn, type).validate();
@@ -254,11 +270,21 @@ public interface Custom extends DynamicObject<Custom> {
         @Required int oddsOnly();
         @Required int required();
 
-        @Override
         default Custom validate() {
             if (oddsOnly() % 2 == 0)
                 throw new IllegalStateException("Odd number expected");
             return this;
         }
     }
+
+    public interface Custom2 extends DynamicObject<Custom2> {
+        @Required String str();
+        Custom2 str(String str);
+
+        default Custom2 validate() {
+            throw new CustomException();
+        }
+    }
+
+    public static class CustomException extends RuntimeException {}
 }