commit bf243bd129d1191c9ba325d5a163d3d29707461f
author Richard Begg <richard.begg@identity-solutions.com.au> Thu Jul 13 13:38:20 2017 +1000
committer Richard Begg <richard.begg@identity-solutions.com.au> Thu Jul 13 13:38:20 2017 +1000
tree 0270041b3c73812b5b38560c358b1a23cf1999e4
parent 88b51ef4cbd45eabbf47b6e62a3b2eabd5080bc4

[DOSGI-267] Treat all intents annotated with @Provider as providers

provider-rs/src/main/java/org/apache/cxf/dosgi/dsw/handlers/rest/RsProvider.java

diff --git a/provider-rs/src/main/java/org/apache/cxf/dosgi/dsw/handlers/rest/RsProvider.java b/provider-rs/src/main/java/org/apache/cxf/dosgi/dsw/handlers/rest/RsProvider.java
index 975c97f..160f185 100644
--- a/provider-rs/src/main/java/org/apache/cxf/dosgi/dsw/handlers/rest/RsProvider.java
+++ b/provider-rs/src/main/java/org/apache/cxf/dosgi/dsw/handlers/rest/RsProvider.java
@@ -32,6 +32,7 @@
 import javax.ws.rs.ext.ExceptionMapper;
 import javax.ws.rs.ext.MessageBodyReader;
 import javax.ws.rs.ext.MessageBodyWriter;
+import javax.ws.rs.ext.Provider;
 
 import org.apache.aries.rsa.spi.DistributionProvider;
 import org.apache.aries.rsa.spi.Endpoint;
@@ -173,7 +174,8 @@
     }
     
     private boolean isProvider(Object intent) {
-        return (intent instanceof ExceptionMapper) // 
+        return intent.getClass().getAnnotation(Provider.class) != null //
+            || (intent instanceof ExceptionMapper) // 
             || (intent instanceof MessageBodyReader) //
             || (intent instanceof MessageBodyWriter) //
             || (intent instanceof ContextResolver) //