Improving the scoping of one of the Abstract Base classes so that it is package private. It is not important that it is visible in the SDK, so instead of exposing the abstract class an interface is exposed.

Author: rpmoore

src/main/java/com/spectralogic/ds3client/NetworkClientImpl.java

@@ -1,6 +1,6 @@
 package com.spectralogic.ds3client;
 
-import com.spectralogic.ds3client.commands.AbstractRequest;
+import com.spectralogic.ds3client.commands.Ds3Request;
 import com.spectralogic.ds3client.models.SignatureDetails;
 import com.spectralogic.ds3client.networking.ConnectionDetails;
 import com.spectralogic.ds3client.networking.NetUtils;
@@ -43,7 +43,7 @@ public ConnectionDetails getConnectionDetails() {
         return connectionDetails;
     }
 
-    public CloseableHttpResponse getResponse(final AbstractRequest request) throws IOException, SignatureException {
+    public CloseableHttpResponse getResponse(final Ds3Request request) throws IOException, SignatureException {
         final HttpHost host = getHost(connectionDetails);
         final HttpRequest httpRequest = getHttpRequest(request);
         final String date = DateFormatter.dateToRfc882();
@@ -94,7 +94,7 @@ private int getPort(final URL url) {
         return port;
     }
 
-    private HttpRequest getHttpRequest(final AbstractRequest request) {
+    private HttpRequest getHttpRequest(final Ds3Request request) {
         final String verb = request.getVerb().toString();
         final InputStream stream = request.getStream();
         final Map<String, String> queryParams = request.getQueryParams();

src/main/java/com/spectralogic/ds3client/commands/AbstractRequest.java

@@ -1,40 +1,42 @@
 package com.spectralogic.ds3client.commands;
 
-import com.spectralogic.ds3client.HttpVerb;
 import org.apache.http.entity.ContentType;
 
 import java.io.InputStream;
 import java.util.HashMap;
 import java.util.Map;
 
-public abstract class AbstractRequest {
+abstract class AbstractRequest implements Ds3Request {
 
     private final Map<String, String> headers = new HashMap<>();
     private final Map<String, String> queryParams = new HashMap<>();
 
-    public abstract String getPath();
-    public abstract HttpVerb getVerb();
-
+    @Override
     public ContentType getContentType() {
         return ContentType.APPLICATION_XML;
     }
 
+    @Override
     public InputStream getStream() {
         return null;
     }
 
+    @Override
     public long getSize() {
         return 0;
     }
 
+    @Override
     public String getMd5() {
         return "";
     }
 
+    @Override
     public final Map<String, String> getQueryParams() {
         return queryParams;
     }
 
+    @Override
     public final Map<String, String> getHeaders() {
         return headers;
     }

src/main/java/com/spectralogic/ds3client/commands/AbstractResponse.java

@@ -1,6 +1,5 @@
 package com.spectralogic.ds3client.commands;
 
-import java.io.Closeable;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.StringWriter;
@@ -12,7 +11,7 @@
 import com.spectralogic.ds3client.serializer.XmlOutput;
 import com.spectralogic.ds3client.models.Error;
 
-abstract class AbstractResponse implements Closeable {
+abstract class AbstractResponse implements Ds3Response{
     final static String UTF8 = "UTF-8";
 
     final private CloseableHttpResponse response;
@@ -62,4 +61,4 @@ private String readResponseString() throws IOException {
     public void close() throws IOException {
         response.close();
     }
-}
+}

src/main/java/com/spectralogic/ds3client/commands/Ds3Request.java

@@ -0,0 +1,25 @@
+package com.spectralogic.ds3client.commands;
+
+import com.spectralogic.ds3client.HttpVerb;
+import org.apache.http.entity.ContentType;
+
+import java.io.InputStream;
+import java.util.Map;
+
+public interface Ds3Request {
+
+    public String getPath();
+    public HttpVerb getVerb();
+
+    public ContentType getContentType();
+
+    public InputStream getStream();
+
+    public long getSize();
+
+    public String getMd5();
+
+    public Map<String, String> getQueryParams();
+
+    public Map<String, String> getHeaders();
+}

src/main/java/com/spectralogic/ds3client/commands/Ds3Response.java

@@ -0,0 +1,6 @@
+package com.spectralogic.ds3client.commands;
+
+import java.io.Closeable;
+
+public interface Ds3Response extends Closeable {
+}

src/main/java/com/spectralogic/ds3client/networking/NetworkClient.java

@@ -1,12 +1,12 @@
 package com.spectralogic.ds3client.networking;
 
-import com.spectralogic.ds3client.commands.AbstractRequest;
+import com.spectralogic.ds3client.commands.Ds3Request;
 import org.apache.http.client.methods.CloseableHttpResponse;
 
 import java.io.IOException;
 import java.security.SignatureException;
 
 public interface NetworkClient {
-    public CloseableHttpResponse getResponse(final AbstractRequest request) throws IOException, SignatureException;
+    public CloseableHttpResponse getResponse(final Ds3Request request) throws IOException, SignatureException;
     public ConnectionDetails getConnectionDetails();
 }