Merge pull request #361 from rpmoore/code_cleanup

Denver · web-flow · commit c01b1f01ee57 · 2016-10-05T13:44:06.000-06:00
General code cleanup.
diff --git a/ds3-sdk/src/main/java/com/spectralogic/ds3client/ConnectionDetailsImpl.java b/ds3-sdk/src/main/java/com/spectralogic/ds3client/ConnectionDetailsImpl.java
@@ -107,7 +107,7 @@ public static ConnectionDetails newForNode(final JobNode node, final ConnectionD
 
     private static String buildAuthority(final JobNode node, final ConnectionDetails connectionDetails) {
         return node.getEndPoint() + ":" + Integer.toString(
-                (connectionDetails.isHttps() ? node.getHttpsPort() : node.getHttpPort()));
+                connectionDetails.isHttps() ? node.getHttpsPort() : node.getHttpPort());
     }
 
     private final String endpoint;
diff --git a/ds3-sdk/src/main/java/com/spectralogic/ds3client/commands/interfaces/AbstractResponse.java b/ds3-sdk/src/main/java/com/spectralogic/ds3client/commands/interfaces/AbstractResponse.java
@@ -58,7 +58,7 @@ public AbstractResponse(final WebResponse response) throws IOException {
         this.processResponse();
     }
 
