added the configuration for max connections to S3

jijisv · jijisv · commit aa42737a7bc6 · 2017-03-27T21:59:47.000+01:00
diff --git a/micro-s3/src/main/java/com/aol/micro/server/s3/S3Configuration.java b/micro-s3/src/main/java/com/aol/micro/server/s3/S3Configuration.java
@@ -1,7 +1,6 @@
 package com.aol.micro.server.s3;
 
 import lombok.Getter;
-
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Component;
@@ -16,17 +15,22 @@ public class S3Configuration {
     private final String region;
     private final int uploadThreads;
     private final String uploadThreadNamePrefix;
+    private final int maxConnections;
 
     @Autowired
-    public S3Configuration(@Value("${s3.accessKey}") String accessKey, @Value("${s3.secretKey}") String secretKey,
-            @Value("${s3.sessionToken:#{null}}") String sessionToken, @Value("${s3.region:#{null}}") String region,
-            @Value("${s3.upload.threads:5}") int uploadThreads,
-            @Value("${s3.upload.thread.name.prefix:s3-transfer-manager-worker-}") String uploadThreadNamePrefix) {
+    public S3Configuration(@Value("${s3.accessKey}") String accessKey,
+                           @Value("${s3.secretKey}") String secretKey,
+                           @Value("${s3.sessionToken:#{null}}") String sessionToken,
+                           @Value("${s3.region:#{null}}") String region,
+                           @Value("${s3.upload.threads:5}") int uploadThreads,
+                           @Value("${s3.upload.thread.name.prefix:s3-transfer-manager-worker-}") String uploadThreadNamePrefix,
+                           @Value("${s3.client.maxConnections:100}") int maxConnections) {
         this.accessKey = accessKey;
         this.secretKey = secretKey;
         this.sessionToken = sessionToken;
         this.region = region;
         this.uploadThreads = uploadThreads;
         this.uploadThreadNamePrefix = uploadThreadNamePrefix;
+        this.maxConnections = maxConnections;
     }
 }
diff --git a/micro-s3/src/main/java/com/aol/micro/server/s3/plugin/S3ClientProvider.java b/micro-s3/src/main/java/com/aol/micro/server/s3/plugin/S3ClientProvider.java
@@ -1,7 +1,9 @@
 package com.aol.micro.server.s3.plugin;
 
+import com.amazonaws.ClientConfiguration;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.ComponentScan;
 import org.springframework.context.annotation.Configuration;
 
 import com.amazonaws.auth.AWSCredentials;
@@ -13,6 +15,7 @@
 import com.aol.micro.server.s3.S3Configuration;
 
 @Configuration
+@ComponentScan(basePackages = {"com.aol.micro.server.s3"})
 public class S3ClientProvider {
 
     @Autowired
@@ -24,16 +27,13 @@ public AmazonS3Client getClient() {
         AWSCredentials credentials;
 
         if (s3Configuration.getSessionToken() == null) {
-            credentials = new BasicAWSCredentials(
-                                                  s3Configuration.getAccessKey(), s3Configuration.getSecretKey());
+            credentials = new BasicAWSCredentials(s3Configuration.getAccessKey(), s3Configuration.getSecretKey());
         } else {
-            credentials = new BasicSessionCredentials(
-                                                      s3Configuration.getAccessKey(), s3Configuration.getSecretKey(),
+            credentials = new BasicSessionCredentials(s3Configuration.getAccessKey(), s3Configuration.getSecretKey(),
                                                       s3Configuration.getSessionToken());
         }
 
-        AmazonS3Client amazonS3Client = new AmazonS3Client(
-                                                           credentials);
+        AmazonS3Client amazonS3Client = new AmazonS3Client(credentials, getClientConfiguration());
 
         if (s3Configuration.getRegion() != null) {
             Region region = Region.getRegion(Regions.fromName(s3Configuration.getRegion()));
@@ -42,4 +42,8 @@ public AmazonS3Client getClient() {
 
         return amazonS3Client;
     }
+
+    private ClientConfiguration getClientConfiguration() {
+        return new ClientConfiguration().withMaxConnections(s3Configuration.getMaxConnections());
+    }
 }
diff --git a/micro-s3/src/test/java/com/aol/micro/server/s3/plugin/S3ClientProviderTest.java b/micro-s3/src/test/java/com/aol/micro/server/s3/plugin/S3ClientProviderTest.java
@@ -0,0 +1,28 @@
+package com.aol.micro.server.s3.plugin;
+
+import com.amazonaws.services.s3.AmazonS3Client;
+import lombok.SneakyThrows;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.ApplicationContext;
+import org.springframework.test.context.ContextConfiguration;
+import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+import org.springframework.test.context.support.AnnotationConfigContextLoader;
+
+import static org.junit.Assert.assertNotNull;
+
+@RunWith(SpringJUnit4ClassRunner.class)
+@ContextConfiguration(classes=S3ClientProvider.class, loader = AnnotationConfigContextLoader.class)
+public class S3ClientProviderTest {
+
+    @Autowired
+    ApplicationContext ctx;
+
+    @Test
+    @SneakyThrows
+    public void getClient() {
+        AmazonS3Client client = ctx.getBean(AmazonS3Client.class);
+        assertNotNull(client);
+    }
+}
