[FABCJ-259] Pagination Fix

Minor fix to pagination - arguments wrong

Signed-off-by: Matthew B White <whitemat@uk.ibm.com>

Author: mbwhite

examples/fabric-chaincode-example-sacc/src/main/java/org/hyperledger/fabric/example/SimpleAsset.java

@@ -21,7 +21,6 @@ dependencies {
     }
  }
 
-
 task getLatestDockerImages{
     doLast {
         exec {
@@ -33,8 +32,5 @@ task getLatestDockerImages{
 
 build.dependsOn project(':fabric-chaincode-docker').buildImage
 
-
-// compileJava.dependsOn project(':fabric-chaincode-docker').buildImage
-// compileJava.dependsOn project(':fabric-chaincode-example-sacc-jars').jar
 test.dependsOn project.getLatestDockerImages
 

fabric-chaincode-integration-test/build.gradle

@@ -7,8 +7,9 @@ echo "======== PULL DOCKER IMAGES ========"
 # Pull and Tag the fabric and fabric-ca images from Nexus
 ##########################################################
 echo "Fetching images from Nexus"
-NEXUS_URL=nexus3.hyperledger.org:10001
-ORG_NAME="hyperledger/fabric"
+# NEXUS_URL=nexus3.hyperledger.org:10001
+NEXUS_URL=hyperledger-fabric.jfrog.io
+ORG_NAME="fabric"
 
 VERSION=2.0.0
 ARCH="amd64"

fabric-chaincode-integration-test/getDockerImages.sh

@@ -24,6 +24,6 @@ shadowJar {
     classifier = null
 
     manifest {
-        attributes 'Main-Class': 'org.hyperledger.fabric.example.SimpleAsset'
+        attributes 'Main-Class': 'org.hyperledger.fabric.contract.ContractRouter'
     }
 }

examples/fabric-chaincode-example-sacc/build.gradle renamed to fabric-chaincode-integration-test/src/contracts/fabric-chaincode-example-sacc/build.gradle

@@ -0,0 +1,99 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package org.example;
+
+import org.hyperledger.fabric.contract.Context;
+import org.hyperledger.fabric.contract.ContractInterface;
+import org.hyperledger.fabric.contract.annotation.*;
+
+
+import org.hyperledger.fabric.shim.ledger.*;
+import org.hyperledger.fabric.shim.*;
+import java.util.*;
+import static java.nio.charset.StandardCharsets.UTF_8;
+
+@Contract(name = "AllAPI",
+    info = @Info(title = "AllAPI contract",
+                description = "Contract but using all the APIs",
+                version = "0.0.1",
+                license =
+                        @License(name = "SPDX-License-Identifier: Apache-2.0",
+                                url = ""),
+                                contact =  @Contact(email = "fred@example.com",
+                                                name = "fred",
+                                                url = "http://fred.example.com")))
+@Default
+public class AllAPI implements ContractInterface {
+    public AllAPI() {
+
+    }
+
+    @Transaction()
+    public void putBulkStates(Context ctx){
+        for (int x=100; x<200; x++){
+            String key = "key"+x;
+            String value = "value:"+x;
+
+            putState(ctx,key,value);
+        }
+    }
+
+    @Transaction()
+    public void putState(Context ctx, String key, String payload){
+        ChaincodeStub stub = ctx.getStub();
+        stub.putState(key,payload.getBytes(UTF_8));
+    }
+
+    @Transaction()
+    public void putStateComposite(Context ctx, String key[], String payload){
+        String composite = new CompositeKey("composite",key).toString();
+        this.putState(ctx,composite,payload);
+    }
+
+    @Transaction()
+    public void getState(Context ctx, String key, String payload){
+        ChaincodeStub stub = ctx.getStub();
+        String result = stub.getStringState(key);
+        if (!result.equals(payload)){
+            String msg = "GetState::["+key+"] Expected "+payload+" got "+result;
+            System.out.println(msg);
+            throw new RuntimeException(msg);
+        }
+    }
+
+    @Transaction()
+    public int getByRange(Context ctx, String start, String end){
+        ChaincodeStub stub = ctx.getStub();
+        System.out.println("getByRange>>");
+        QueryResultsIterator<KeyValue> qri = stub.getStateByRange(start,end);
+        int count=0;
+        for (KeyValue kv : qri){
+            kv.getKey();
+            kv.getStringValue();
+            count++;
+            System.out.println("["+kv.getKey()+"] "+kv.getStringValue());
+        }
+        System.out.println("getByRange<<");
+        return count;
+    }
+
+    @Transaction()
+    public String getByRangePaged(Context ctx, String start, String end, int pageSize, String bookmark){
+        ChaincodeStub stub = ctx.getStub();
+        System.out.println("getByRangePaged>>");
+        QueryResultsIteratorWithMetadata<KeyValue> qri = stub.getStateByRangeWithPagination(start,end,pageSize,bookmark);
+        for (KeyValue kv : qri){
+            kv.getKey();
+            kv.getStringValue();
+            System.out.println("["+kv.getKey()+"] "+kv.getStringValue());
+        }
+        String newbookmark = qri.getMetadata().getBookmark();
+        int records = qri.getMetadata().getFetchedRecordsCount();
+        System.out.println(newbookmark+" @ "+records);
+
+        System.out.println("getByRangePaged<<");
+        return newbookmark;
+    }
+
+}