Merge branch 'features/apiFront' into develop

cmd.txt

@@ -0,0 +1 @@
+mvn package && java -jar target/java-api-0.1.jar

src/main/java/blockchain/query/TransactionWrapper.java

@@ -29,6 +29,7 @@ public class TransactionWrapper {
             tpr.setArgs(new String[]{from,to,amount});
 
             Collection<ProposalResponse> responses = channelClientWrapper.sendTransactionProposal(tpr);
+            System.out.println("VERIFY HERE, TRY TO SEND TRANSACTION");
             BlockEvent.TransactionEvent event = channelClientWrapper.sendTransaction(responses);
 
             return event.getTransactionID();

src/main/java/restImplementation/QueryImplementation.java

@@ -0,0 +1,15 @@
+package restImplementation;
+
+import blockchain.query.QueryWrapper;
+
+public class QueryImplementation {
+
+    public String getUserBalance(String userHash){
+        QueryWrapper queryWrapper = new QueryWrapper();
+
+        String result = queryWrapper.getUserBalance(userHash);
+        //do something here ?
+        return result;
+
+    }
+}

src/main/java/restService/QueryController.java

@@ -0,0 +1,28 @@
+package restService;
+
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.bind.annotation.RestController;
+import restImplementation.QueryImplementation;
+
+@RestController
+public class QueryController {
+
+    @RequestMapping(value = "/user",params = {"name"})
+    public @ResponseBody
+    String getUser(
+            @RequestParam(value = "name") String hash){
+        return "Hello "+hash;
+    }
+
+    @RequestMapping(value = "/balance",params = {"name"})
+    public @ResponseBody
+    String getUserBalance(
+            @RequestParam(value = "name") String hash){
+        QueryImplementation queryImplementation = new QueryImplementation();
+        return queryImplementation.getUserBalance(hash);
+    }
+
+
+}

src/test/java/blockchain/query/ChaincodeTransactionTest.java

@@ -55,7 +55,7 @@ public class ChaincodeTransactionTest {
             ChaincodeID cid = ChaincodeID.newBuilder().setName(Config.CHAINCODE_NAME).build();
             tpr.setChaincodeID(cid);
             tpr.setFcn("invoke");
-            tpr.setArgs(new String[]{"a","b","20"}); //send 20 from a to b
+            tpr.setArgs(new String[]{"b","a","25"}); //send 20 from a to b
 
             Collection<ProposalResponse> responses = channel.sendTransactionProposal(tpr);
             List<ProposalResponse> invalid = responses.stream().filter(r -> r.isInvalid()).collect(Collectors.toList());
@@ -67,6 +67,7 @@ public class ChaincodeTransactionTest {
             }
 
 
+            logger.info("SEND TRANSACTION");
             BlockEvent.TransactionEvent event = channel.sendTransaction(responses).get();
             logger.info("Event transaction id : "+event.getTransactionID()); //print transaction id
 

src/test/java/blockchain/queryWrapper/TransactionWrapperTest.java

@@ -16,7 +16,7 @@ public class TransactionWrapperTest {
         BasicConfigurator.configure();
         QueryWrapper queryWrapper = new QueryWrapper();
         TransactionWrapper transactionWrapper = new TransactionWrapper();
-        String responseTransaction = transactionWrapper.sendTransaction("a","b","15"); //do transaction
+        String responseTransaction = transactionWrapper.sendTransaction("b","a","150"); //do transaction
         logger.info("TRANSACTION ID : "+responseTransaction);
 
         String responseUserB = queryWrapper.getUserBalance("b"); //check new balance of user b

target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst

@@ -1,11 +0,0 @@
-restService\WelcomeController.class
-blockchain\user\UserContext.class
-blockchain\client\CAClientWrapper.class
-blockchain\utility\Util.class
-blockchain\client\ChannelClientWrapper.class
-blockchain\user\CAEnrollement.class
-Application\App.class
-blockchain\configuration\Config.class
-blockchain\query\QueryWrapper.class
-blockchain\query\TransactionWrapper.class
-blockchain\client\FabricClientWrapper.class

target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst

@@ -1,11 +0,0 @@
-B:\SCIENCES U\GroupProject\java-api\src\main\java\blockchain\client\ChannelClientWrapper.java
-B:\SCIENCES U\GroupProject\java-api\src\main\java\blockchain\client\FabricClientWrapper.java
-B:\SCIENCES U\GroupProject\java-api\src\main\java\blockchain\user\CAEnrollement.java
-B:\SCIENCES U\GroupProject\java-api\src\main\java\blockchain\client\CAClientWrapper.java
-B:\SCIENCES U\GroupProject\java-api\src\main\java\blockchain\query\QueryWrapper.java
-B:\SCIENCES U\GroupProject\java-api\src\main\java\restService\WelcomeController.java
-B:\SCIENCES U\GroupProject\java-api\src\main\java\Application\App.java
-B:\SCIENCES U\GroupProject\java-api\src\main\java\blockchain\configuration\Config.java
-B:\SCIENCES U\GroupProject\java-api\src\main\java\blockchain\query\TransactionWrapper.java
-B:\SCIENCES U\GroupProject\java-api\src\main\java\blockchain\user\UserContext.java
-B:\SCIENCES U\GroupProject\java-api\src\main\java\blockchain\utility\Util.java

target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/createdFiles.lst

@@ -1,11 +0,0 @@
-blockchain\query\QueryTest.class
-blockchain\queryWrapper\QueryWrapperTest.class
-blockchain\query\QueryChannelTest.class
-blockchain\queryWrapper\TransactionWrapperTest.class
-blockchain\utility\UtilTest.class
-blockchain\client\TestEnrollAdmin.class
-blockchain\query\ChaincodeTransactionTest.class
-blockchain\utility\ReadUserTest.class
-blockchain\client\TestRegisterEnrollUser.class
-blockchain\query\CreateChaincodeUserTest.class
-blockchain\user\UserContextTest.class

target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/inputFiles.lst

@@ -1,11 +0,0 @@
-B:\SCIENCES U\GroupProject\java-api\src\test\java\blockchain\client\TestRegisterEnrollUser.java
-B:\SCIENCES U\GroupProject\java-api\src\test\java\blockchain\query\QueryTest.java
-B:\SCIENCES U\GroupProject\java-api\src\test\java\blockchain\client\TestEnrollAdmin.java
-B:\SCIENCES U\GroupProject\java-api\src\test\java\blockchain\query\CreateChaincodeUserTest.java
-B:\SCIENCES U\GroupProject\java-api\src\test\java\blockchain\queryWrapper\TransactionWrapperTest.java
-B:\SCIENCES U\GroupProject\java-api\src\test\java\blockchain\utility\UtilTest.java
-B:\SCIENCES U\GroupProject\java-api\src\test\java\blockchain\query\QueryChannelTest.java
-B:\SCIENCES U\GroupProject\java-api\src\test\java\blockchain\query\ChaincodeTransactionTest.java
-B:\SCIENCES U\GroupProject\java-api\src\test\java\blockchain\utility\ReadUserTest.java
-B:\SCIENCES U\GroupProject\java-api\src\test\java\blockchain\queryWrapper\QueryWrapperTest.java
-B:\SCIENCES U\GroupProject\java-api\src\test\java\blockchain\user\UserContextTest.java