You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by se...@apache.org on 2013/12/05 12:58:40 UTC

svn commit: r1548099 - in /cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/validation: JAXRSBeanValidationInInterceptor.java JAXRSBeanValidationOutInterceptor.java

Author: sergeyb
Date: Thu Dec  5 11:58:40 2013
New Revision: 1548099

URL: http://svn.apache.org/r1548099
Log:
[CXF-5309] Minor updates to JAX-RS bean validators

Modified:
    cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/validation/JAXRSBeanValidationInInterceptor.java
    cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/validation/JAXRSBeanValidationOutInterceptor.java

Modified: cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/validation/JAXRSBeanValidationInInterceptor.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/validation/JAXRSBeanValidationInInterceptor.java?rev=1548099&r1=1548098&r2=1548099&view=diff
==============================================================================
--- cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/validation/JAXRSBeanValidationInInterceptor.java (original)
+++ cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/validation/JAXRSBeanValidationInInterceptor.java Thu Dec  5 11:58:40 2013
@@ -22,12 +22,14 @@ import java.io.IOException;
 
 import javax.ws.rs.container.ContainerRequestContext;
 import javax.ws.rs.container.ContainerRequestFilter;
+import javax.ws.rs.ext.Provider;
 
+import org.apache.cxf.interceptor.InterceptorChain;
 import org.apache.cxf.message.Message;
 import org.apache.cxf.phase.PhaseInterceptorChain;
 import org.apache.cxf.validation.BeanValidationInInterceptor;
 
-
+@Provider
 public class JAXRSBeanValidationInInterceptor extends BeanValidationInInterceptor 
     implements ContainerRequestFilter {
     public JAXRSBeanValidationInInterceptor() {
@@ -43,7 +45,7 @@ public class JAXRSBeanValidationInInterc
     
     @Override
     public void filter(ContainerRequestContext context) throws IOException {
-        super.handleMessage(PhaseInterceptorChain.getCurrentMessage());
-        
+        InterceptorChain chain = PhaseInterceptorChain.getCurrentMessage().getInterceptorChain();
+        chain.add(this);    
     }
 }

Modified: cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/validation/JAXRSBeanValidationOutInterceptor.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/validation/JAXRSBeanValidationOutInterceptor.java?rev=1548099&r1=1548098&r2=1548099&view=diff
==============================================================================
--- cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/validation/JAXRSBeanValidationOutInterceptor.java (original)
+++ cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/validation/JAXRSBeanValidationOutInterceptor.java Thu Dec  5 11:58:40 2013
@@ -24,12 +24,13 @@ import javax.ws.rs.container.ContainerRe
 import javax.ws.rs.container.ContainerResponseContext;
 import javax.ws.rs.container.ContainerResponseFilter;
 import javax.ws.rs.core.Response;
+import javax.ws.rs.ext.Provider;
 
 import org.apache.cxf.message.Message;
 import org.apache.cxf.phase.PhaseInterceptorChain;
 import org.apache.cxf.validation.BeanValidationOutInterceptor;
 
-
+@Provider
 public class JAXRSBeanValidationOutInterceptor extends BeanValidationOutInterceptor
     implements ContainerResponseFilter {
     public JAXRSBeanValidationOutInterceptor() {