Merge pull request #19196 from geoand/#19171-2

Introduce LocaleResolver for RESTEasy Reactive
quarkusio · Aug 3, 2021 · 9aa9a5a · 9aa9a5a
2 parents ad8f74e + a530db1
commit 9aa9a5a
Show file tree

Hide file tree

Showing 7 changed files with 76 additions and 39 deletions.
diff --git a/.../src/main/java/io/quarkus/hibernate/validator/deployment/HibernateValidatorProcessor.java b/.../src/main/java/io/quarkus/hibernate/validator/deployment/HibernateValidatorProcessor.java
@@ -75,8 +75,8 @@
 import io.quarkus.hibernate.validator.runtime.HibernateValidatorRecorder;
 import io.quarkus.hibernate.validator.runtime.ValidatorProvider;
 import io.quarkus.hibernate.validator.runtime.interceptor.MethodValidationInterceptor;
-import io.quarkus.hibernate.validator.runtime.jaxrs.QuarkusRestViolationExceptionMapper;
 import io.quarkus.hibernate.validator.runtime.jaxrs.ResteasyConfigSupport;
+import io.quarkus.hibernate.validator.runtime.jaxrs.ResteasyReactiveViolationExceptionMapper;
 import io.quarkus.hibernate.validator.spi.BeanValidationAnnotationsBuildItem;
 import io.quarkus.resteasy.common.spi.ResteasyConfigBuildItem;
 import io.quarkus.resteasy.common.spi.ResteasyDotNames;
@@ -153,7 +153,9 @@ void registerAdditionalBeans(HibernateValidatorRecorder hibernateValidatorRecord
         } else if (capabilities.isPresent(Capability.RESTEASY_REACTIVE)) {
             // The CDI interceptor which will validate the methods annotated with @JaxrsEndPointValidated
             additionalBeans.produce(new AdditionalBeanBuildItem(
-                    "io.quarkus.hibernate.validator.runtime.jaxrs.QuarkusRestEndPointValidationInterceptor"));
+                    "io.quarkus.hibernate.validator.runtime.jaxrs.ResteasyReactiveEndPointValidationInterceptor"));
+            additionalBeans.produce(new AdditionalBeanBuildItem(
+                    "io.quarkus.hibernate.validator.runtime.jaxrs.ResteasyReactiveContextLocaleResolver"));
         }
 
         // A constraint validator with an injection point but no scope is added as @Singleton
