Table implementation in java shim with example

This will fix issue FAB-215 https://jira.hyperledger.org/browse/FAB-215 Change-Id: I2599ba09f81ae44f9e6f28b53917300d2922a897 Signed-off-by: Satheesh Kathamuthu <satheesh.ceg@gmail.com>
hyperledger · Sep 8, 2016 · 4b13232 · 4b13232
1 parent 0c3fb65
commit 4b13232
Show file tree

Hide file tree

Showing 9 changed files with 784 additions and 592 deletions.
diff --git a/Makefile b/Makefile
@@ -209,16 +209,16 @@ build/image/ccenv/.dummy: build/image/src/.dummy build/image/ccenv/bin/protoc-ge
 	@touch $@
 
 # Special override for java-image
+# Following items are packed and sent to docker context while building image
+# 1. Java shim layer source code
+# 2. Proto files used to generate java classes
+# 3. Gradle settings file
 build/image/javaenv/.dummy: Makefile $(JAVASHIM_DEPS)
 	@echo "Building docker javaenv-image"
 	@mkdir -p $(@D)
 	@cat images/javaenv/Dockerfile.in > $(@D)/Dockerfile
-	# Following items are packed and sent to docker context while building image
-	# 1. Java shim layer source code
-	# 2. Proto files used to generate java classes
-	# 3. Gradle settings file
 	@git ls-files core/chaincode/shim/java | tar -jcT - > $(@D)/javashimsrc.tar.bz2
-	@git ls-files protos settings.gradle  | tar -jcT - > $(@D)/protos.tar.bz2
+	@git ls-files protos core/chaincode/shim/table.proto settings.gradle  | tar -jcT - > $(@D)/protos.tar.bz2
 	docker build -t $(PROJECT_NAME)-javaenv $(@D)
 	docker tag $(PROJECT_NAME)-javaenv $(PROJECT_NAME)-javaenv:$(DOCKER_TAG)
 	@touch $@

diff --git a/bddtests/java_shim.feature b/bddtests/java_shim.feature
@@ -25,44 +25,44 @@
 
 
 #@chaincodeImagesUpToDate
-Feature: SimpleSample Java example
+Feature: Java chaincode example
 
   Scenario: java SimpleSample chaincode example single peer
       Given we compose "docker-compose-1.yml"
       When requesting "/chain" from "vp0"
       Then I should get a JSON response with "height" = "1"
-      	    When I deploy lang chaincode "examples/chaincode/java/SimpleSample" of "JAVA" with ctor "init" to "vp0"
-      		     | arg1 |  arg2 | arg3 | arg4 |
-      		     |  a   |  100  |  b   |  200 |
-      	    Then I should have received a chaincode name
-      	    Then I wait up to "300" seconds for transaction to be committed to all peers
+            When I deploy lang chaincode "examples/chaincode/java/SimpleSample" of "JAVA" with ctor "init" to "vp0"
+               | arg1 |  arg2 | arg3 | arg4 |
+               |  a   |  100  |  b   |  200 |
+            Then I should have received a chaincode name
+            Then I wait up to "300" seconds for transaction to be committed to all peers
 
-      	    When requesting "/chain" from "vp0"
-      	    Then I should get a JSON response with "height" = "2"
+            When requesting "/chain" from "vp0"
+            Then I should get a JSON response with "height" = "2"
 
               When I query chaincode "SimpleSample" function name "query" on "vp0":
                   |arg1|
                   |  a |
-      	    Then I should get a JSON response with "result.message" = "{'Name':'a','Amount':'100'}"
+            Then I should get a JSON response with "result.message" = "{'Name':'a','Amount':'100'}"
 
             When I invoke chaincode "SimpleSample" function name "transfer" on "vp0"
-      			|arg1|arg2|arg3|
-      			| a  | b  | 10 |
-      	    Then I should have received a transactionID
-      	    Then I wait up to "25" seconds for transaction to be committed to all peers
+            |arg1|arg2|arg3|
+            | a  | b  | 10 |
+            Then I should have received a transactionID
+            Then I wait up to "25" seconds for transaction to be committed to all peers
 
-      	    When requesting "/chain" from "vp0"
-      	    Then I should get a JSON response with "height" = "3"
+            When requesting "/chain" from "vp0"
+            Then I should get a JSON response with "height" = "3"
 
               When I query chaincode "SimpleSample" function name "query" on "vp0":
                   |arg1|
                   |  a |
