Made messageDigest static, fixed parser not resetting iterator after parsing to map, refactored project structure

Author: robothaver

src/main/java/com/robothaver/torrentfileparser/Main.java

@@ -2,6 +2,7 @@
 
 import com.robothaver.torrentfileparser.domain.Torrent;
 import com.robothaver.torrentfileparser.exception.MalformedTorrentFileException;
+import com.robothaver.torrentfileparser.parser.TorrentFileParser;
 
 import java.io.IOException;
 import java.nio.file.Files;
@@ -17,7 +18,7 @@ public static void main(String[] args) {
             byte[] bytes = Files.readAllBytes(path);
             Instant start = Instant.now();
 
-            TorrentFileParser torrentParser = new TorrentFileParser(bytes);
+            TorrentFileParser torrentParser = new TorrentFileParser(bytes, true);
             Torrent torrent = torrentParser.parseToTorrent();
             System.out.println(torrent.getName());
 

…entfileparser/domain/InfoHasCompute.java …entfileparser/parser/InfoHasCompute.javasrc/main/java/com/robothaver/torrentfileparser/domain/InfoHasCompute.java renamed to src/main/java/com/robothaver/torrentfileparser/parser/InfoHasCompute.java src/main/java/com/robothaver/torrentfileparser/domain/InfoHasCompute.java renamed to src/main/java/com/robothaver/torrentfileparser/parser/InfoHasCompute.java

@@ -1,21 +1,26 @@
-package com.robothaver.torrentfileparser.domain;
+package com.robothaver.torrentfileparser.parser;
 
 import java.security.MessageDigest;
 import java.security.NoSuchAlgorithmException;
 import java.util.HexFormat;
 
 public class InfoHasCompute {
-    public static String getInfoHash(byte[] infoBytes) {
+    private static final MessageDigest messageDigest;
+
+    static {
         try {
-            return getSHAsum(infoBytes);
+            messageDigest = MessageDigest.getInstance("SHA-1");
         } catch (NoSuchAlgorithmException e) {
-            throw new RuntimeException(e);
+            throw new IllegalStateException(e);
         }
     }
 
-    private static String getSHAsum(byte[] input) throws NoSuchAlgorithmException {
-        MessageDigest messageDigest = MessageDigest.getInstance("SHA-1");
-        return byteArrayToHex(messageDigest.digest(input));
+    private InfoHasCompute() {
+        throw new IllegalStateException("Utility class");
+    }
+
+    public static String getInfoHash(byte[] infoBytes) {
+        return byteArrayToHex(messageDigest.digest(infoBytes));
     }
 
     private static String byteArrayToHex(byte[] bytes) {

…entfileparser/domain/TorrentBuilder.java …entfileparser/parser/TorrentBuilder.javasrc/main/java/com/robothaver/torrentfileparser/domain/TorrentBuilder.java renamed to src/main/java/com/robothaver/torrentfileparser/parser/TorrentBuilder.java src/main/java/com/robothaver/torrentfileparser/domain/TorrentBuilder.java renamed to src/main/java/com/robothaver/torrentfileparser/parser/TorrentBuilder.java

@@ -1,4 +1,7 @@
-package com.robothaver.torrentfileparser.domain;
+package com.robothaver.torrentfileparser.parser;
+
+import com.robothaver.torrentfileparser.domain.Torrent;
+import com.robothaver.torrentfileparser.domain.TorrentFile;
 
 import java.util.List;
 import java.util.Map;
@@ -27,6 +30,7 @@ public void processKeyValue(String key, Object value) {
             case "pieces" -> torrent.setPieces(String.valueOf(value));
             case "comment" -> torrent.setComment(String.valueOf(value));
             case "private" -> torrent.setPrivate((long) value == 1);
+            default -> throw new IllegalStateException("Unknown key!");
         }
     }
 

…torrentfileparser/TorrentFileParser.java …fileparser/parser/TorrentFileParser.javasrc/main/java/com/robothaver/torrentfileparser/TorrentFileParser.java renamed to src/main/java/com/robothaver/torrentfileparser/parser/TorrentFileParser.java src/main/java/com/robothaver/torrentfileparser/TorrentFileParser.java renamed to src/main/java/com/robothaver/torrentfileparser/parser/TorrentFileParser.java

@@ -1,7 +1,6 @@
-package com.robothaver.torrentfileparser;
+package com.robothaver.torrentfileparser.parser;
 
 import com.robothaver.torrentfileparser.domain.Torrent;
-import com.robothaver.torrentfileparser.domain.TorrentBuilder;
 import com.robothaver.torrentfileparser.exception.MalformedTorrentFileException;
 
 import java.util.*;
@@ -41,7 +40,9 @@ public Torrent parseToTorrent() throws MalformedTorrentFileException {
     }
 
     public Map<String, Object> parseToMap() throws MalformedTorrentFileException {
-        return (Map<String, Object>) parse();
+        Object parse = parse();
+        iterator = 0;
+        return (Map<String, Object>) parse;
     }
 
     private boolean isInt(byte currentByte) {