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/21 12:25:51 UTC
cxf git commit: [CXF-7343] Updating AbstractSpringComponentScanServer
to pick up out fault interceptors,
slightly modified patch from Hugo Trippaers applied, This closes #265
Repository: cxf
Updated Branches:
refs/heads/master 5afec44d7 -> b4b2da750
[CXF-7343] Updating AbstractSpringComponentScanServer to pick up out fault interceptors, slightly modified patch from Hugo Trippaers applied, This closes #265
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/b4b2da75
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/b4b2da75
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/b4b2da75
Branch: refs/heads/master
Commit: b4b2da7507aa2d6461156089bd826c00f0bc5360
Parents: 5afec44
Author: Sergey Beryozkin <sb...@gmail.com>
Authored: Fri Apr 21 13:25:36 2017 +0100
Committer: Sergey Beryozkin <sb...@gmail.com>
Committed: Fri Apr 21 13:25:36 2017 +0100
----------------------------------------------------------------------
.../cxf/jaxrs/spring/AbstractSpringComponentScanServer.java | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/b4b2da75/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 65c665b..36c0b7e 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
@@ -74,6 +74,7 @@ public abstract class AbstractSpringComponentScanServer extends AbstractSpringCo
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() {
@@ -178,7 +179,9 @@ public abstract class AbstractSpringComponentScanServer extends AbstractSpringCo
factory.setFeatures(getFeatures());
factory.setInInterceptors(getInInterceptors());
factory.setOutInterceptors(getOutInterceptors());
+ factory.setOutFaultInterceptors(getOutFaultInterceptors());
}
+
protected void addCxfProvidersFromClasses(Collection<Class<?>> classes) {
List<Object> cxfProviders = JAXRSServerFactoryBeanDefinitionParser
.createBeansFromDiscoveredClasses(applicationContext, classes, null);
@@ -251,9 +254,11 @@ public abstract class AbstractSpringComponentScanServer extends AbstractSpringCo
cxfInInterceptors.add((Interceptor<?>)bean);
} else if (ann.value() == org.apache.cxf.annotations.Provider.Type.OutInterceptor) {
cxfOutInterceptors.add((Interceptor<?>)bean);
+ } else if (ann.value() == org.apache.cxf.annotations.Provider.Type.OutFaultInterceptor) {
+ cxfOutFaultInterceptors.add((Interceptor<?>)bean);
}
-
}
+
protected boolean matchesServiceAnnotation(String beanName) {
return serviceAnnotation == null || isAnnotationAvailable(beanName, serviceAnnotation);
}