Skip to content

Commit 1b4fa19

Browse files
committed
Address part of the feedback
1 parent 144b16d commit 1b4fa19

25 files changed

+363
-322
lines changed

pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@
9898
<slf4j.version>1.7.30</slf4j.version>
9999
<log4j.version>1.2.17</log4j.version>
100100
<commons.io.version>2.5</commons.io.version>
101-
<equalsverifier.version>3.5</equalsverifier.version>
101+
<equalsverifier.version>3.7.1</equalsverifier.version>
102102
<!-- Update netty-open-ssl-version accordingly whenever we update netty version-->
103103
<!-- https://github.com/netty/netty/blob/4.1/pom.xml search "tcnative.version" -->
104104
<netty.version>4.1.68.Final</netty.version>

services-custom/s3-transfer-manager/pom.xml

+5
Original file line numberDiff line numberDiff line change
@@ -158,6 +158,11 @@
158158
<artifactId>jimfs</artifactId>
159159
<scope>test</scope>
160160
</dependency>
161+
<dependency>
162+
<groupId>nl.jqno.equalsverifier</groupId>
163+
<artifactId>equalsverifier</artifactId>
164+
<scope>test</scope>
165+
</dependency>
161166
</dependencies>
162167

163168
<build>

services-custom/s3-transfer-manager/src/main/java/software/amazon/awssdk/transfer/s3/CompletedFileTransfer.java

-34
This file was deleted.

services-custom/s3-transfer-manager/src/main/java/software/amazon/awssdk/transfer/s3/CompletedUploadDirectory.java

+6-1
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,8 @@ private CompletedUploadDirectory(DefaultBuilder builder) {
4141
}
4242

4343
/**
44-
* Return failed uploads with error details, request metadata about each file that is failed to upload.
44+
* An immutable collection of failed uploads with error details, request metadata about each file that is failed to
45+
* upload.
4546
*
4647
* @return a list of failed uploads
4748
*/
@@ -111,6 +112,10 @@ public Builder failedUploads(Collection<FailedSingleFileUpload> failedUploads) {
111112
return this;
112113
}
113114

115+
public Collection<FailedSingleFileUpload> getFailedUploads() {
116+
return failedUploads;
117+
}
118+
114119
public void setFailedUploads(Collection<FailedSingleFileUpload> failedUploads) {
115120
failedUploads(failedUploads);
116121
}

services-custom/s3-transfer-manager/src/main/java/software/amazon/awssdk/transfer/s3/DownloadRequest.java

+16
Original file line numberDiff line numberDiff line change
@@ -172,12 +172,28 @@ public Builder destination(Path destination) {
172172
return this;
173173
}
174174

175+
public Path getDestination() {
176+
return destination;
177+
}
178+
179+
public void setDestination(Path destination) {
180+
destination(destination);
181+
}
182+
175183
@Override
176184
public Builder getObjectRequest(GetObjectRequest getObjectRequest) {
177185
this.getObjectRequest = getObjectRequest;
178186
return this;
179187
}
180188

