Added a check to the withProxy method in the ds3client builder to prevent throwing a NPE, and undid a change that ended up hiding a bug

Author: rpmoore

ds3-sdk-integration/src/test/java/com/spectralogic/ds3client/integration/Insecure_Test.java

@@ -18,16 +18,12 @@
 import com.spectralogic.ds3client.Ds3Client;
 import com.spectralogic.ds3client.commands.GetServiceRequest;
 import com.spectralogic.ds3client.commands.GetServiceResponse;
-import com.spectralogic.ds3client.integration.test.helpers.TempStorageIds;
-import com.spectralogic.ds3client.integration.test.helpers.TempStorageUtil;
-import com.spectralogic.ds3client.models.ChecksumType;
 import org.junit.AfterClass;
 import org.junit.BeforeClass;
 import org.junit.Test;
 
 import java.io.IOException;
 import java.security.SignatureException;
-import java.util.UUID;
 
 import static org.hamcrest.CoreMatchers.is;
 import static org.hamcrest.CoreMatchers.notNullValue;
@@ -41,19 +37,14 @@
 public class Insecure_Test {
 
     private static Ds3Client client;
-    private static final String TEST_ENV_NAME = "insecure_test";
-    private static TempStorageIds envStorageIds;
 
     @BeforeClass
     public static void startup() throws IOException, SignatureException {
-        client = Util.fromEnv();
-        final UUID dataPolicyId = TempStorageUtil.setupDataPolicy(TEST_ENV_NAME, true, ChecksumType.Type.MD5, client);
-        envStorageIds = TempStorageUtil.setup(TEST_ENV_NAME, dataPolicyId, client);
+        client = Util.insecureFromEnv();
     }
 
     @AfterClass
     public static void teardown() throws IOException, SignatureException {
-        TempStorageUtil.teardown(TEST_ENV_NAME, envStorageIds, client);
         client.close();
     }
 

ds3-sdk/src/main/java/com/spectralogic/ds3client/Ds3ClientBuilder.java

@@ -17,6 +17,7 @@
 
 import com.spectralogic.ds3client.models.Credentials;
 import com.spectralogic.ds3client.networking.NetworkClient;
+import com.spectralogic.ds3client.networking.NetworkClientImpl;
 import com.spectralogic.ds3client.utils.Builder;
 import com.spectralogic.ds3client.utils.Guard;
 import org.slf4j.Logger;
@@ -135,6 +136,10 @@ public Ds3ClientBuilder withCertificateVerification(final boolean certificateVer
      * @throws IllegalArgumentException This will be thrown if the proxy endpoint is not a valid URI.
      */
     public Ds3ClientBuilder withProxy(final String proxy) throws IllegalArgumentException {
+        if (proxy == null) {
+            LOG.warn("Proxy was null");
+            return this;
+        }
         try {
             final URI proxyUri;
             if(!proxy.startsWith("http")) {