Skip to content

Commit e26b229

Browse files
author
Denver
authored
Merge pull request #110 from rpmoore/folder_filter
Updating to latest sdk. Added the folder filter to the getbulk.
2 parents 1a8aae0 + c1a8de1 commit e26b229

File tree

3 files changed

+6
-13
lines changed

3 files changed

+6
-13
lines changed

build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515

1616

1717
allprojects {
18-
version = '3.0.2-SNAPSHOT'
18+
version = '3.0.2'
1919
group = 'com.spectralogic'
2020
}
2121

@@ -37,7 +37,7 @@ subprojects {
3737
compile 'ch.qos.logback:logback-core:1.1.6'
3838
compile 'ch.qos.logback:logback-classic:1.1.6'
3939
compile 'com.google.guava:guava:19.0'
40-
compile 'com.spectralogic.ds3:ds3-sdk:3.0.4'
40+
compile 'com.spectralogic.ds3:ds3-sdk:3.0.6'
4141
testCompile ('org.mockito:mockito-core:1.10.19') {
4242
exclude group: 'org.hamcrest'
4343
}

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

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -15,14 +15,14 @@
1515

1616
package com.spectralogic.ds3cli.command;
1717

18-
import com.google.common.base.Function;
1918
import com.google.common.collect.Iterables;
2019
import com.spectralogic.ds3cli.Arguments;
2120
import com.spectralogic.ds3cli.exceptions.CommandException;
2221
import com.spectralogic.ds3cli.models.DefaultResult;
2322
import com.spectralogic.ds3cli.util.*;
2423
import com.spectralogic.ds3client.helpers.Ds3ClientHelpers;
2524
import com.spectralogic.ds3client.helpers.FileObjectGetter;
25+
import com.spectralogic.ds3client.helpers.FolderNameFilter;
2626
import com.spectralogic.ds3client.helpers.MetadataReceivedListener;
2727
import com.spectralogic.ds3client.helpers.options.ReadJobOptions;
2828
import com.spectralogic.ds3client.models.Contents;
@@ -154,14 +154,7 @@ private String restoreSome(final Ds3ClientHelpers.ObjectChannelBuilder getter) t
154154
filteredContents = null;
155155
}
156156

157-
final Iterable<Ds3Object> objects = Iterables.transform(
158-
filteredContents == null ? contents : filteredContents,
159-
new Function<Contents, Ds3Object>() {
160-
@Override
161-
public Ds3Object apply(final Contents input) {
162-
return new Ds3Object(input.getKey(), input.getSize());
163-
}
164-
});
157+
final Iterable<Ds3Object> objects = helper.toDs3Iterable(filteredContents, FolderNameFilter.filter());
165158

166159
final Ds3ClientHelpers.Job job = helper.startReadJob(this.bucketName, objects,
167160
ReadJobOptions.create()
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
#Fri Jul 15 16:36:28 MDT 2016
1+
#Fri Jul 22 18:05:58 MDT 2016
22
distributionBase=GRADLE_USER_HOME
33
distributionPath=wrapper/dists
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists
6-
distributionUrl=https\://services.gradle.org/distributions/gradle-2.14-bin.zip
6+
distributionUrl=https\://services.gradle.org/distributions/gradle-2.14-all.zip

0 commit comments

Comments
 (0)