svn commit: r1021794 - in /tuscany/sca-java-1.x/trunk/modules: binding-jsonp-runtime/src/test/java/helloworld/ binding-jsonp-runtime/src/test/java/test/ databinding-json-2-x/src/main/java/org/apache/tuscany/sca/databinding/json2x/jackson/

[slaws]

Author: slaws
Date: Tue Oct 12 15:16:54 2010
New Revision: 1021794

URL: http://svn.apache.org/viewvc?rev=1021794&view=rev
Log:
Add primitive type test and take account of it in the temporary databinding 
that jsonp uses. 

Modified:
    
tuscany/sca-java-1.x/trunk/modules/binding-jsonp-runtime/src/test/java/helloworld/HelloWorldClient.java
    
tuscany/sca-java-1.x/trunk/modules/binding-jsonp-runtime/src/test/java/helloworld/HelloWorldImpl.java
    
tuscany/sca-java-1.x/trunk/modules/binding-jsonp-runtime/src/test/java/helloworld/HelloWorldService.java
    
tuscany/sca-java-1.x/trunk/modules/binding-jsonp-runtime/src/test/java/test/BindingTestCase.java
    
tuscany/sca-java-1.x/trunk/modules/databinding-json-2-x/src/main/java/org/apache/tuscany/sca/databinding/json2x/jackson/Object2JSON.java

Modified: 
tuscany/sca-java-1.x/trunk/modules/binding-jsonp-runtime/src/test/java/helloworld/HelloWorldClient.java
URL: 
http://svn.apache.org/viewvc/tuscany/sca-java-1.x/trunk/modules/binding-jsonp-runtime/src/test/java/helloworld/HelloWorldClient.java?rev=1021794&r1=1021793&r2=1021794&view=diff
==============================================================================
--- 
tuscany/sca-java-1.x/trunk/modules/binding-jsonp-runtime/src/test/java/helloworld/HelloWorldClient.java
 (original)
+++ 
tuscany/sca-java-1.x/trunk/modules/binding-jsonp-runtime/src/test/java/helloworld/HelloWorldClient.java
 Tue Oct 12 15:16:54 2010
@@ -58,4 +58,8 @@ public class HelloWorldClient implements
     public void sayHello8(String name) {
        ref.sayHello8(name);
     }
+    
+    public int sayHello9(int name) {
+       return ref.sayHello9(name);
+    }    
 }

Modified: 
tuscany/sca-java-1.x/trunk/modules/binding-jsonp-runtime/src/test/java/helloworld/HelloWorldImpl.java
URL: 
http://svn.apache.org/viewvc/tuscany/sca-java-1.x/trunk/modules/binding-jsonp-runtime/src/test/java/helloworld/HelloWorldImpl.java?rev=1021794&r1=1021793&r2=1021794&view=diff
==============================================================================
--- 
tuscany/sca-java-1.x/trunk/modules/binding-jsonp-runtime/src/test/java/helloworld/HelloWorldImpl.java
 (original)
+++ 
tuscany/sca-java-1.x/trunk/modules/binding-jsonp-runtime/src/test/java/helloworld/HelloWorldImpl.java
 Tue Oct 12 15:16:54 2010
@@ -72,4 +72,9 @@ public class HelloWorldImpl implements H
     public void sayHello8(String name) {
        System.out.println("Hello void " + name);
     }
+    
+    public int sayHello9(int name) {
+       System.out.println("Hello void " + name);
+       return name;
+    }    
 }

Modified: 
tuscany/sca-java-1.x/trunk/modules/binding-jsonp-runtime/src/test/java/helloworld/HelloWorldService.java
URL: 
http://svn.apache.org/viewvc/tuscany/sca-java-1.x/trunk/modules/binding-jsonp-runtime/src/test/java/helloworld/HelloWorldService.java?rev=1021794&r1=1021793&r2=1021794&view=diff
==============================================================================
--- 
tuscany/sca-java-1.x/trunk/modules/binding-jsonp-runtime/src/test/java/helloworld/HelloWorldService.java
 (original)
+++ 
tuscany/sca-java-1.x/trunk/modules/binding-jsonp-runtime/src/test/java/helloworld/HelloWorldService.java
 Tue Oct 12 15:16:54 2010
@@ -39,5 +39,7 @@ public interface HelloWorldService {
     void sayHello7();
     
     void sayHello8(String name);
+    
+    int sayHello9(int name);
  
 }

Modified: 
tuscany/sca-java-1.x/trunk/modules/binding-jsonp-runtime/src/test/java/test/BindingTestCase.java
URL: 
http://svn.apache.org/viewvc/tuscany/sca-java-1.x/trunk/modules/binding-jsonp-runtime/src/test/java/test/BindingTestCase.java?rev=1021794&r1=1021793&r2=1021794&view=diff
==============================================================================
--- 
tuscany/sca-java-1.x/trunk/modules/binding-jsonp-runtime/src/test/java/test/BindingTestCase.java
 (original)
+++ 
tuscany/sca-java-1.x/trunk/modules/binding-jsonp-runtime/src/test/java/test/BindingTestCase.java
 Tue Oct 12 15:16:54 2010
@@ -163,6 +163,17 @@ public class BindingTestCase {
     }  
     
     @Test
+    public void testIntOut() throws MalformedURLException, IOException {
+        HelloWorldService client = 
((SCAClient)node).getService(HelloWorldService.class, "HelloWorldClient");
+
+           try {
+               Assert.assertEquals(28, client.sayHello9(28));
+           } catch (Exception ex){
+               Assert.fail();
+           }
+    }      
+    
+    @Test
     @Ignore
     public void waitForInput(){
         System.out.println("Press a key");

Modified: 
tuscany/sca-java-1.x/trunk/modules/databinding-json-2-x/src/main/java/org/apache/tuscany/sca/databinding/json2x/jackson/Object2JSON.java
URL: 
http://svn.apache.org/viewvc/tuscany/sca-java-1.x/trunk/modules/databinding-json-2-x/src/main/java/org/apache/tuscany/sca/databinding/json2x/jackson/Object2JSON.java?rev=1021794&r1=1021793&r2=1021794&view=diff
==============================================================================
--- 
tuscany/sca-java-1.x/trunk/modules/databinding-json-2-x/src/main/java/org/apache/tuscany/sca/databinding/json2x/jackson/Object2JSON.java
 (original)
+++ 
tuscany/sca-java-1.x/trunk/modules/databinding-json-2-x/src/main/java/org/apache/tuscany/sca/databinding/json2x/jackson/Object2JSON.java
 Tue Oct 12 15:16:54 2010
@@ -54,7 +54,7 @@ public class Object2JSON implements Pull
         }
         try {
             String value = mapper.writeValueAsString(source);
-            if (targetType == String.class || targetType == Object.class) {
+            if (targetType == String.class || targetType == Object.class || 
targetType.isPrimitive()) {
                 return value;
             } else if (JsonNode.class.isAssignableFrom(targetType)) {
                 return JacksonHelper.createJsonParser(value).readValueAsTree();