You are viewing a plain text version of this content. The canonical link for it is here.
Posted to server-dev@james.apache.org by bt...@apache.org on 2019/12/18 11:23:17 UTC
[james-project] 02/13: JAMES-3008 Remove unused parameter in AWS
blobPutter
This is an automated email from the ASF dual-hosted git repository.
btellier pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/james-project.git
commit 207ad0a9690080468eebc97bac10b68b9ee7b6e9
Author: Rene Cordier <rc...@linagora.com>
AuthorDate: Thu Dec 12 15:38:25 2019 +0700
JAMES-3008 Remove unused parameter in AWS blobPutter
---
.../org/apache/james/blob/objectstorage/aws/AwsS3ObjectStorage.java | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/server/blob/blob-objectstorage/src/main/java/org/apache/james/blob/objectstorage/aws/AwsS3ObjectStorage.java b/server/blob/blob-objectstorage/src/main/java/org/apache/james/blob/objectstorage/aws/AwsS3ObjectStorage.java
index e02577a..f1e8f77 100644
--- a/server/blob/blob-objectstorage/src/main/java/org/apache/james/blob/objectstorage/aws/AwsS3ObjectStorage.java
+++ b/server/blob/blob-objectstorage/src/main/java/org/apache/james/blob/objectstorage/aws/AwsS3ObjectStorage.java
@@ -146,14 +146,14 @@ public class AwsS3ObjectStorage {
@Override
public Mono<Void> putDirectly(ObjectStorageBucketName bucketName, Blob blob) {
- return writeFileAndAct(blob, file -> putWithRetry(bucketName, configuration, blob, file, FIRST_TRY));
+ return writeFileAndAct(blob, file -> putWithRetry(bucketName, configuration, blob, file));
}
@Override
public Mono<BlobId> putAndComputeId(ObjectStorageBucketName bucketName, Blob initialBlob, Supplier<BlobId> blobIdSupplier) {
Function<File, Mono<Void>> putChangedBlob = file -> {
initialBlob.getMetadata().setName(blobIdSupplier.get().asString());
- return putWithRetry(bucketName, configuration, initialBlob, file, FIRST_TRY);
+ return putWithRetry(bucketName, configuration, initialBlob, file);
};
return writeFileAndAct(initialBlob, putChangedBlob)
.then(Mono.fromCallable(blobIdSupplier::get));
@@ -171,7 +171,7 @@ public class AwsS3ObjectStorage {
);
}
- private Mono<Void> putWithRetry(ObjectStorageBucketName bucketName, AwsS3AuthConfiguration configuration, Blob blob, File file, int tried) {
+ private Mono<Void> putWithRetry(ObjectStorageBucketName bucketName, AwsS3AuthConfiguration configuration, Blob blob, File file) {
return Mono.<Void>fromRunnable(Throwing.runnable(() -> put(bucketName, configuration, blob, file)).sneakyThrow())
.publishOn(Schedulers.elastic())
.retryWhen(Retry
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org