From 114b0cc4c03ab3cc8c3e1d64ad1401e934a76f9c Mon Sep 17 00:00:00 2001 From: Justin Lipton Date: Mon, 26 Nov 2018 16:16:36 +1100 Subject: [PATCH] Change properties file to not include dots (breaks some JREs when loading bundles) Changed main/test method to use properties file if present --- .../techblue/docusign/client/DocuSignClient.java | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/docusign-restclient-core/src/main/java/uk/co/techblue/docusign/client/DocuSignClient.java b/docusign-restclient-core/src/main/java/uk/co/techblue/docusign/client/DocuSignClient.java index 7d26b7f..1701927 100644 --- a/docusign-restclient-core/src/main/java/uk/co/techblue/docusign/client/DocuSignClient.java +++ b/docusign-restclient-core/src/main/java/uk/co/techblue/docusign/client/DocuSignClient.java @@ -46,7 +46,7 @@ import uk.co.techblue.docusign.resteasy.providers.DocumentFileProvider; /** * The HTTP client can be configured adding in the classpath the following properties file: - * uk.co.techblue.docusign.client.DocuSignClient.properties + * DocuSignClient.properties * The configuration allows to set the timeout and the maximum number of connections per route: * docusign.connection.timeout=20000 * docusign.max.per.route=50 @@ -57,12 +57,7 @@ public class DocuSignClient { public static void main(String[] args) throws ClientProtocolException, IOException { - ThreadSafeClientConnManager cm = new ThreadSafeClientConnManager(); - int maxPerRoute = 50; - cm.setDefaultMaxPerRoute(maxPerRoute); - cm.setMaxTotal(maxPerRoute); - - HttpClient client = new DefaultHttpClient(cm); + HttpClient client = getHttpClient(); HttpParams params = client.getParams(); // Allowable time between packets HttpConnectionParams.setSoTimeout(params, 6000); @@ -154,11 +149,12 @@ private static class HttpClientConfiguration { private ResourceBundle docusignClientBundle = null; private HttpClientConfiguration () { try { - docusignClientBundle = ResourceBundle.getBundle(DocuSignClient.class.getCanonicalName()); + docusignClientBundle = ResourceBundle.getBundle(DocuSignClient.class.getSimpleName()); } catch(MissingResourceException mre) { - /* Ignore */ + /* Ignore */ } + } private String getString(String key, String defaultValue) { @@ -230,7 +226,6 @@ private static HttpClient getHttpClient() { int timeout = httpClientConfiguration.getTimeout(); String proxyHost = httpClientConfiguration.getProxyHost(); - HttpParams params = client.getParams(); // Allowable time between packets HttpConnectionParams.setSoTimeout(params, timeout);