Merge pull request #32 from charlesk40/master

Allow AsyncHttpClient to be passed in.   Use bounded threadpool.

Author: Baruch Sadogursky

ning-services/src/main/groovy/org/jfrog/artifactory/client/ning/ArtifactoryClient.groovy

@@ -6,9 +6,15 @@
  * limitations under the License. See accompanying LICENSE file.  */
 package org.jfrog.artifactory.client.ning
 
-import java.util.concurrent.ExecutorService
+import java.util.concurrent.ThreadFactory
+
 import java.util.concurrent.Executors
 import java.util.concurrent.ThreadFactory
+import java.util.concurrent.ExecutorService
+import java.util.concurrent.SynchronousQueue
+import java.util.concurrent.ThreadFactory
+import java.util.concurrent.ThreadPoolExecutor
+import java.util.concurrent.TimeUnit
 
 import org.jfrog.artifactory.client.Artifactory
 import org.slf4j.Logger
@@ -30,17 +36,8 @@ import com.ning.http.client.Realm.AuthScheme
 public class ArtifactoryClient {
 
     private static final Logger log = LoggerFactory.getLogger(ArtifactoryClient.class);
-    private static AsyncHttpClient ningHttpClient;
-    private static final NingRequest ningRequest;
 
     public static Artifactory create(final String url, final String username, final char[] password, final NingRequest ningRequest) {
-        def matcher = url =~ /(https?:\/\/[^\/]+)\/+([^\/]*).*/
-        if (!matcher) {
-            matcher = url =~ /(https?:\/\/[^\/]+)\/*()/
-            if (!matcher) {
-                throw new IllegalArgumentException("Invalid Artifactory URL: ${url}.")
-            }
-        }
         Realm realm=null;
         if (username!=null && !"".equals(username)){
             realm = new Realm.RealmBuilder()
@@ -50,19 +47,31 @@ public class ArtifactoryClient {
                     .setScheme(AuthScheme.BASIC)
                     .build();
         }
-        ExecutorService executorService =  Executors
-                        .newCachedThreadPool(new ThreadFactory() {
-                            public Thread newThread(Runnable r) {
-                                Thread t = new Thread(r,
-                                        "AsyncHttpClient-Callback");
-                                t.setDaemon(true);
-                                return t;
-                            }
-                        });
-        ningHttpClient = new AsyncHttpClient(new AsyncHttpClientConfig.Builder()
+        //Use bounded
+        ExecutorService executorService =  new ThreadPoolExecutor(20, 100, 60L, TimeUnit.SECONDS, new SynchronousQueue<Runnable>(),
+            new ThreadFactory() {
+                public Thread newThread(Runnable r) {
+                    Thread t = new Thread(r,
+                            "AsyncHttpClient-Callback");
+                    t.setDaemon(true);
+                    return t;
+                }
+            });
+        AsyncHttpClient ningHttpClient = new AsyncHttpClient(new AsyncHttpClientConfig.Builder()
             .setRealm(realm)
             .setExecutorService(executorService)
             .build());
+        return create(url, ningHttpClient, ningRequest);
+    }
+    
+    public static Artifactory create(final String url, final AsyncHttpClient ningHttpClient, final NingRequest ningRequest) {
+        def matcher = url =~ /(https?:\/\/[^\/]+)\/+([^\/]*).*/
+        if (!matcher) {
+            matcher = url =~ /(https?:\/\/[^\/]+)\/*()/
+            if (!matcher) {
+                throw new IllegalArgumentException("Invalid Artifactory URL: ${url}.")
+            }
+        }
         log.debug("Url: {}, Context: {}, Host: {}", url, matcher[0][2], matcher[0][1]);
         return new ArtifactoryNingClientImpl(ningHttpClient, matcher[0][2], matcher[0][1], ningRequest);
     }

ning-services/src/test/java/org/jfrog/artifactory/client/ning/ArtifactoryNingClientTest.java

@@ -9,6 +9,9 @@
 
 import com.ning.http.client.AsyncHttpClient.BoundRequestBuilder;
 import com.ning.http.client.Cookie;
+import com.ning.http.client.AsyncHttpClient;
+import com.ning.http.client.AsyncHttpClientConfig;
+
 import org.apache.http.client.HttpResponseException;
 import org.jfrog.artifactory.client.*;
 import org.jfrog.artifactory.client.model.File;
@@ -22,6 +25,14 @@
 import java.io.InputStream;
 import java.util.Properties;
 
+import java.util.concurrent.Executors;
+import java.util.concurrent.ThreadFactory;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.SynchronousQueue;
+import java.util.concurrent.ThreadFactory;
+import java.util.concurrent.ThreadPoolExecutor;
+import java.util.concurrent.TimeUnit;
+
 /**
  * @author charlesk
  */
@@ -112,6 +123,29 @@ public void clean() {
         artifactory.close();
     }
 
+    @Test
+    public void testCreateArtifactoryClient() throws Exception {
+        ExecutorService executorService =  new ThreadPoolExecutor(20, 100, 60L, TimeUnit.SECONDS, new SynchronousQueue<Runnable>(), 
+                        new ThreadFactory() {
+                            public Thread newThread(Runnable r) {
+                                Thread t = new Thread(r,
+                                        "AsyncHttpClient-Callback");
+                                t.setDaemon(true);
+                                return t;
+                            }
+                        });
+        AsyncHttpClient ningHttpClient = new AsyncHttpClient(new AsyncHttpClientConfig.Builder()
+        .setExecutorService(executorService)
+        .build());
+        Artifactory artifactory = org.jfrog.artifactory.client.ning.ArtifactoryClient.create(url, ningHttpClient, testNingRequestImpl);
+        RepositoryHandle repositoryHandle = artifactory.repository(repo);
+        Assert.assertNotNull(repositoryHandle);
+        ItemHandle itemHandle = repositoryHandle.file(filePath + "/" + fileName);
+        Assert.assertNotNull(itemHandle);
+        Item item = itemHandle.info();
+        Assert.assertNotNull(item);
+    }
+
     @Test
     public void testGetMetaData() throws Exception {
         // meta-data Get
@@ -192,5 +226,4 @@ public BoundRequestBuilder getBoundRequestBuilder(BoundRequestBuilder requestBui
 
         }
     }
-
 }