@@ -348,7 +350,7 @@ NativeImageConfigBuildItem nativeImageConfig() {
 
     @BuildStep
     ExceptionMapperBuildItem mapper() {
-        return new ExceptionMapperBuildItem(QuarkusRestViolationExceptionMapper.class.getName(),
+        return new ExceptionMapperBuildItem(ResteasyReactiveViolationExceptionMapper.class.getName(),
                 ValidationException.class.getName(), Priorities.USER + 1, true);
     }
 

diff --git a/...me/src/main/java/io/quarkus/hibernate/validator/runtime/jaxrs/AbstractLocaleResolver.java b/...me/src/main/java/io/quarkus/hibernate/validator/runtime/jaxrs/AbstractLocaleResolver.java
@@ -0,0 +1,42 @@
+package io.quarkus.hibernate.validator.runtime.jaxrs;
+
+import java.util.List;
+import java.util.Locale;
+import java.util.Optional;
+
+import javax.ws.rs.core.HttpHeaders;
+
+import org.hibernate.validator.spi.messageinterpolation.LocaleResolver;
+import org.hibernate.validator.spi.messageinterpolation.LocaleResolverContext;
+
+abstract class AbstractLocaleResolver implements LocaleResolver {
+
+    protected abstract HttpHeaders getHeaders();
+
+    @Override
+    public Locale resolve(LocaleResolverContext context) {
+        Optional<List<Locale.LanguageRange>> localePriorities = getAcceptableLanguages();
+        if (!localePriorities.isPresent()) {
+            return context.getDefaultLocale();
+        }
+
+        List<Locale> resolvedLocales = Locale.filter(localePriorities.get(), context.getSupportedLocales());
+        if (resolvedLocales.size() > 0) {
+            return resolvedLocales.get(0);
+        }
+
+        return context.getDefaultLocale();
+    }
+
+    private Optional<List<Locale.LanguageRange>> getAcceptableLanguages() {
+        HttpHeaders httpHeaders = getHeaders();
+        if (httpHeaders != null) {
+            List<String> acceptLanguageList = httpHeaders.getRequestHeader("Accept-Language");
+            if (acceptLanguageList != null && !acceptLanguageList.isEmpty()) {
+                return Optional.of(Locale.LanguageRange.parse(acceptLanguageList.get(0)));
+            }
+        }
+
+        return Optional.empty();
+    }
+}
diff --git a/...main/java/io/quarkus/hibernate/validator/runtime/jaxrs/ResteasyContextLocaleResolver.java b/...main/java/io/quarkus/hibernate/validator/runtime/jaxrs/ResteasyContextLocaleResolver.java
@@ -1,48 +1,18 @@
 package io.quarkus.hibernate.validator.runtime.jaxrs;
 
-import java.util.List;
-import java.util.Locale;
-import java.util.Locale.LanguageRange;
-import java.util.Optional;
-
 import javax.inject.Singleton;
 import javax.ws.rs.core.HttpHeaders;
 
-import org.hibernate.validator.spi.messageinterpolation.LocaleResolver;
-import org.hibernate.validator.spi.messageinterpolation.LocaleResolverContext;
 import org.jboss.resteasy.core.ResteasyContext;
 
 import io.quarkus.arc.DefaultBean;
 
 @Singleton
 @DefaultBean
-public class ResteasyContextLocaleResolver implements LocaleResolver {
+public class ResteasyContextLocaleResolver extends AbstractLocaleResolver {
 
     @Override
-    public Locale resolve(LocaleResolverContext context) {
-        Optional<List<LanguageRange>> localePriorities = getAcceptableLanguages();
-        if (!localePriorities.isPresent()) {
-            return context.getDefaultLocale();
-        }
-
-        List<Locale> resolvedLocales = Locale.filter(localePriorities.get(), context.getSupportedLocales());
-        if (resolvedLocales.size() > 0) {
-            return resolvedLocales.get(0);
-        }
-
-        return context.getDefaultLocale();
+    protected HttpHeaders getHeaders() {
+        return ResteasyContext.getContextData(HttpHeaders.class);
     }
-
-    private Optional<List<LanguageRange>> getAcceptableLanguages() {
-        HttpHeaders httpHeaders = ResteasyContext.getContextData(HttpHeaders.class);
-        if (httpHeaders != null) {
-            List<String> acceptLanguageList = httpHeaders.getRequestHeader("Accept-Language");
-            if (acceptLanguageList != null && !acceptLanguageList.isEmpty()) {
-                return Optional.of(LanguageRange.parse(acceptLanguageList.get(0)));
-            }
-        }
-
-        return Optional.empty();
-    }
-
 }
diff --git a/...a/io/quarkus/hibernate/validator/runtime/jaxrs/ResteasyReactiveContextLocaleResolver.java b/...a/io/quarkus/hibernate/validator/runtime/jaxrs/ResteasyReactiveContextLocaleResolver.java
@@ -0,0 +1,23 @@
+package io.quarkus.hibernate.validator.runtime.jaxrs;
+
+import javax.inject.Singleton;
+import javax.ws.rs.core.HttpHeaders;
+
+import io.quarkus.arc.DefaultBean;
+
+@Singleton
+@DefaultBean
+public class ResteasyReactiveContextLocaleResolver extends AbstractLocaleResolver {
+
+    private final HttpHeaders headers;
+
+    // automatically injected for RESTEasy Reactive because of org.jboss.resteasy.reactive.server.injection.ContextProducers
+    public ResteasyReactiveContextLocaleResolver(HttpHeaders headers) {
+        this.headers = headers;
+    }
+
+    @Override
+    protected HttpHeaders getHeaders() {
+        return headers;
+    }
+}
diff --git a/...kusRestEndPointValidationInterceptor.java → ...eactiveEndPointValidationInterceptor.java b/...kusRestEndPointValidationInterceptor.java → ...eactiveEndPointValidationInterceptor.java
@@ -11,7 +11,7 @@
 @JaxrsEndPointValidated
 @Interceptor
 @Priority(Interceptor.Priority.PLATFORM_AFTER + 800)
-public class QuarkusRestEndPointValidationInterceptor extends AbstractMethodValidationInterceptor {
+public class ResteasyReactiveEndPointValidationInterceptor extends AbstractMethodValidationInterceptor {
 
     @AroundInvoke
     @Override

diff --git a/.../QuarkusRestViolationExceptionMapper.java → ...easyReactiveViolationExceptionMapper.java b/.../QuarkusRestViolationExceptionMapper.java → ...easyReactiveViolationExceptionMapper.java
@@ -12,7 +12,7 @@
 import javax.ws.rs.ext.Provider;
 
 @Provider
-public class QuarkusRestViolationExceptionMapper implements ExceptionMapper<ValidationException> {
+public class ResteasyReactiveViolationExceptionMapper implements ExceptionMapper<ValidationException> {
 
     @Override
     public Response toResponse(ValidationException exception) {

diff --git a/tcks/resteasy-reactive/pom.xml b/tcks/resteasy-reactive/pom.xml
@@ -17,7 +17,7 @@
     <properties>
 
         <!-- to avoid sudden surprises, checkout is pinned to a specific commit -->
-        <resteasy-reactive-testsuite.repo.ref>e3cd2c5e5b9262ae5d1197005c542fdd02f9d4ff</resteasy-reactive-testsuite.repo.ref>
+        <resteasy-reactive-testsuite.repo.ref>8dad67600518d02c8c6b376199efb91d360277b0</resteasy-reactive-testsuite.repo.ref>
 
         <exec.skip>${skipTests}</exec.skip>
         <resteasy-reactive-testsuite.clone.skip>${exec.skip}</resteasy-reactive-testsuite.clone.skip>