Merge pull request #52 from rpmoore/master

Fixed the Helpers which were broken due to a change to try to create new ConnectionDetails objects from Node objects

Author: markpaulson

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/Ds3Client.java

@@ -23,24 +23,9 @@
 import java.security.SignatureException;
 
 /**
- * The main interface for communicating with a DS3 appliance.  All communication with a DS3 appliance should start with
+ * The main interface for communicating with a DS3 appliance.  All communication with a DS3 appliance starts with
  * this class.
  *
- * Here is an example showing how the Ds3Client interface is used to get a list of buckets from a remote DS3 appliance.
- *
- * <pre>
- *     {@code
- *     final Ds3Client client = Ds3ClientBuilder.create("ds3Endpoint:8080",
- *                                  new Credentials("accessKey", "secretKey")).build();
- *
- *     final GetServiceResponse response = client.getService(new GetServiceRequest());
- *
- *     for(final Bucket bucket: response.getResult().getBuckets()) {
- *         System.out.println(bucket.getName());
- *     }
- *     }
- * </pre>
- *
  * See {@link Ds3ClientBuilder} on what options can be used to create a Ds3Client instance.
  */
 public interface Ds3Client {
@@ -128,7 +113,7 @@ public abstract DeleteObjectResponse deleteObject(
             DeleteObjectRequest request) throws IOException, SignatureException;
 
     /**
-     * Get an object in a bucket from a DS3 endpoint
+     * Retrieves an object from DS3
      * @param request The Get Object Request object used to customize the HTTP request.  The get object request object
      *                has some options for customizing the request.  See {@link GetObjectRequest} for the full list of
      *                options that can be configured.
@@ -141,10 +126,7 @@ public abstract GetObjectResponse getObject(GetObjectRequest request)
             throws IOException, SignatureException;
 
     /**
-     * Puts a new object to an existing bucket to a DS3 endpoint.  If the InputStream passed into the PutObjectRequest
-     * is not seekable, meaning if InputStream.markSupported() returns false, the request will fail and throw a
-     * {@link com.spectralogic.ds3client.networking.RequiresMarkSupportedException}.  If using a FileInputStream see
-     * {@link com.spectralogic.ds3client.helpers.ResettableFileInputStream} to make seekable.
+     * Puts a new object to an existing bucket.  The call will fail if the bucket does not exist.
      * @param request The Put Object Request object used to customize the HTTP request.  The put object request object
      *                has some options for customizing the request.  See {@link PutObjectRequest} for the full list of
      *                options that can be configured.

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/commands/PutObjectRequest.java

@@ -23,10 +23,7 @@
 import java.util.UUID;
 
 /**
- * Maps to a DS3 Single Object Put request.  This request requires that the InputStream is seekable, that is the
- * InputStream.markSupported() method must return true.  By default the Java FileInputStream does not do this.  To
- * use a FileInputStream see {@link com.spectralogic.ds3client.helpers.ResettableFileInputStream} which wraps a
- * FileInputStream and makes it seekable.
+ * Maps to a DS3 Single Object Put request.
  */
 public class PutObjectRequest extends AbstractRequest {
 

ds3-sdk/src/main/java/com/spectralogic/ds3client/helpers/ResettableFileInputStream.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();
 }