fix conficts

solidity/Table.sol

@@ -0,0 +1,57 @@
+pragma solidity ^0.4.24;
+
+contract TableFactory {
+    function openTable(string) public constant returns (Table); //open table
+    function createTable(string,string,string) public returns(int); //create table
+}
+
+//select condition
+contract Condition {
+    function EQ(string, int) public;
+    function EQ(string, string) public;
+
+    function NE(string, int) public;
+    function NE(string, string)  public;
+
+    function GT(string, int) public;
+    function GE(string, int) public;
+
+    function LT(string, int) public;
+    function LE(string, int) public;
+
+    function limit(int) public;
+    function limit(int, int) public;
+}
+
+//one record 
+contract Entry {
+    function getInt(string) public constant returns(int);
+    function getAddress(string) public constant returns(address);
+    function getBytes64(string) public constant returns(byte[64]);
+    function getBytes32(string) public constant returns(bytes32);
+    function getString(string) public constant returns(string);
+
+    function set(string, int) public;
+    function set(string, string) public;
+}
+
+//record sets
+contract Entries {
+    function get(int) public constant returns(Entry);
+    function size() public constant returns(int);
+}
+
+//Table main contract
+contract Table {
+    //select api
+    function select(string, Condition) public constant returns(Entries);
+    //insert api
+    function insert(string, Entry) public returns(int);
+    //update api
+    function update(string, Entry, Condition) public returns(int);
+    //remove api
+    function remove(string, Condition) public returns(int);
+
+    function newEntry() public constant returns(Entry);
+    function newCondition() public constant returns(Condition);
+}

solidity/TableTest.sol

@@ -0,0 +1,89 @@
+pragma solidity ^0.4.24;
+pragma experimental ABIEncoderV2;
+
+import "./Table.sol";
+
+contract TableTest {
+    event CreateResult(int count);
+    event InsertResult(int count);
+    event UpdateResult(int count);
+    event RemoveResult(int count);
+
+    //create table
+    function create() public returns(int){
+        TableFactory tf = TableFactory(0x1001); //The fixed address is 0x1001 for TableFactory
+
+        int count = tf.createTable("t_test", "name", "item_id,item_name");
+        emit CreateResult(count);
+        return count;
+    }
+
+    //select records
+    function select(string name) public constant returns(string[], int[], string[]){
+        TableFactory tf = TableFactory(0x1001);
+        Table table = tf.openTable("t_test");
+
+        Condition condition = table.newCondition();
+
+        Entries entries = table.select(name, condition);
+        string[] memory user_name_bytes_list = new string[](uint256(entries.size()));
+        int[] memory item_id_list = new int[](uint256(entries.size()));
+        string[] memory item_name_bytes_list = new string[](uint256(entries.size()));
+
+        for(int i=0; i<entries.size(); ++i) {
+            Entry entry = entries.get(i);
+
+            user_name_bytes_list[uint256(i)] = entry.getString("name");
+            item_id_list[uint256(i)] = entry.getInt("item_id");
+            item_name_bytes_list[uint256(i)] = entry.getString("item_name"); 
+        }
+
+        return (user_name_bytes_list, item_id_list, item_name_bytes_list);
+    }
+    //insert records
+    function insert(string name, int item_id, string item_name) public returns(int) {
+        TableFactory tf = TableFactory(0x1001);
+        Table table = tf.openTable("t_test");
+
+        Entry entry = table.newEntry();
+        entry.set("name", name);
+        entry.set("item_id", item_id);
+        entry.set("item_name", item_name);
+
+        int count = table.insert(name, entry);
+        emit InsertResult(count);
+
+        return count;
+    }
+    //update records
+    function update(string name, int item_id, string item_name) public returns(int) {
+        TableFactory tf = TableFactory(0x1001);
+        Table table = tf.openTable("t_test");
+
+        Entry entry = table.newEntry();
+        entry.set("item_name", item_name);
+
+        Condition condition = table.newCondition();
+        condition.EQ("name", name);
+        condition.EQ("item_id", item_id);
+
+        int count = table.update(name, entry, condition);
+        emit UpdateResult(count);
+
+        return count;
+    }
+    //remove records
+    function remove(string name, int item_id) public returns(int){
+        TableFactory tf = TableFactory(0x1001);
+        Table table = tf.openTable("t_test");
+
+        Condition condition = table.newCondition();
+        condition.EQ("name", name);
+        condition.EQ("item_id", item_id);
+
+        int count = table.remove(name, condition);
+        emit RemoveResult(count);
+
+        return count;
+    }
+}

