Initial changes for bean validation support

jbossws · Feb 17, 2016 · 2f629ca · 2f629ca
1 parent e9a002b
commit 2f629ca
Showing 1 changed file with 14 additions and 1 deletion.
diff --git a/...ver/src/main/java/org/jboss/wsf/stack/cxf/deployment/aspect/JAXRSBusDeploymentAspect.java b/...ver/src/main/java/org/jboss/wsf/stack/cxf/deployment/aspect/JAXRSBusDeploymentAspect.java
@@ -24,6 +24,7 @@
 import java.lang.reflect.Constructor;
 import java.lang.reflect.InvocationTargetException;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
 
 import javax.ws.rs.core.Application;
@@ -33,12 +34,17 @@
 
 import org.apache.cxf.Bus;
 import org.apache.cxf.BusFactory;
+import org.apache.cxf.interceptor.Interceptor;
 import org.apache.cxf.jaxrs.JAXRSServerFactoryBean;
 import org.apache.cxf.jaxrs.model.ApplicationInfo;
 import org.apache.cxf.jaxrs.model.ProviderInfo;
 import org.apache.cxf.jaxrs.provider.ProviderFactory;
 import org.apache.cxf.jaxrs.provider.json.JSONProvider;
 import org.apache.cxf.jaxrs.utils.ResourceUtils;
+import org.apache.cxf.jaxrs.validation.JAXRSBeanValidationInInterceptor;
+import org.apache.cxf.jaxrs.validation.JAXRSBeanValidationOutInterceptor;
+import org.apache.cxf.jaxrs.validation.ValidationExceptionMapper;
+import org.apache.cxf.message.Message;
 import org.apache.cxf.transport.http.HttpDestinationFactory;
 import org.apache.cxf.transport.servlet.ServletDestinationFactory;
 import org.jboss.ws.common.integration.AbstractDeploymentAspect;
@@ -131,12 +137,19 @@ private static void createFromApplication(JAXRSDeploymentMetadata md, Class<?> a
       }
       processJNDIComponentResources(bean, md, bus, classLoader, additionalResources);
       setJSONProviders(bean);
+      setValidationInterceptors(bean);
       if (!bean.getResourceClasses().isEmpty() || !additionalResources.isEmpty()) {
          bean.setResourceClasses(additionalResources);
          bean.create();
       }
    }
 
+   private static void setValidationInterceptors(JAXRSServerFactoryBean bean) {
+      bean.setInInterceptors(Arrays.<Interceptor<? extends Message>> asList(new JAXRSBeanValidationInInterceptor()));
+      bean.setOutInterceptors(Arrays.<Interceptor<? extends Message>> asList(new JAXRSBeanValidationOutInterceptor()));
+      bean.setProvider(new ValidationExceptionMapper());
+   }
+
    private static void create(JAXRSDeploymentMetadata md, Bus bus, ClassLoader classLoader) {
       JAXRSServerFactoryBean bean = new JAXRSServerFactoryBean();
       bean.setBus(bus);
@@ -151,8 +164,8 @@ private static void create(JAXRSDeploymentMetadata md, Bus bus, ClassLoader clas
       setProviders(bean, md, bus, classLoader);
       //jndi resource...
       processJNDIComponentResources(bean, md, bus, classLoader, resources);
-
       setJSONProviders(bean);
+      setValidationInterceptors(bean);
       if (!bean.getResourceClasses().isEmpty() || !resources.isEmpty()) {
          bean.setResourceClasses(resources);
          bean.create();