Merge pull request #110 from rpmoore/folder_filter

Updating to latest sdk.  Added the folder filter to the getbulk.

Author: Denver

build.gradle

@@ -15,7 +15,7 @@
 
 
 allprojects {
-    version = '3.0.2-SNAPSHOT'
+    version = '3.0.2'
     group = 'com.spectralogic'
 }
 
@@ -37,7 +37,7 @@ subprojects {
         compile 'ch.qos.logback:logback-core:1.1.6'
         compile 'ch.qos.logback:logback-classic:1.1.6'
         compile 'com.google.guava:guava:19.0'
-        compile 'com.spectralogic.ds3:ds3-sdk:3.0.4'
+        compile 'com.spectralogic.ds3:ds3-sdk:3.0.6'
         testCompile ('org.mockito:mockito-core:1.10.19') {
             exclude group: 'org.hamcrest'
         }

ds3_java_cli/src/main/java/com/spectralogic/ds3cli/command/GetBulk.java

@@ -15,14 +15,14 @@
 
 package com.spectralogic.ds3cli.command;
 
-import com.google.common.base.Function;
 import com.google.common.collect.Iterables;
 import com.spectralogic.ds3cli.Arguments;
 import com.spectralogic.ds3cli.exceptions.CommandException;
 import com.spectralogic.ds3cli.models.DefaultResult;
 import com.spectralogic.ds3cli.util.*;
 import com.spectralogic.ds3client.helpers.Ds3ClientHelpers;
 import com.spectralogic.ds3client.helpers.FileObjectGetter;
+import com.spectralogic.ds3client.helpers.FolderNameFilter;
 import com.spectralogic.ds3client.helpers.MetadataReceivedListener;
 import com.spectralogic.ds3client.helpers.options.ReadJobOptions;
 import com.spectralogic.ds3client.models.Contents;
@@ -154,14 +154,7 @@ private String restoreSome(final Ds3ClientHelpers.ObjectChannelBuilder getter) t
             filteredContents = null;
         }
 
-        final Iterable<Ds3Object> objects = Iterables.transform(
-                filteredContents == null ? contents : filteredContents,
-                new Function<Contents, Ds3Object>() {
-                    @Override
-                    public Ds3Object apply(final Contents input) {
-                        return new Ds3Object(input.getKey(), input.getSize());
-                    }
-                });
+        final Iterable<Ds3Object> objects = helper.toDs3Iterable(filteredContents, FolderNameFilter.filter());
 
         final Ds3ClientHelpers.Job job = helper.startReadJob(this.bucketName, objects,
                 ReadJobOptions.create()

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
-#Fri Jul 15 16:36:28 MDT 2016
+#Fri Jul 22 18:05:58 MDT 2016
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.14-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-2.14-all.zip