-    private static ChecksumType.Type determineChecksumType(final Headers headers) throws ResponseProcessingException {
+    private static ChecksumType.Type determineChecksumType(final Headers headers) {
         for (final ChecksumType.Type type : ChecksumType.Type.values()) {
             if (getFirstHeaderValue(headers, "content-" + type.toString().replace("_", "").toLowerCase()) != null) {
                 return type;
@@ -114,8 +114,8 @@ public void checkStatusCode(final int ... expectedStatuses) throws IOException {
     }
 
     private boolean checkForManagementPortException() {
-        return ((this.getStatusCode() == FailedRequestUsingMgmtPortException.MGMT_PORT_STATUS_CODE)
-            && (getFirstHeaderValue(getResponse().getHeaders(), FailedRequestUsingMgmtPortException.MGMT_PORT_HEADER) != null));
+        return this.getStatusCode() == FailedRequestUsingMgmtPortException.MGMT_PORT_STATUS_CODE
+            && getFirstHeaderValue(getResponse().getHeaders(), FailedRequestUsingMgmtPortException.MGMT_PORT_HEADER) != null;
     }
 
     public int getStatusCode() {
diff --git a/ds3-sdk/src/main/java/com/spectralogic/ds3client/helpers/Ds3ClientHelpers.java b/ds3-sdk/src/main/java/com/spectralogic/ds3client/helpers/Ds3ClientHelpers.java
@@ -288,10 +288,8 @@ public abstract Iterable<Contents> listObjects(final String bucket, final String
      *                   The response might contain fewer keys but will never contain more. If there are additional keys
      *                   that satisfy the search criteria but were not returned because max-keys was exceeded, the
      *                   response.isTruncated() is true. To return the additional keys, see nextMarker.
-     * @throws IOException
      */
-    public abstract Iterable<Contents> listObjects(final String bucket, final String keyPrefix, final String nextMarker, final int maxKeys)
-            throws IOException;
+    public abstract Iterable<Contents> listObjects(final String bucket, final String keyPrefix, final String nextMarker, final int maxKeys);
 
     /**
      * Returns information about objects in the bucket in alphabetical order, starting with key after the next_marker in order,
@@ -310,9 +308,8 @@ public abstract Iterable<Contents> listObjects(final String bucket, final String
      *                   that satisfy the search criteria but were not returned because max-keys was exceeded, the
      *                   response.isTruncated() is true. To return the additional keys, see nextMarker.
      * @param retries    Specifies how many times the helper function will attempt to retry a request for failing. Default - 5
-     * @throws IOException
      */
-    public abstract Iterable<Contents> listObjects(final String bucket, final String keyPrefix, final String nextMarker, final int maxKeys, final int retries) throws IOException;
+    public abstract Iterable<Contents> listObjects(final String bucket, final String keyPrefix, final String nextMarker, final int maxKeys, final int retries);
 
     /**
      * Returns an object list with which you can call {@code startWriteJobImpl} based on the files in a {@code directory}.
@@ -332,11 +329,11 @@ public abstract Iterable<Contents> listObjects(final String bucket, final String
      */
     public abstract Iterable<Ds3Object> removePrefixFromDs3ObjectsList(final Iterable<Ds3Object> objectsList, final String prefix);
 
-    @SafeVarargs
     /**
      * Converts an {@link Contents} to a {@link Ds3Object}.  Optionally a caller can supply many filters
      * that will be applied before converting.
      */
+    @SafeVarargs
     public final Iterable<Ds3Object> toDs3Iterable(final Iterable<Contents> objects, final Predicate<Contents>... filters) {
 
         FluentIterable<Contents> fluentIterable = FluentIterable.from(objects).filter(new com.google.common.base.Predicate<Contents>() {
@@ -351,11 +348,7 @@ public boolean apply(@Nullable final Contents input) {
                 fluentIterable = fluentIterable.filter(new com.google.common.base.Predicate<Contents>() {
                     @Override
                     public boolean apply(@Nullable final Contents input) {
-                        if (filter != null) {
-                            return filter.test(input);
-                        } else {
-                            return true; // do not filter anything if filter is null
-                        }
+                        return filter == null || filter.test(input); // do not filter anything if filter is null
                     }
                 });
             }
diff --git a/ds3-sdk/src/main/java/com/spectralogic/ds3client/helpers/Ds3ClientHelpersImpl.java b/ds3-sdk/src/main/java/com/spectralogic/ds3client/helpers/Ds3ClientHelpersImpl.java
@@ -21,7 +21,6 @@
 import com.google.common.collect.ImmutableMultimap;
 import com.google.common.collect.Lists;
 import com.spectralogic.ds3client.Ds3Client;
-import com.spectralogic.ds3client.helpers.events.ConcurrentEventRunner;
 import com.spectralogic.ds3client.helpers.events.EventRunner;
 import com.spectralogic.ds3client.helpers.events.SameThreadEventRunner;
 import com.spectralogic.ds3client.helpers.pagination.GetBucketLoaderFactory;
@@ -267,13 +266,13 @@ public Iterable<Contents> listObjects(final String bucket, final String keyPrefi
     }
 
     @Override
-    public Iterable<Contents> listObjects(final String bucket, final String keyPrefix, final String nextMarker, final int maxKeys) throws IOException {
+    public Iterable<Contents> listObjects(final String bucket, final String keyPrefix, final String nextMarker, final int maxKeys) {
 
         return new LazyIterable<>(new GetBucketLoaderFactory(client, bucket, keyPrefix, nextMarker, maxKeys, DEFAULT_LIST_OBJECTS_RETRIES));
     }
 
     @Override
-    public Iterable<Contents> listObjects(final String bucket, final String keyPrefix, final String nextMarker, final int maxKeys, final int retries) throws IOException {
+    public Iterable<Contents> listObjects(final String bucket, final String keyPrefix, final String nextMarker, final int maxKeys, final int retries) {
 
         return new LazyIterable<>(new GetBucketLoaderFactory(client, bucket, keyPrefix, nextMarker, maxKeys, retries));
     }
diff --git a/ds3-sdk/src/main/java/com/spectralogic/ds3client/helpers/JobPartTrackerFactory.java b/ds3-sdk/src/main/java/com/spectralogic/ds3client/helpers/JobPartTrackerFactory.java
@@ -26,7 +26,7 @@
 import java.util.Collection;
 import java.util.HashMap;
 
-class JobPartTrackerFactory {
+final class JobPartTrackerFactory {
     public static JobPartTracker buildPartTracker(final Iterable<BulkObject> objects, final EventRunner eventRunner) {
         final ArrayListMultimap<String, ObjectPart> multimap = ArrayListMultimap.create();
         for (final BulkObject bulkObject : Preconditions.checkNotNull(objects)) {
diff --git a/ds3-sdk/src/main/java/com/spectralogic/ds3client/helpers/ObjectPartComparator.java b/ds3-sdk/src/main/java/com/spectralogic/ds3client/helpers/ObjectPartComparator.java
@@ -34,7 +34,7 @@ public int compare(final ObjectPart o1, final ObjectPart o2) {
     }
     
     private static long signum(final long value) {
-        return value < 0 ? -1 : (value == 0 ? 0 : 1);
+        return value < 0 ? -1 : value == 0 ? 0 : 1;
     }
     
     private static int intOf(final long value) {
diff --git a/ds3-sdk/src/main/java/com/spectralogic/ds3client/helpers/ReadJobImpl.java b/ds3-sdk/src/main/java/com/spectralogic/ds3client/helpers/ReadJobImpl.java
@@ -62,7 +62,7 @@ public ReadJobImpl(
 
         this.chunks = this.masterObjectList.getObjects();
         this.partTracker = JobPartTrackerFactory
-                .buildPartTracker(Iterables.concat(getAllBlobApiBeans(chunks)), eventRunner);
+                .buildPartTracker(getAllBlobApiBeans(chunks), eventRunner);
         this.blobToRanges = PartialObjectHelpers.mapRangesToBlob(masterObjectList.getObjects(), objectRanges);
         this.metadataListeners = Sets.newIdentityHashSet();
         this.checksumListeners = Sets.newIdentityHashSet();
@@ -74,7 +74,7 @@ public ReadJobImpl(
     }
 
     protected static ImmutableList<BulkObject> getAllBlobApiBeans(final List<Objects> jobWithChunksApiBeans) {
-        ImmutableList.Builder<BulkObject> builder = ImmutableList.builder();
+        final ImmutableList.Builder<BulkObject> builder = ImmutableList.builder();
         for (final Objects objects : jobWithChunksApiBeans) {
             builder.addAll(objects.getObjects());
         }
diff --git a/ds3-sdk/src/main/java/com/spectralogic/ds3client/helpers/WriteJobImpl.java b/ds3-sdk/src/main/java/com/spectralogic/ds3client/helpers/WriteJobImpl.java
@@ -17,7 +17,6 @@
 
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.ImmutableMultimap;
-import com.google.common.collect.Iterables;
 import com.google.common.collect.Sets;
 import com.spectralogic.ds3client.Ds3Client;
 import com.spectralogic.ds3client.commands.PutObjectRequest;
@@ -76,7 +75,7 @@ public WriteJobImpl(
                     this.masterObjectList.getJobId().toString(), this.masterObjectList.getObjects().size());
             this.filteredChunks = filterChunks(this.masterObjectList.getObjects());
             this.partTracker = JobPartTrackerFactory
-                    .buildPartTracker(Iterables.concat(ReadJobImpl.getAllBlobApiBeans(filteredChunks)), eventRunner);
+                    .buildPartTracker(ReadJobImpl.getAllBlobApiBeans(filteredChunks), eventRunner);
         }
         this.retryAfter = this.retryAfterLeft = retryAfter;
         this.retryDelay = retryDelay;
@@ -165,7 +164,7 @@ public void transfer(final ObjectChannelBuilder channelBuilder)
         LOG.debug("Starting job transfer");
         if (this.masterObjectList == null || this.masterObjectList.getObjects() == null) {
             LOG.info("There is nothing to transfer for job"
-                    + ((this.getJobId() == null) ? "" : " " + this.getJobId().toString()));
+                    + (this.getJobId() == null ? "" : " " + this.getJobId().toString()));
             return;
         }
 
diff --git a/ds3-sdk/src/main/java/com/spectralogic/ds3client/networking/NetUtils.java b/ds3-sdk/src/main/java/com/spectralogic/ds3client/networking/NetUtils.java
@@ -28,7 +28,7 @@
 import java.net.URL;
 import java.util.*;
 
-public class NetUtils {
+public final class NetUtils {
 
     private NetUtils() {
         throw new IllegalStateException("This component should never be initialized.");
diff --git a/ds3-sdk/src/main/java/com/spectralogic/ds3client/networking/NetworkClientImpl.java b/ds3-sdk/src/main/java/com/spectralogic/ds3client/networking/NetworkClientImpl.java
@@ -252,7 +252,7 @@ public CloseableHttpResponse execute() throws IOException {
             }
         }
 
-        private HttpRequest buildHttpRequest() throws IOException {
+        private HttpRequest buildHttpRequest() {
             final String verb = this.ds3Request.getVerb().toString();
             final String path = this.buildPath();
             if (this.content != null) {
@@ -277,7 +277,7 @@ private String buildPath() {
             return path;
         }
 
-        private void addHeaders(final HttpRequest httpRequest) throws IOException {
+        private void addHeaders(final HttpRequest httpRequest) {
             // Add common headers.
             final String date = DateFormatter.dateToRfc882();
             httpRequest.addHeader(HOST, NetUtils.buildHostField(NetworkClientImpl.this.connectionDetails));
diff --git a/ds3-sdk/src/main/java/com/spectralogic/ds3client/serializer/XmlOutput.java b/ds3-sdk/src/main/java/com/spectralogic/ds3client/serializer/XmlOutput.java
@@ -32,7 +32,7 @@
 import org.slf4j.LoggerFactory;
 
 
-public class XmlOutput {
+public final class XmlOutput {
     private static final JacksonXmlModule module;
     private static final XmlMapper mapper;
     static private final Logger LOG = LoggerFactory.getLogger(XmlOutput.class);
diff --git a/ds3-sdk/src/main/java/com/spectralogic/ds3client/utils/DateFormatter.java b/ds3-sdk/src/main/java/com/spectralogic/ds3client/utils/DateFormatter.java
@@ -19,7 +19,7 @@
 import java.util.Date;
 import java.util.TimeZone;
 
-public class DateFormatter {
+public final class DateFormatter {
     final static private String RFC822FORMAT = "EEE, dd MMM yyyy HH:mm:ss Z";
     /**
      * Returns a RFC-882 formatted string with the current time.
diff --git a/ds3-sdk/src/main/java/com/spectralogic/ds3client/utils/IOUtils.java b/ds3-sdk/src/main/java/com/spectralogic/ds3client/utils/IOUtils.java
@@ -21,7 +21,7 @@
 import java.nio.ByteBuffer;
 import java.nio.channels.WritableByteChannel;
 
-public class IOUtils {
+public final class IOUtils {
 
     public static long copy(
         final InputStream inputStream,
diff --git a/ds3-sdk/src/main/java/com/spectralogic/ds3client/utils/JobUtils.java b/ds3-sdk/src/main/java/com/spectralogic/ds3client/utils/JobUtils.java
@@ -30,7 +30,7 @@
 import java.util.Set;
 import java.util.UUID;
 
-public class JobUtils {
+public final class JobUtils {
 
     private JobUtils() {}
 
@@ -39,7 +39,7 @@ private JobUtils() {}
      * only one job ID should be returned.  It is possible that when {@param type} is GET that there could be multiple
      * job IDs returned.
      */
-    public static List<UUID> findJob(final Ds3Client client, final JobRequestType type, final String bucketName, final Set<String> fileNames) throws IOException, SignatureException {
+    public static List<UUID> findJob(final Ds3Client client, final JobRequestType type, final String bucketName, final Set<String> fileNames) throws IOException {
         final ImmutableSet<String> files = ImmutableSet.copyOf(fileNames);
         final GetJobsSpectraS3Response response = client.getJobsSpectraS3(new GetJobsSpectraS3Request());
         final List<UUID> jobIds = new ArrayList<>();
diff --git a/ds3-sdk/src/main/java/com/spectralogic/ds3client/utils/PerformanceUtils.java b/ds3-sdk/src/main/java/com/spectralogic/ds3client/utils/PerformanceUtils.java
@@ -18,7 +18,7 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-public class PerformanceUtils {
+public final class PerformanceUtils {
 
     static private final Logger LOG = LoggerFactory.getLogger(PerformanceUtils.class);
 
diff --git a/ds3-sdk/src/main/java/com/spectralogic/ds3client/utils/ResourceUtils.java b/ds3-sdk/src/main/java/com/spectralogic/ds3client/utils/ResourceUtils.java
@@ -21,7 +21,7 @@
 import java.nio.file.Path;
 import java.nio.file.Paths;
 
-public class ResourceUtils {
+public final class ResourceUtils {
 
     public static Path loadFileResource(final Path filePath) throws FileNotFoundException, URISyntaxException {
         return loadFileResource(filePath.toString());
diff --git a/ds3-sdk/src/main/java/com/spectralogic/ds3client/utils/ResponseUtils.java b/ds3-sdk/src/main/java/com/spectralogic/ds3client/utils/ResponseUtils.java
@@ -17,7 +17,7 @@
 
 import com.google.common.collect.ImmutableList;
 
-public class ResponseUtils {
+public final class ResponseUtils {
     public static ImmutableList<Integer> toImmutableIntList(final int[] expectedStatuses) {
         final ImmutableList.Builder<Integer> integerBuilder = ImmutableList.builder();
 
diff --git a/ds3-sdk/src/main/java/com/spectralogic/ds3client/utils/SafeStringManipulation.java b/ds3-sdk/src/main/java/com/spectralogic/ds3client/utils/SafeStringManipulation.java
@@ -64,7 +64,7 @@ public static Escaper getDs3Escaper() {
     }
 
     public static String getEscapedRequestPath(final Ds3Request request) {
-        if ((request == null) || (request.getPath() == null)){
+        if (request == null || request.getPath() == null){
             return "";
         }
         return getDs3Escaper().escape(request.getPath());
diff --git a/ds3-sdk/src/main/java/com/spectralogic/ds3client/utils/Signature.java b/ds3-sdk/src/main/java/com/spectralogic/ds3client/utils/Signature.java
@@ -31,7 +31,7 @@
 import javax.crypto.Mac;
 import javax.crypto.spec.SecretKeySpec;
 
-public class Signature {
+public final class Signature {
     private final static Logger LOG = LoggerFactory.getLogger(Signature.class);
     private final static String HMAC_SHA1_ALGORITHM = "HmacSHA1";
 
diff --git a/ds3-sdk/src/main/java/com/spectralogic/ds3client/utils/collections/LazyIterable.java b/ds3-sdk/src/main/java/com/spectralogic/ds3client/utils/collections/LazyIterable.java
@@ -30,7 +30,7 @@
  */
 public class LazyIterable<T> implements Iterable<T> {
 
-    private LazyLoaderFactory<T> lazyLoaderFactory;
+    final private LazyLoaderFactory<T> lazyLoaderFactory;
 
     public LazyIterable(final LazyLoaderFactory<T> lazyLoaderFactory) {
         this.lazyLoaderFactory = lazyLoaderFactory;
@@ -62,15 +62,15 @@ public interface LazyLoader<T> {
         List<T> getNextValues();
     }
 
-    private class LazyObjectIterator<T> implements Iterator<T> {
+    private class LazyObjectIterator<E> implements Iterator<E> {
 
-        private final LazyLoader<T> iterableLoader;
+        private final LazyLoader<E> iterableLoader;
 
-        private List<T> cache = null;
+        private List<E> cache = null;
         private int cachePointer;
         private boolean endOfContent = false;
 
-        private LazyObjectIterator(final LazyLoader<T> iterableLoader) {
+        private LazyObjectIterator(final LazyLoader<E> iterableLoader) {
             this.iterableLoader = iterableLoader;
         }
 
@@ -87,14 +87,14 @@ public boolean hasNext() {
         }
 
         @Override
-        public T next() {
+        public E next() {
             if (endOfContent) {
                 throw new NoSuchElementException("No more content");
             }
             if (cache == null || cachePointer >= cache.size()) {
                 loadCache();
             }
-            final T contents = cache.get(cachePointer);
+            final E contents = cache.get(cachePointer);
             this.cachePointer++;
             return contents;
         }
diff --git a/ds3-sdk/src/main/java/com/spectralogic/ds3client/utils/hashing/Crc32c.java b/ds3-sdk/src/main/java/com/spectralogic/ds3client/utils/hashing/Crc32c.java
@@ -106,7 +106,7 @@ public Crc32c() {
    * @param b the new byte.
    */
   @Override
-  public void update(int b) {
+  public void update(final int b) {
     long newCrc = crc ^ LONG_MASK;
     newCrc = updateByte((byte) b, newCrc);
     crc = newCrc ^ LONG_MASK;
@@ -119,7 +119,7 @@ public void update(int b) {
    * @param len the length of data to examine.
    */
   @Override
-  public void update(byte[] bArray, int off, int len) {
+  public void update(final byte[] bArray, final int off, final int len) {
     long newCrc = crc ^ LONG_MASK;
     for (int i = off; i < off + len; i++) {
       newCrc = updateByte(bArray[i], newCrc);
@@ -142,7 +142,7 @@ public long getValue() {
    */
   public byte[] getValueAsBytes() {
     long value = crc;
-    byte[] result = new byte[4];
+    final byte[] result = new byte[4];
     for (int i = 3; i >= 0; i--) {
       result[i] = (byte) (value & 0xffL);
       value >>= 8;
@@ -158,9 +158,9 @@ public void reset() {
     crc = 0;
   }
 
-  private long updateByte(byte newByte, long crc) {
-    byte b = (byte) (newByte & BYTE_MASK);
-    int index = (int) ((crc ^ b) & BYTE_MASK);
+  private long updateByte(final byte newByte, final long crc) {
+    final byte b = (byte) (newByte & BYTE_MASK);
+    final int index = (int) ((crc ^ b) & BYTE_MASK);
     return (CRC_TABLE[index] ^ (crc >> 8)) & LONG_MASK;
   }
 }
diff --git a/ds3-sdk/src/main/java/com/spectralogic/ds3client/utils/hashing/DigestHasher.java b/ds3-sdk/src/main/java/com/spectralogic/ds3client/utils/hashing/DigestHasher.java
@@ -30,7 +30,7 @@ abstract class DigestHasher implements Hasher {
     abstract MessageDigest getDigest();
 
     @Override
-    public void update(final byte[] bytes, int offset, int length) {
+    public void update(final byte[] bytes, final int offset, final int length) {
         digest.update(bytes, offset, length);
     }
 

Original file line number	Diff line number	Diff line change
`@@ -107,7 +107,7 @@ public static ConnectionDetails newForNode(final JobNode node, final ConnectionD`
`107`	`107`
`108`	`108`	`private static String buildAuthority(final JobNode node, final ConnectionDetails connectionDetails) {`
`109`	`109`	`return node.getEndPoint() + ":" + Integer.toString(`
`110`		`- (connectionDetails.isHttps() ? node.getHttpsPort() : node.getHttpPort()));`
	`110`	`+ connectionDetails.isHttps() ? node.getHttpsPort() : node.getHttpPort());`
`111`	`111`	`}`
`112`	`112`
`113`	`113`	`private final String endpoint;`
Original file line number	Diff line number	Diff line change
`@@ -58,7 +58,7 @@ public AbstractResponse(final WebResponse response) throws IOException {`
`58`	`58`	`this.processResponse();`
`59`	`59`	`}`
`60`	`60`
`61`		`- private static ChecksumType.Type determineChecksumType(final Headers headers) throws ResponseProcessingException {`
	`61`	`+ private static ChecksumType.Type determineChecksumType(final Headers headers) {`
`62`	`62`	`for (final ChecksumType.Type type : ChecksumType.Type.values()) {`
`63`	`63`	`if (getFirstHeaderValue(headers, "content-" + type.toString().replace("_", "").toLowerCase()) != null) {`
`64`	`64`	`return type;`
`@@ -114,8 +114,8 @@ public void checkStatusCode(final int ... expectedStatuses) throws IOException {`
`114`	`114`	`}`
`115`	`115`
`116`	`116`	`private boolean checkForManagementPortException() {`
`117`		`- return ((this.getStatusCode() == FailedRequestUsingMgmtPortException.MGMT_PORT_STATUS_CODE)`
`118`		`- && (getFirstHeaderValue(getResponse().getHeaders(), FailedRequestUsingMgmtPortException.MGMT_PORT_HEADER) != null));`
	`117`	`+ return this.getStatusCode() == FailedRequestUsingMgmtPortException.MGMT_PORT_STATUS_CODE`
	`118`	`+ && getFirstHeaderValue(getResponse().getHeaders(), FailedRequestUsingMgmtPortException.MGMT_PORT_HEADER) != null;`
`119`	`119`	`}`
`120`	`120`
`121`	`121`	`public int getStatusCode() {`
Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,6 @@`
`21`	`21`	`import com.google.common.collect.ImmutableMultimap;`
`22`	`22`	`import com.google.common.collect.Lists;`
`23`	`23`	`import com.spectralogic.ds3client.Ds3Client;`
`24`		`-import com.spectralogic.ds3client.helpers.events.ConcurrentEventRunner;`
`25`	`24`	`import com.spectralogic.ds3client.helpers.events.EventRunner;`
`26`	`25`	`import com.spectralogic.ds3client.helpers.events.SameThreadEventRunner;`
`27`	`26`	`import com.spectralogic.ds3client.helpers.pagination.GetBucketLoaderFactory;`
`@@ -267,13 +266,13 @@ public Iterable<Contents> listObjects(final String bucket, final String keyPrefi`
`267`	`266`	`}`
`268`	`267`
`269`	`268`	`@Override`
`270`		`- public Iterable<Contents> listObjects(final String bucket, final String keyPrefix, final String nextMarker, final int maxKeys) throws IOException {`
	`269`	`+ public Iterable<Contents> listObjects(final String bucket, final String keyPrefix, final String nextMarker, final int maxKeys) {`
`271`	`270`
`272`	`271`	`return new LazyIterable<>(new GetBucketLoaderFactory(client, bucket, keyPrefix, nextMarker, maxKeys, DEFAULT_LIST_OBJECTS_RETRIES));`
`273`	`272`	`}`
`274`	`273`
`275`	`274`	`@Override`
`276`		`- public Iterable<Contents> listObjects(final String bucket, final String keyPrefix, final String nextMarker, final int maxKeys, final int retries) throws IOException {`
	`275`	`+ public Iterable<Contents> listObjects(final String bucket, final String keyPrefix, final String nextMarker, final int maxKeys, final int retries) {`
`277`	`276`
`278`	`277`	`return new LazyIterable<>(new GetBucketLoaderFactory(client, bucket, keyPrefix, nextMarker, maxKeys, retries));`
`279`	`278`	`}`
Original file line number	Diff line number	Diff line change
`@@ -34,7 +34,7 @@ public int compare(final ObjectPart o1, final ObjectPart o2) {`
`34`	`34`	`}`
`35`	`35`
`36`	`36`	`private static long signum(final long value) {`
`37`		`- return value < 0 ? -1 : (value == 0 ? 0 : 1);`
	`37`	`+ return value < 0 ? -1 : value == 0 ? 0 : 1;`
`38`	`38`	`}`
`39`	`39`
`40`	`40`	`private static int intOf(final long value) {`
Original file line number	Diff line number	Diff line change
`@@ -252,7 +252,7 @@ public CloseableHttpResponse execute() throws IOException {`
`252`	`252`	`}`
`253`	`253`	`}`
`254`	`254`
`255`		`- private HttpRequest buildHttpRequest() throws IOException {`
	`255`	`+ private HttpRequest buildHttpRequest() {`
`256`	`256`	`final String verb = this.ds3Request.getVerb().toString();`
`257`	`257`	`final String path = this.buildPath();`
`258`	`258`	`if (this.content != null) {`
`@@ -277,7 +277,7 @@ private String buildPath() {`
`277`	`277`	`return path;`
`278`	`278`	`}`
`279`	`279`
`280`		`- private void addHeaders(final HttpRequest httpRequest) throws IOException {`
	`280`	`+ private void addHeaders(final HttpRequest httpRequest) {`
`281`	`281`	`// Add common headers.`
`282`	`282`	`final String date = DateFormatter.dateToRfc882();`
`283`	`283`	`httpRequest.addHeader(HOST, NetUtils.buildHostField(NetworkClientImpl.this.connectionDetails));`