Merge pull request #70 from rpmoore/master

Fix for when using the Helper functions with the Simulator

Author: hansdude

build.gradle

@@ -15,7 +15,7 @@
 
 allprojects {
     group = 'com.spectralogic.ds3'
-    version = '1.1.0-RC2'
+    version = '1.1.0-RC3'
 }
 
 subprojects {
@@ -30,8 +30,10 @@ subprojects {
     }
 
     dependencies {
+        compile     'org.slf4j:slf4j-api:1.7.12'
         testCompile 'org.mockito:mockito-all:1.9.5'
         testCompile 'junit:junit:4.11'
+        testCompile 'org.slf4j:slf4j-simple:1.7.12'
     }
 }
 

ds3-sdk/build.gradle

@@ -16,7 +16,7 @@
 buildscript {
     repositories { jcenter() }
     dependencies {
-        classpath 'com.github.jengelman.gradle.plugins:shadow:1.1.1'
+        classpath 'com.github.jengelman.gradle.plugins:shadow:1.2.1'
     }
 }
 
@@ -27,6 +27,7 @@ shadowJar {
     relocate 'org.apache', 'ds3fatjar.org.apache'
     relocate 'org.codehaus', 'ds3fatjar.org.codehaus'
     relocate 'com.fasterxml', 'ds3fatjar.com.fasterxml'
+    relocate 'org.slf4j', 'ds3fatjar.org.slf4j'
     dependencies {
         exclude(dependency('org.hamcrest:hamcrest-library:1.3'))
         exclude(dependency('org.mockito:mockito-all:1.9.5'))

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

@@ -18,10 +18,15 @@
 import com.spectralogic.ds3client.models.Credentials;
 import com.spectralogic.ds3client.models.bulk.Node;
 import com.spectralogic.ds3client.networking.ConnectionDetails;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import java.net.URI;
+import java.sql.Connection;
 
 class ConnectionDetailsImpl implements ConnectionDetails {
+    static private final Logger LOG = LoggerFactory.getLogger(ConnectionDetailsImpl.class);
+
     static class Builder implements com.spectralogic.ds3client.utils.Builder<ConnectionDetailsImpl> {
 
         private final String endpoint;
@@ -72,10 +77,12 @@ public ConnectionDetailsImpl build() {
     public static ConnectionDetails newForNode(final Node node, final ConnectionDetails connectionDetails) {
         final Builder connectionBuilder;
         if (node.getEndpoint() == null || node.getEndpoint().equals("FAILED_TO_DETERMINE_DATAPATH_IP_ADDRESS")) {
+            LOG.trace("Running against an old version of the DS3 API, reusing existing endpoint configuration");
             connectionBuilder = builder(connectionDetails.getEndpoint(), connectionDetails.getCredentials());
         }
         else {
-            connectionBuilder = builder(node.getEndpoint(), connectionDetails.getCredentials());
+            LOG.trace("Creating new Connection Details for endpoint: " + node.getEndpoint());
+            connectionBuilder = builder(buildAuthority(node, connectionDetails), connectionDetails.getCredentials());
         }
         connectionBuilder.withRedirectRetries(connectionDetails.getRetries())
             .withHttps(connectionDetails.isHttps())
@@ -86,6 +93,11 @@ public static ConnectionDetails newForNode(final Node node, final ConnectionDeta
         return connectionBuilder.build();
     }
 
+    private static String buildAuthority(final Node node, final ConnectionDetails connectionDetails) {
+        return node.getEndpoint() + ":" + Integer.toString(
+                (connectionDetails.isHttps() ? node.getHttpsPort() : node.getHttpPort()));
+    }
+
     private final String endpoint;
     private final Credentials credentials;
     private final boolean https;

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

@@ -18,6 +18,8 @@
 import com.spectralogic.ds3client.models.Credentials;
 import com.spectralogic.ds3client.networking.NetworkClient;
 import com.spectralogic.ds3client.utils.Builder;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import java.net.URI;
 import java.net.URISyntaxException;
@@ -30,6 +32,8 @@
  */
 public class Ds3ClientBuilder implements Builder<Ds3Client> {
 
+    static final private Logger LOG = LoggerFactory.getLogger(Ds3ClientBuilder.class);
+
     final private String endpoint;
     final private Credentials credentials;
 
@@ -125,6 +129,7 @@ public Ds3ClientBuilder withRedirectRetries(final int retries) {
      */
     @Override
     public Ds3Client build() {
+        LOG.info("Making connection details for endpoint: " + this.endpoint);
         final ConnectionDetailsImpl.Builder connBuilder = ConnectionDetailsImpl.builder(this.endpoint, this.credentials)
             .withProxy(this.proxy).withHttps(this.https).withCertificateVerification(this.certificateVerification).withRedirectRetries(this.retries).withBufferSize(this.bufferSize);
 

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

@@ -37,6 +37,8 @@
 import org.apache.http.impl.client.HttpClients;
 import org.apache.http.message.BasicHttpEntityEnclosingRequest;
 import org.apache.http.message.BasicHttpRequest;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import javax.net.ssl.SSLContext;
 import java.io.Closeable;
@@ -53,6 +55,7 @@
 import java.util.Map;
 
 class NetworkClientImpl implements NetworkClient {
+    final static private Logger LOG = LoggerFactory.getLogger(NetworkClientImpl.class);
     final static private String HOST = "HOST";
     final static private String DATE = "DATE";
     final static private String AUTHORIZATION = "Authorization";
@@ -136,6 +139,8 @@ public RequestExecutor(final CloseableHttpClient client, final Ds3Request ds3Req
             if (this.content != null && !this.content.markSupported()) {
                 throw new RequiresMarkSupportedException();
             }
+
+            LOG.info("Sending request: " + this.ds3Request.getVerb() + " " + this.host.toString() + "" + this.ds3Request.getPath());
             this.hash = this.buildHash();
         }
 

ds3-sdk/src/main/java/com/spectralogic/ds3client/helpers/WriteJobImpl.java

@@ -25,6 +25,8 @@
 import com.spectralogic.ds3client.models.bulk.MasterObjectList;
 import com.spectralogic.ds3client.models.bulk.Objects;
 import com.spectralogic.ds3client.serializer.XmlProcessingException;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import java.io.IOException;
 import java.security.SignatureException;
@@ -34,6 +36,7 @@
 import java.util.List;
 
 class WriteJobImpl extends JobImpl {
+    static private final Logger LOG = LoggerFactory.getLogger(WriteJobImpl.class);
     public WriteJobImpl(
             final Ds3Client client,
             final MasterObjectList masterObjectList) {

ds3-sdk/src/test/java/com/spectralogic/ds3client/Ds3Client_Test.java

@@ -670,9 +670,11 @@ public void newForNode() {
 
         final Node node = new Node();
         node.setEndpoint("newEndpoint");
+        node.setHttpPort(80);
+        node.setHttpsPort(443);
 
         final Ds3Client newClient = client.newForNode(node);
-        assertThat(newClient.getConnectionDetails().getEndpoint(), is("newEndpoint"));
+        assertThat(newClient.getConnectionDetails().getEndpoint(), is("newEndpoint:443"));
         assertThat(newClient.getConnectionDetails().getCredentials().getClientId(), is("access"));
         assertThat(newClient.getConnectionDetails().getCredentials().getKey(), is("key"));
     }

ds3-sdk/src/test/java/com/spectralogic/ds3client/helpers/Ds3ClientHelpers_Test.java

@@ -26,6 +26,7 @@
 import com.spectralogic.ds3client.models.Owner;
 import com.spectralogic.ds3client.models.bulk.*;
 import com.spectralogic.ds3client.models.bulk.Objects;
+import com.spectralogic.ds3client.networking.ConnectionDetails;
 import com.spectralogic.ds3client.serializer.XmlProcessingException;
 import com.spectralogic.ds3client.utils.ByteArraySeekableByteChannel;
 
@@ -36,6 +37,7 @@
 import java.io.IOException;
 import java.nio.channels.SeekableByteChannel;
 import java.security.SignatureException;
+import java.sql.Connection;
 import java.util.*;
 import java.util.concurrent.TimeUnit;
 
@@ -170,8 +172,11 @@ public SeekableByteChannel buildChannel(final String key) throws IOException {
     @Test
     public void testWriteObjectsWithFailedPut() throws SignatureException, IOException, XmlProcessingException {
         final Ds3Client ds3Client = mock(Ds3Client.class);
+        final ConnectionDetails details = mock(ConnectionDetails.class);
+        Mockito.when(details.getEndpoint()).thenReturn("localhost");
 
         Mockito.when(ds3Client.newForNode(Mockito.<Node>any())).thenReturn(ds3Client);
+        Mockito.when(ds3Client.getConnectionDetails()).thenReturn(details);
 
         final BulkPutResponse buildBulkPutResponse = buildBulkPutResponse();
         Mockito.when(ds3Client.bulkPut(Mockito.any(BulkPutRequest.class))).thenReturn(buildBulkPutResponse);
@@ -317,7 +322,8 @@ private static Contents buildContents(
     private static Ds3Client buildDs3ClientForBulk() throws IOException,
             SignatureException {
         final Ds3Client ds3Client = mock(Ds3Client.class);
-
+        final ConnectionDetails details = mock(ConnectionDetails.class);
+        Mockito.when(details.getEndpoint()).thenReturn("localhost");
         final GetAvailableJobChunksResponse jobChunksResponse1 = buildJobChunksResponse1();
         final GetAvailableJobChunksResponse jobChunksResponse2 = buildJobChunksResponse2();
         final GetAvailableJobChunksResponse jobChunksResponse3 = buildJobChunksResponse3();
@@ -327,7 +333,7 @@ private static Ds3Client buildDs3ClientForBulk() throws IOException,
             .thenReturn(jobChunksResponse3);
 
         Mockito.when(ds3Client.newForNode(Mockito.<Node>any())).thenReturn(ds3Client);
-
+        Mockito.when(ds3Client.getConnectionDetails()).thenReturn(details);
         return ds3Client;
     }