ID-1570 - code cleanup;

Author: snackk

dice-where-downloader-lib/src/main/java/technology/dice/dicewhere/downloader/destination/local/LocalFileAcceptor.java

@@ -21,7 +21,6 @@
 public class LocalFileAcceptor implements FileAcceptor<Void> {
 
   private static final Logger LOG = LoggerFactory.getLogger(LocalFileAcceptor.class);
-  private static final int BUFFER = 8192;
 
   private final Path destination;
 
@@ -39,7 +38,7 @@ public StreamConsumer<Void> getStreamConsumer(
       } catch (FileAlreadyExistsException e) {
         LOG.debug("Destination directory already exists");
       }
-      Files.copy(stream.getInputStream(), destination, StandardCopyOption.REPLACE_EXISTING);
+      Files.copy(stream.inputStream(), destination, StandardCopyOption.REPLACE_EXISTING);
       if ((!noMd5Check) && (!originalFileMd5.matches(stream.md5()))) {
         LOG.error("MD5 mismatch. Deleting destination file");
         Files.delete(destination);

dice-where-downloader-lib/src/main/java/technology/dice/dicewhere/downloader/destination/s3/S3FileAcceptor.java

@@ -59,7 +59,7 @@ public StreamConsumer<Void> getStreamConsumer(
                   .contentLength(size)
                   .storageClass(StorageClass.INTELLIGENT_TIERING)
                   .build();
-          client.putObject(putObjectRequest, RequestBody.fromInputStream(stream.getInputStream(), size));
+          client.putObject(putObjectRequest, RequestBody.fromInputStream(stream.inputStream(), size));
           Latest latest = new Latest(clock.instant(), key);
           String latestContent = mapper.writeValueAsString(latest);
 

dice-where-downloader-lib/src/main/java/technology/dice/dicewhere/downloader/stream/StreamWithMD5Decorator.java

@@ -13,15 +13,19 @@
 
 public class StreamWithMD5Decorator extends InputStream {
 
-  private final ByteArrayOutputStream buffer = new ByteArrayOutputStream();
+  private static final int BUFFER_SIZE = 8192;
+  private static final HexBinaryAdapter HEX_BINARY_ADAPTER = new HexBinaryAdapter();
+
   private final MessageDigest md5;
-  DigestInputStream inputStream;
+  private final DigestInputStream originalStream;
+  private final ByteArrayOutputStream duplicatedStream = new ByteArrayOutputStream();
+
   private boolean consumed = false;
   private Optional<MD5Checksum> md5Checksum = Optional.empty();
 
-  private StreamWithMD5Decorator(DigestInputStream inputStream, MessageDigest md5)
+  private StreamWithMD5Decorator(DigestInputStream originalStream, MessageDigest md5)
       throws IOException {
-    this.inputStream = inputStream;
+    this.originalStream = originalStream;
     this.md5 = md5;
     consumeStream();
   }
@@ -34,10 +38,10 @@ public static StreamWithMD5Decorator of(InputStream inputStream)
   }
 
   private void consumeStream() throws IOException {
-    byte[] data = new byte[8192];
+    byte[] data = new byte[BUFFER_SIZE];
     int bytesRead;
-    while ((bytesRead = inputStream.read(data)) != -1) {
-      buffer.write(data, 0, bytesRead);
+    while ((bytesRead = originalStream.read(data)) != -1) {
+      duplicatedStream.write(data, 0, bytesRead);
     }
     consumed = true;
   }
@@ -48,68 +52,36 @@ public MD5Checksum md5() {
     }
     return md5Checksum.orElseGet(
         () -> {
-          String hex = (new HexBinaryAdapter()).marshal(md5.digest());
+          String hex = HEX_BINARY_ADAPTER.marshal(md5.digest());
           MD5Checksum checksum = MD5Checksum.of(hex);
           md5Checksum = Optional.of(checksum);
           return checksum;
         });
   }
 
-  public InputStream getInputStream() {
-    return new ByteArrayInputStream(buffer.toByteArray());
+  public InputStream inputStream() {
+    return new ByteArrayInputStream(duplicatedStream.toByteArray());
   }
 
   @Override
   public int read() throws IOException {
     if (!consumed) {
       throw new IllegalStateException("Stream not fully consumed yet.");
     }
-    return getInputStream().read();
+    return inputStream().read();
   }
 
   @Override
   public int read(byte[] b, int off, int len) throws IOException {
     if (!consumed) {
       throw new IllegalStateException("Stream not fully consumed yet.");
     }
-    return getInputStream().read(b, off, len);
+    return inputStream().read(b, off, len);
   }
 
   @Override
   public void close() throws IOException {
-    getInputStream().close();
-    inputStream.close();
-  }
-  /*
-  public static String of1(InputStream inputStream) throws NoSuchAlgorithmException {
-    return bytesToHex(checksum(inputStream));
-  }
-
-  private static byte[] checksum(InputStream is) {
-
-    MessageDigest md;
-    try {
-      md = MessageDigest.getInstance("MD5");
-    } catch (NoSuchAlgorithmException e) {
-      throw new IllegalArgumentException(e);
-    }
-
-    try (DigestInputStream dis = new DigestInputStream(is, md)) {
-      while (dis.read() != -1)
-        ; // empty loop to clear the data
-      md = dis.getMessageDigest();
-    } catch (IOException e) {
-      throw new IllegalArgumentException(e);
-    }
-    return md.digest();
-  }
-
-  private static String bytesToHex(byte[] bytes) {
-    StringBuilder sb = new StringBuilder();
-    for (byte b : bytes) {
-      sb.append(String.format("%02x", b));
-    }
-    return sb.toString();
+    inputStream().close();
+    originalStream.close();
   }
-  */
 }

dice-where-downloader-lib/src/test/java/technology/dice/dicewhere/downloader/stream/StreamWithMD5DecoratorTest.java

@@ -42,7 +42,7 @@ public void shouldSuccessfullyReadAndCalculateDigestOfStream()
 
     String first = is.md5().stringFormat();
     // Read from the stream
-    IOUtils.toString(is.getInputStream(), Charset.defaultCharset());
+    IOUtils.toString(is.inputStream(), Charset.defaultCharset());
 
     // Assert the Stream Hash before and after
     assertEquals(first, is.md5().stringFormat());
@@ -66,7 +66,7 @@ public void shouldSuccessfullyReadAndCalculateDigestOfStreamFromHttp()
 
     String first = is.md5().stringFormat();
     // Read from the stream
-    IOUtils.toString(is.getInputStream(), Charset.defaultCharset());
+    IOUtils.toString(is.inputStream(), Charset.defaultCharset());
 
     // Assert the Stream Hash before and after
     assertEquals(first, is.md5().stringFormat());