Rename HttpClient.getNumRetriesSoFar to getCurrentRetryCount, convert…

… HttpClientUnitTest to Kotlin, and remove unused function and test class (#1242)
braintree · Dec 17, 2024 · a74fe2b · a74fe2b
1 parent 8c181f1
commit a74fe2b
Show file tree

Hide file tree

Showing 5 changed files with 176 additions and 227 deletions.
diff --git a/SharedUtils/src/androidTest/java/com/braintreepayments/api/sharedutils/ClassHelperTest.java b/SharedUtils/src/androidTest/java/com/braintreepayments/api/sharedutils/ClassHelperTest.java
diff --git a/SharedUtils/src/main/java/com/braintreepayments/api/sharedutils/HttpClient.kt b/SharedUtils/src/main/java/com/braintreepayments/api/sharedutils/HttpClient.kt
@@ -72,7 +72,7 @@ class HttpClient internal constructor(
         }
 
         if (url != null) {
-            val retryCount = getNumRetriesSoFar(url)
+            val retryCount = getCurrentRetryCount(url)
             val shouldRetry = ((retryCount + 1) < MAX_RETRY_ATTEMPTS)
             if (shouldRetry) {
                 scheduleRequest(request, retryStrategy, callback)
@@ -85,10 +85,7 @@ class HttpClient internal constructor(
         }
     }
 
-    private fun getNumRetriesSoFar(url: URL): Int {
-        val retryCount = retryCountMap[url] ?: return 0
-        return retryCount
-    }
+    private fun getCurrentRetryCount(url: URL) = retryCountMap[url] ?: 0
 
     private fun resetRetryCount(request: HttpRequest) {
         try {

diff --git a/SharedUtils/src/main/java/com/braintreepayments/api/sharedutils/TLSSocketFactory.java b/SharedUtils/src/main/java/com/braintreepayments/api/sharedutils/TLSSocketFactory.java
@@ -27,20 +27,6 @@ public class TLSSocketFactory extends SSLSocketFactory {
 
     private final SSLSocketFactory internalSSLSocketFactory;
 
-    static TLSSocketFactory newInstance() throws SSLException {
-        return new TLSSocketFactory();
-    }
-
-    TLSSocketFactory() throws SSLException {
-        try {
-            SSLContext sslContext = SSLContext.getInstance("TLS");
-            sslContext.init(null, null, null); // use system security providers
-            internalSSLSocketFactory = sslContext.getSocketFactory();
-        } catch (NoSuchAlgorithmException | KeyManagementException e) {
-            throw new SSLException(e.getMessage());
-        }
-    }
-
     /**
      * @see <a href="http://developer.android.com/training/articles/security-ssl.html#UnknownCa">Android Documentation</a>
      */

diff --git a/SharedUtils/src/test/java/com/braintreepayments/api/sharedutils/HttpClientUnitTest.java b/SharedUtils/src/test/java/com/braintreepayments/api/sharedutils/HttpClientUnitTest.java