Return-Path: X-Original-To: apmail-cxf-commits-archive@www.apache.org Delivered-To: apmail-cxf-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 869DC10D8C for ; Thu, 13 Feb 2014 23:07:22 +0000 (UTC) Received: (qmail 46200 invoked by uid 500); 13 Feb 2014 23:07:21 -0000 Delivered-To: apmail-cxf-commits-archive@cxf.apache.org Received: (qmail 46139 invoked by uid 500); 13 Feb 2014 23:07:20 -0000 Mailing-List: contact commits-help@cxf.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cxf.apache.org Delivered-To: mailing list commits@cxf.apache.org Received: (qmail 46132 invoked by uid 99); 13 Feb 2014 23:07:20 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 13 Feb 2014 23:07:20 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 13 Feb 2014 23:07:17 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 06DD8238883D; Thu, 13 Feb 2014 23:06:56 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1568108 - in /cxf/branches/2.7.x-fixes: ./ rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/client/ rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/model/ rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/ rt/frontend/jaxrs/src... Date: Thu, 13 Feb 2014 23:06:55 -0000 To: commits@cxf.apache.org From: sergeyb@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20140213230656.06DD8238883D@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: sergeyb Date: Thu Feb 13 23:06:55 2014 New Revision: 1568108 URL: http://svn.apache.org/r1568108 Log: Merged revisions 1568083-1568084 via svnmerge from https://svn.apache.org/repos/asf/cxf/trunk ........ r1568083 | sergeyb | 2014-02-13 22:49:56 +0000 (Thu, 13 Feb 2014) | 1 line [CXF-5562] Relaxing the checks when injecting via setters, no need to have a name match ........ r1568084 | sergeyb | 2014-02-13 22:52:55 +0000 (Thu, 13 Feb 2014) | 1 line [CXF-5562] One more test update ........ Modified: cxf/branches/2.7.x-fixes/ (props changed) cxf/branches/2.7.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/client/ClientProxyImpl.java cxf/branches/2.7.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/model/BeanResourceInfo.java cxf/branches/2.7.x-fixes/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/Customer.java cxf/branches/2.7.x-fixes/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/utils/JAXRSUtilsTest.java cxf/branches/2.7.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookStore.java cxf/branches/2.7.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSClientServerBookTest.java Propchange: cxf/branches/2.7.x-fixes/ ------------------------------------------------------------------------------ Merged /cxf/trunk:r1568083-1568084 Propchange: cxf/branches/2.7.x-fixes/ ------------------------------------------------------------------------------ Binary property 'svnmerge-integrated' - no diff available. Modified: cxf/branches/2.7.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/client/ClientProxyImpl.java URL: http://svn.apache.org/viewvc/cxf/branches/2.7.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/client/ClientProxyImpl.java?rev=1568108&r1=1568107&r2=1568108&view=diff ============================================================================== --- cxf/branches/2.7.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/client/ClientProxyImpl.java (original) +++ cxf/branches/2.7.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/client/ClientProxyImpl.java Thu Feb 13 23:06:55 2014 @@ -466,12 +466,14 @@ public class ClientProxyImpl extends Abs Map values = new HashMap(); for (Method m : bean.getClass().getMethods()) { - if (m.getAnnotation(annClass) != null) { + Annotation annotation = m.getAnnotation(annClass); + if (annotation != null) { try { String propertyName = m.getName().substring(3); Method getter = bean.getClass().getMethod("get" + propertyName, new Class[]{}); Object value = getter.invoke(bean, new Object[]{}); - values.put(propertyName.toLowerCase(), value); + String annotationValue = AnnotationUtils.getAnnotationValue(annotation); + values.put(annotationValue, value); } catch (Throwable t) { // ignore } Modified: cxf/branches/2.7.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/model/BeanResourceInfo.java URL: http://svn.apache.org/viewvc/cxf/branches/2.7.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/model/BeanResourceInfo.java?rev=1568108&r1=1568107&r2=1568108&view=diff ============================================================================== --- cxf/branches/2.7.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/model/BeanResourceInfo.java (original) +++ cxf/branches/2.7.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/model/BeanResourceInfo.java Thu Feb 13 23:06:55 2014 @@ -82,7 +82,7 @@ public abstract class BeanResourceInfo e } for (Annotation a : m.getAnnotations()) { if (AnnotationUtils.isParamAnnotationClass(a.annotationType())) { - checkParamMethod(m, AnnotationUtils.getAnnotationValue(a)); + addParamMethod(m); break; } } @@ -110,10 +110,4 @@ public abstract class BeanResourceInfo e return paramFields == null ? Collections.emptyList() : Collections.unmodifiableList(paramFields); } - - private void checkParamMethod(Method m, String value) { - if (m.getName().equalsIgnoreCase("set" + value)) { - addParamMethod(m); - } - } } Modified: cxf/branches/2.7.x-fixes/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/Customer.java URL: http://svn.apache.org/viewvc/cxf/branches/2.7.x-fixes/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/Customer.java?rev=1568108&r1=1568107&r2=1568108&view=diff ============================================================================== --- cxf/branches/2.7.x-fixes/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/Customer.java (original) +++ cxf/branches/2.7.x-fixes/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/Customer.java Thu Feb 13 23:06:55 2014 @@ -280,7 +280,7 @@ public class Customer extends AbstractCu return servletContext3; } - @QueryParam("a") + @QueryParam("a_value") public void setA(String a) { queryParam = a; } Modified: cxf/branches/2.7.x-fixes/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/utils/JAXRSUtilsTest.java URL: http://svn.apache.org/viewvc/cxf/branches/2.7.x-fixes/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/utils/JAXRSUtilsTest.java?rev=1568108&r1=1568107&r2=1568108&view=diff ============================================================================== --- cxf/branches/2.7.x-fixes/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/utils/JAXRSUtilsTest.java (original) +++ cxf/branches/2.7.x-fixes/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/utils/JAXRSUtilsTest.java Thu Feb 13 23:06:55 2014 @@ -1854,7 +1854,7 @@ public class JAXRSUtilsTest extends Asse MultivaluedMap headers = new MetadataMap(); headers.add("AHeader2", "theAHeader2"); m.put(Message.PROTOCOL_HEADERS, headers); - m.put(Message.QUERY_STRING, "a=aValue&query2=b"); + m.put(Message.QUERY_STRING, "a_value=aValue&query2=b"); JAXRSUtils.injectParameters(ori, c, m); assertEquals("aValue", c.getQueryParam()); assertEquals("theAHeader2", c.getAHeader2()); Modified: cxf/branches/2.7.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookStore.java URL: http://svn.apache.org/viewvc/cxf/branches/2.7.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookStore.java?rev=1568108&r1=1568107&r2=1568108&view=diff ============================================================================== --- cxf/branches/2.7.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookStore.java (original) +++ cxf/branches/2.7.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookStore.java Thu Feb 13 23:06:55 2014 @@ -1562,7 +1562,7 @@ public class BookStore { return id2; } - @QueryParam("id2") + @QueryParam("id_2") public void setId2(long id2) { this.id2 = id2; } Modified: cxf/branches/2.7.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSClientServerBookTest.java URL: http://svn.apache.org/viewvc/cxf/branches/2.7.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSClientServerBookTest.java?rev=1568108&r1=1568107&r2=1568108&view=diff ============================================================================== --- cxf/branches/2.7.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSClientServerBookTest.java (original) +++ cxf/branches/2.7.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSClientServerBookTest.java Thu Feb 13 23:06:55 2014 @@ -277,7 +277,7 @@ public class JAXRSClientServerBookTest e private void doTestUseParamBeanWebClient(String address) { WebClient wc = WebClient.create(address); wc.path("100"); - wc.query("id2", "20"); + wc.query("id_2", "20"); wc.query("id3", "3"); Book book = wc.get(Book.class); assertEquals(123L, book.getId());