mapping java object type in Web3jAbi

Author: tempofeng

etherspace-java/contract/contracts/Greeter.sol

@@ -41,4 +41,20 @@ contract greeter is mortal {
     event Modified(
             string indexed oldGreetingIdx, string indexed newGreetingIdx,
             string oldGreeting, string newGreeting);
+
+    function boolType(bool a) constant returns (bool) {
+        return a;
+    }
+
+    function intType(int a) constant returns (int) {
+        return a;
+    }
+
+    function uintType(uint a) constant returns (uint) {
+        return a;
+    }
+
+    function int24Type(int24 a) constant returns (int24) {
+        return a;
+    }
 }

etherspace-java/src/main/java/cc/etherspace/web3j/Web3jAbi.kt

@@ -110,16 +110,21 @@ class Web3jAbi : Web3.Abi {
         val web3jType = when {
             typeToken.childOf(String::class) -> Utf8String::class.java
             typeToken.childOf(Boolean::class) -> Bool::class.java
+            typeToken.childOf(java.lang.Boolean::class) -> Bool::class.java
             typeToken.childOf(BigInteger::class) -> Int256::class.java
             typeToken.childOf(Short::class) -> Int16::class.java
+            typeToken.childOf(java.lang.Short::class) -> Int16::class.java
             typeToken.childOf(Int::class) -> Int32::class.java
+            typeToken.childOf(java.lang.Integer::class) -> Int32::class.java
             typeToken.childOf(Long::class) -> Int64::class.java
+            typeToken.childOf(java.lang.Long::class) -> Int64::class.java
             typeToken.childOf(Ushort::class) -> Uint16::class.java
             typeToken.childOf(unsigned.Uint::class) -> Uint32::class.java
             typeToken.childOf(Ulong::class) -> Uint64::class.java
             typeToken.childOf(SolNumber::class) -> typeToken.toWeb3jNumberType()
             typeToken.childOf(SolAddress::class) -> Address::class.java
             typeToken.childOf(Byte::class) -> Bytes1::class.java
+            typeToken.childOf(java.lang.Byte::class) -> Bytes1::class.java
             typeToken.childOf(SolBytes::class) -> typeToken.toWeb3jBytesType()
             typeToken.childOf(ByteArray::class) -> DynamicBytes::class.java
             typeToken.childOf(List::class) -> toWeb3jArrayType(typeToken)

etherspace-java/src/test/java/cc/etherspace/LocalGreeterTest.kt

@@ -45,6 +45,15 @@ class LocalGreeterTest {
         ret.`should equal`(SolUint256(3))
     }
 
+    @Test
+    fun boolType() {
+        var b = greeter.boolType(true)
+        b.`should be equal to`(true)
+
+        b = greeter.boolType(false)
+        b.`should be equal to`(false)
+    }
+
     @Test
     fun newGreeting() {
         val receipt = greeter.newGreeting("Hello World")

etherspace-java/src/test/java/cc/etherspace/calladapter/CoroutineGreeter.kt

@@ -25,13 +25,9 @@ interface CoroutineGreeter {
     @Call
     fun greet_wrongFunctionName(): Deferred<String>
 
-    @Throws(IOException::class)
-    @Send
-    fun newPersonalGreeting(from: String, greeting: String): Deferred<String>
-
     @Throws(IOException::class)
     @Call
-    fun personalGreet(): Deferred<Pair<String, String>>
+    fun boolType(bool: Boolean): Deferred<Boolean>
 
     data class Modified @EventConstructor constructor(@Indexed(value = String::class) val oldGreetingIdx: SolBytes32,
                                                       @Indexed(value = String::class) val newGreetingIdx: SolBytes32,

etherspace-java/src/test/java/cc/etherspace/calladapter/CoroutineGreeterTest.kt

@@ -3,9 +3,7 @@ package cc.etherspace.calladapter
 import cc.etherspace.*
 import kotlinx.coroutines.experimental.Deferred
 import kotlinx.coroutines.experimental.runBlocking
-import org.amshove.kluent.`should be equal to`
-import org.amshove.kluent.`should be greater than`
-import org.amshove.kluent.`should equal`
+import org.amshove.kluent.*
 import org.junit.Before
 import org.junit.Test
 import org.web3j.utils.Numeric
@@ -83,19 +81,14 @@ class CoroutineGreeterTest {
         }
     }
 
-    fun newPersonalGreeting() {
-        runBlocking {
-            val transactionHash = greeter.newPersonalGreeting("tempo", "Hello World").await()
-            transactionHash.length.`should be equal to`(66)
-        }
-    }
-
     @Test
-    fun personalGreet() {
+    fun boolType() {
         runBlocking {
-            val pair = greeter.personalGreet().await()
-            pair.first.`should equal`("tempo")
-            pair.second.`should equal`("Hello World")
+            var greet = greeter.boolType(true).await()
+            greet.`should be true`()
+
+            greet = greeter.boolType(false).await()
+            greet.`should be false`()
         }
     }
 }