Adding in some extra checks for the ConnectionDetails forNewNode method to provide some reasonable fallbacks if the node passed in is unknown.

Author: rpmoore

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

@@ -70,8 +70,14 @@ public ConnectionDetailsImpl build() {
     }
 
     public static ConnectionDetails newForNode(final Node node, final ConnectionDetails connectionDetails) {
-        final Builder connectionBuilder = builder(node.getEndpoint(), connectionDetails.getCredentials())
-            .withRedirectRetries(connectionDetails.getRetries())
+        final Builder connectionBuilder;
+        if (node.getEndpoint() == null || node.getEndpoint().equals("FAILED_TO_DETERMINE_DATAPATH_IP_ADDRESS")) {
+            connectionBuilder = builder(connectionDetails.getEndpoint(), connectionDetails.getCredentials());
+        }
+        else {
+            connectionBuilder = builder(node.getEndpoint(), connectionDetails.getCredentials());
+        }
+        connectionBuilder.withRedirectRetries(connectionDetails.getRetries())
             .withHttps(connectionDetails.isHttps())
             .withCertificateVerification(connectionDetails.isCertificateVerification())
             .withBufferSize(connectionDetails.getBufferSize())
@@ -137,4 +143,8 @@ public boolean isCertificateVerification() {
         return certificateVerification;
     }
 
+    public String toString() {
+        return "Endpoint: " + this.endpoint + " | Https?: " + this.https;
+    }
+
 }

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

@@ -127,8 +127,7 @@ public ModifyJobResponse modifyJob(final ModifyJobRequest request) throws IOExce
     @Override
     public Ds3Client newForNode(final Node node) {
         final ConnectionDetails newConnectionDetails = ConnectionDetailsImpl.newForNode(node, this.getConnectionDetails());
-        final NetworkClient netClient = new NetworkClientImpl(newConnectionDetails);
-
-        return new Ds3ClientImpl(netClient);
+        final NetworkClient newNetClient = new NetworkClientImpl(newConnectionDetails);
+        return new Ds3ClientImpl(newNetClient);
     }
 }

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

@@ -39,6 +39,7 @@
 import java.io.Closeable;
 import java.io.IOException;
 import java.io.InputStream;
+import java.lang.AssertionError;
 import java.net.MalformedURLException;
 import java.net.URI;
 import java.net.URL;
@@ -57,6 +58,7 @@ class NetworkClientImpl implements NetworkClient {
     final private ConnectionDetails connectionDetails;
 
     NetworkClientImpl(final ConnectionDetails connectionDetails) {
+        if (connectionDetails == null) throw new AssertionError(connectionDetails);
         this.connectionDetails = connectionDetails;
     }
 

ds3-sdk/src/main/java/com/spectralogic/ds3client/networking/ConnectionDetails.java

@@ -40,5 +40,5 @@ public interface ConnectionDetails {
      * Returns true if the network layer should perform certificate authentication for SSL.  False will disable
      * certificate authentication.
      */
-    boolean isCertificateVerification();
+    public boolean isCertificateVerification();
 }