git commit: [CXF-5838] Setting a correct default char value

2014-07-09 Thread sergeyb 
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 
Authored: Wed Jul 9 12:36:28 2014 +0100
Committer: Sergey Beryozkin 
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('\u') : "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 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));

git commit: [CXF-5838] Setting a correct default char value

2014-07-09 Thread sergeyb 
Repository: cxf
Updated Branches:
  refs/heads/2.7.x-fixes 5f76a5316 -> 18f7085cb


[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/18f7085c
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/18f7085c
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/18f7085c

Branch: refs/heads/2.7.x-fixes
Commit: 18f7085cbbb06167543aec42a82036e74cf0541d
Parents: 5f76a53
Author: Sergey Beryozkin 
Authored: Wed Jul 9 12:36:28 2014 +0100
Committer: Sergey Beryozkin 
Committed: Wed Jul 9 12:39:15 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/18f7085c/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 cc11ddc..fdf4dd6 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
@@ -907,7 +907,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('\u') : "0");
 } else if 
(InjectionUtils.isSupportedCollectionOrArray(paramType)) {
 paramValues = Collections.emptyList();
 } else {

http://git-wip-us.apache.org/repos/asf/cxf/blob/18f7085c/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 2155e23..c30513f 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
@@ -393,7 +393,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/18f7085c/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 c4c58e9..b707952 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
@@ -1431,12 +1431,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 params = JAXRSUtils.processParameters(new 
OperationResourceInfo(m, 
new 
ClassResourceInfo(Customer.class)), 
null, messageImpl);
@@ -1448,8 +1448,10 @@ public class JAXRSUtilsTest extends Assert {
  new Long(3), params.get(2));

git commit: [CXF-5838] Setting a correct default char value

2014-07-09 Thread sergeyb 
Repository: cxf
Updated Branches:
  refs/heads/master 669e2f061 -> badfac577


[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/badfac57
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/badfac57
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/badfac57

Branch: refs/heads/master
Commit: badfac57768fdf8fdd2ec5179d3420fc8cd21c4b
Parents: 669e2f0
Author: Sergey Beryozkin 
Authored: Wed Jul 9 12:36:28 2014 +0100
Committer: Sergey Beryozkin 
Committed: Wed Jul 9 12:36:28 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/badfac57/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 8043da9..7cbfea9 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
@@ -917,7 +917,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('\u') : "0");
 } else if 
(InjectionUtils.isSupportedCollectionOrArray(paramType)) {
 paramValues = Collections.emptyList();
 } else {

http://git-wip-us.apache.org/repos/asf/cxf/blob/badfac57/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 9bc29bb..f64ae66 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
@@ -394,7 +394,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/badfac57/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 cd0fb53..1e740a9 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
@@ -1428,12 +1428,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);
 Message messageImpl = createMessage();
 
 messageImpl.put(Message.QUERY_STRING, 
-
"query=first&query2=second&query3=3&query4=true&query5");
+
"query=first&query2=second&query3=3&query4=true&query6");
 List params = JAXRSUtils.processParameters(new 
OperationResourceInfo(m, 
new 
ClassResourceInfo(Customer.class)), 
null, messageImpl);
@@ -1445,8 +1445,10 @@ public class JAXRSUtilsTest extends Assert {
  new Long(3), params.get(2));
 assertEquals