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 2017/04/24 11:08:45 UTC
cxf git commit: [CXF-7343] Removing cxf interceptor field duplicates,
slightly modified patch from Dennis Kieselhorst applied, This closes #267
Repository: cxf
Updated Branches:
refs/heads/master 2735d624a -> f209d05f9
[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/f209d05f
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/f209d05f
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/f209d05f
Branch: refs/heads/master
Commit: f209d05f9c32b845fb9ea0071aaddf1bc0468ebd
Parents: 2735d62
Author: Sergey Beryozkin <sb...@gmail.com>
Authored: Mon Apr 24 12:08:26 2017 +0100
Committer: Sergey Beryozkin <sb...@gmail.com>
Committed: Mon Apr 24 12:08:26 2017 +0100
----------------------------------------------------------------------
.../AbstractSpringComponentScanServer.java | 19 ++++---------------
1 file changed, 4 insertions(+), 15 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/f209d05f/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 36c0b7e..3e808e6 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() {
@@ -251,11 +247,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);
}
}
@@ -277,14 +273,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());
}