Merge branch 'master' into JSDK_192

Author: RachelTucker

ds3-sdk/src/main/java/com/spectralogic/ds3client/helpers/RangeHelper.java

@@ -22,9 +22,6 @@
 import com.spectralogic.ds3client.models.common.Range;
 import com.spectralogic.ds3client.utils.Guard;
 
-import java.util.ArrayList;
-import java.util.List;
-
 final class RangeHelper {
     private RangeHelper() {}
 
@@ -40,7 +37,7 @@ static ImmutableCollection<Range> replaceRange(final ImmutableCollection<Range>
             return ImmutableList.of(Range.byLength(numBytesTransferred, intendedNumBytesToTransfer - numBytesTransferred));
         }
 
-        final List<Range> newRanges = new ArrayList<>();
+        final ImmutableList.Builder<Range> newRangesbuilder = ImmutableList.builder();
 
         final UnmodifiableIterator<Range> existingRangesIterator = existingRanges.iterator();
 
@@ -52,22 +49,22 @@ static ImmutableCollection<Range> replaceRange(final ImmutableCollection<Range>
 
             if (numBytesTransferred < currentAccumulatedBytesInRanges) {
                 final Range firstNewRange = Range.byPosition(existingRange.getStart() - previousAccumulatedBytesInRanges  + numBytesTransferred, existingRange.getEnd());
-                newRanges.add(firstNewRange);
+                newRangesbuilder.add(firstNewRange);
 
-                addRemainingRanges(existingRangesIterator, newRanges);
+                addRemainingRanges(existingRangesIterator, newRangesbuilder);
                 break;
             }
 
             previousAccumulatedBytesInRanges += existingRange.getLength();
             currentAccumulatedBytesInRanges += existingRange.getLength();
         }
 
-        return ImmutableList.copyOf(newRanges);
+        return newRangesbuilder.build();
     }
 
-    static void addRemainingRanges(final UnmodifiableIterator<Range> existingRangesIterator, final List<Range> newRanges) {
+    static void addRemainingRanges(final UnmodifiableIterator<Range> existingRangesIterator, final ImmutableList.Builder<Range> newRangesbuilder) {
         while (existingRangesIterator.hasNext()) {
-            newRanges.add(existingRangesIterator.next());
+            newRangesbuilder.add(existingRangesIterator.next());
         }
     }