ID-1570 - Fix dice-where and update dce-id to use the latest version

dice-where-downloader-lib/pom.xml

@@ -138,6 +138,25 @@
       <scope>test</scope>
     </dependency>
 
+    <dependency>
+      <groupId>org.mockito</groupId>
+      <artifactId>mockito-junit-jupiter</artifactId>
+      <version>3.3.0</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.mockito</groupId>
+      <artifactId>mockito-inline</artifactId>
+      <version>3.4.6</version>
+      <scope>test</scope>
+    </dependency>
+
+    <dependency>
+      <groupId>org.junit.vintage</groupId>
+      <artifactId>junit-vintage-engine</artifactId>
+      <version>5.10.1</version>
+      <scope>test</scope>
+    </dependency>
   </dependencies>
 
 </project>

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

@@ -21,7 +21,7 @@
 public class LocalFileAcceptor implements FileAcceptor<Void> {
 
   private static final Logger LOG = LoggerFactory.getLogger(LocalFileAcceptor.class);
-  public static final int BUFFER = 8192;
+  private static final int BUFFER = 8192;
 
   private final Path destination;
 

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

@@ -10,32 +10,34 @@
 
 public class StreamWithMD5Decorator extends InputStream {
 
+  private final DigestInputStream inputStream;
   private final MessageDigest md5;
-  DigestInputStream inputStream;
 
   private StreamWithMD5Decorator(DigestInputStream inputStream, MessageDigest md5) {
     this.inputStream = inputStream;
     this.md5 = md5;
+    inputStream.on(false);
   }
 
+
   public static StreamWithMD5Decorator of(InputStream inputStream) throws NoSuchAlgorithmException {
     MessageDigest md5 = MessageDigest.getInstance("MD5");
     DigestInputStream dis = new DigestInputStream(inputStream, md5);
     return new StreamWithMD5Decorator(dis, md5);
   }
 
   public MD5Checksum md5() {
-    String hex = (new HexBinaryAdapter()).marshal(this.md5.digest());
+    String hex = (new HexBinaryAdapter()).marshal(md5.digest());
     return MD5Checksum.of(hex);
   }
 
   @Override
   public int read() throws IOException {
-    return this.inputStream.read();
+    return inputStream.read();
   }
 
   @Override
   public void close() throws IOException {
-    this.inputStream.close();
+    inputStream.close();
   }
 }

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

@@ -0,0 +1,37 @@
+package technology.dice.dicewhere.downloader.stream;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.net.URISyntaxException;
+import java.nio.charset.Charset;
+import java.nio.file.Path;
+import java.security.NoSuchAlgorithmException;
+import org.apache.commons.io.IOUtils;
+import org.junit.jupiter.api.DisplayName;
+import org.junit.jupiter.api.Test;
+
+public class StreamWithMD5DecoratorTest {
+
+  private static final String PATH = "/maxmind/maxmind-city-1.zip";
+
+  @Test
+  @DisplayName("Should Successfully Read a Stream and calculate the entire stream digest")
+  public void shouldSuccessfullyReadAndCalculateDigestOfStream()
+      throws IOException, NoSuchAlgorithmException, URISyntaxException {
+    Path path = Path.of(getClass().getResource(PATH).toURI());
+    StreamWithMD5Decorator is = StreamWithMD5Decorator.of(new FileInputStream(path.toFile()));
+
+    String first = is.md5().stringFormat();
+    //Read from the stream
+    IOUtils.toString(is, Charset.defaultCharset());
+
+    //Calculate multiple Hashes
+    is.md5().stringFormat();
+    is.md5().stringFormat();
+
+    //Assert the Stream Hash before and after
+    assertEquals(first, is.md5().stringFormat());
+  }
+}