Change null checks to use operators

Author: SpaiR

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

@@ -1,18 +1,17 @@
 package io.github.spair.byond.dmi;
 
-import java.util.Objects;
 import java.util.function.BooleanSupplier;
 import java.util.function.Function;
 
 final class CheckSupplierUtil {
 
     static <T, R> R returnIfNonNull(final T toCheck, final Function<T, R> toApply) {
-        return Objects.nonNull(toCheck) ? toApply.apply(toCheck) : null;
+        return toCheck != null ? toApply.apply(toCheck) : null;
     }
 
     static <T, R> R returnIfNonNullAndTrue(
             final T toCheck, final BooleanSupplier boolCheck, final Function<T, R> toApply) {
-        return Objects.nonNull(toCheck) && boolCheck.getAsBoolean() ? toApply.apply(toCheck) : null;
+        return toCheck != null && boolCheck.getAsBoolean() ? toApply.apply(toCheck) : null;
     }
 
     private CheckSupplierUtil() {

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

@@ -6,7 +6,6 @@
 
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
-import java.util.Objects;
 
 @Data
 @Setter(AccessLevel.PACKAGE)
@@ -25,11 +24,11 @@ public class Diff {
         this.oldSprite = oldSprite;
         this.newSprite = newSprite;
 
-        if (Objects.nonNull(oldSprite) && Objects.nonNull(newSprite)) {
+        if (oldSprite != null && newSprite != null) {
             status = DiffStatus.MODIFIED;
-        } else if (Objects.isNull(oldSprite) && Objects.nonNull(newSprite)) {
+        } else if (oldSprite == null && newSprite != null) {
             status = DiffStatus.CREATED;
-        } else if (Objects.nonNull(oldSprite)) {
+        } else if (oldSprite != null) {
             status = DiffStatus.DELETED;
         } else {
             throw new IllegalArgumentException("Original and Modified sprites are null. State name: " + stateName);

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

@@ -7,7 +7,6 @@
 import java.util.Map;
 import java.util.Optional;
 import java.util.Collections;
-import java.util.Objects;
 import java.util.stream.Collectors;
 
 /**
@@ -44,7 +43,7 @@ private static List<Diff> getDiffList(@Nullable final Dmi oldDmi, @Nullable fina
         oldStates.forEach((stateName, oldState) -> {
             final DmiState newState = newStates.get(stateName);
 
-            if (Objects.nonNull(newState)) {
+            if (newState != null) {
                 diffEntries.addAll(findOldAndNewStateDiff(oldState, newState));
             } else {
                 diffEntries.addAll(listOnlyOneStateSprites(oldState, true));

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

@@ -9,7 +9,6 @@
 import javax.imageio.stream.ImageInputStream;
 import java.io.IOException;
 import java.io.InputStream;
-import java.util.Objects;
 import java.util.List;
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -67,7 +66,7 @@ private static DmiMeta parseMetadataText(final String metadataText) {
         DmiMeta metadata = new DmiMeta();
         Matcher widthHeight = WIDTH_HEIGHT.matcher(metadataText);
 
-        if (widthHeight.find() && Objects.nonNull(widthHeight.group(1)) && Objects.nonNull(widthHeight.group(2))) {
+        if (widthHeight.find() && widthHeight.group(1) != null && widthHeight.group(2) != null) {
             metadata.setSpritesWidth(Integer.parseInt(widthHeight.group(1)));
             metadata.setSpritesHeight(Integer.parseInt(widthHeight.group(2)));
         } else {