Skip to content

Commit 63aee44

Browse files
GraciesPadreGraciesPadre
authored
Merge pull request #474 from RachelTucker/update-to-3-5-api
Update to 3 5 api
2 parents d0e0eec + 386f8cc commit 63aee44

File tree

15 files changed

+133
-28
lines changed

15 files changed

+133
-28
lines changed

‎ds3-sdk-integration/src/test/java/com/spectralogic/ds3client/integration/Iterators_Test.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
import com.spectralogic.ds3client.integration.test.helpers.TempStorageUtil;
2525
import com.spectralogic.ds3client.models.ChecksumType;
2626
import com.spectralogic.ds3client.models.Contents;
27-
import com.spectralogic.ds3client.models.FileSystemKey;
27+
import com.spectralogic.ds3client.helpers.pagination.FileSystemKey;
2828
import com.spectralogic.ds3client.networking.FailedRequestException;
2929
import com.spectralogic.ds3client.utils.collections.LazyIterable;
3030
import org.junit.AfterClass;

‎ds3-sdk/src/main/java/com/spectralogic/ds3client/commands/spectrads3/DeleteDataPersistenceRuleSpectraS3Request.java‎

Lines changed: 13 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -18,19 +18,26 @@
1818

1919
import com.spectralogic.ds3client.networking.HttpVerb;
2020
import com.spectralogic.ds3client.commands.interfaces.AbstractRequest;
21+
import java.util.UUID;
2122
import com.google.common.net.UrlEscapers;
2223

