Skip to content

Commit 86e0fc0

Browse files
Merge pull request #367 from RachelTucker/fix_eject_storage_domain
Removed required param object list from EjectStorageDomain request handler
2 parents eeb9bcd + 13ecb47 commit 86e0fc0

File tree

299 files changed

+1902
-93
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

299 files changed

+1902
-93
lines changed

ds3-sdk/src/main/java/com/spectralogic/ds3client/Ds3Client.java

Lines changed: 598 additions & 10 deletions
Large diffs are not rendered by default.

ds3-sdk/src/main/java/com/spectralogic/ds3client/Ds3ClientImpl.java

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
11
/*
2-
* ****************************************************************************
3-
* Copyright 2014-2016 Spectra Logic Corporation. All Rights Reserved.
4-
* Licensed under the Apache License, Version 2.0 (the "License"). You may not use
5-
* this file except in compliance with the License. A copy of the License is located at
2+
* ******************************************************************************
3+
* Copyright 2014-2015 Spectra Logic Corporation. All Rights Reserved.
4+
* Licensed under the Apache License, Version 2.0 (the "License"). You may not use
5+
* this file except in compliance with the License. A copy of the License is located at
66
*
7-
* http://www.apache.org/licenses/LICENSE-2.0
7+
* http://www.apache.org/licenses/LICENSE-2.0
88
*
9-
* or in the "license" file accompanying this file.
10-
* This file is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
11-
* CONDITIONS OF ANY KIND, either express or implied. See the License for the
12-
* specific language governing permissions and limitations under the License.
13-
* ****************************************************************************
9+
* or in the "license" file accompanying this file.
10+
* This file is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
11+
* CONDITIONS OF ANY KIND, either express or implied. See the License for the
12+
* specific language governing permissions and limitations under the License.
13+
* ****************************************************************************
1414
*/
1515

1616
// This code is auto-generated, do not modify

