SpectraLogic · shabtaisharon · Oct 16, 2020 · Oct 16, 2020 · Oct 16, 2020 · Oct 16, 2020
diff --git a/build.gradle b/build.gradle
@@ -16,7 +16,7 @@
 buildscript {
 
     buildscript {
-        ext.kotlin_version = '1.3.72'
+        ext.kotlin_version = '1.4.10'
     }
 
     repositories {

diff --git a/ds3_java_cli/src/main/java/com/spectralogic/ds3cli/command/GetBucket.java b/ds3_java_cli/src/main/java/com/spectralogic/ds3cli/command/GetBucket.java
@@ -31,7 +31,7 @@
 import com.spectralogic.ds3client.models.Contents;
 import com.spectralogic.ds3client.networking.FailedRequestException;
 import org.apache.commons.cli.Option;
-
+import java.util.ArrayList;
 import java.util.List;
 
 import static com.spectralogic.ds3cli.ArgumentFactory.BUCKET;
@@ -42,6 +42,7 @@ public class GetBucket extends CliCommand<GetBucketResult> {
 
     private final static ImmutableList<Option> requiredArgs = ImmutableList.of(BUCKET);
     private final static ImmutableList<Option> optionalArgs = ImmutableList.of(PREFIX, SHOW_VERSIONS);
+    private final static int maxKeys = 1000;
 
     private String bucket;
     private String prefix;
@@ -60,22 +61,42 @@ public CliCommand init(final Arguments args) throws Exception {
     @Override
     public GetBucketResult call() throws Exception {
         try {
+            final List<Contents> contents = new ArrayList<>();
             // GetBucketDetail to get both name and id
-            final GetBucketRequest getBucketRequest = new GetBucketRequest(bucket);
-            getBucketRequest.withVersions(showVersion);
-            getBucketRequest.withPrefix(prefix);
-            final GetBucketSpectraS3Request getBucketSpectraS3Request = new GetBucketSpectraS3Request(bucket);
-            final GetBucketSpectraS3Response response = getClient().getBucketSpectraS3(getBucketSpectraS3Request);
-            final Bucket bucketDetails = response.getBucketResult();
-            final GetBucketResponse bucket = getClient().getBucket(getBucketRequest);
+            GetBucketRequest getBucketRequest = new GetBucketRequest(bucket)
+                    .withVersions(showVersion)
+                    .withPrefix(prefix)
+                    .withMaxKeys(maxKeys);
+
+            GetBucketResponse bucketResponse = getClient().getBucket(getBucketRequest);
 
-            final List<Contents> contents;
             if (showVersion) {
-                contents = bucket.getListBucketResult().getVersionedObjects();
+                contents.addAll(bucketResponse.getListBucketResult().getVersionedObjects());
             } else {
-                contents = bucket.getListBucketResult().getObjects();
+                contents.addAll(bucketResponse.getListBucketResult().getObjects());
+            }
+
+            String marker = bucketResponse.getListBucketResult().getNextMarker();
+            while (marker != null) {
+                getBucketRequest = new GetBucketRequest(this.bucket)
+                        .withVersions(showVersion)
+                        .withPrefix(prefix)
+                        .withMaxKeys(maxKeys)
+                        .withMarker(marker);
+
+                bucketResponse = getClient().getBucket(getBucketRequest);
+
+                if (showVersion) {
+                    contents.addAll(bucketResponse.getListBucketResult().getVersionedObjects());
+                } else {
+                    contents.addAll(bucketResponse.getListBucketResult().getObjects());
+                }
+                marker = bucketResponse.getListBucketResult().getNextMarker();
             }
 
+            final GetBucketSpectraS3Request getBucketSpectraS3Request = new GetBucketSpectraS3Request(this.bucket);
+            final GetBucketSpectraS3Response response = getClient().getBucketSpectraS3(getBucketSpectraS3Request);
+            final Bucket bucketDetails = response.getBucketResult();
             return new GetBucketResult(bucketDetails, contents);
         } catch (final FailedRequestException e) {
             if (e.getStatusCode() == 404) {

diff --git a/ds3_java_cli/src/main/java/com/spectralogic/ds3cli/command/GetObjectsOnTape.java b/ds3_java_cli/src/main/java/com/spectralogic/ds3cli/command/GetObjectsOnTape.java
@@ -25,17 +25,22 @@
 import com.spectralogic.ds3cli.views.json.DataView;
 import com.spectralogic.ds3client.commands.spectrads3.GetBlobsOnTapeSpectraS3Request;
 import com.spectralogic.ds3client.commands.spectrads3.GetBlobsOnTapeSpectraS3Response;
+import com.spectralogic.ds3client.models.BulkObject;
 import com.spectralogic.ds3client.networking.FailedRequestException;
 import org.apache.commons.cli.Option;
 
 import java.io.IOException;
+import java.util.ArrayList;
+import java.util.List;
 
 import static com.spectralogic.ds3cli.ArgumentFactory.ID;
+import static com.spectralogic.ds3cli.ArgumentFactory.PREFIX;
 
 
 public class GetObjectsOnTape extends CliCommand<GetObjectsOnTapeResult> {
 
     private final static ImmutableList<Option> requiredArgs = ImmutableList.of(ID);
+    private final static int maxKeys = 1000;
 
     // Barcode or tape ID
     private String tapeId;
@@ -48,20 +53,31 @@ public CliCommand init(final Arguments args) throws Exception {
         processCommandOptions(requiredArgs, EMPTY_LIST, args);
 
         this.tapeId = args.getId();
-        return  this;
+        return this;
     }
 
     @Override
     public GetObjectsOnTapeResult call() throws CommandException, IOException {
+        final List<BulkObject> objects = new ArrayList<>();
+        int offset = 0;
         try {
-
-            final GetBlobsOnTapeSpectraS3Response response
-                        = getClient().getBlobsOnTapeSpectraS3(new GetBlobsOnTapeSpectraS3Request(this.tapeId));
-
-            return new GetObjectsOnTapeResult(this.tapeId, response.getBulkObjectListResult().getObjects());
+            while (true) {
+                final GetBlobsOnTapeSpectraS3Request request = new GetBlobsOnTapeSpectraS3Request(this.tapeId)
+                        .withPageOffset(offset)
+                        .withPageLength(maxKeys);
+                final GetBlobsOnTapeSpectraS3Response response = getClient().getBlobsOnTapeSpectraS3(request);
+                final List<BulkObject> objectList = response.getBulkObjectListResult().getObjects();
+                if (objectList.isEmpty()) {
+                    break;
+                } else {
+                    objects.addAll(response.getBulkObjectListResult().getObjects());
+                }
+                offset = objects.size();
+            }
+            return new GetObjectsOnTapeResult(this.tapeId, objects);
         } catch (final FailedRequestException e) {
             if (e.getStatusCode() == 404) {
-                throw new CommandException("Unknown tape '" + this.tapeId +"'", e);
+                throw new CommandException("Unknown tape '" + this.tapeId + "'", e);
             }
             throw e;
         }

diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
diff --git a/gradlew b/gradlew
@@ -1,5 +1,21 @@
 #!/usr/bin/env sh
 
+#
+# Copyright 2015 the original author or authors.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      https://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
 ##############################################################################
 ##
 ##  Gradle start up script for UN*X
@@ -28,7 +44,7 @@ APP_NAME="Gradle"
 APP_BASE_NAME=`basename "$0"`
 
 # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS=""
+DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD="maximum"
@@ -109,8 +125,8 @@ if $darwin; then
     GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
 fi
 
-# For Cygwin, switch paths to Windows format before running java
-if $cygwin ; then
+# For Cygwin or MSYS, switch paths to Windows format before running java
+if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
     APP_HOME=`cygpath --path --mixed "$APP_HOME"`
     CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
     JAVACMD=`cygpath --unix "$JAVACMD"`
@@ -138,19 +154,19 @@ if $cygwin ; then
         else
             eval `echo args$i`="\"$arg\""
         fi
-        i=$((i+1))
+        i=`expr $i + 1`
     done
     case $i in
-        (0) set -- ;;
-        (1) set -- "$args0" ;;
-        (2) set -- "$args0" "$args1" ;;
-        (3) set -- "$args0" "$args1" "$args2" ;;
-        (4) set -- "$args0" "$args1" "$args2" "$args3" ;;
-        (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
-        (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
-        (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
-        (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
-        (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
+        0) set -- ;;
+        1) set -- "$args0" ;;
+        2) set -- "$args0" "$args1" ;;
+        3) set -- "$args0" "$args1" "$args2" ;;
+        4) set -- "$args0" "$args1" "$args2" "$args3" ;;
+        5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
+        6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
+        7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
+        8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
+        9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
     esac
 fi
 
@@ -159,14 +175,9 @@ save () {
     for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
     echo " "
 }
-APP_ARGS=$(save "$@")
+APP_ARGS=`save "$@"`
 
 # Collect all arguments for the java command, following the shell quoting and substitution rules
 eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
 
-# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong
-if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then
-  cd "$(dirname "$0")"
-fi
-
 exec "$JAVACMD" "$@"
diff --git a/gradlew.bat b/gradlew.bat
@@ -1,3 +1,19 @@
+@rem
+@rem Copyright 2015 the original author or authors.
+@rem
+@rem Licensed under the Apache License, Version 2.0 (the "License");
+@rem you may not use this file except in compliance with the License.
+@rem You may obtain a copy of the License at
+@rem
+@rem      https://www.apache.org/licenses/LICENSE-2.0
+@rem
+@rem Unless required by applicable law or agreed to in writing, software
+@rem distributed under the License is distributed on an "AS IS" BASIS,
+@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+@rem See the License for the specific language governing permissions and
+@rem limitations under the License.
+@rem
+
 @if "%DEBUG%" == "" @echo off
 @rem ##########################################################################
 @rem
@@ -14,7 +30,7 @@ set APP_BASE_NAME=%~n0
 set APP_HOME=%DIRNAME%
 
 @rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-set DEFAULT_JVM_OPTS=
+set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
 
 @rem Find java.exe
 if defined JAVA_HOME goto findJavaFromJavaHome