Repository: cxf Updated Branches: refs/heads/2.6.x-fixes f5ac8ade5 -> 05239840b
[CXF-5838] Setting a correct default char value Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/05239840 Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/05239840 Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/05239840 Branch: refs/heads/2.6.x-fixes Commit: 05239840b7a6a4cec5112bbb6c7a4768b4aaf170 Parents: f5ac8ad Author: Sergey Beryozkin <sberyoz...@talend.com> Authored: Wed Jul 9 12:36:28 2014 +0100 Committer: Sergey Beryozkin <sberyoz...@talend.com> Committed: Wed Jul 9 12:40:38 2014 +0100 ---------------------------------------------------------------------- .../java/org/apache/cxf/jaxrs/utils/InjectionUtils.java | 3 ++- .../src/test/java/org/apache/cxf/jaxrs/Customer.java | 3 ++- .../java/org/apache/cxf/jaxrs/utils/JAXRSUtilsTest.java | 10 ++++++---- 3 files changed, 10 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cxf/blob/05239840/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/InjectionUtils.java ---------------------------------------------------------------------- diff --git a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/InjectionUtils.java b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/InjectionUtils.java index 4f297fe..858bf74 100644 --- a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/InjectionUtils.java +++ b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/InjectionUtils.java @@ -846,7 +846,8 @@ public final class InjectionUtils { } else { if (paramType.isPrimitive()) { paramValues = Collections.singletonList( - boolean.class == paramType ? "false" : "0"); + boolean.class == paramType ? "false" + : char.class == paramType ? Character.toString('\u0000') : "0"); } else if (InjectionUtils.isSupportedCollectionOrArray(paramType)) { paramValues = Collections.emptyList(); } else { http://git-wip-us.apache.org/repos/asf/cxf/blob/05239840/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/Customer.java ---------------------------------------------------------------------- diff --git a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/Customer.java b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/Customer.java index c76dea1..c394769 100644 --- a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/Customer.java +++ b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/Customer.java @@ -382,7 +382,8 @@ public class Customer extends AbstractCustomer implements CustomerInfo { @QueryParam("query2") String queryString2, @QueryParam("query3") Long queryString3, @QueryParam("query4") boolean queryBoolean4, - @QueryParam("query5") String queryString4) { + @QueryParam("query5") char queryChar5, + @QueryParam("query6") String queryString6) { // complete } http://git-wip-us.apache.org/repos/asf/cxf/blob/05239840/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/utils/JAXRSUtilsTest.java ---------------------------------------------------------------------- diff --git a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/utils/JAXRSUtilsTest.java b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/utils/JAXRSUtilsTest.java index d68801c..21b96df 100644 --- a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/utils/JAXRSUtilsTest.java +++ b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/utils/JAXRSUtilsTest.java @@ -1312,12 +1312,12 @@ public class JAXRSUtilsTest extends Assert { @Test public void testMultipleQueryParameters() throws Exception { Class<?>[] argType = {String.class, String.class, Long.class, - Boolean.TYPE, String.class}; + Boolean.TYPE, char.class, String.class}; Method m = Customer.class.getMethod("testMultipleQuery", argType); MessageImpl messageImpl = new MessageImpl(); messageImpl.put(Message.QUERY_STRING, - "query=first&query2=second&query3=3&query4=true&query5"); + "query=first&query2=second&query3=3&query4=true&query6"); List<Object> params = JAXRSUtils.processParameters(new OperationResourceInfo(m, new ClassResourceInfo(Customer.class)), null, messageImpl); @@ -1329,8 +1329,10 @@ public class JAXRSUtilsTest extends Assert { new Long(3), params.get(2)); assertEquals("Fourth Query Parameter of multiple was not matched correctly", Boolean.TRUE, params.get(3)); - assertEquals("Fourth Query Parameter of multiple was not matched correctly", - "", params.get(4)); + assertEquals("Fifth Query Parameter of multiple was not matched correctly", + '\u0000', params.get(4)); + assertEquals("Six Query Parameter of multiple was not matched correctly", + "", params.get(5)); } @SuppressWarnings("unchecked")