189+
public GetObjectRequest getGetObjectRequest() {
190+
return getObjectRequest;
191+
}
192+
193+
public void setGetObjectRequest(GetObjectRequest getObjectRequest) {
194+
getObjectRequest(getObjectRequest);
195+
}
196+
181197
@Override
182198
public DownloadRequest build() {
183199
return new DownloadRequest(this);

services-custom/s3-transfer-manager/src/main/java/software/amazon/awssdk/transfer/s3/FailedSingleFileUpload.java

+16-1
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,6 @@ private DefaultBuilder(FailedSingleFileUpload failedSingleFileUpload) {
113113
}
114114

115115
private DefaultBuilder() {
116-
117116
}
118117

119118
@Override
@@ -122,12 +121,28 @@ public Builder exception(Throwable exception) {
122121
return this;
123122
}
124123

124+
public void setException(Throwable exception) {
125+
exception(exception);
126+
}
127+
128+
public Throwable getException() {
129+
return exception;
130+
}
131+
125132
@Override
126133
public Builder request(UploadRequest request) {
127134
this.request = request;
128135
return this;
129136
}
130137

138+
public void setRequest(UploadRequest request) {
139+
request(request);
140+
}
141+
142+
public UploadRequest getRequest() {
143+
return request;
144+
}
145+
131146
@Override
132147
public FailedSingleFileUpload build() {
133148
return new FailedSingleFileUpload(this);

services-custom/s3-transfer-manager/src/main/java/software/amazon/awssdk/transfer/s3/S3TransferManager.java

+2
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
import software.amazon.awssdk.annotations.SdkPublicApi;
2222
import software.amazon.awssdk.transfer.s3.internal.DefaultS3TransferManager;
2323
import software.amazon.awssdk.utils.SdkAutoCloseable;
24+
import software.amazon.awssdk.utils.Validate;
2425

2526
/**
2627
* The S3 Transfer Manager is a library that allows users to easily and
@@ -266,6 +267,7 @@ default UploadDirectoryTransfer uploadDirectory(UploadDirectoryRequest uploadDir
266267
* @see UploadDirectoryOverrideConfiguration
267268
*/
268269
default UploadDirectoryTransfer uploadDirectory(Consumer<UploadDirectoryRequest.Builder> requestBuilder) {
270+
Validate.paramNotNull(requestBuilder, "requestBuilder");
269271
return uploadDirectory(UploadDirectoryRequest.builder().applyMutation(requestBuilder).build());
270272
}
271273

services-custom/s3-transfer-manager/src/main/java/software/amazon/awssdk/transfer/s3/S3TransferManagerOverrideConfiguration.java

+12-3
Original file line numberDiff line numberDiff line change
@@ -30,9 +30,9 @@
3030
* <p>
3131
* All values are optional, and not specifying them will use default values provided bt the SDK.
3232
*
33-
* <p>Use {@link #builder()} to create a set of options.</p>
33+
* <p>Use {@link #builder()} to create a set of options.
34+
* @see S3TransferManager.Builder#transferConfiguration(S3TransferManagerOverrideConfiguration)
3435
*/
35-
3636
@SdkPublicApi
3737
@SdkPreviewApi
3838
public final class S3TransferManagerOverrideConfiguration implements
@@ -102,7 +102,8 @@ public static Builder builder() {
102102
public interface Builder extends CopyableBuilder<Builder, S3TransferManagerOverrideConfiguration> {
103103

104104
/**
105-
* Specify the executor that will be used in {@link S3TransferManager}
105+
* Specify the executor that will be used in {@link S3TransferManager} to offload
106+
* execution
106107
*
107108
* @param executor the async configuration
108109
* @return this builder for method chaining.
@@ -159,6 +160,10 @@ public void setExecutor(Executor executor) {
159160
executor(executor);
160161
}
161162

163+
public Executor getExecutor() {
164+
return executor;
165+
}
166+
162167
@Override
163168
public Builder uploadDirectoryConfiguration(UploadDirectoryOverrideConfiguration uploadDirectoryConfiguration) {
164169
this.uploadDirectoryConfiguration = uploadDirectoryConfiguration;
@@ -169,6 +174,10 @@ public void setUploadDirectoryConfiguration(UploadDirectoryOverrideConfiguration
169174
uploadDirectoryConfiguration(uploadDirectoryConfiguration);
170175
}
171176

177+
public UploadDirectoryOverrideConfiguration getUploadDirectoryConfiguration() {
178+
return uploadDirectoryConfiguration;
179+
}
180+
172181
@Override
173182
public S3TransferManagerOverrideConfiguration build() {
174183
return new S3TransferManagerOverrideConfiguration(this);

services-custom/s3-transfer-manager/src/main/java/software/amazon/awssdk/transfer/s3/UploadDirectoryOverrideConfiguration.java

+17-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,8 @@
2828
* Configuration options for {@link S3TransferManager#uploadDirectory}. All values are optional, and not specifying them will
2929
* use the SDK default values.
3030
*
31-
* <p>Use {@link #builder()} to create a set of options.</p>
31+
* <p>Use {@link #builder()} to create a set of options.
32+
* @see S3TransferManager#uploadDirectory(UploadDirectoryRequest)
3233
*/
3334
@SdkPublicApi
3435
@SdkPreviewApi
@@ -47,20 +48,23 @@ public UploadDirectoryOverrideConfiguration(DefaultBuilder builder) {
4748

4849
/**
4950
* @return whether to follow symbolic links
51+
* @see Builder#followSymbolicLinks(Boolean)
5052
*/
5153
public Optional<Boolean> followSymbolicLinks() {
5254
return Optional.ofNullable(followSymbolicLinks);
5355
}
5456

5557
/**
5658
* @return the maximum number of directory levels to traverse
59+
* @see Builder#maxDepth(Integer)
5760
*/
5861
public Optional<Integer> maxDepth() {
5962
return Optional.ofNullable(maxDepth);
6063
}
6164

6265
/**
6366
* @return whether to recursively upload all files under the specified directory
67+
* @see Builder#recursive(Boolean)
6468
*/
6569
public Optional<Boolean> recursive() {
6670
return Optional.ofNullable(recursive);
@@ -171,6 +175,10 @@ public Builder recursive(Boolean recursive) {
171175
return this;
172176
}
173177

178+
public Boolean getRecursive() {
179+
return recursive;
180+
}
181+
174182
public void setRecursive(Boolean recursive) {
175183
recursive(recursive);
176184
}
@@ -185,6 +193,10 @@ public void setFollowSymbolicLinks(Boolean followSymbolicLinks) {
185193
followSymbolicLinks(followSymbolicLinks);
186194
}
187195

196+
public Boolean getFollowSymbolicLinks() {
197+
return followSymbolicLinks;
198+
}
199+
188200
@Override
189201
public Builder maxDepth(Integer maxDepth) {
190202
this.maxDepth = maxDepth;
@@ -195,6 +207,10 @@ public void setMaxDepth(Integer maxDepth) {
195207
maxDepth(maxDepth);
196208
}
197209

210+
public Integer getMaxDepth() {
211+
return maxDepth;
212+
}
213+
198214
@Override
199215
public UploadDirectoryOverrideConfiguration build() {
200216
return new UploadDirectoryOverrideConfiguration(this);

services-custom/s3-transfer-manager/src/main/java/software/amazon/awssdk/transfer/s3/UploadDirectoryRequest.java

+44
Original file line numberDiff line numberDiff line change
@@ -115,6 +115,9 @@ public boolean equals(Object o) {
115115
if (!Objects.equals(prefix, that.prefix)) {
116116
return false;
117117
}
118+
if (!Objects.equals(delimiter, that.delimiter)) {
119+
return false;
120+
}
118121
return Objects.equals(overrideConfiguration, that.overrideConfiguration);
119122
}
120123

@@ -123,6 +126,7 @@ public int hashCode() {
123126
int result = sourceDirectory.hashCode();
124127
result = 31 * result + bucket.hashCode();
125128
result = 31 * result + (prefix != null ? prefix.hashCode() : 0);
129+
result = 31 * result + (delimiter != null ? delimiter.hashCode() : 0);
126130
result = 31 * result + (overrideConfiguration != null ? overrideConfiguration.hashCode() : 0);
127131
return result;
128132
}
@@ -223,30 +227,70 @@ public Builder sourceDirectory(Path sourceDirectory) {
223227
return this;
224228
}
225229

230+
public void setSourceDirectory(Path sourceDirectory) {
231+
sourceDirectory(sourceDirectory);
232+
}
233+
234+
public Path getSourceDirectory() {
235+
return sourceDirectory;
236+
}
237+
226238
@Override
227239
public Builder bucket(String bucket) {
228240
this.bucket = bucket;
229241
return this;
230242
}
231243

244+
public void setBucket(String bucket) {
245+
bucket(bucket);
246+
}
247+
248+
public String getBucket() {
249+
return bucket;
250+
}
251+
232252
@Override
233253
public Builder prefix(String prefix) {
234254
this.prefix = prefix;
235255
return this;
236256
}
237257

258+
public void setPrefix(String prefix) {
259+
prefix(prefix);
260+
}
261+
262+
public String getPrefix() {
263+
return prefix;
264+
}
265+
238266
@Override
239267
public Builder delimiter(String delimiter) {
240268
this.delimiter = delimiter;
241269
return this;
242270
}
243271

272+
public void setDelimiter(String delimiter) {
273+
delimiter(delimiter);
274+
}
275+
276+
public String getDelimiter() {
277+
return delimiter;
278+
}
279+
244280
@Override
245281
public Builder overrideConfiguration(UploadDirectoryOverrideConfiguration configuration) {
246282
this.configuration = configuration;
247283
return this;
248284
}
249285

286+
public void setOverrideConfiguration(UploadDirectoryOverrideConfiguration configuration) {
287+
overrideConfiguration(configuration);
288+
}
289+
290+
public UploadDirectoryOverrideConfiguration getOverrideConfiguration() {
291+
return configuration;
292+
}
293+
250294
@Override
251295
public UploadDirectoryRequest build() {
252296
return new UploadDirectoryRequest(this);

services-custom/s3-transfer-manager/src/main/java/software/amazon/awssdk/transfer/s3/UploadRequest.java

+16
Original file line numberDiff line numberDiff line change
@@ -179,12 +179,28 @@ public Builder source(Path source) {
179179
return this;
180180
}
181181

182+
public Path getSource() {
183+
return source;
184+
}
185+
186+
public void setSource(Path source) {
187+
source(source);
188+
}
189+
182190
@Override
183191
public Builder putObjectRequest(PutObjectRequest putObjectRequest) {
184192
this.putObjectRequest = putObjectRequest;
185193
return this;
186194
}
187195

196+
public PutObjectRequest getPutObjectRequest() {
197+
return putObjectRequest;
198+
}
199+
200+
public void setPutObjectRequest(PutObjectRequest putObjectRequest) {
201+
putObjectRequest(putObjectRequest);
202+
}
203+
188204
@Override
189205
public UploadRequest build() {
190206
return new UploadRequest(this);

0 commit comments

Comments
 (0)