Fix: continuation-token support in GetBucket API

Signed-off-by: RichardLea <chigix@zoho.com>

Author: chigix

src/main/java/com/chigix/resserver/domain/model/resource/ResourceRepository.java

@@ -30,6 +30,17 @@ public interface ResourceRepository {
      */
     Iterator<Resource> fetchResources(Specification<Resource> specification, int limit);
 
+    /**
+     * Marks a resource in a fetched list relative to the iterator given as a
+     * continuation point and returns the continuation token for next fetching
+     * which could start from this target resource.
+     *
+     * @param fetched
+     * @param continuePos
+     * @return
+     */
+    String markContinuationInFetchList(Iterator<Resource> fetched, Resource continuePos);
+
     void removeResource(Resource resource) throws NoSuchKey, NoSuchBucket;
 
     /**

src/main/java/com/chigix/resserver/endpoint/GetBucket/ResourceListHandler.java

@@ -125,7 +125,7 @@ public int read() throws IOException {
                                 .and(resourceSpecifications.keyStartWith(listCtx.prefix));
                         if (listCtx.continuationToken != null) {
                             resourceSpecs.and(resourceSpecifications
-                                    .continuateFrom(listCtx.nextContinuationToken));
+                                    .continuateFrom(listCtx.continuationToken));
                         }
                         final Iterator<Resource> resources;
                         resources = application.getEntityManager()
@@ -135,10 +135,13 @@ public int read() throws IOException {
                                         listCtx.maxKeys + 1);
                         setStream(new IteratorInputStream<Resource>(resources) {
                             @Override
-                            protected InputStream inputStreamProvider(Resource item) throws NoSuchElementException {
+                            protected InputStream inputStreamProvider(Resource item)
+                                    throws NoSuchElementException {
                                 if (listCtx.keyCountTotal >= listCtx.maxKeys) {
                                     listCtx.isTruncated = true;
-                                    listCtx.nextContinuationToken = item.getVersionId();
+                                    listCtx.nextContinuationToken = application
+                                            .getEntityManager().getResourceRepository()
+                                            .markContinuationInFetchList(resources, item);
                                     return new ClosedInputStream();
                                 }
                                 byte_charging.setStream(new ByteArrayOutputStream());

src/main/java/com/chigix/resserver/mybatis/ResourceRepositoryImpl.java

@@ -289,4 +289,12 @@ public void putChunk(ChunkedResource r, Chunk c, int chunkIndex) {
         chunkMapper.insert(record);
     }
 
+    @Override
+    public String markContinuationInFetchList(Iterator<Resource> fetched, Resource continuePos) {
+        if (continuePos instanceof ResourceExtension) {
+            return ((ResourceExtension) continuePos).getKeyHash();
+        }
+        throw new RuntimeException("Unexpected!! Unpersisted Subresource Domain Object was passed.");
+    }
+
 }