Going through and fixing some code analysis warnings. This improves some access scoping. Also removed Main.java

Author: rpmoore

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

@@ -1,5 +1,5 @@
 package com.spectralogic.ds3client;
 
 public enum HttpVerb {
-    GET,PUT,DELETE,HEAD,POST;
+    GET,PUT,DELETE,HEAD,POST
 }

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

@@ -12,22 +12,23 @@
 import com.spectralogic.ds3client.serializer.XmlOutput;
 import com.spectralogic.ds3client.models.Error;
 
-public abstract class AbstractResponse implements Closeable {
-    final static protected String UTF8 = "UTF-8";
-    final CloseableHttpResponse response;
+abstract class AbstractResponse implements Closeable {
+    final static String UTF8 = "UTF-8";
 
-    public AbstractResponse(final CloseableHttpResponse response) throws IOException {
+    final private CloseableHttpResponse response;
+
+    AbstractResponse(final CloseableHttpResponse response) throws IOException {
         this.response = response;
         processResponse();
     }
 
     protected abstract void processResponse() throws IOException;
 
-    protected CloseableHttpResponse getResponse() {
+    CloseableHttpResponse getResponse() {
         return response;
     }
 
-    protected void checkStatusCode(final int expectedStatus) throws IOException {
+    void checkStatusCode(final int expectedStatus) throws IOException {
         final int statusCode = response.getStatusLine().getStatusCode();
         if (statusCode != expectedStatus) {
             final String responseString = readResponseString();

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

@@ -11,7 +11,7 @@
 import java.util.List;
 
 
-public abstract class BulkRequest extends AbstractRequest {
+abstract class BulkRequest extends AbstractRequest {
 
     private final String bucket;
     private final List<Ds3Object> ds3Objects;

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

@@ -66,10 +66,6 @@ public void setSize(final int size) {
     }
 
     public String toString() {
-        final StringBuilder builder = new StringBuilder();
-        builder.append("{{key:: ").append(key).append("}, ");
-        builder.append("{size:: ").append(size).append("}, ");
-        builder.append("{owner:: ").append(owner).append("}}");
-        return builder.toString();
+        return "{{key:: " + key + "}, " + "{size:: " + size + "}, " + "{owner:: " + owner + "}}";
     }
 }

src/main/java/com/spectralogic/ds3client/models/Contents.java

@@ -77,11 +77,7 @@ public void setContentsList(final List<Contents> contentsList) {
     }
 
     public String toString() {
-        final StringBuilder builder = new StringBuilder();
-        builder.append("{{bucket:: ").append(name).append("},\n");
-        builder.append("{numKeys:: ").append(maxKeys).append("},\n");
-        builder.append("{objects:: ").append(contentsList).append("}}");
-        return builder.toString();
+        return "{{bucket:: " + name + "},\n" + "{numKeys:: " + maxKeys + "},\n" + "{objects:: " + contentsList + "}}";
     }
 
     public String getCreationDate() {

src/main/java/com/spectralogic/ds3client/models/ListBucketResult.java

@@ -51,7 +51,6 @@ public static String toXml(final Objects objects, final BulkCommand command) thr
     }
 
     public static<T> T fromXml(final String xmlString, final Class<T> type) throws IOException {
-        final T rootElement = mapper.readValue(xmlString, type);
-        return rootElement;
+        return mapper.readValue(xmlString, type);
     }
 }