src/integration-test/java/org/fisco/bcos/TestBase.java

@@ -31,7 +31,7 @@ public static void setUpBeforeClass() throws Exception {
   	context = new ClassPathXmlApplicationContext("classpath:applicationContext.xml");
 
     Service service = context.getBean(Service.class);
-   service.run();
+    service.run();
 
     ChannelEthereumService channelEthereumService = new ChannelEthereumService();
     channelEthereumService.setChannelService(service);

src/main/java/org/fisco/bcos/web3j/tx/txdecode/ContractAbiUtil.java

@@ -122,7 +122,8 @@ public static List<TypeReference<?>> paramFormat(List<NamedType> paramTypes)
 
         for (int i = 0; i < paramTypes.size(); i++) {
 
-            AbiDefinition.NamedType.Type type =  new AbiDefinition.NamedType.Type(paramTypes.get(i).getType());
+            AbiDefinition.NamedType.Type type =
+                    new AbiDefinition.NamedType.Type(paramTypes.get(i).getType());
             // nested array , not support now.
             if (type.getDepth() > 1) {
                 throw new BaseException(

src/main/java/org/fisco/bcos/web3j/tx/txdecode/EventResultEntity.java

@@ -3,13 +3,6 @@
 import org.fisco.bcos.web3j.abi.datatypes.Type;
 
 public class EventResultEntity extends ResultEntity {
-
-    public EventResultEntity(String name, String type, boolean indexed, Type data) {
-        super(name, type, data);
-
-        this.setIndexed(indexed);
-    }
-
     private boolean indexed;
 
     public boolean isIndexed() {
@@ -19,4 +12,10 @@ public boolean isIndexed() {
     public void setIndexed(boolean indexed) {
         this.indexed = indexed;
     }
+
+    public EventResultEntity(String name, String type, boolean indexed, Type data) {
+        super(name, type, data);
+
+        this.setIndexed(indexed);
+    }
 }

src/main/java/org/fisco/bcos/web3j/tx/txdecode/TransactionDecoder.java

@@ -31,7 +31,7 @@ public class TransactionDecoder {
     private Map<String, AbiDefinition> methodIDMap;
 
     public TransactionDecoder(String abi) {
-    	this(abi, "");
+        this(abi, "");
     }
 
     public TransactionDecoder(String abi, String bin) {
@@ -45,13 +45,13 @@ public TransactionDecoder(String abi, String bin) {
             methodIDMap.put(methodID, abiDefinition);
         }
     }
-    
+
     private String addHexPrefixToString(String s) {
-    	if(!s.startsWith("0x")) {
-    		return "0x" + s;
-    	}
-    	
-    	return s;
+        if (!s.startsWith("0x")) {
+            return "0x" + s;
+        }
+
+        return s;
     }
 
     /**
@@ -63,22 +63,15 @@ private String addHexPrefixToString(String s) {
      */
     public String decodeInputReturnJson(String input)
             throws JsonProcessingException, TransactionException, BaseException {
-    	
-    	input = addHexPrefixToString(input);
-    	
+
+        input = addHexPrefixToString(input);
+
         // select abi
         AbiDefinition abiFunc = selectAbiDefinition(input);
 
         // decode input
-        List<ResultEntity> resultList = decodeInputReturnObject(input);
-
+        Map<String, Object> resultMap = decodeInputReturnObject(input);
         // format result to json
-        Map<String, Object> resultMap = new LinkedHashMap<>();
-        String methodSign = decodeMethodSign(abiFunc);
-        resultMap.put("function", methodSign);
-        resultMap.put("methodID", FunctionEncoder.buildMethodId(methodSign));
-        resultMap.put("data", resultList);
-
         String result = ObjectMapperFactory.getObjectMapper().writeValueAsString(resultMap);
 
         return result;
@@ -90,11 +83,11 @@ public String decodeInputReturnJson(String input)
      * @throws BaseException
      * @throws TransactionException
      */
-    public List<ResultEntity> decodeInputReturnObject(String input)
+    public Map<String, Object> decodeInputReturnObject(String input)
             throws BaseException, TransactionException {
-    	
-    	input = addHexPrefixToString(input);
-    	
+
+        input = addHexPrefixToString(input);
+
         // select abi
         AbiDefinition abiDefinition = selectAbiDefinition(input);
 
@@ -114,7 +107,14 @@ public List<ResultEntity> decodeInputReturnObject(String input)
                             inputTypes.get(i).getType(),
                             resultType.get(i)));
         }
-        return resultList;
+
+        Map<String, Object> resultMap = new LinkedHashMap<>();
+        String methodSign = decodeMethodSign(abiDefinition);
+        resultMap.put("function", methodSign);
+        resultMap.put("methodID", FunctionEncoder.buildMethodId(methodSign));
+        resultMap.put("data", resultList);
+
+        return resultMap;
     }
 
     /**
@@ -128,8 +128,9 @@ public List<ResultEntity> decodeInputReturnObject(String input)
     public String decodeOutputReturnJson(String input, String output)
             throws JsonProcessingException, BaseException, TransactionException {
 
-        List<ResultEntity> resultList = decodeOutputReturnObject(input, output);
-        String result = ObjectMapperFactory.getObjectMapper().writeValueAsString(resultList);
+        Map<String, Object> resultMap = decodeOutputReturnObject(input, output);
+
+        String result = ObjectMapperFactory.getObjectMapper().writeValueAsString(resultMap);
         return result;
     }
 
@@ -140,10 +141,11 @@ public String decodeOutputReturnJson(String input, String output)
      * @throws TransactionException
      * @throws BaseException
      */
-    public List<ResultEntity> decodeOutputReturnObject(String input, String output)
+    public Map<String, Object> decodeOutputReturnObject(String input, String output)
             throws TransactionException, BaseException {
-
-    	output = addHexPrefixToString(output);
+
+        input = addHexPrefixToString(input);
+        output = addHexPrefixToString(output);
 
         // select abi
         AbiDefinition abiDefinition = selectAbiDefinition(input);
@@ -163,7 +165,14 @@ public List<ResultEntity> decodeOutputReturnObject(String input, String output)
                             outputTypes.get(i).getType(),
                             resultType.get(i)));
         }
-        return resultList;
+
+        Map<String, Object> resultMap = new LinkedHashMap<>();
+        String methodSign = decodeMethodSign(abiDefinition);
+        resultMap.put("function", methodSign);
+        resultMap.put("methodID", FunctionEncoder.buildMethodId(methodSign));
+        resultMap.put("data", resultList);
+
+        return resultMap;
     }
 
     /**
@@ -273,7 +282,7 @@ public Tuple2<AbiDefinition, List<EventResultEntity>> decodeEventReturnObject(Lo
                                     indexedInputs.get(i).getType(),
                                     true,
                                     eventValued.getIndexedValues().get(i));
-                    
+
                     resultEntityList.add(eventEntity);
                 }
 
@@ -284,7 +293,7 @@ public Tuple2<AbiDefinition, List<EventResultEntity>> decodeEventReturnObject(Lo
                                     nonIndexedInputs.get(i).getType(),
                                     false,
                                     eventValued.getNonIndexedValues().get(i));
-                    
+
                     resultEntityList.add(eventEntity);
                 }
 

src/test/java/org/fisco/bcos/web3j/tx/txdecode/TestTxDecode.java

@@ -29,7 +29,7 @@ public static void main(String[] args) throws Exception {
         System.out.println("===================decode input===================");
         String input = txReceipt.getInput();
         String inputResult1 = transactionDecoder.decodeInputReturnJson(input);
-        List<ResultEntity> inputResult2 = transactionDecoder.decodeInputReturnObject(input);
+        Map<String, Object> inputResult2 = transactionDecoder.decodeInputReturnObject(input);
 
         System.out.println(inputResult1);
         System.out.println(inputResult2);
@@ -38,7 +38,8 @@ public static void main(String[] args) throws Exception {
         System.out.println("===================decode output===================");
         String output = txReceipt.getOutput();
         String outputResult1 = transactionDecoder.decodeOutputReturnJson(input, output);
-        List<ResultEntity> outputResult2 =
+
+        Map<String, Object> outputResult2 =
                 transactionDecoder.decodeOutputReturnObject(input, output);
 
         System.out.println(outputResult1);