Skip to content

Commit 71d2fbc

Browse files
author
Denver
authored
Merge pull request #475 from RachelTucker/sdkpm-33
SDKPM - Using updateQueryParam over getQueryParams().put
2 parents 63aee44 + 32ebe5a commit 71d2fbc

File tree

56 files changed

+378
-189
lines changed

Some content is hidden

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

56 files changed

+378
-189
lines changed

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

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,8 @@ public AbortMultiPartUploadRequest(final String bucketName, final String objectN
3939
this.objectName = objectName;
4040
this.uploadId = uploadId.toString();
4141

42-
this.getQueryParams().put("upload_id", uploadId.toString());
42+
this.updateQueryParam("upload_id", uploadId);
43+
4344
}
4445

4546

@@ -48,7 +49,8 @@ public AbortMultiPartUploadRequest(final String bucketName, final String objectN
4849
this.objectName = objectName;
4950
this.uploadId = uploadId;
5051

51-
this.getQueryParams().put("upload_id", UrlEscapers.urlFragmentEscaper().escape(uploadId).replace("+", "%2B"));
52+
this.updateQueryParam("upload_id", uploadId);
53+
5254
}
5355

5456

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

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,8 @@ public CompleteMultiPartUploadRequest(final String bucketName, final String obje
4848
this.uploadId = uploadId.toString();
4949
this.requestPayload = requestPayload;
5050

51-
this.getQueryParams().put("upload_id", uploadId.toString());
51+
this.updateQueryParam("upload_id", uploadId);
52+
5253
}
5354

5455

@@ -58,7 +59,8 @@ public CompleteMultiPartUploadRequest(final String bucketName, final String obje
5859
this.uploadId = uploadId;
5960
this.requestPayload = requestPayload;
6061

61-
this.getQueryParams().put("upload_id", UrlEscapers.urlFragmentEscaper().escape(uploadId).replace("+", "%2B"));
62+
this.updateQueryParam("upload_id", uploadId);
63+
6264
}
6365

6466

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

Lines changed: 16 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -68,8 +68,10 @@ public GetObjectRequest(final String bucketName, final String objectName, final
6868
this.offset = offset;
6969
this.channel = channel;
7070

71-
this.getQueryParams().put("job", job.toString());
72-
this.getQueryParams().put("offset", Long.toString(offset));
71+
this.updateQueryParam("job", job);
72+
73+
this.updateQueryParam("offset", offset);
74+
7375

7476
}
7577

@@ -81,8 +83,10 @@ public GetObjectRequest(final String bucketName, final String objectName, final
8183
this.offset = offset;
8284
this.channel = channel;
8385

84-
this.getQueryParams().put("job", UrlEscapers.urlFragmentEscaper().escape(job).replace("+", "%2B"));
85-
this.getQueryParams().put("offset", Long.toString(offset));
86+
this.updateQueryParam("job", job);
87+
88+
this.updateQueryParam("offset", offset);
89+
8690

8791
}
8892

@@ -94,8 +98,10 @@ public GetObjectRequest(final String bucketName, final String objectName, final
9498
this.offset = offset;
9599
this.channel = Channels.newChannel(stream);
96100

97-
this.getQueryParams().put("job", job.toString());
98-
this.getQueryParams().put("offset", Long.toString(offset));
101+
this.updateQueryParam("job", job);
102+
103+
this.updateQueryParam("offset", offset);
104+
99105

100106
}
101107

@@ -107,8 +113,10 @@ public GetObjectRequest(final String bucketName, final String objectName, final
107113
this.offset = offset;
108114
this.channel = Channels.newChannel(stream);
109115

110-
this.getQueryParams().put("job", UrlEscapers.urlFragmentEscaper().escape(job).replace("+", "%2B"));
111-
this.getQueryParams().put("offset", Long.toString(offset));
116+
this.updateQueryParam("job", job);
117+
118+
this.updateQueryParam("offset", offset);
119+
112120

113121
}
114122

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

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,8 @@ public ListMultiPartUploadPartsRequest(final String bucketName, final String obj
4444
this.objectName = objectName;
4545
this.uploadId = uploadId.toString();
4646

47-
this.getQueryParams().put("upload_id", uploadId.toString());
47+
this.updateQueryParam("upload_id", uploadId);
48+
4849
}
4950

