[cxf] branch master updated: Remove unnecessary warning when no provider is specified

[amccright]

This is an automated email from the ASF dual-hosted git repository.

amccright pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/cxf.git


The following commit(s) were added to refs/heads/master by this push:
     new d70589e  Remove unnecessary warning when no provider is specified
d70589e is described below

commit d70589ed28942692f86753590fa23712850b3854
Author: Andy McCright <j.andrew.mccri...@gmail.com>
AuthorDate: Tue Feb 5 16:44:40 2019 -0600

    Remove unnecessary warning when no provider is specified
---
 .../apache/cxf/jaxrs/model/AbstractResourceInfo.java |  3 ++-
 .../cxf/microprofile/client/cdi/RestClientBean.java  | 20 +++++++++++---------
 2 files changed, 13 insertions(+), 10 deletions(-)

diff --git 
a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/model/AbstractResourceInfo.java
 
b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/model/AbstractResourceInfo.java
index 3a66ca4..0e7da80 100644
--- 
a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/model/AbstractResourceInfo.java
+++ 
b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/model/AbstractResourceInfo.java
@@ -36,6 +36,7 @@ import javax.ws.rs.core.Context;
 import org.apache.cxf.Bus;
 import org.apache.cxf.BusFactory;
 import org.apache.cxf.common.logging.LogUtils;
+import org.apache.cxf.common.util.ReflectionUtil;
 import org.apache.cxf.jaxrs.impl.tl.ThreadLocalProxy;
 import org.apache.cxf.jaxrs.utils.InjectionUtils;
 
@@ -119,7 +120,7 @@ public abstract class AbstractResourceInfo {
         if (cls == Object.class || cls == null) {
             return;
         }
-        for (Field f : cls.getDeclaredFields()) {
+        for (Field f : ReflectionUtil.getDeclaredFields(cls)) {
             for (Annotation a : f.getAnnotations()) {
                 if (a.annotationType() == Context.class
                     && (f.getType().isInterface() || f.getType() == 
Application.class)) {
diff --git 
a/rt/rs/microprofile-client/src/main/java/org/apache/cxf/microprofile/client/cdi/RestClientBean.java
 
b/rt/rs/microprofile-client/src/main/java/org/apache/cxf/microprofile/client/cdi/RestClientBean.java
index fa6a84a..8f146f1 100644
--- 
a/rt/rs/microprofile-client/src/main/java/org/apache/cxf/microprofile/client/cdi/RestClientBean.java
+++ 
b/rt/rs/microprofile-client/src/main/java/org/apache/cxf/microprofile/client/cdi/RestClientBean.java
@@ -196,16 +196,18 @@ public class RestClientBean implements Bean<Object>, 
PassivationCapable {
 
     List<Class<?>> getConfiguredProviders() {
         String property = String.format(REST_PROVIDERS_FORMAT, 
clientInterface.getName());
-        String providersList = ConfigFacade.getOptionalValue(property, 
String.class).orElse("");
-        String[] providerClassNames = providersList.split(",");
+        String providersList = ConfigFacade.getOptionalValue(property, 
String.class).orElse(null);
         List<Class<?>> providers = new ArrayList<>();
-        for (int i = 0; i < providerClassNames.length; i++) {
-            try {
-                
providers.add(ClassLoaderUtils.loadClass(providerClassNames[i], 
RestClientBean.class));
-            } catch (ClassNotFoundException e) {
-                LOG.log(Level.WARNING,
-                        "Could not load provider, {0}, configured for Rest 
Client interface, {1} ",
-                        new Object[]{providerClassNames[i], 
clientInterface.getName()});
+        if (providersList != null) {
+            String[] providerClassNames = providersList.split(",");
+            for (int i = 0; i < providerClassNames.length; i++) {
+                try {
+                    
providers.add(ClassLoaderUtils.loadClass(providerClassNames[i], 
RestClientBean.class));
+                } catch (ClassNotFoundException e) {
+                    LOG.log(Level.WARNING,
+                            "Could not load provider, {0}, configured for Rest 
Client interface, {1} ",
+                            new Object[]{providerClassNames[i], 
clientInterface.getName()});
+                }
             }
         }
         return providers;