Global structure refactor and removing of Nullable / NonNull annotations

Author: SpaiR

pom.xml

@@ -48,15 +48,10 @@
     </properties>
 
     <dependencies>
-        <dependency>
-            <groupId>com.google.code.findbugs</groupId>
-            <artifactId>jsr305</artifactId>
-            <version>3.0.2</version>
-        </dependency>
         <dependency>
             <groupId>org.projectlombok</groupId>
             <artifactId>lombok</artifactId>
-            <version>1.16.20</version>
+            <version>1.18.2</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
@@ -107,7 +102,7 @@
             <plugin>
                 <groupId>org.projectlombok</groupId>
                 <artifactId>lombok-maven-plugin</artifactId>
-                <version>1.16.20.0</version>
+                <version>1.18.0.0</version>
                 <executions>
                     <execution>
                         <id>delombok</id>

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

@@ -5,13 +5,14 @@
 import lombok.NoArgsConstructor;
 import lombok.Setter;
 
-import javax.annotation.Nonnull;
 import java.util.Map;
 import java.util.HashMap;
 import java.util.Set;
 import java.util.HashSet;
+import java.util.Optional;
 
 @Data
+@Setter(AccessLevel.PACKAGE)
 @NoArgsConstructor
 @SuppressWarnings("WeakerAccess")
 public class Dmi {
@@ -21,35 +22,32 @@ public class Dmi {
      */
     public static final int MAX_STATES = 512;
 
-    @Nonnull private String name = "";
+    private String name = "";
     private int width;
     private int height;
-    @Nonnull private DmiMeta metadata = new DmiMeta();
-    @Nonnull private Map<String, DmiState> states = new HashMap<>();
+    private DmiMeta metadata = new DmiMeta();
+    private Map<String, DmiState> states = new HashMap<>();
+    private Set<String> duplicateStatesNames = new HashSet<>();
 
-    @Setter(AccessLevel.NONE)
-    @Nonnull private Set<String> duplicateStatesNames = new HashSet<>();
-
-    public Dmi(@Nonnull final String name, final int width, final int height,
-               @Nonnull final DmiMeta metadata, @Nonnull final Map<String, DmiState> states) {
+    public Dmi(final String name, final int width, final int height,
+               final DmiMeta metadata, final Map<String, DmiState> states) {
         this.name = name;
         this.width = width;
         this.height = height;
         this.metadata = metadata;
         this.states = states;
-        checkDuplicates();
-    }
 
-    public void setStates(@Nonnull final Map<String, DmiState> states) {
-        this.states = states;
-        checkDuplicates();
+        states.forEach((stateName, dmiState) -> {
+            if (dmiState.isDuplicate()) {
+                duplicateStatesNames.add(stateName);
+            }
+        });
     }
 
     public void addState(final DmiState dmiState) {
-        final String stateName = dmiState.getStateName();
-        states.put(stateName, dmiState);
+        states.put(dmiState.getName(), dmiState);
         if (dmiState.isDuplicate()) {
-            duplicateStatesNames.add(stateName);
+            duplicateStatesNames.add(dmiState.getName());
         }
     }
 
@@ -59,8 +57,8 @@ public void addState(final DmiState dmiState) {
      * @param stateName state name to search
      * @return {@link DmiState} instance or null if wasn't found
      */
-    public DmiState getState(final String stateName) {
-        return states.get(stateName);
+    public Optional<DmiState> getState(final String stateName) {
+        return Optional.ofNullable(states.get(stateName));
     }
 
     /**
@@ -69,8 +67,8 @@ public DmiState getState(final String stateName) {
      * @param stateName state name to search
      * @return {@link DmiSprite} instance or null if wasn't found
      */
-    public DmiSprite getStateSprite(final String stateName) {
-        return CheckSupplierUtil.returnIfNonNull(getState(stateName), DmiState::getSprite);
+    public Optional<DmiSprite> getStateSprite(final String stateName) {
+        return getState(stateName).flatMap(DmiState::getSprite);
     }
 
     /**
@@ -79,8 +77,8 @@ public DmiSprite getStateSprite(final String stateName) {
      * @param stateName state name to search
      * @return {@link DmiSprite} instance or null if wasn't found
      */
-    public DmiSprite getStateSprite(final String stateName, final SpriteDir dir) {
-        return CheckSupplierUtil.returnIfNonNull(getState(stateName), s -> s.getSprite(dir));
+    public Optional<DmiSprite> getStateSprite(final String stateName, final SpriteDir dir) {
+        return getState(stateName).flatMap(s -> s.getSprite(dir));
     }
 
     /**
@@ -89,8 +87,8 @@ public DmiSprite getStateSprite(final String stateName, final SpriteDir dir) {
      * @param stateName state name to search
      * @return {@link DmiSprite} instance or null if wasn't found
      */
-    public DmiSprite getStateSprite(final String stateName, final SpriteDir dir, final int frame) {
-        return CheckSupplierUtil.returnIfNonNull(getState(stateName), s -> s.getSprite(dir, frame));
+    public Optional<DmiSprite> getStateSprite(final String stateName, final SpriteDir dir, final int frame) {
+        return getState(stateName).flatMap(s -> s.getSprite(dir, frame));
     }
 
     public boolean hasState(final String stateName) {
@@ -114,13 +112,4 @@ public boolean isHasDuplicates() {
     public boolean isStateOverflow() {
         return states.size() > MAX_STATES;
     }
-
-    private void checkDuplicates() {
-        duplicateStatesNames.clear();
-        states.forEach((stateName, dmiState) -> {
-            if (dmiState.isDuplicate()) {
-                duplicateStatesNames.add(stateName);
-            }
-        });
-    }
 }

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

@@ -4,15 +4,22 @@
 import lombok.NoArgsConstructor;
 import lombok.AllArgsConstructor;
 
+import java.util.Collections;
+import java.util.Iterator;
 import java.util.List;
 
 @Data
 @NoArgsConstructor
 @AllArgsConstructor
 @SuppressWarnings("WeakerAccess")
-public class DmiMeta {
+public class DmiMeta implements Iterable<DmiMetaEntry> {
 
     private int spritesWidth;
     private int spritesHeight;
-    private List<Meta> metas;
+    private List<DmiMetaEntry> metas = Collections.emptyList();
+
+    @Override
+    public Iterator<DmiMetaEntry> iterator() {
+        return metas.iterator();
+    }
 }

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

@@ -8,8 +8,7 @@
 @NoArgsConstructor
 @AllArgsConstructor
 @SuppressWarnings("WeakerAccess")
-public class Meta {
-
+public class DmiMetaEntry {
     private String name;
     private int dirs;
     private int frames;

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

@@ -3,23 +3,38 @@
 import lombok.AllArgsConstructor;
 import lombok.Data;
 
-import javax.annotation.Nonnull;
 import java.awt.image.BufferedImage;
+import java.awt.image.DataBuffer;
+import java.awt.image.DataBufferByte;
+import java.awt.image.DataBufferInt;
+import java.util.Arrays;
 import java.util.Objects;
 
 @Data
 @AllArgsConstructor
 @SuppressWarnings("WeakerAccess")
 public class DmiSprite {
 
-    @Nonnull private BufferedImage sprite;
-    @Nonnull private SpriteDir dir;
+    private BufferedImage sprite;
+    private int width;
+    private int height;
+    private SpriteDir dir;
     private int frameNum;
 
+    public DmiSprite(final BufferedImage sprite, final SpriteDir dir, final int frameNum) {
+        this.sprite = sprite;
+        this.width = sprite.getWidth();
+        this.height = sprite.getHeight();
+        this.dir = dir;
+        this.frameNum = frameNum;
+    }
+
     @Override
     public String toString() {
         return "DmiSprite{"
                 + "sprite=binary-image"
+                + ", width=" + width
+                + ", height=" + height
                 + ", dir=" + dir
                 + ", frameNum=" + frameNum
                 + '}';
@@ -44,23 +59,28 @@ public int hashCode() {
         return Objects.hash(sprite, dir, frameNum);
     }
 
-    private boolean isEqualSprite(final BufferedImage spriteToCompare) {
-        if (sprite == spriteToCompare) {
+    private boolean isEqualSprite(final BufferedImage spriteToCheck) {
+        if (sprite == spriteToCheck) {
             return true;
         }
-
-        if (sprite.getHeight() != spriteToCompare.getHeight() || sprite.getWidth() != spriteToCompare.getWidth()) {
+        if (sprite.getWidth() != spriteToCheck.getWidth() || sprite.getHeight() != spriteToCheck.getHeight()) {
             return false;
         }
 
-        for (int x = 0; x < sprite.getWidth(); x++) {
-            for (int y = 0; y < sprite.getHeight(); y++) {
-                if (sprite.getRGB(x, y) != spriteToCompare.getRGB(x, y)) {
-                    return false;
-                }
-            }
+        DataBuffer actual = sprite.getData().getDataBuffer();
+        DataBuffer toCheck = spriteToCheck.getData().getDataBuffer();
+
+        if (actual.getClass() != toCheck.getClass()) {
+            return false;
         }
 
-        return true;
+        // DataBufferByte - for RGB images, DataBufferInt - for ARGB
+        if (actual instanceof DataBufferByte) {
+            return Arrays.equals(((DataBufferByte) actual).getData(), ((DataBufferByte) toCheck).getData());
+        } else if (actual instanceof DataBufferInt) {
+            return Arrays.equals(((DataBufferInt) actual).getData(), ((DataBufferInt) toCheck).getData());
+        } else {
+            throw new IllegalStateException();
+        }
     }
 }