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 2015/04/23 17:58:46 UTC
cxf git commit: [CXF-6367] Adding a test and another fix
Repository: cxf
Updated Branches:
refs/heads/master 3f07721b7 -> ae4781bbc
[CXF-6367] Adding a test and another fix
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/ae4781bb
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/ae4781bb
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/ae4781bb
Branch: refs/heads/master
Commit: ae4781bbc933d5da87dfb3b8ec031ec241555543
Parents: 3f07721
Author: Sergey Beryozkin <sb...@talend.com>
Authored: Thu Apr 23 16:58:25 2015 +0100
Committer: Sergey Beryozkin <sb...@talend.com>
Committed: Thu Apr 23 16:58:25 2015 +0100
----------------------------------------------------------------------
.../main/java/org/apache/cxf/jaxrs/client/ClientProxyImpl.java | 6 ++++--
.../src/test/java/org/apache/cxf/systest/jaxrs/BookStore.java | 2 +-
2 files changed, 5 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/ae4781bb/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/ClientProxyImpl.java
----------------------------------------------------------------------
diff --git a/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/ClientProxyImpl.java b/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/ClientProxyImpl.java
index 2ec19cc..9e1b179 100644
--- a/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/ClientProxyImpl.java
+++ b/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/ClientProxyImpl.java
@@ -61,6 +61,7 @@ import org.apache.cxf.common.classloader.ClassLoaderUtils.ClassLoaderHolder;
import org.apache.cxf.common.i18n.BundleUtils;
import org.apache.cxf.common.logging.LogUtils;
import org.apache.cxf.common.util.PropertyUtils;
+import org.apache.cxf.common.util.ReflectionUtil;
import org.apache.cxf.common.util.StringUtils;
import org.apache.cxf.endpoint.Endpoint;
import org.apache.cxf.helpers.CastUtils;
@@ -489,13 +490,14 @@ public class ClientProxyImpl extends AbstractClient implements
values.put(annotationValue, new BeanPair(value, m.getParameterAnnotations()[0]));
}
} else {
- Field f = bean.getClass().getField(StringUtils.uncapitalize(propertyName));
+ String fieldName = StringUtils.uncapitalize(propertyName);
+ Field f = ReflectionUtil.getDeclaredField(bean.getClass(), fieldName);
if (f == null) {
continue;
}
annotation = f.getAnnotation(annClass);
if (annotation != null) {
- Object value = f.get(bean);
+ Object value = ReflectionUtil.accessDeclaredField(f, bean, Object.class);
if (value != null) {
String annotationValue = AnnotationUtils.getAnnotationValue(annotation);
values.put(annotationValue, new BeanPair(value, f.getAnnotations()));
http://git-wip-us.apache.org/repos/asf/cxf/blob/ae4781bb/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookStore.java
----------------------------------------------------------------------
diff --git a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookStore.java b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookStore.java
index 3bbf7c3..57da727 100644
--- a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookStore.java
+++ b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookStore.java
@@ -1664,6 +1664,7 @@ public class BookStore {
public static class BookBean {
private long id;
+ @QueryParam("id_2")
private long id2;
private long id3;
@@ -1680,7 +1681,6 @@ public class BookStore {
return id2;
}
- @QueryParam("id_2")
public void setId2(long id2) {
this.id2 = id2;
}