From 30dd65de14ed443269caaab59fb9832f3efc0147 Mon Sep 17 00:00:00 2001
From: Alexander Goldberg <alexander.goldberg@bnymellon.com>
Date: Fri, 13 Jan 2023 16:23:52 -0500
Subject: [PATCH] Turn on additional IntelliJ inspections and fix violations
 (Trivial else). #1323

Signed-off-by: Alexander Goldberg <alexander.goldberg@bnymellon.com>
---
 .idea/inspectionProfiles/3_Consistent_Style.xml              | 3 ++-
 .idea/inspectionProfiles/IDE.xml                             | 4 ++++
 .../collections/impl/bimap/mutable/AbstractMutableBiMap.java | 5 +----
 .../org/eclipse/collections/impl/map/mutable/UnifiedMap.java | 5 +----
 .../impl/map/mutable/primitive/ObjectBooleanHashMap.java     | 5 +----
 .../primitive/ObjectBooleanHashMapWithHashingStrategy.java   | 2 +-
 .../map/strategy/mutable/UnifiedMapWithHashingStrategy.java  | 5 +----
 7 files changed, 11 insertions(+), 18 deletions(-)

diff --git a/.idea/inspectionProfiles/3_Consistent_Style.xml b/.idea/inspectionProfiles/3_Consistent_Style.xml
index c7ef266320..f66a1cfca1 100644
--- a/.idea/inspectionProfiles/3_Consistent_Style.xml
+++ b/.idea/inspectionProfiles/3_Consistent_Style.xml
@@ -1,5 +1,6 @@
 <component name="InspectionProjectProfileManager">
   <profile version="1.0" is_locked="true">
+    <option name="myName" value="3 Consistent Style" />
     <option name="myName" value="3 Consistent Style" />
     <inspection_tool class="AbsoluteAlignmentInUserInterface" enabled="false" level="WARNING" enabled_by_default="false" />
     <inspection_tool class="AbstractBeanReferencesInspection" enabled="false" level="ERROR" enabled_by_default="false" />
@@ -782,7 +783,7 @@
     <inspection_tool class="ConfigurationProperties" enabled="false" level="ERROR" enabled_by_default="false" />
     <inspection_tool class="ConflictingAnnotations" enabled="false" level="WARNING" enabled_by_default="false" />
     <inspection_tool class="ConflictingExtensionProperty" enabled="false" level="WARNING" enabled_by_default="false" />
-    <inspection_tool class="ConfusingElse" enabled="false" level="WARNING" enabled_by_default="false">
+    <inspection_tool class="ConfusingElse" enabled="true" level="ERROR" enabled_by_default="true">
       <option name="reportWhenNoStatementFollow" value="false" />
     </inspection_tool>
     <inspection_tool class="ConfusingFloatingPointLiteral" enabled="true" level="ERROR" enabled_by_default="true" />
diff --git a/.idea/inspectionProfiles/IDE.xml b/.idea/inspectionProfiles/IDE.xml
index 54b36011ab..e7ba5f243a 100644
--- a/.idea/inspectionProfiles/IDE.xml
+++ b/.idea/inspectionProfiles/IDE.xml
@@ -1,5 +1,6 @@
 <component name="InspectionProjectProfileManager">
   <profile version="1.0" is_locked="false">
+    <option name="myName" value="IDE" />
     <option name="myName" value="IDE" />
     <inspection_tool class="AbstractBeanReferencesInspection" enabled="false" level="INSPECTION" enabled_by_default="false" />
     <inspection_tool class="AbstractClassExtendsConcreteClass" enabled="true" level="WARNING" enabled_by_default="true" />
@@ -127,6 +128,9 @@
     <inspection_tool class="ComparatorNotSerializable" enabled="true" level="WARNING" enabled_by_default="true" />
     <inspection_tool class="CompareToUsesNonFinalVariable" enabled="true" level="INFO" enabled_by_default="true" />
     <inspection_tool class="ComparisonOfShortAndChar" enabled="true" level="WARNING" enabled_by_default="true" />
+    <inspection_tool class="ConfusingElse" enabled="true" level="ERROR" enabled_by_default="true">
+      <option name="reportWhenNoStatementFollow" value="true" />
+    </inspection_tool>
     <inspection_tool class="ConfusingFloatingPointLiteral" enabled="true" level="INSPECTION" enabled_by_default="true" />
     <inspection_tool class="ConfusingMainMethod" enabled="true" level="WARNING" enabled_by_default="true" />
     <inspection_tool class="ConfusingOctalEscape" enabled="true" level="WARNING" enabled_by_default="true" />
diff --git a/eclipse-collections/src/main/java/org/eclipse/collections/impl/bimap/mutable/AbstractMutableBiMap.java b/eclipse-collections/src/main/java/org/eclipse/collections/impl/bimap/mutable/AbstractMutableBiMap.java
index ca904785ca..e7de5d2158 100644
--- a/eclipse-collections/src/main/java/org/eclipse/collections/impl/bimap/mutable/AbstractMutableBiMap.java
+++ b/eclipse-collections/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
index 1f80a9d44d..daf681741b 100644
--- 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/eclipse-collections/src/main/java/org/eclipse/collections/impl/map/mutable/primitive/ObjectBooleanHashMap.java b/eclipse-collections/src/main/java/org/eclipse/collections/impl/map/mutable/primitive/ObjectBooleanHashMap.java
index 01dc74ccd4..f342f27ae0 100644
--- a/eclipse-collections/src/main/java/org/eclipse/collections/impl/map/mutable/primitive/ObjectBooleanHashMap.java
+++ b/eclipse-collections/src/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/eclipse-collections/src/main/java/org/eclipse/collections/impl/map/mutable/primitive/ObjectBooleanHashMapWithHashingStrategy.java b/eclipse-collections/src/main/java/org/eclipse/collections/impl/map/mutable/primitive/ObjectBooleanHashMapWithHashingStrategy.java
index 13cb86c489..eb112ea17e 100644
--- a/eclipse-collections/src/main/java/org/eclipse/collections/impl/map/mutable/primitive/ObjectBooleanHashMapWithHashingStrategy.java
+++ b/eclipse-collections/src/main/java/org/eclipse/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/eclipse-collections/src/main/java/org/eclipse/collections/impl/map/strategy/mutable/UnifiedMapWithHashingStrategy.java b/eclipse-collections/src/main/java/org/eclipse/collections/impl/map/strategy/mutable/UnifiedMapWithHashingStrategy.java
index 438fde738f..172fe877ef 100644
--- a/eclipse-collections/src/main/java/org/eclipse/collections/impl/map/strategy/mutable/UnifiedMapWithHashingStrategy.java
+++ b/eclipse-collections/src/main/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>>