5051

@@ -53,7 +54,8 @@ public ListMultiPartUploadPartsRequest(final String bucketName, final String obj
5354
this.objectName = objectName;
5455
this.uploadId = uploadId;
5556

56-
this.getQueryParams().put("upload_id", UrlEscapers.urlFragmentEscaper().escape(uploadId).replace("+", "%2B"));
57+
this.updateQueryParam("upload_id", uploadId);
58+
5759
}
5860

5961
public ListMultiPartUploadPartsRequest withMaxParts(final int maxParts) {

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

Lines changed: 16 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -53,8 +53,10 @@ public PutMultiPartUploadPartRequest(final String bucketName, final String objec
5353
this.size = size;
5454
this.channel = channel;
5555

56-
this.getQueryParams().put("part_number", Integer.toString(partNumber));
57-
this.getQueryParams().put("upload_id", uploadId.toString());
56+
this.updateQueryParam("part_number", partNumber);
57+
58+
this.updateQueryParam("upload_id", uploadId);
59+
5860
this.stream = new SeekableByteChannelInputStream(channel);
5961
}
6062

@@ -67,8 +69,10 @@ public PutMultiPartUploadPartRequest(final String bucketName, final String objec
6769
this.size = size;
6870
this.channel = channel;
6971

70-
this.getQueryParams().put("part_number", Integer.toString(partNumber));
71-
this.getQueryParams().put("upload_id", UrlEscapers.urlFragmentEscaper().escape(uploadId).replace("+", "%2B"));
72+
this.updateQueryParam("part_number", partNumber);
73+
74+
this.updateQueryParam("upload_id", uploadId);
75+
7276
this.stream = new SeekableByteChannelInputStream(channel);
7377
}
7478

@@ -81,8 +85,10 @@ public PutMultiPartUploadPartRequest(final String bucketName, final String objec
8185
this.size = size;
8286
this.stream = stream;
8387

84-
this.getQueryParams().put("part_number", Integer.toString(partNumber));
85-
this.getQueryParams().put("upload_id", uploadId.toString());
88+
this.updateQueryParam("part_number", partNumber);
89+
90+
this.updateQueryParam("upload_id", uploadId);
91+
8692
}
8793

8894

@@ -94,8 +100,10 @@ public PutMultiPartUploadPartRequest(final String bucketName, final String objec
94100
this.size = size;
95101
this.stream = stream;
96102

97-
this.getQueryParams().put("part_number", Integer.toString(partNumber));
98-
this.getQueryParams().put("upload_id", UrlEscapers.urlFragmentEscaper().escape(uploadId).replace("+", "%2B"));
103+
this.updateQueryParam("part_number", partNumber);
104+
105+
this.updateQueryParam("upload_id", uploadId);
106+
99107
}
100108

101109

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

Lines changed: 16 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -73,8 +73,10 @@ public PutObjectRequest(final String bucketName, final String objectName, final
7373
this.channel = channel;
7474
this.stream = new SeekableByteChannelInputStream(channel);
7575

76-
this.getQueryParams().put("job", job.toString());
77-
this.getQueryParams().put("offset", Long.toString(offset));
76+
this.updateQueryParam("job", job);
77+
78+
this.updateQueryParam("offset", offset);
79+
7880

7981
}
8082

@@ -88,8 +90,10 @@ public PutObjectRequest(final String bucketName, final String objectName, final
8890
this.channel = channel;
8991
this.stream = new SeekableByteChannelInputStream(channel);
9092

91-
this.getQueryParams().put("job", UrlEscapers.urlFragmentEscaper().escape(job).replace("+", "%2B"));
92-
this.getQueryParams().put("offset", Long.toString(offset));
93+
this.updateQueryParam("job", job);
94+
95+
this.updateQueryParam("offset", offset);
96+
9397

9498
}
9599

@@ -102,8 +106,10 @@ public PutObjectRequest(final String bucketName, final String objectName, final
102106
this.offset = offset;
103107
this.stream = stream;
104108

105-
this.getQueryParams().put("job", job.toString());
106-
this.getQueryParams().put("offset", Long.toString(offset));
109+
this.updateQueryParam("job", job);
110+
111+
this.updateQueryParam("offset", offset);
112+
107113

108114
}
109115

@@ -116,8 +122,10 @@ public PutObjectRequest(final String bucketName, final String objectName, final
116122
this.offset = offset;
117123
this.stream = stream;
118124

119-
this.getQueryParams().put("job", UrlEscapers.urlFragmentEscaper().escape(job).replace("+", "%2B"));
120-
this.getQueryParams().put("offset", Long.toString(offset));
125+
this.updateQueryParam("job", job);
126+
127+
this.updateQueryParam("offset", offset);
128+
121129

122130
}
123131

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

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,15 +36,17 @@ public ConvertStorageDomainToDs3TargetSpectraS3Request(final UUID convertToDs3Ta
3636
this.storageDomain = storageDomain;
3737
this.convertToDs3Target = convertToDs3Target.toString();
3838

39-
this.getQueryParams().put("convert_to_ds3_target", convertToDs3Target.toString());
39+
this.updateQueryParam("convert_to_ds3_target", convertToDs3Target);
40+
4041
}
4142

4243

4344
public ConvertStorageDomainToDs3TargetSpectraS3Request(final String convertToDs3Target, final String storageDomain) {
4445
this.storageDomain = storageDomain;
4546
this.convertToDs3Target = convertToDs3Target;
4647

47-
this.getQueryParams().put("convert_to_ds3_target", UrlEscapers.urlFragmentEscaper().escape(convertToDs3Target).replace("+", "%2B"));
48+
this.updateQueryParam("convert_to_ds3_target", convertToDs3Target);
49+
4850
}
4951

5052

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,8 @@ public class DelegateCreateUserSpectraS3Request extends AbstractRequest {
3737
public DelegateCreateUserSpectraS3Request(final String name) {
3838
this.name = name;
3939

40-
this.getQueryParams().put("name", UrlEscapers.urlFragmentEscaper().escape(name).replace("+", "%2B"));
40+
this.updateQueryParam("name", name);
41+
4142
}
4243

4344
public DelegateCreateUserSpectraS3Request withId(final UUID id) {

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,8 @@ public DeleteFolderRecursivelySpectraS3Request(final String bucketId, final Stri
3737
this.folder = folder;
3838
this.bucketId = bucketId;
3939

40-
this.getQueryParams().put("bucket_id", bucketId);
40+
this.updateQueryParam("bucket_id", bucketId);
41+
4142
this.getQueryParams().put("recursive", null);
4243
}
4344

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

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -56,8 +56,10 @@ public EjectStorageDomainBlobsSpectraS3Request(final String bucketId, final List
5656
this.getQueryParams().put("operation", "eject");
5757

5858
this.getQueryParams().put("blobs", null);
59-
this.getQueryParams().put("bucket_id", bucketId);
60-
this.getQueryParams().put("storage_domain_id", storageDomainId.toString());
59+
this.updateQueryParam("bucket_id", bucketId);
60+
61+
this.updateQueryParam("storage_domain_id", storageDomainId);
62+
6163
}
6264

6365

@@ -69,8 +71,10 @@ public EjectStorageDomainBlobsSpectraS3Request(final String bucketId, final List
6971
this.getQueryParams().put("operation", "eject");
7072

7173
this.getQueryParams().put("blobs", null);
72-
this.getQueryParams().put("bucket_id", bucketId);
73-
this.getQueryParams().put("storage_domain_id", UrlEscapers.urlFragmentEscaper().escape(storageDomainId).replace("+", "%2B"));
74+
this.updateQueryParam("bucket_id", bucketId);
75+
76+
this.updateQueryParam("storage_domain_id", storageDomainId);
77+
7478
}
7579

7680
public EjectStorageDomainBlobsSpectraS3Request withEjectLabel(final String ejectLabel) {

0 commit comments

Comments
 (0)