supdev GiKIgqnO - Allow http read timeout to be set

KeepItSimpleStupid · Feb 29, 2016 · 4f11cdb · 4f11cdb
1 parent b5adc6d
commit 4f11cdb
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 5 deletions.
diff --git a/src/main/java/com/braintreegateway/Configuration.java b/src/main/java/com/braintreegateway/Configuration.java
@@ -10,13 +10,14 @@
 
 public class Configuration {
     private Environment environment;
+    private int readTimeout;
+    private Proxy proxy;
+    private String accessToken;
+    private String clientId;
+    private String clientSecret;
     private String merchantId;
     private String privateKey;
     private String publicKey;
-    private String clientId;
-    private String clientSecret;
-    private String accessToken;
-    private Proxy proxy;
     private static Logger logger;
 
     static {
@@ -118,4 +119,12 @@ public Logger getLogger() {
     public void setLogger(Logger log) {
         logger = log;
     }
+
+    public int getReadTimeout() {
+        return (readTimeout == 0) ? 60000 : readTimeout;
+    }
+
+    public void setReadTimeout(Integer readTimeout) {
+        this.readTimeout = readTimeout;
+    }
 }
diff --git a/src/main/java/com/braintreegateway/util/Http.java b/src/main/java/com/braintreegateway/util/Http.java
@@ -232,7 +232,7 @@ private HttpURLConnection buildConnection(RequestMethod requestMethod, String ur
         connection.addRequestProperty("Accept-Encoding", "gzip");
         connection.addRequestProperty("Content-Type", "application/xml");
         connection.setDoOutput(true);
-        connection.setReadTimeout(60000);
+        connection.setReadTimeout(configuration.getReadTimeout());
         return connection;
     }
 

diff --git a/src/test/java/com/braintreegateway/unittest/ConfigurationTest.java b/src/test/java/com/braintreegateway/unittest/ConfigurationTest.java
@@ -44,4 +44,17 @@ public void testConfigurationIsUsingProxy() {
 
         assertTrue(configuration.usesProxy());
     }
+
+    @Test
+    public void testReadtimeoutDefaultsToSixtySeconds() {
+        Configuration configuration = new Configuration(Environment.DEVELOPMENT, "merchant_id", "integration_public_key", "integration_private_key");
+        assertEquals(configuration.getReadTimeout(), 60000);
+    }
+
+    @Test
+    public void testSettingReadTimeout() {
+        Configuration configuration = new Configuration(Environment.DEVELOPMENT, "merchant_id", "integration_public_key", "integration_private_key");
+        configuration.setReadTimeout(30000);
+        assertEquals(configuration.getReadTimeout(), 30000);
+    }
 }