TDP-1204 Change finalize to close() so users can shutdown the client

src/main/java/com/bandwidth/sdk/BandwidthClient.java

@@ -42,6 +42,7 @@
 import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.OutputStream;
+import java.io.Closeable;
 import java.net.URI;
 import java.net.URISyntaxException;
 import java.util.ArrayList;
@@ -64,7 +65,7 @@
  *
  * Created by sbarstow on 10/3/14.
  */
-public class BandwidthClient implements Client{
+public class BandwidthClient implements Client, Closeable {
 
     private final static Logger LOG = LoggerFactory.getLogger(BandwidthClient.class);
     public static final int MONITOR_TIMER = 5000;
@@ -144,6 +145,12 @@ public synchronized static BandwidthClient getInstance() {
         return INSTANCE;
     }
 
+    public synchronized static void shutdown() {
+        if (INSTANCE != null) {
+            INSTANCE.close();
+            INSTANCE = null;
+        }
+    }
 
     /**
      * Constructor. Instances are created through getInstance() method.
@@ -770,11 +777,20 @@ public void shutdown() {
     protected void finalize() throws Throwable
     {
         try {
-            this.idleConnectionMonitorRunnable.shutdown();
-        } catch(Throwable t){
-            throw t;
+            close();
         } finally {
             super.finalize();
         }
     }
+
+    @Override
+    public void close() {
+        if (!this.idleConnectionMonitorRunnable.shutdown) {
+            this.idleConnectionMonitorRunnable.shutdown();
+        }
+        if (!this.executorService.isShutdown()) {
+            this.executorService.shutdown();
+        }
+    }
+
 }

src/test/java/com/bandwidth/sdk/MockClient.java

@@ -15,13 +15,10 @@
 import java.util.Map;
 
 public class MockClient extends BandwidthClient {
-    private String userId;
     private String token;
     private String secret;
-    private String endpoint;
-    private String version;
 
-	public MockClient() {
+    public MockClient() {
 		super(TestsHelper.TEST_USER_ID, "", "", "", "", 200, 20);
 	}
 
@@ -33,11 +30,8 @@ public MockClient(final String userId,
                       final int maxConnections,
                       final int defaultMaxPerRoute){
         super(userId, token, secret, endpoint, version, maxConnections, defaultMaxPerRoute);
-        this.userId = userId;
         this.token = token;
         this.secret = secret;
-        this.endpoint = endpoint;
-        this.version = version;
     }
 
     public final List<RestRequest> requests = new ArrayList<RestRequest>();