-      	    Then I should get a JSON response with "result.message" = "{'Name':'a','Amount':'90'}"
+            Then I should get a JSON response with "result.message" = "{'Name':'a','Amount':'90'}"
 
               When I query chaincode "SimpleSample" function name "query" on "vp0":
                   |arg1|
                   |  b |
-      	    Then I should get a JSON response with "result.message" = "{'Name':'b','Amount':'210'}"
+            Then I should get a JSON response with "result.message" = "{'Name':'b','Amount':'210'}"
 
 Scenario: java RangeExample chaincode single peer
       Given we compose "docker-compose-1.yml"
@@ -116,4 +116,60 @@ Scenario: java RangeExample chaincode single peer
             When I query chaincode "RangeExample" function name "keys" on "vp0":
             ||
             ||
-            Then I should get a JSON response with "result.message" = "[a]"
+            Then I should get a JSON response with "result.message" = "[a]"
+
+  Scenario: Java TableExample chaincode single peer
+      Given we compose "docker-compose-1.yml"
+      When requesting "/chain" from "vp0"
+      Then I should get a JSON response with "height" = "1"
+            When I deploy lang chaincode "examples/chaincode/java/TableExample" of "JAVA" with ctor "init" to "vp0"
+                       ||
+                       ||
+                Then I should have received a chaincode name
+                Then I wait up to "30" seconds for transaction to be committed to all peers
+
+            When requesting "/chain" from "vp0"
+                Then I should get a JSON response with "height" = "2"
+            When I invoke chaincode "TableExample" function name "insert" on "vp0"
+                        |arg1|arg2|
+                        | 0  | Alice  |
+                Then I should have received a transactionID
+                Then I wait up to "25" seconds for transaction to be committed to all peers
+            When I invoke chaincode "TableExample" function name "insert" on "vp0"
+                        |arg1|arg2|
+                        | 1  | Bob  |
+                Then I should have received a transactionID
+                Then I wait up to "25" seconds for transaction to be committed to all peers
+            When I invoke chaincode "TableExample" function name "insert" on "vp0"
+                        |arg1|arg2|
+                        | 2  | Charlie  |
+                Then I should have received a transactionID
+                Then I wait up to "25" seconds for transaction to be committed to all peers
+
+              When I query chaincode "TableExample" function name "get" on "vp0":
+                  |arg1|
+                  |  0 |
+                Then I should get a JSON response with "result.message" = "Alice"
+
+              When I query chaincode "TableExample" function name "get" on "vp0":
+                  |arg1|
+                  |  2 |
+                Then I should get a JSON response with "result.message" = "Charlie"
+              When I invoke chaincode "TableExample" function name "update" on "vp0"
+                        |arg1|arg2|
+                        | 2  | Chaitra  |
+                Then I should have received a transactionID
+                Then I wait up to "25" seconds for transaction to be committed to all peers
+             When I query chaincode "TableExample" function name "get" on "vp0":
+                  |arg1|
+                  |  2 |
+                Then I should get a JSON response with "result.message" = "Chaitra"
+              When I invoke chaincode "TableExample" function name "delete" on "vp0"
+                  |arg1|
+                  |  2 |
+                Then I should have received a transactionID
+                Then I wait up to "25" seconds for transaction to be committed to all peers
+             When I query chaincode "TableExample" function name "get" on "vp0":
+                  |arg1|
+                  |  2 |
+                Then I should get a JSON response with "result.message" = "No record found !"
diff --git a/core/chaincode/shim/java/build.gradle b/core/chaincode/shim/java/build.gradle
@@ -83,12 +83,21 @@ task copyToLib(type: Copy) {
 
 
 task copyProtos(type:Copy){
- into "${projectDir}/src/main/proto"
- from "${rootDir}/protos"
- include '**/chaincodeevent.proto'
- include '**/chaincode.proto'
+
+ from ("${rootDir}/protos"){
+	 include '**/chaincodeevent.proto'
+	 include '**/chaincode.proto'
+ }
+	from ("../") {
+		duplicatesStrategy.EXCLUDE
+		include '**/table.proto'
+		exclude 'java'
+	}
+	into "${projectDir}/src/main/proto"
+
 }
 
+
 tasks['build'].mustRunAfter tasks['copyProtos']
 build.dependsOn(copyProtos)
 build.finalizedBy(copyToLib)