Turn on additional IntelliJ inspections and fix violations (Trivial e…

…lse). #1323 Signed-off-by: Alexander Goldberg <alexander.goldberg@bnymellon.com>
eclipse · Jan 13, 2023 · 30dd65d · 30dd65d
1 parent 48b73f0
commit 30dd65d
Show file tree

Hide file tree

Showing 7 changed files with 11 additions and 18 deletions.
diff --git a/.idea/inspectionProfiles/3_Consistent_Style.xml b/.idea/inspectionProfiles/3_Consistent_Style.xml
diff --git a/.idea/inspectionProfiles/IDE.xml b/.idea/inspectionProfiles/IDE.xml
diff --git a/...ctions/src/main/java/org/eclipse/collections/impl/bimap/mutable/AbstractMutableBiMap.java b/...ctions/src/main/java/org/eclipse/collections/impl/bimap/mutable/AbstractMutableBiMap.java
@@ -117,10 +117,7 @@ private static boolean nullSafeEquals(Object value, Object other)
         {
             return other == null;
         }
-        else
-        {
-            return other == value || value.equals(other);
-        }
+        return other == value || value.equals(other);
     }
 
     @Override

diff --git a/eclipse-collections/src/main/java/org/eclipse/collections/impl/map/mutable/UnifiedMap.java b/eclipse-collections/src/main/java/org/eclipse/collections/impl/map/mutable/UnifiedMap.java
@@ -2541,10 +2541,7 @@ private static boolean nullSafeEquals(Object value, Object other)
         {
             return other == null;
         }
-        else
-        {
-            return other == value || value.equals(other);
-        }
+        return other == value || value.equals(other);
     }
 
     protected class EntrySet implements Set<Entry<K, V>>, Serializable, BatchIterable<Entry<K, V>>

diff --git a/...rc/main/java/org/eclipse/collections/impl/map/mutable/primitive/ObjectBooleanHashMap.java b/...rc/main/java/org/eclipse/collections/impl/map/mutable/primitive/ObjectBooleanHashMap.java
@@ -1055,10 +1055,7 @@ private static boolean nullSafeEquals(Object value, Object other)
         {
             return other == null;
         }
-        else
-        {
-            return other == value || value.equals(other);
-        }
+        return other == value || value.equals(other);
     }
 
     private K toNonSentinel(Object key)

diff --git a/...lipse/collections/impl/map/mutable/primitive/ObjectBooleanHashMapWithHashingStrategy.java b/...lipse/collections/impl/map/mutable/primitive/ObjectBooleanHashMapWithHashingStrategy.java
@@ -1074,7 +1074,7 @@ private boolean nullSafeEquals(K key, Object other)
         {
             return other == null;
         }
-        else if (key != NULL_KEY && other != null)
+        if (key != NULL_KEY && other != null)
         {
             return this.hashingStrategy.equals(key, this.toNonSentinel(other));
         }

diff --git a/...java/org/eclipse/collections/impl/map/strategy/mutable/UnifiedMapWithHashingStrategy.java b/...java/org/eclipse/collections/impl/map/strategy/mutable/UnifiedMapWithHashingStrategy.java
@@ -2270,10 +2270,7 @@ private static boolean nullSafeEquals(Object value, Object other)
         {
             return other == null;
         }
-        else
-        {
-            return other == value || value.equals(other);
-        }
+        return other == value || value.equals(other);
     }
 
     protected class EntrySet implements Set<Entry<K, V>>, Serializable, BatchIterable<Entry<K, V>>