2324
public class DeleteDataPersistenceRuleSpectraS3Request extends AbstractRequest {
2425

2526
// Variables
2627

27-
private final String dataPersistenceRule;
28+
private final String dataPersistenceRuleId;
2829

2930
// Constructor
3031

3132

32-
public DeleteDataPersistenceRuleSpectraS3Request(final String dataPersistenceRule) {
33-
this.dataPersistenceRule = dataPersistenceRule;
33+
public DeleteDataPersistenceRuleSpectraS3Request(final UUID dataPersistenceRuleId) {
34+
this.dataPersistenceRuleId = dataPersistenceRuleId.toString();
35+
36+
}
37+
38+
39+
public DeleteDataPersistenceRuleSpectraS3Request(final String dataPersistenceRuleId) {
40+
this.dataPersistenceRuleId = dataPersistenceRuleId;
3441

3542
}
3643

@@ -42,11 +49,11 @@ public HttpVerb getVerb() {
4249

4350
@Override
4451
public String getPath() {
45-
return "/_rest_/data_persistence_rule/" + dataPersistenceRule;
52+
return "/_rest_/data_persistence_rule/" + dataPersistenceRuleId;
4653
}
4754

48-
public String getDataPersistenceRule() {
49-
return this.dataPersistenceRule;
55+
public String getDataPersistenceRuleId() {
56+
return this.dataPersistenceRuleId;
5057
}
5158

5259
}

‎ds3-sdk/src/main/java/com/spectralogic/ds3client/commands/spectrads3/GetDataPersistenceRuleSpectraS3Request.java‎

Lines changed: 13 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -18,19 +18,26 @@
1818

1919
import com.spectralogic.ds3client.networking.HttpVerb;
2020
import com.spectralogic.ds3client.commands.interfaces.AbstractRequest;
21+
import java.util.UUID;
2122
import com.google.common.net.UrlEscapers;
2223

2324
public class GetDataPersistenceRuleSpectraS3Request extends AbstractRequest {
2425

2526
// Variables
2627

27-
private final String dataPersistenceRule;
28+
private final String dataPersistenceRuleId;
2829

2930
// Constructor
3031

3132

32-
public GetDataPersistenceRuleSpectraS3Request(final String dataPersistenceRule) {
33-
this.dataPersistenceRule = dataPersistenceRule;
33+
public GetDataPersistenceRuleSpectraS3Request(final UUID dataPersistenceRuleId) {
34+
this.dataPersistenceRuleId = dataPersistenceRuleId.toString();
35+
36+
}
37+
38+
39+
public GetDataPersistenceRuleSpectraS3Request(final String dataPersistenceRuleId) {
40+
this.dataPersistenceRuleId = dataPersistenceRuleId;
3441

3542
}
3643

@@ -42,11 +49,11 @@ public HttpVerb getVerb() {
4249

4350
@Override
4451
public String getPath() {
45-
return "/_rest_/data_persistence_rule/" + dataPersistenceRule;
52+
return "/_rest_/data_persistence_rule/" + dataPersistenceRuleId;
4653
}
4754

48-
public String getDataPersistenceRule() {
49-
return this.dataPersistenceRule;
55+
public String getDataPersistenceRuleId() {
56+
return this.dataPersistenceRuleId;
5057
}
5158

5259
}

‎ds3-sdk/src/main/java/com/spectralogic/ds3client/commands/spectrads3/ModifyDataPersistenceRuleSpectraS3Request.java‎

Lines changed: 13 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -21,13 +21,14 @@
2121
import com.spectralogic.ds3client.models.DataIsolationLevel;
2222
import java.lang.Integer;
2323
import com.spectralogic.ds3client.models.DataPersistenceRuleType;
24+
import java.util.UUID;
2425
import com.google.common.net.UrlEscapers;
2526

2627
public class ModifyDataPersistenceRuleSpectraS3Request extends AbstractRequest {
2728

2829
// Variables
2930

30-
private final String dataPersistenceRule;
31+
private final String dataPersistenceRuleId;
3132

3233
private DataIsolationLevel isolationLevel;
3334

@@ -38,8 +39,14 @@ public class ModifyDataPersistenceRuleSpectraS3Request extends AbstractRequest {
3839
// Constructor
3940

4041

41-
public ModifyDataPersistenceRuleSpectraS3Request(final String dataPersistenceRule) {
42-
this.dataPersistenceRule = dataPersistenceRule;
42+
public ModifyDataPersistenceRuleSpectraS3Request(final UUID dataPersistenceRuleId) {
43+
this.dataPersistenceRuleId = dataPersistenceRuleId.toString();
44+
45+
}
46+
47+
48+
public ModifyDataPersistenceRuleSpectraS3Request(final String dataPersistenceRuleId) {
49+
this.dataPersistenceRuleId = dataPersistenceRuleId;
4350

4451
}
4552

@@ -72,11 +79,11 @@ public HttpVerb getVerb() {
7279

7380
@Override
7481
public String getPath() {
75-
return "/_rest_/data_persistence_rule/" + dataPersistenceRule;
82+
return "/_rest_/data_persistence_rule/" + dataPersistenceRuleId;
7683
}
7784

78-
public String getDataPersistenceRule() {
79-
return this.dataPersistenceRule;
85+
public String getDataPersistenceRuleId() {
86+
return this.dataPersistenceRuleId;
8087
}
8188

8289

‎ds3-sdk/src/main/java/com/spectralogic/ds3client/commands/spectrads3/RawImportAllTapesSpectraS3Request.java‎

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
import com.spectralogic.ds3client.networking.HttpVerb;
2020
import com.spectralogic.ds3client.commands.interfaces.AbstractRequest;
2121
import com.google.common.net.UrlEscapers;
22+
import java.util.UUID;
2223
import com.spectralogic.ds3client.models.Priority;
2324

2425
public class RawImportAllTapesSpectraS3Request extends AbstractRequest {
@@ -27,6 +28,8 @@ public class RawImportAllTapesSpectraS3Request extends AbstractRequest {
2728

2829
private final String bucketId;
2930

31+
private String storageDomainId;
32+
3033
private Priority taskPriority;
3134

3235
// Constructor
@@ -40,6 +43,20 @@ public RawImportAllTapesSpectraS3Request(final String bucketId) {
4043
this.getQueryParams().put("bucket_id", bucketId);
4144
}
4245

46+
public RawImportAllTapesSpectraS3Request withStorageDomainId(final UUID storageDomainId) {
47+
this.storageDomainId = storageDomainId.toString();
48+
this.updateQueryParam("storage_domain_id", storageDomainId);
49+
return this;
50+
}
51+
52+
53+
public RawImportAllTapesSpectraS3Request withStorageDomainId(final String storageDomainId) {
54+
this.storageDomainId = storageDomainId;
55+
this.updateQueryParam("storage_domain_id", storageDomainId);
56+
return this;
57+
}
58+
59+
4360
public RawImportAllTapesSpectraS3Request withTaskPriority(final Priority taskPriority) {
4461
this.taskPriority = taskPriority;
4562
this.updateQueryParam("task_priority", taskPriority);
@@ -63,6 +80,11 @@ public String getBucketId() {
6380
}
6481

6582

83+
public String getStorageDomainId() {
84+
return this.storageDomainId;
85+
}
86+
87+
6688
public Priority getTaskPriority() {
6789
return this.taskPriority;
6890
}

‎ds3-sdk/src/main/java/com/spectralogic/ds3client/commands/spectrads3/RawImportTapeSpectraS3Request.java‎

Lines changed: 22 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@
1919
import com.spectralogic.ds3client.networking.HttpVerb;
2020
import com.spectralogic.ds3client.commands.interfaces.AbstractRequest;
2121
import com.google.common.net.UrlEscapers;
22-
import com.spectralogic.ds3client.models.Priority;
2322
import java.util.UUID;
23+
import com.spectralogic.ds3client.models.Priority;
2424

2525
public class RawImportTapeSpectraS3Request extends AbstractRequest {
2626

@@ -30,6 +30,8 @@ public class RawImportTapeSpectraS3Request extends AbstractRequest {
3030

3131
private final String bucketId;
3232

33+
private String storageDomainId;
34+
3335
private Priority taskPriority;
3436

3537
// Constructor
@@ -54,6 +56,20 @@ public RawImportTapeSpectraS3Request(final String bucketId, final String tapeId)
5456
this.getQueryParams().put("bucket_id", bucketId);
5557
}
5658

59+
public RawImportTapeSpectraS3Request withStorageDomainId(final UUID storageDomainId) {
60+
this.storageDomainId = storageDomainId.toString();
61+
this.updateQueryParam("storage_domain_id", storageDomainId);
62+
return this;
63+
}
64+
65+
66+
public RawImportTapeSpectraS3Request withStorageDomainId(final String storageDomainId) {
67+
this.storageDomainId = storageDomainId;
68+
this.updateQueryParam("storage_domain_id", storageDomainId);
69+
return this;
70+
}
71+
72+
5773
public RawImportTapeSpectraS3Request withTaskPriority(final Priority taskPriority) {
5874
this.taskPriority = taskPriority;
5975
this.updateQueryParam("task_priority", taskPriority);
@@ -82,6 +98,11 @@ public String getBucketId() {
8298
}
8399

84100

101+
public String getStorageDomainId() {
102+
return this.storageDomainId;
103+
}
104+
105+
85106
public Priority getTaskPriority() {
86107
return this.taskPriority;
87108
}

‎ds3-sdk/src/main/java/com/spectralogic/ds3client/models/UnableToConvertToCommonPrefixesException.java‎ renamed to ‎ds3-sdk/src/main/java/com/spectralogic/ds3client/exceptions/UnableToConvertToCommonPrefixesException.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
* ****************************************************************************
1414
*/
1515

16-
package com.spectralogic.ds3client.models;
16+
package com.spectralogic.ds3client.exceptions;
1717
public class UnableToConvertToCommonPrefixesException extends RuntimeException {
1818
public UnableToConvertToCommonPrefixesException(final String s) {
1919
super(s);

‎ds3-sdk/src/main/java/com/spectralogic/ds3client/models/UnabledToConvertToContentsException.java‎ renamed to ‎ds3-sdk/src/main/java/com/spectralogic/ds3client/exceptions/UnableToConvertToContentsException.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,10 @@
1212
* specific language governing permissions and limitations under the License.
1313
* ****************************************************************************
1414
*/
15-
package com.spectralogic.ds3client.models;
15+
package com.spectralogic.ds3client.exceptions;
1616

17-
public class UnabledToConvertToContentsException extends RuntimeException {
18-
public UnabledToConvertToContentsException(final String s) {
17+
public class UnableToConvertToContentsException extends RuntimeException {
18+
public UnableToConvertToContentsException(final String s) {
1919
super(s);
2020
}
2121
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
import com.spectralogic.ds3client.helpers.options.WriteJobOptions;
2323
import com.spectralogic.ds3client.helpers.strategy.transferstrategy.TransferStrategy;
2424
import com.spectralogic.ds3client.models.Contents;
25-
import com.spectralogic.ds3client.models.FileSystemKey;
25+
import com.spectralogic.ds3client.helpers.pagination.FileSystemKey;
2626
import com.spectralogic.ds3client.models.bulk.Ds3Object;
2727
import com.spectralogic.ds3client.utils.Predicate;
2828

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@
3030
import com.spectralogic.ds3client.helpers.events.SameThreadEventRunner;
3131
import com.spectralogic.ds3client.helpers.options.ReadJobOptions;
3232
import com.spectralogic.ds3client.helpers.options.WriteJobOptions;
33+
import com.spectralogic.ds3client.helpers.pagination.FileSystemKey;
3334
import com.spectralogic.ds3client.helpers.pagination.GetBucketKeyLoaderFactory;
3435
import com.spectralogic.ds3client.helpers.strategy.transferstrategy.EventDispatcher;
3536
import com.spectralogic.ds3client.helpers.strategy.transferstrategy.EventDispatcherImpl;

0 commit comments

Comments
 (0)