Skip to content

Commit c1fc879

Browse files
rpmoorerpmoore
authored
Merge pull request #528 from RachelTucker/v3_5_3_tapetype_to_string
TapeType to String, nonnullable channels, and fix max blob size
2 parents 6af3bed + bc0b466 commit c1fc879

18 files changed

+79
-97
lines changed

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

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,8 @@
2929
import com.spectralogic.ds3client.commands.interfaces.AbstractRequest;
3030
import java.util.UUID;
3131
import com.google.common.net.UrlEscapers;
32+
import javax.annotation.Nonnull;
33+
import com.google.common.base.Preconditions;
3234
import com.spectralogic.ds3client.models.ChecksumType;
3335

3436
public class GetObjectRequest extends AbstractRequest {
@@ -52,7 +54,8 @@ public class GetObjectRequest extends AbstractRequest {
5254

5355
/** @deprecated use {@link #GetObjectRequest(String, String, WritableByteChannel, UUID, long)} instead */
5456
@Deprecated
55-
public GetObjectRequest(final String bucketName, final String objectName, final WritableByteChannel channel) {
57+
public GetObjectRequest(final String bucketName, final String objectName, @Nonnull final WritableByteChannel channel) {
58+
Preconditions.checkNotNull(channel, "Channel may not be null.");
5659
this.bucketName = bucketName;
5760
this.objectName = objectName;
5861
this.channel = channel;
@@ -61,7 +64,8 @@ public GetObjectRequest(final String bucketName, final String objectName, final
6164
}
6265

6366

64-
public GetObjectRequest(final String bucketName, final String objectName, final WritableByteChannel channel, final UUID job, final long offset) {
67+
public GetObjectRequest(final String bucketName, final String objectName, @Nonnull final WritableByteChannel channel, final UUID job, final long offset) {
68+
Preconditions.checkNotNull(channel, "Channel may not be null.");
6569
this.bucketName = bucketName;
6670
this.objectName = objectName;
6771
this.job = job.toString();
@@ -76,7 +80,8 @@ public GetObjectRequest(final String bucketName, final String objectName, final
7680
}
7781

7882

79-
public GetObjectRequest(final String bucketName, final String objectName, final WritableByteChannel channel, final String job, final long offset) {
83+
public GetObjectRequest(final String bucketName, final String objectName, @Nonnull final WritableByteChannel channel, final String job, final long offset) {
84+
Preconditions.checkNotNull(channel, "Channel may not be null.");
8085
this.bucketName = bucketName;
8186
this.objectName = objectName;
8287
this.job = job;
@@ -91,7 +96,8 @@ public GetObjectRequest(final String bucketName, final String objectName, final
9196
}
9297

9398

94-
public GetObjectRequest(final String bucketName, final String objectName, final UUID job, final long offset, final OutputStream stream) {
99+
public GetObjectRequest(final String bucketName, final String objectName, final UUID job, final long offset, @Nonnull final OutputStream stream) {
100+
Preconditions.checkNotNull(stream, "Stream may not be null.");
95101
this.bucketName = bucketName;
96102
this.objectName = objectName;
97103
this.job = job.toString();
@@ -106,7 +112,8 @@ public GetObjectRequest(final String bucketName, final String objectName, final
106112
}
107113

108114

109-
public GetObjectRequest(final String bucketName, final String objectName, final String job, final long offset, final OutputStream stream) {
115+
public GetObjectRequest(final String bucketName, final String objectName, final String job, final long offset, @Nonnull final OutputStream stream) {
116+
Preconditions.checkNotNull(stream, "Stream may not be null.");
110117
this.bucketName = bucketName;
111118
this.objectName = objectName;
112119
this.job = job;

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

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,8 @@
2020
import com.spectralogic.ds3client.commands.interfaces.AbstractRequest;
2121
import java.util.UUID;
2222
import com.google.common.net.UrlEscapers;
23+
import javax.annotation.Nonnull;
24+
import com.google.common.base.Preconditions;
2325
import com.spectralogic.ds3client.utils.SeekableByteChannelInputStream;
2426
import java.nio.channels.SeekableByteChannel;
2527
import java.io.InputStream;
@@ -45,7 +47,8 @@ public class PutMultiPartUploadPartRequest extends AbstractRequest {
4547
// Constructor
4648

4749

48-
public PutMultiPartUploadPartRequest(final String bucketName, final String objectName, final SeekableByteChannel channel, final int partNumber, final long size, final UUID uploadId) {
50+
public PutMultiPartUploadPartRequest(final String bucketName, final String objectName, @Nonnull final SeekableByteChannel channel, final int partNumber, final long size, final UUID uploadId) {
51+
Preconditions.checkNotNull(channel, "Channel may not be null.");
4952
this.bucketName = bucketName;
5053
this.objectName = objectName;
5154
this.partNumber = partNumber;
@@ -61,7 +64,8 @@ public PutMultiPartUploadPartRequest(final String bucketName, final String objec
6164
}
6265

6366

64-
public PutMultiPartUploadPartRequest(final String bucketName, final String objectName, final SeekableByteChannel channel, final int partNumber, final long size, final String uploadId) {
67+
public PutMultiPartUploadPartRequest(final String bucketName, final String objectName, @Nonnull final SeekableByteChannel channel, final int partNumber, final long size, final String uploadId) {
68+
Preconditions.checkNotNull(channel, "Channel may not be null.");
6569
this.bucketName = bucketName;
6670
this.objectName = objectName;
6771
this.partNumber = partNumber;
@@ -77,7 +81,8 @@ public PutMultiPartUploadPartRequest(final String bucketName, final String objec
7781
}
7882

7983

80-
public PutMultiPartUploadPartRequest(final String bucketName, final String objectName, final int partNumber, final long size, final InputStream stream, final UUID uploadId) {
84+
public PutMultiPartUploadPartRequest(final String bucketName, final String objectName, final int partNumber, final long size, @Nonnull final InputStream stream, final UUID uploadId) {
85+
Preconditions.checkNotNull(stream, "Stream may not be null.");
8186
this.bucketName = bucketName;
8287
this.objectName = objectName;
8388
this.partNumber = partNumber;
@@ -92,7 +97,8 @@ public PutMultiPartUploadPartRequest(final String bucketName, final String objec
9297
}
9398

9499

95-
public PutMultiPartUploadPartRequest(final String bucketName, final String objectName, final int partNumber, final long size, final InputStream stream, final String uploadId) {
100+
public PutMultiPartUploadPartRequest(final String bucketName, final String objectName, final int partNumber, final long size, @Nonnull final InputStream stream, final String uploadId) {
101+
Preconditions.checkNotNull(stream, "Stream may not be null.");
96102
this.bucketName = bucketName;
97103
this.objectName = objectName;
98104
this.partNumber = partNumber;

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

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,8 @@
2626
import com.spectralogic.ds3client.commands.interfaces.AbstractRequest;
2727
import java.util.UUID;
2828
import com.google.common.net.UrlEscapers;
29+
import javax.annotation.Nonnull;
30+
import com.google.common.base.Preconditions;
2931
import com.spectralogic.ds3client.models.ChecksumType;
3032
public class PutObjectRequest extends AbstractRequest {
3133

@@ -53,7 +55,8 @@ public class PutObjectRequest extends AbstractRequest {
5355

5456
/** @deprecated use {@link #PutObjectRequest(String, String, SeekableByteChannel, UUID, long, long)} instead */
5557
@Deprecated
56-
public PutObjectRequest(final String bucketName, final String objectName, final SeekableByteChannel channel, final long size) {
58+
public PutObjectRequest(final String bucketName, final String objectName, @Nonnull final SeekableByteChannel channel, final long size) {
59+
Preconditions.checkNotNull(channel, "Channel may not be null.");
5760
this.bucketName = bucketName;
5861
this.objectName = objectName;
5962
this.size = size;
@@ -64,7 +67,8 @@ public PutObjectRequest(final String bucketName, final String objectName, final
6467
}
6568

6669

67-
public PutObjectRequest(final String bucketName, final String objectName, final SeekableByteChannel channel, final UUID job, final long offset, final long size) {
70+
public PutObjectRequest(final String bucketName, final String objectName, @Nonnull final SeekableByteChannel channel, final UUID job, final long offset, final long size) {
71+
Preconditions.checkNotNull(channel, "Channel may not be null.");
6872
this.bucketName = bucketName;
6973
this.objectName = objectName;
7074
this.size = size;
@@ -81,7 +85,8 @@ public PutObjectRequest(final String bucketName, final String objectName, final
8185
}
8286

8387

84-
public PutObjectRequest(final String bucketName, final String objectName, final SeekableByteChannel channel, final String job, final long offset, final long size) {
88+
public PutObjectRequest(final String bucketName, final String objectName, @Nonnull final SeekableByteChannel channel, final String job, final long offset, final long size) {
89+
Preconditions.checkNotNull(channel, "Channel may not be null.");
8590
this.bucketName = bucketName;
8691
this.objectName = objectName;
8792
this.size = size;
@@ -98,7 +103,8 @@ public PutObjectRequest(final String bucketName, final String objectName, final
98103
}
99104

100105

101-
public PutObjectRequest(final String bucketName, final String objectName, final UUID job, final long offset, final long size, final InputStream stream) {
106+
public PutObjectRequest(final String bucketName, final String objectName, final UUID job, final long offset, final long size, @Nonnull final InputStream stream) {
107+
Preconditions.checkNotNull(stream, "Stream may not be null.");
102108
this.bucketName = bucketName;
103109
this.objectName = objectName;
104110
this.size = size;
@@ -114,7 +120,8 @@ public PutObjectRequest(final String bucketName, final String objectName, final
114120
}
115121

116122

117-
public PutObjectRequest(final String bucketName, final String objectName, final String job, final long offset, final long size, final InputStream stream) {
123+
public PutObjectRequest(final String bucketName, final String objectName, final String job, final long offset, final long size, @Nonnull final InputStream stream) {
124+
Preconditions.checkNotNull(stream, "Stream may not be null.");
118125
this.bucketName = bucketName;
119126
this.objectName = objectName;
120127
this.size = size;

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

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@
2424
import com.spectralogic.ds3client.models.PoolState;
2525
import com.spectralogic.ds3client.models.PoolType;
2626
import com.spectralogic.ds3client.models.TapeState;
27-
import com.spectralogic.ds3client.models.TapeType;
2827

2928
public class GetBucketCapacitySummarySpectraS3Request extends AbstractRequest {
3029

@@ -42,7 +41,7 @@ public class GetBucketCapacitySummarySpectraS3Request extends AbstractRequest {
4241

4342
private TapeState tapeState;
4443

45-
private TapeType tapeType;
44+
private String tapeType;
4645

4746
// Constructor
4847

@@ -96,7 +95,7 @@ public GetBucketCapacitySummarySpectraS3Request withTapeState(final TapeState ta
9695
}
9796

9897

99-
public GetBucketCapacitySummarySpectraS3Request withTapeType(final TapeType tapeType) {
98+
public GetBucketCapacitySummarySpectraS3Request withTapeType(final String tapeType) {
10099
this.tapeType = tapeType;
101100
this.updateQueryParam("tape_type", tapeType);
102101
return this;
@@ -144,7 +143,7 @@ public TapeState getTapeState() {
144143
}
145144

146145

147-
public TapeType getTapeType() {
146+
public String getTapeType() {
148147
return this.tapeType;
149148
}
150149

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

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@
2424
import com.spectralogic.ds3client.models.PoolState;
2525
import com.spectralogic.ds3client.models.PoolType;
2626
import com.spectralogic.ds3client.models.TapeState;
27-
import com.spectralogic.ds3client.models.TapeType;
2827

2928
public class GetStorageDomainCapacitySummarySpectraS3Request extends AbstractRequest {
3029

@@ -40,7 +39,7 @@ public class GetStorageDomainCapacitySummarySpectraS3Request extends AbstractReq
4039

4140
private TapeState tapeState;
4241

43-
private TapeType tapeType;
42+
private String tapeType;
4443

4544
// Constructor
4645

@@ -88,7 +87,7 @@ public GetStorageDomainCapacitySummarySpectraS3Request withTapeState(final TapeS
8887
}
8988

9089

91-
public GetStorageDomainCapacitySummarySpectraS3Request withTapeType(final TapeType tapeType) {
90+
public GetStorageDomainCapacitySummarySpectraS3Request withTapeType(final String tapeType) {
9291
this.tapeType = tapeType;
9392
this.updateQueryParam("tape_type", tapeType);
9493
return this;
@@ -131,7 +130,7 @@ public TapeState getTapeState() {
131130
}
132131

133132

134-
public TapeType getTapeType() {
133+
public String getTapeType() {
135134
return this.tapeType;
136135
}
137136

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

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@
2121
import java.util.UUID;
2222
import com.google.common.net.UrlEscapers;
2323
import com.spectralogic.ds3client.models.StorageDomainMemberState;
24-
import com.spectralogic.ds3client.models.TapeType;
2524
import com.spectralogic.ds3client.models.WritePreferenceLevel;
2625

2726
public class GetStorageDomainMembersSpectraS3Request extends AbstractPaginationRequest {
@@ -44,7 +43,7 @@ public class GetStorageDomainMembersSpectraS3Request extends AbstractPaginationR
4443

4544
private String tapePartitionId;
4645

47-
private TapeType tapeType;
46+
private String tapeType;
4847

4948
private WritePreferenceLevel writePreference;
5049

@@ -143,7 +142,7 @@ public GetStorageDomainMembersSpectraS3Request withTapePartitionId(final String
143142
}
144143

145144

146-
public GetStorageDomainMembersSpectraS3Request withTapeType(final TapeType tapeType) {
145+
public GetStorageDomainMembersSpectraS3Request withTapeType(final String tapeType) {
147146
this.tapeType = tapeType;
148147
this.updateQueryParam("tape_type", tapeType);
149148
return this;
@@ -208,7 +207,7 @@ public String getTapePartitionId() {
208207
}
209208

210209

211-
public TapeType getTapeType() {
210+
public String getTapeType() {
212211
return this.tapeType;
213212
}
214213

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
import com.spectralogic.ds3client.models.PoolState;
2323
import com.spectralogic.ds3client.models.PoolType;
2424
import com.spectralogic.ds3client.models.TapeState;
25-
import com.spectralogic.ds3client.models.TapeType;
25+
import com.google.common.net.UrlEscapers;
2626

2727
public class GetSystemCapacitySummarySpectraS3Request extends AbstractRequest {
2828

@@ -36,7 +36,7 @@ public class GetSystemCapacitySummarySpectraS3Request extends AbstractRequest {
3636

3737
private TapeState tapeState;
3838

39-
private TapeType tapeType;
39+
private String tapeType;
4040

4141
// Constructor
4242

@@ -73,7 +73,7 @@ public GetSystemCapacitySummarySpectraS3Request withTapeState(final TapeState ta
7373
}
7474

7575

76-
public GetSystemCapacitySummarySpectraS3Request withTapeType(final TapeType tapeType) {
76+
public GetSystemCapacitySummarySpectraS3Request withTapeType(final String tapeType) {
7777
this.tapeType = tapeType;
7878
this.updateQueryParam("tape_type", tapeType);
7979
return this;
@@ -111,7 +111,7 @@ public TapeState getTapeState() {
111111
}
112112

113113

114-
public TapeType getTapeType() {
114+
public String getTapeType() {
115115
return this.tapeType;
116116
}
117117

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

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@
2121
import com.spectralogic.ds3client.models.TapeDriveType;
2222
import java.util.UUID;
2323
import com.google.common.net.UrlEscapers;
24-
import com.spectralogic.ds3client.models.TapeType;
2524

2625
public class GetTapeDensityDirectivesSpectraS3Request extends AbstractPaginationRequest {
2726

@@ -39,7 +38,7 @@ public class GetTapeDensityDirectivesSpectraS3Request extends AbstractPagination
3938

4039
private String partitionId;
4140

42-
private TapeType tapeType;
41+
private String tapeType;
4342

4443
// Constructor
4544

@@ -108,7 +107,7 @@ public GetTapeDensityDirectivesSpectraS3Request withPartitionId(final String par
108107
}
109108

110109

111-
public GetTapeDensityDirectivesSpectraS3Request withTapeType(final TapeType tapeType) {
110+
public GetTapeDensityDirectivesSpectraS3Request withTapeType(final String tapeType) {
112111
this.tapeType = tapeType;
113112
this.updateQueryParam("tape_type", tapeType);
114113
return this;
@@ -156,7 +155,7 @@ public String getPartitionId() {
156155
}
157156

158157

159-
public TapeType getTapeType() {
158+
public String getTapeType() {
160159
return this.tapeType;
161160
}
162161

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

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@
2323
import java.util.Date;
2424
import java.util.UUID;
2525
import com.spectralogic.ds3client.models.TapeState;
26-
import com.spectralogic.ds3client.models.TapeType;
2726
import com.spectralogic.ds3client.models.Priority;
2827

2928
public class GetTapesSpectraS3Request extends AbstractPaginationRequest {
@@ -66,7 +65,7 @@ public class GetTapesSpectraS3Request extends AbstractPaginationRequest {
6665

6766
private String storageDomainId;
6867

69-
private TapeType type;
68+
private String type;
7069

7170
private Priority verifyPending;
7271

@@ -230,7 +229,7 @@ public GetTapesSpectraS3Request withStorageDomainId(final String storageDomainId
230229
}
231230

232231

233-
public GetTapesSpectraS3Request withType(final TapeType type) {
232+
public GetTapesSpectraS3Request withType(final String type) {
234233
this.type = type;
235234
this.updateQueryParam("type", type);
236235
return this;
@@ -352,7 +351,7 @@ public String getStorageDomainId() {
352351
}
353352

354353

355-
public TapeType getType() {
354+
public String getType() {
356355
return this.type;
357356
}
358357

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ public PutBulkJobSpectraS3Request withImplicitJobIdResolution(final boolean impl
8888

8989

9090
public PutBulkJobSpectraS3Request withMaxUploadSize(final long maxUploadSize) {
91-
if (maxUploadSize > MIN_UPLOAD_SIZE_IN_BYTES) {
91+
if (maxUploadSize >= MIN_UPLOAD_SIZE_IN_BYTES) {
9292
this.getQueryParams().put("max_upload_size", Long.toString(maxUploadSize));
9393
} else {
9494
this.getQueryParams().put("max_upload_size", MAX_UPLOAD_SIZE_IN_BYTES);

0 commit comments

Comments
 (0)