Hibernate Validator - Normalize ClientProxy for bean metadata retrieval

gsmet · Jan 3, 2023 · b9969ef · b9969ef
1 parent 4fa6890
commit b9969ef
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/...main/java/io/quarkus/hibernate/validator/runtime/ArcProxyBeanMetaDataClassNormalizer.java b/...main/java/io/quarkus/hibernate/validator/runtime/ArcProxyBeanMetaDataClassNormalizer.java
@@ -2,12 +2,13 @@
 
 import org.hibernate.validator.metadata.BeanMetaDataClassNormalizer;
 
+import io.quarkus.arc.ClientProxy;
 import io.quarkus.arc.Subclass;
 
 /**
  * In the case of a proxy generated by Arc, return the parent class.
  * <br />
- * This can have more than one level of hierarchy, in example:
+ * This can have more than one level of hierarchy, for example:
  * <ul>
  * <li>When using @{@link io.quarkus.test.junit.mockito.InjectMock} or @{@link io.quarkus.test.junit.mockito.InjectSpy}</li>
  * </ul>
@@ -20,6 +21,9 @@ public <T> Class<? super T> normalize(Class<T> beanClass) {
         while (Subclass.class.isAssignableFrom(targetClass)) {
             targetClass = targetClass.getSuperclass();
         }
+        while (ClientProxy.class.isAssignableFrom(targetClass)) {
+            targetClass = targetClass.getSuperclass();
+        }
         return targetClass;
     }