cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From serg...@apache.org
Subject cxf git commit: [CXF-7343] Removing cxf interceptor field duplicates, slightly modified patch from Dennis Kieselhorst applied, This closes #267
Date Mon, 24 Apr 2017 11:09:50 GMT
Repository: cxf
Updated Branches:
  refs/heads/3.1.x-fixes e7774e76e -> a2c97032e


[CXF-7343] Removing cxf interceptor field duplicates, slightly modified patch from Dennis
Kieselhorst applied, This closes #267


Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/a2c97032
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/a2c97032
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/a2c97032

Branch: refs/heads/3.1.x-fixes
Commit: a2c97032e8185862f3ef27be83b05da167d89ad9
Parents: e7774e7
Author: Sergey Beryozkin <sberyozkin@gmail.com>
Authored: Mon Apr 24 12:08:26 2017 +0100
Committer: Sergey Beryozkin <sberyozkin@gmail.com>
Committed: Mon Apr 24 12:09:32 2017 +0100

----------------------------------------------------------------------
 .../AbstractSpringComponentScanServer.java       | 19 ++++---------------
 1 file changed, 4 insertions(+), 15 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cxf/blob/a2c97032/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/spring/AbstractSpringComponentScanServer.java
----------------------------------------------------------------------
diff --git a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/spring/AbstractSpringComponentScanServer.java
b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/spring/AbstractSpringComponentScanServer.java
index 840c1fd..e7a008c 100644
--- a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/spring/AbstractSpringComponentScanServer.java
+++ b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/spring/AbstractSpringComponentScanServer.java
@@ -46,7 +46,6 @@ import org.apache.cxf.interceptor.Interceptor;
 import org.apache.cxf.jaxrs.JAXRSServerFactoryBean;
 import org.apache.cxf.jaxrs.lifecycle.ResourceProvider;
 import org.apache.cxf.jaxrs.utils.ResourceUtils;
-import org.apache.cxf.message.Message;
 import org.apache.cxf.service.factory.ServiceConstructionException;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.annotation.ComponentScan;
@@ -72,9 +71,6 @@ public abstract class AbstractSpringComponentScanServer extends AbstractSpringCo
     private List<ResourceProvider> resourceProviders = new LinkedList<ResourceProvider>();
     private List<Object> jaxrsProviders = new LinkedList<Object>();
     private List<Feature> cxfFeatures = new LinkedList<Feature>();
-    private List<Interceptor<? extends Message>> cxfInInterceptors = new LinkedList<Interceptor<?>>();
-    private List<Interceptor<? extends Message>> cxfOutInterceptors = new LinkedList<Interceptor<?>>();
-    private List<Interceptor<? extends Message>> cxfOutFaultInterceptors = new
LinkedList<Interceptor<?>>();
     private Class<? extends Annotation> serviceAnnotation;
     
     protected AbstractSpringComponentScanServer() {
@@ -252,11 +248,11 @@ public abstract class AbstractSpringComponentScanServer extends AbstractSpringCo
         if (ann.value() == org.apache.cxf.annotations.Provider.Type.Feature) {
             cxfFeatures.add((Feature)bean);
         } else if (ann.value() == org.apache.cxf.annotations.Provider.Type.InInterceptor)
{
-            cxfInInterceptors.add((Interceptor<?>)bean);
+            super.getInInterceptors().add((Interceptor<?>)bean);
         } else if (ann.value() == org.apache.cxf.annotations.Provider.Type.OutInterceptor)
{
-            cxfOutInterceptors.add((Interceptor<?>)bean);
+            super.getOutInterceptors().add((Interceptor<?>)bean);
         } else if (ann.value() == org.apache.cxf.annotations.Provider.Type.OutFaultInterceptor)
{
-            cxfOutFaultInterceptors.add((Interceptor<?>)bean);
+            super.getOutFaultInterceptors().add((Interceptor<?>)bean);
         }
     }
     
@@ -278,14 +274,7 @@ public abstract class AbstractSpringComponentScanServer extends AbstractSpringCo
     public List<Feature> getFeatures() {
         return cxfFeatures;
     }
-    @Override
-    public List<Interceptor<? extends Message>> getInInterceptors() {
-        return cxfInInterceptors;
-    }
-    public List<Interceptor<? extends Message>> getOutInterceptors() {
-        return cxfOutInterceptors;
-    }
-
+    
     protected JAXRSServerFactoryBean createFactoryBeanFromApplication(Application app) {
         return ResourceUtils.createApplication(app, false, true, false, getBus());
     }


Mime
View raw message