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
The following commit(s) were added to refs/heads/master by this push:
new 3e5ab9fbe9 Move Singleton annotation to the right place (#2455)
3e5ab9fbe9 is described below
commit 3e5ab9fbe9c2609e0c6145fedce81397d67c7df6
Author: hungphan227 <[email protected]>
AuthorDate: Thu Oct 17 01:33:24 2024 +0700
Move Singleton annotation to the right place (#2455)
Co-authored-by: hung phan <[email protected]>
---
.../java/org/apache/james/blob/objectstorage/aws/S3BlobStoreDAO.java | 2 +-
.../java/org/apache/james/blob/objectstorage/aws/S3ClientFactory.java | 2 +-
.../java/org/apache/james/jmap/api/upload/UploadServiceDefaultImpl.java | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git
a/server/blob/blob-s3/src/main/java/org/apache/james/blob/objectstorage/aws/S3BlobStoreDAO.java
b/server/blob/blob-s3/src/main/java/org/apache/james/blob/objectstorage/aws/S3BlobStoreDAO.java
index 0f8980d4b6..74ac19a483 100644
---
a/server/blob/blob-s3/src/main/java/org/apache/james/blob/objectstorage/aws/S3BlobStoreDAO.java
+++
b/server/blob/blob-s3/src/main/java/org/apache/james/blob/objectstorage/aws/S3BlobStoreDAO.java
@@ -72,6 +72,7 @@ import
software.amazon.awssdk.services.s3.model.ObjectIdentifier;
import software.amazon.awssdk.services.s3.model.PutObjectResponse;
import software.amazon.awssdk.services.s3.model.S3Object;
+@Singleton
public class S3BlobStoreDAO implements BlobStoreDAO {
private static class FileBackedOutputStreamByteSource extends ByteSource {
@@ -113,7 +114,6 @@ public class S3BlobStoreDAO implements BlobStoreDAO {
private final BlobId.Factory blobIdFactory;
@Inject
- @Singleton
public S3BlobStoreDAO(S3ClientFactory s3ClientFactory,
S3BlobStoreConfiguration configuration,
BlobId.Factory blobIdFactory) {
diff --git
a/server/blob/blob-s3/src/main/java/org/apache/james/blob/objectstorage/aws/S3ClientFactory.java
b/server/blob/blob-s3/src/main/java/org/apache/james/blob/objectstorage/aws/S3ClientFactory.java
index ef3f32f2fd..6a9ebacd90 100644
---
a/server/blob/blob-s3/src/main/java/org/apache/james/blob/objectstorage/aws/S3ClientFactory.java
+++
b/server/blob/blob-s3/src/main/java/org/apache/james/blob/objectstorage/aws/S3ClientFactory.java
@@ -50,6 +50,7 @@ import
software.amazon.awssdk.http.nio.netty.NettyNioAsyncHttpClient;
import software.amazon.awssdk.services.s3.S3AsyncClient;
import software.amazon.awssdk.services.s3.S3Configuration;
+@Singleton
public class S3ClientFactory implements Startable, Closeable {
private static final TrustManager DUMMY_TRUST_MANAGER = new
X509TrustManager() {
@Override
@@ -75,7 +76,6 @@ public class S3ClientFactory implements Startable, Closeable {
private final S3AsyncClient s3Client;
@Inject
- @Singleton
public S3ClientFactory(S3BlobStoreConfiguration configuration,
MetricFactory metricFactory, GaugeRegistry gaugeRegistry) {
this(configuration, () -> new JamesS3MetricPublisher(metricFactory,
gaugeRegistry, S3_METRICS_PREFIX));
}
diff --git
a/server/data/data-jmap/src/main/java/org/apache/james/jmap/api/upload/UploadServiceDefaultImpl.java
b/server/data/data-jmap/src/main/java/org/apache/james/jmap/api/upload/UploadServiceDefaultImpl.java
index d691ebff1c..e981c9459c 100644
---
a/server/data/data-jmap/src/main/java/org/apache/james/jmap/api/upload/UploadServiceDefaultImpl.java
+++
b/server/data/data-jmap/src/main/java/org/apache/james/jmap/api/upload/UploadServiceDefaultImpl.java
@@ -41,13 +41,13 @@ import org.reactivestreams.Publisher;
import reactor.core.publisher.Flux;
import reactor.core.publisher.Mono;
+@Singleton
public class UploadServiceDefaultImpl implements UploadService {
private final UploadRepository uploadRepository;
private final UploadUsageRepository uploadUsageRepository;
private final JmapUploadQuotaConfiguration jmapUploadQuotaConfiguration;
@Inject
- @Singleton
public UploadServiceDefaultImpl(UploadRepository uploadRepository,
UploadUsageRepository
uploadUsageRepository,
JmapUploadQuotaConfiguration
jmapUploadQuotaConfiguration) {
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