ds3-sdk/src/main/java/com/spectralogic/ds3client/commands/AbortMultiPartUploadRequest.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@ public class AbortMultiPartUploadRequest extends AbstractRequest {
3333

3434
// Constructor
3535

36+
3637
public AbortMultiPartUploadRequest(final String bucketName, final String objectName, final UUID uploadId) {
3738
this.bucketName = bucketName;
3839
this.objectName = objectName;
@@ -41,6 +42,7 @@ public AbortMultiPartUploadRequest(final String bucketName, final String objectN
4142
this.getQueryParams().put("upload_id", uploadId.toString());
4243
}
4344

45+
4446
public AbortMultiPartUploadRequest(final String bucketName, final String objectName, final String uploadId) {
4547
this.bucketName = bucketName;
4648
this.objectName = objectName;

ds3-sdk/src/main/java/com/spectralogic/ds3client/commands/CompleteMultiPartUploadRequest.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@ public class CompleteMultiPartUploadRequest extends AbstractRequest {
4141

4242
// Constructor
4343

44+
4445
public CompleteMultiPartUploadRequest(final String bucketName, final String objectName, final CompleteMultipartUpload requestPayload, final UUID uploadId) {
4546
this.bucketName = bucketName;
4647
this.objectName = objectName;
@@ -50,6 +51,7 @@ public CompleteMultiPartUploadRequest(final String bucketName, final String obje
5051
this.getQueryParams().put("upload_id", uploadId.toString());
5152
}
5253

54+
5355
public CompleteMultiPartUploadRequest(final String bucketName, final String objectName, final CompleteMultipartUpload requestPayload, final String uploadId) {
5456
this.bucketName = bucketName;
5557
this.objectName = objectName;

ds3-sdk/src/main/java/com/spectralogic/ds3client/commands/DeleteBucketRequest.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ public class DeleteBucketRequest extends AbstractRequest {
2727

2828
// Constructor
2929

30+
3031
public DeleteBucketRequest(final String bucketName) {
3132
this.bucketName = bucketName;
3233

ds3-sdk/src/main/java/com/spectralogic/ds3client/commands/DeleteObjectRequest.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@ public class DeleteObjectRequest extends AbstractRequest {
3333

3434
// Constructor
3535

36+
3637
public DeleteObjectRequest(final String bucketName, final String objectName) {
3738
this.bucketName = bucketName;
3839
this.objectName = objectName;
@@ -49,6 +50,7 @@ public DeleteObjectRequest withReplicate(final boolean replicate) {
4950
return this;
5051
}
5152

53+
5254
public DeleteObjectRequest withRollBack(final boolean rollBack) {
5355
this.rollBack = rollBack;
5456
if (this.rollBack) {
@@ -60,6 +62,7 @@ public DeleteObjectRequest withRollBack(final boolean rollBack) {
6062
}
6163

6264

65+
6366
@Override
6467
public HttpVerb getVerb() {
6568
return HttpVerb.DELETE;

ds3-sdk/src/main/java/com/spectralogic/ds3client/commands/DeleteObjectsRequest.java

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,13 +44,15 @@ public class DeleteObjectsRequest extends AbstractRequest {
4444

4545
// Constructor
4646

47+
4748
public DeleteObjectsRequest(final String bucketName, final List<String> objects) {
4849
this.bucketName = bucketName;
4950
this.objects = objects;
5051

5152
this.getQueryParams().put("delete", null);
5253
}
5354

55+
5456
public DeleteObjectsRequest(final String bucketName, final Iterable<Contents> objs) {
5557
this.bucketName = bucketName;
5658

@@ -76,6 +78,7 @@ public DeleteObjectsRequest withReplicate(final boolean replicate) {
7678
return this;
7779
}
7880

81+
7982
public DeleteObjectsRequest withRollBack(final boolean rollBack) {
8083
this.rollBack = rollBack;
8184
if (this.rollBack) {
@@ -87,6 +90,7 @@ public DeleteObjectsRequest withRollBack(final boolean rollBack) {
8790
}
8891

8992

93+
9094
public DeleteObjectsRequest withQuiet(final boolean quiet) {
9195
this.quiet = quiet;
9296
return this;

ds3-sdk/src/main/java/com/spectralogic/ds3client/commands/GetBucketRequest.java

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@ public class GetBucketRequest extends AbstractRequest {
3636

3737
// Constructor
3838

39+
3940
public GetBucketRequest(final String bucketName) {
4041
this.bucketName = bucketName;
4142

@@ -47,25 +48,29 @@ public GetBucketRequest withDelimiter(final String delimiter) {
4748
return this;
4849
}
4950

51+
5052
public GetBucketRequest withMarker(final String marker) {
5153
this.marker = marker;
5254
this.updateQueryParam("marker", marker);
5355
return this;
5456
}
5557

58+
5659
public GetBucketRequest withMaxKeys(final int maxKeys) {
5760
this.maxKeys = maxKeys;
5861
this.updateQueryParam("max_keys", maxKeys);
5962
return this;
6063
}
6164

65+
6266
public GetBucketRequest withPrefix(final String prefix) {
6367
this.prefix = prefix;
6468
this.updateQueryParam("prefix", prefix);
6569
return this;
6670
}
6771

6872

73+
6974
@Override
7075
public HttpVerb getVerb() {
7176
return HttpVerb.GET;

ds3-sdk/src/main/java/com/spectralogic/ds3client/commands/GetObjectRequest.java

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,7 @@ public class GetObjectRequest extends AbstractRequest {
4646
private ChecksumType.Type checksumType = ChecksumType.Type.NONE;
4747

4848
// Constructor
49+
4950
/** @deprecated use {@link #GetObjectRequest(String, String, WritableByteChannel, UUID, long)} instead */
5051
@Deprecated
5152
public GetObjectRequest(final String bucketName, final String objectName, final WritableByteChannel channel) {
@@ -56,6 +57,7 @@ public GetObjectRequest(final String bucketName, final String objectName, final
5657

5758
}
5859

60+
5961
public GetObjectRequest(final String bucketName, final String objectName, final WritableByteChannel channel, final UUID job, final long offset) {
6062
this.bucketName = bucketName;
6163
this.objectName = objectName;
@@ -68,6 +70,7 @@ public GetObjectRequest(final String bucketName, final String objectName, final
6870

6971
}
7072

73+
7174
public GetObjectRequest(final String bucketName, final String objectName, final WritableByteChannel channel, final String job, final long offset) {
7275
this.bucketName = bucketName;
7376
this.objectName = objectName;
@@ -87,19 +90,22 @@ public GetObjectRequest withJob(final UUID job) {
8790
return this;
8891
}
8992

93+
9094
public GetObjectRequest withJob(final String job) {
9195
this.job = job;
9296
this.updateQueryParam("job", job);
9397
return this;
9498
}
9599

100+
96101
public GetObjectRequest withOffset(final long offset) {
97102
this.offset = offset;
98103
this.updateQueryParam("offset", offset);
99104
return this;
100105
}
101106

102107

108+
103109
/**
104110
* Set a MD5 checksum for the request.
105111
*/

ds3-sdk/src/main/java/com/spectralogic/ds3client/commands/GetServiceRequest.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ public class GetServiceRequest extends AbstractRequest {
2525

2626
// Constructor
2727

28+
2829
public GetServiceRequest() {
2930

3031
}

0 commit comments

Comments
 (0)