Next development version - 0.6

Author: danf

impl/src/main/java/com/jfrog/bintray/client/impl/BintrayClient.java

@@ -14,36 +14,37 @@
  */
 public class BintrayClient {
 
-    public static final int DEFAULT_TIMEOUT = 15000;
+    public static final int DEFAULT_TIMEOUT = 150000;
     public static final String BINTRAY_API_URL = "https://api.bintray.com";
     public static final String USER_AGENT = "BintrayJavaClient/0.5"; // TODO: make dynamic
+    private static final int DEFAULT_THREAD_POOL_SIZE = 5; //Don't mess with this - its here for a reason
 
     //Mainly used by Artifactory to avoid all of the configuration, but you can specify your own too
-    static public Bintray create(CloseableHttpClient preConfiguredClient, String url) {
-        return new BintrayImpl(preConfiguredClient, url);
+    static public Bintray create(CloseableHttpClient preConfiguredClient, String url, int threadPoolSize) {
+        return new BintrayImpl(preConfiguredClient, url, threadPoolSize);
     }
 
     /**
      * Username and API key, no proxy
      */
     static public Bintray create(String userName, String apiKey) {
         UsernamePasswordCredentials creds = new UsernamePasswordCredentials(userName, apiKey);
-        return new BintrayImpl(createClient(creds, null, BINTRAY_API_URL), BINTRAY_API_URL);
+        return new BintrayImpl(createClient(creds, null, BINTRAY_API_URL), BINTRAY_API_URL, DEFAULT_THREAD_POOL_SIZE);
     }
 
     /**
      * Username, API key, and custom url
      */
     static public Bintray create(String url, String userName, String apiKey) {
         UsernamePasswordCredentials creds = new UsernamePasswordCredentials(userName, apiKey);
-        return new BintrayImpl(createClient(creds, null, BINTRAY_API_URL), BINTRAY_API_URL);
+        return new BintrayImpl(createClient(creds, null, BINTRAY_API_URL), BINTRAY_API_URL, DEFAULT_THREAD_POOL_SIZE);
     }
 
     /**
      * Credentials with proxy
      */
     static public Bintray create(UsernamePasswordCredentials creds, HttpClientConfigurator.ProxyConfig proxyConfig) {
-        return new BintrayImpl(createClient(creds, proxyConfig, BINTRAY_API_URL), BINTRAY_API_URL);
+        return new BintrayImpl(createClient(creds, proxyConfig, BINTRAY_API_URL), BINTRAY_API_URL, DEFAULT_THREAD_POOL_SIZE);
     }
 
     /**
@@ -52,7 +53,7 @@ static public Bintray create(UsernamePasswordCredentials creds, HttpClientConfig
     static public Bintray create(String bintrayUserName, String bintrayApiKey,
                                  HttpClientConfigurator.ProxyConfig proxyConfig, String url) {
         UsernamePasswordCredentials creds = new UsernamePasswordCredentials(bintrayUserName, bintrayApiKey);
-        return new BintrayImpl(createClient(creds, proxyConfig, url), url);
+        return new BintrayImpl(createClient(creds, proxyConfig, url), url, DEFAULT_THREAD_POOL_SIZE);
     }
 
 

impl/src/main/java/com/jfrog/bintray/client/impl/handle/BintrayImpl.java

@@ -30,15 +30,16 @@
  */
 public class BintrayImpl implements Bintray {
     private static final Logger log = LoggerFactory.getLogger(BintrayImpl.class);
-    ExecutorService executorService = Executors.newCachedThreadPool();
+    ExecutorService executorService;
     private CloseableHttpClient client;
     private ResponseHandler<HttpResponse> responseHandler = new BintrayResponseHandler();
     private String baseUrl;
 
 
-    public BintrayImpl(CloseableHttpClient client, String baseUrl) {
+    public BintrayImpl(CloseableHttpClient client, String baseUrl, int threadPoolSize) {
         this.client = client;
         this.baseUrl = (baseUrl == null || baseUrl.isEmpty()) ? BintrayClient.BINTRAY_API_URL : baseUrl;
+        this.executorService = Executors.newFixedThreadPool(threadPoolSize);
     }
 
     static public void addContentTypeJsonHeader(Map<String, String> headers) {
@@ -202,7 +203,7 @@ private HttpResponse put(List<HttpPut> requests) throws MultipleBintrayCallExcep
             runners.add(runner);
         }
         try {
-            executions = executorService.invokeAll(runners, BintrayClient.DEFAULT_TIMEOUT, TimeUnit.MILLISECONDS);
+            executions = executorService.invokeAll(runners, 10, TimeUnit.MINUTES);
         } catch (InterruptedException e) {
             BintrayCallException bce = new BintrayCallException(400, e.getMessage(), (e.getCause() == null) ? "" : e.getCause().getMessage());
             log.error(bce.toString());
@@ -225,7 +226,7 @@ private HttpResponse put(List<HttpPut> requests) throws MultipleBintrayCallExcep
                             bce = new BintrayCallException(400, e.getMessage(), (e.getCause() == null) ? "" : e.getCause().getMessage());
                         }
                         log.error(bce.toString());
-                        log.debug("{}", e);
+                        log.debug("{}", e.getMessage(), e);
                         errors.add(bce);
                     } finally {
                         executionIter.remove();     //Remove completed execution from iteration
@@ -312,15 +313,18 @@ public String call() throws BintrayCallException {
             try {
                 response = client.execute(request, responseHandler, context);
             } catch (BintrayCallException bce) {
-                log.debug("{}", bce);
+                log.debug("{}", bce.getMessage(), bce);
                 errorResultBuilder.append(bce.getMessage());
                 bce.setMessage(errorResultBuilder.toString());
                 throw bce;
             } catch (IOException ioe) {
-                log.debug("{}", ioe);
-                String cause = (ioe.getCause() == null) ? "" : " : " + ioe.getCause().getMessage();
+                log.debug("IOException occured: '{}'", ioe.getMessage(), ioe);
+                String cause = (ioe.getCause() == null) ? ((ioe.getMessage() != null && !ioe.getMessage().equals("")) ? ioe.getMessage() : ioe.toString())
+                        : " : " + ((ioe.getCause().getMessage() != null && !ioe.getCause().getMessage().equals("")) ? ioe.getCause().getMessage() : ioe.getCause().toString());
                 errorResultBuilder.append(ioe.getMessage()).append(cause);
                 throw new BintrayCallException(HttpStatus.SC_BAD_REQUEST, ioe.getMessage(), errorResultBuilder.toString());
+            } finally {
+                request.releaseConnection();
             }
             if (statusNotOk(response.getStatusLine().getStatusCode())) {
                 BintrayCallException bce = new BintrayCallException(response);