Normalize CDIWrappers to an interface that they implement for Validator

extensions/hibernate-validator/runtime/src/main/java/io/quarkus/hibernate/validator/runtime/ArcProxyBeanMetaDataClassNormalizer.java

@@ -15,6 +15,9 @@
  */
 public class ArcProxyBeanMetaDataClassNormalizer implements BeanMetaDataClassNormalizer {
 
+    private static final String CDI_WRAPPER_SUFFIX = "$$CDIWrapper";
+
+    @SuppressWarnings("unchecked")
     @Override
     public <T> Class<? super T> normalize(Class<T> beanClass) {
         Class<? super T> targetClass = beanClass;
@@ -24,6 +27,14 @@ public <T> Class<? super T> normalize(Class<T> beanClass) {
         while (ClientProxy.class.isAssignableFrom(targetClass)) {
             targetClass = targetClass.getSuperclass();
         }
+        if (beanClass.isSynthetic() && beanClass.getSimpleName().endsWith(CDI_WRAPPER_SUFFIX)) {
+            String nameToFind = beanClass.getName().substring(0, beanClass.getName().length() - (CDI_WRAPPER_SUFFIX.length()));
+            for (Class<?> anInterface : targetClass.getInterfaces()) {
+                if (nameToFind.equals(anInterface.getName())) {
+                    return (Class<? super T>) anInterface;
+                }
+            }
+        }
         return targetClass;
     }
 

integration-tests/hibernate-validator-resteasy-reactive/pom.xml

@@ -22,6 +22,14 @@
             <groupId>io.quarkus</groupId>
             <artifactId>quarkus-rest-jaxb</artifactId>
         </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-rest-client</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-rest-client-jsonb</artifactId>
+        </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
             <artifactId>quarkus-hibernate-validator</artifactId>
@@ -146,6 +154,32 @@
                 </exclusion>
             </exclusions>
         </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-rest-client-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-rest-client-jsonb-deployment</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
     </dependencies>
 
     <build>

integration-tests/hibernate-validator-resteasy-reactive/src/main/java/io/quarkus/it/hibernate/validator/restclient/RestClientEntity.java

@@ -0,0 +1,27 @@
+package io.quarkus.it.hibernate.validator.restclient;
+
+import jakarta.validation.constraints.Max;
+import jakarta.validation.constraints.NotNull;
+
+public class RestClientEntity {
+    @Max(value = 5, groups = Error.class)
+    public int number;
+    @NotNull
+    public String string;
+
+    public RestClientEntity() {
+    }
+
+    public RestClientEntity(int number, String string) {
+        this.number = number;
+        this.string = string;
+    }
+
+    @Override
+    public String toString() {
+        return "RestClientEntity{" +
+                "number=" + number +
+                ", string='" + string + '\'' +
+                '}';
+    }
+}

integration-tests/hibernate-validator-resteasy-reactive/src/main/java/io/quarkus/it/hibernate/validator/restclient/RestClientInterface.java

@@ -0,0 +1,22 @@
+package io.quarkus.it.hibernate.validator.restclient;
+
+import jakarta.validation.Valid;
+import jakarta.validation.constraints.NotNull;
+import jakarta.validation.groups.ConvertGroup;
+import jakarta.ws.rs.Consumes;
+import jakarta.ws.rs.POST;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.Produces;
+import jakarta.ws.rs.core.MediaType;
+
+import org.eclipse.microprofile.rest.client.inject.RegisterRestClient;
+
+@RegisterRestClient
+@Path("/rest-client")
+public interface RestClientInterface {
+    @POST
+    @Consumes(MediaType.APPLICATION_JSON)
+    @Produces(MediaType.APPLICATION_JSON)
+    RestClientEntity doSomething(
+            @Valid @ConvertGroup(to = Error.class) @NotNull RestClientEntity parameter);
+}

integration-tests/hibernate-validator-resteasy-reactive/src/main/java/io/quarkus/it/hibernate/validator/restclient/RestClientTestResource.java

@@ -0,0 +1,31 @@
+package io.quarkus.it.hibernate.validator.restclient;
+
+import jakarta.inject.Inject;
+import jakarta.validation.ConstraintViolationException;
+import jakarta.ws.rs.GET;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.Produces;
+import jakarta.ws.rs.core.MediaType;
+
+import org.eclipse.microprofile.rest.client.inject.RestClient;
+
+@Path("/hibernate-validator/test-rest-client")
+public class RestClientTestResource {
+
+    @Inject
+    @RestClient
+    RestClientInterface restClient;
+
+    @GET
+    @Produces(MediaType.APPLICATION_JSON)
+    public RestClientEntity doSomething() {
+        RestClientEntity entity = new RestClientEntity(9, "aaa");
+        try {
+            entity = restClient.doSomething(entity);
+            throw new IllegalStateException(
+                    "This point should not be reached. Validation should fail on the rest client call.");
+        } catch (ConstraintViolationException e) {
+            return entity;
+        }
+    }
+}

integration-tests/hibernate-validator-resteasy-reactive/src/main/java/io/quarkus/it/hibernate/validator/restclient/server/ServerResource.java

@@ -0,0 +1,27 @@
+package io.quarkus.it.hibernate.validator.restclient.server;
+
+import jakarta.ws.rs.Consumes;
+import jakarta.ws.rs.GET;
+import jakarta.ws.rs.POST;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.Produces;
+import jakarta.ws.rs.core.MediaType;
+
+import io.quarkus.it.hibernate.validator.restclient.RestClientEntity;
+
+@Path("/rest-client")
+public class ServerResource {
+
+    @POST
+    @Consumes(MediaType.APPLICATION_JSON)
+    @Produces(MediaType.APPLICATION_JSON)
+    public String doSomething(String parameter) {
+        return parameter;
+    }
+
+    @GET
+    @Produces(MediaType.APPLICATION_JSON)
+    public RestClientEntity doSomething() {
+        return new RestClientEntity(1, "aa");
+    }
+}

integration-tests/hibernate-validator-resteasy-reactive/src/main/resources/application.properties

@@ -1,2 +1,3 @@
 quarkus.locales=en,de
-quarkus.default-locale=en
+quarkus.default-locale=en
+quarkus.rest-client."io.quarkus.it.hibernate.validator.restclient.RestClientInterface".url=${test.url}

integration-tests/hibernate-validator-resteasy-reactive/src/test/java/io/quarkus/it/hibernate/validator/RestClientTest.java

@@ -0,0 +1,18 @@
+package io.quarkus.it.hibernate.validator;
+
+import static io.restassured.RestAssured.given;
+
+import org.junit.jupiter.api.Test;
+
+import io.quarkus.test.junit.QuarkusTest;
+
+@QuarkusTest
+public class RestClientTest {
+
+    @Test
+    public void fetchDefault() {
+        given().get("hibernate-validator/test-rest-client")
+                .then()
+                .statusCode(200);
+    }
+}