Reverts singleton enforcing

Author: SpaiR

src/main/java/io/github/spair/byond/dmi/Dmi.java

@@ -67,7 +67,7 @@ public DmiState getState(final String stateName) {
     }
 
     /**
-     * Returns first sprite of state with provided name or null if wasn't found.
+     * Returns the first sprite of state with provided name or null if wasn't found.
      *
      * @param stateName state name to search
      * @return {@link DmiSprite} instance or null if wasn't found
@@ -77,7 +77,7 @@ public DmiSprite getStateSprite(final String stateName) {
     }
 
     /**
-     * Returns first sprite of state with provided name and dir or null if wasn't found.
+     * Returns the first sprite of state with provided name and dir or null if wasn't found.
      *
      * @param stateName state name to search
      * @return {@link DmiSprite} instance or null if wasn't found

src/main/java/io/github/spair/byond/dmi/DmiComparator.java

@@ -12,7 +12,7 @@
 import java.util.stream.Collectors;
 
 /**
- * Singleton class to compare two {@link io.github.spair.byond.dmi.Dmi} objects and get result of comparison
+ * Class to compare two {@link io.github.spair.byond.dmi.Dmi} objects and get result of comparison
  * as {@link io.github.spair.byond.dmi.DmiDiff}.
  */
 public final class DmiComparator {
@@ -136,19 +136,4 @@ private <V> V extractOrNull(final Dmi dmi, final Function<Dmi, V> function) {
             return null;
         }
     }
-
-    private DmiComparator() {
-    }
-
-    /**
-     * Method to get singleton instance of DmiComparator object.
-     * @return DmiComparator object instance
-     */
-    public static DmiComparator getInstance() {
-        return SingletonHolder.HOLDER_INSTANCE;
-    }
-
-    private static class SingletonHolder {
-        private static final DmiComparator HOLDER_INSTANCE = new DmiComparator();
-    }
 }

src/main/java/io/github/spair/byond/dmi/DmiSlurper.java

@@ -14,7 +14,7 @@
 import java.util.Map;
 
 /**
- * Singleton class to extract {@link io.github.spair.byond.dmi.Dmi} object from file/base64 string/raw input stream.
+ * Class to extract {@link io.github.spair.byond.dmi.Dmi} object from file/base64 string/raw input stream.
  */
 public final class DmiSlurper {
 
@@ -71,19 +71,4 @@ public Dmi slurpUp(final String dmiName, final InputStream input) {
             throw new IllegalArgumentException("Provided DMI can't be read");
         }
     }
-
-    private DmiSlurper() {
-    }
-
-    /**
-     * Method to get singleton instance of DmiSlurper object.
-     * @return DmiSlurper object instance
-     */
-    public static DmiSlurper getInstance() {
-        return SingletonHolder.HOLDER_INSTANCE;
-    }
-
-    private static class SingletonHolder {
-        private static final DmiSlurper HOLDER_INSTANCE = new DmiSlurper();
-    }
 }

src/main/java/io/github/spair/byond/dmi/DmiState.java

@@ -23,7 +23,8 @@ public String getStateName() {
     }
 
     /**
-     * Returns first available sprite. That means, that sprite will be the first frame and {@link SpriteDir#SOUTH} dir.
+     * Returns the first available sprite.
+     * That means, that sprite will be the first frame and {@link SpriteDir#SOUTH} dir.
      * If sprite wasn't found result will be null.
      *
      * @return first available sprite
@@ -33,7 +34,7 @@ public DmiSprite getSprite() {
     }
 
     /**
-     * Returns first available sprite of specified dir.
+     * Returns the first available sprite of specified dir.
      * That means, that sprite will be the first frame of provided dir. If sprite wasn't found result will be null.
      *
      * @param dir dir to search sprite
@@ -48,16 +49,6 @@ public DmiSprite getSprite(final SpriteDir dir) {
         }
     }
 
-    /**
-     * Returns the list of sprites for specified dir.
-     *
-     * @param dir dir to search sprite
-     * @return list of sprites for specified dir
-     */
-    public List<DmiSprite> getSpriteList(final SpriteDir dir) {
-        return sprites.get(dir);
-    }
-
     /**
      * Returns sprite with specified dir and frame. If sprite wasn't found result will be null.
      * Frame count goes <b>from</b> '1' number, so if method get something lesser then it than exception will be thrown.
@@ -72,10 +63,20 @@ public DmiSprite getSprite(final SpriteDir dir, final int frame) {
         }
 
         List<DmiSprite> spriteList = sprites.get(dir);
-        if (Objects.nonNull(spriteList) && !spriteList.isEmpty()) {
+        if (Objects.nonNull(spriteList) && !spriteList.isEmpty() && spriteList.size() >= frame - 1) {
             return spriteList.get(frame - 1);
         } else {
             return null;
         }
     }
+
+    /**
+     * Returns the list of sprites for specified dir.
+     *
+     * @param dir dir to search sprite
+     * @return list of sprites for specified dir
+     */
+    public List<DmiSprite> getSpriteList(final SpriteDir dir) {
+        return sprites.get(dir);
+    }
 }

src/test/java/io/github/spair/byond/dmi/DmiComparatorTest.java

@@ -12,8 +12,8 @@
 
 public class DmiComparatorTest {
 
-    private final DmiSlurper dmiSlurper = DmiSlurper.getInstance();
-    private final DmiComparator dmiComparator = DmiComparator.getInstance();
+    private final DmiSlurper dmiSlurper = new DmiSlurper();
+    private final DmiComparator dmiComparator = new DmiComparator();
 
     private static final String ROLLERBED_ORIGINAL_PATH = "src/test/resources/rollerbed_original.dmi";
     private static final String ROLLERBED_DIFF_PATH = "src/test/resources/rollerbed_original_diff.dmi";

src/test/java/io/github/spair/byond/dmi/DmiSlurperTest.java

@@ -14,7 +14,7 @@
 
 public class DmiSlurperTest {
 
-    private final DmiSlurper dmiSlurper = DmiSlurper.getInstance();
+    private final DmiSlurper dmiSlurper = new DmiSlurper();
 
     @Test
     public void testSlurpUpFromFile() {