You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by rf...@apache.org on 2010/09/08 07:54:43 UTC
svn commit: r993611 - in /tuscany/sca-java-2.x/trunk/modules:
binding-jsonp-runtime/src/test/java/helloworld/
binding-jsonp-runtime/src/test/java/test/
databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/jackson/
Author: rfeng
Date: Wed Sep 8 05:54:43 2010
New Revision: 993611
URL: http://svn.apache.org/viewvc?rev=993611&view=rev
Log:
Add support for primitive java types
Modified:
tuscany/sca-java-2.x/trunk/modules/binding-jsonp-runtime/src/test/java/helloworld/HelloWorldClient.java
tuscany/sca-java-2.x/trunk/modules/binding-jsonp-runtime/src/test/java/helloworld/HelloWorldImpl.java
tuscany/sca-java-2.x/trunk/modules/binding-jsonp-runtime/src/test/java/helloworld/HelloWorldService.java
tuscany/sca-java-2.x/trunk/modules/binding-jsonp-runtime/src/test/java/test/BindingTestCase.java
tuscany/sca-java-2.x/trunk/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/jackson/Object2JSON.java
Modified: tuscany/sca-java-2.x/trunk/modules/binding-jsonp-runtime/src/test/java/helloworld/HelloWorldClient.java
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/binding-jsonp-runtime/src/test/java/helloworld/HelloWorldClient.java?rev=993611&r1=993610&r2=993611&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/modules/binding-jsonp-runtime/src/test/java/helloworld/HelloWorldClient.java (original)
+++ tuscany/sca-java-2.x/trunk/modules/binding-jsonp-runtime/src/test/java/helloworld/HelloWorldClient.java Wed Sep 8 05:54:43 2010
@@ -37,4 +37,8 @@ public class HelloWorldClient implements
public BeanA sayHello3(BeanA bean) {
return ref.sayHello3(bean);
}
+
+ public int sayHello4(boolean flag) {
+ return ref.sayHello4(flag);
+ }
}
Modified: tuscany/sca-java-2.x/trunk/modules/binding-jsonp-runtime/src/test/java/helloworld/HelloWorldImpl.java
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/binding-jsonp-runtime/src/test/java/helloworld/HelloWorldImpl.java?rev=993611&r1=993610&r2=993611&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/modules/binding-jsonp-runtime/src/test/java/helloworld/HelloWorldImpl.java (original)
+++ tuscany/sca-java-2.x/trunk/modules/binding-jsonp-runtime/src/test/java/helloworld/HelloWorldImpl.java Wed Sep 8 05:54:43 2010
@@ -33,5 +33,9 @@ public class HelloWorldImpl implements H
bean.setS("XYZ");
return bean;
}
+
+ public int sayHello4(boolean flag) {
+ return 0;
+ }
}
Modified: tuscany/sca-java-2.x/trunk/modules/binding-jsonp-runtime/src/test/java/helloworld/HelloWorldService.java
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/binding-jsonp-runtime/src/test/java/helloworld/HelloWorldService.java?rev=993611&r1=993610&r2=993611&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/modules/binding-jsonp-runtime/src/test/java/helloworld/HelloWorldService.java (original)
+++ tuscany/sca-java-2.x/trunk/modules/binding-jsonp-runtime/src/test/java/helloworld/HelloWorldService.java Wed Sep 8 05:54:43 2010
@@ -28,5 +28,7 @@ public interface HelloWorldService {
String sayHello2(String firstName, String lastName);
BeanA sayHello3(BeanA bean);
+
+ int sayHello4(boolean flag);
}
Modified: tuscany/sca-java-2.x/trunk/modules/binding-jsonp-runtime/src/test/java/test/BindingTestCase.java
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/binding-jsonp-runtime/src/test/java/test/BindingTestCase.java?rev=993611&r1=993610&r2=993611&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/modules/binding-jsonp-runtime/src/test/java/test/BindingTestCase.java (original)
+++ tuscany/sca-java-2.x/trunk/modules/binding-jsonp-runtime/src/test/java/test/BindingTestCase.java Wed Sep 8 05:54:43 2010
@@ -66,6 +66,7 @@ public class BindingTestCase {
Assert.assertEquals("Hello beate", client.sayHello("beate"));
Assert.assertEquals("Hello beate arnold", client.sayHello2("beate", "arnold"));
+ Assert.assertEquals(0, client.sayHello4(true));
}
@Test
Modified: tuscany/sca-java-2.x/trunk/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/jackson/Object2JSON.java
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/jackson/Object2JSON.java?rev=993611&r1=993610&r2=993611&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/jackson/Object2JSON.java (original)
+++ tuscany/sca-java-2.x/trunk/modules/databinding-json/src/main/java/org/apache/tuscany/sca/databinding/json/jackson/Object2JSON.java Wed Sep 8 05:54:43 2010
@@ -53,6 +53,9 @@ public class Object2JSON implements Pull
targetType = String.class;
}
try {
+ if (targetType != null && targetType.isPrimitive()) {
+ return source;
+ }
String value = mapper.writeValueAsString(source);
if (targetType == String.class || targetType == Object.class || targetType.isPrimitive()) {
return value;