From dc31c5db75489b04bff24f424b221e39728c04fb Mon Sep 17 00:00:00 2001
From: Pavel Dolgov <pavel.dolgov@jetbrains.com>
Date: Thu, 14 Jun 2018 15:34:00 +0300
Subject: [PATCH] Java: Changed defaults for the inspection "Replace with
 Objects.equals()" (IDEA-193783)

---
 ...alsReplaceableByObjectsCallInspection.java |  2 +-
 .../src/META-INF/InspectionGadgets.xml        |  2 +-
 ...EqualsReplaceableByObjectsCallFixTest.java | 24 ++++++++++++-------
 ...eplaceableByObjectsCallInspectionTest.java | 14 +++++++----
 4 files changed, 28 insertions(+), 14 deletions(-)

diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/migration/EqualsReplaceableByObjectsCallInspection.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/migration/EqualsReplaceableByObjectsCallInspection.java
index f029608aec43..82fb4efc12ab 100644
--- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/migration/EqualsReplaceableByObjectsCallInspection.java
+++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/migration/EqualsReplaceableByObjectsCallInspection.java
@@ -42,7 +42,7 @@ import javax.swing.*;
  * @author Bas Leijdekkers
  */
 public class EqualsReplaceableByObjectsCallInspection extends BaseInspection {
-  public boolean checkNotNull;
+  public boolean checkNotNull = true;
 
   private static final EquivalenceChecker EQUIVALENCE = new NoSideEffectExpressionEquivalenceChecker();
 
diff --git a/plugins/InspectionGadgets/src/META-INF/InspectionGadgets.xml b/plugins/InspectionGadgets/src/META-INF/InspectionGadgets.xml
index 0accc3033d10..fadaddde0152 100644
--- a/plugins/InspectionGadgets/src/META-INF/InspectionGadgets.xml
+++ b/plugins/InspectionGadgets/src/META-INF/InspectionGadgets.xml
@@ -1288,7 +1288,7 @@
                      implementationClass="com.siyeh.ig.migration.BigDecimalLegacyMethodInspection"/>
     <localInspection groupPath="Java,Java language level migration aids" language="JAVA" shortName="EqualsReplaceableByObjectsCall" bundle="com.siyeh.InspectionGadgetsBundle"
                      key="equals.replaceable.by.objects.call.display.name" groupBundle="messages.InspectionsBundle"
-                     groupKey="group.names.language.level.specific.issues.and.migration.aids7" enabledByDefault="true" level="INFORMATION"
+                     groupKey="group.names.language.level.specific.issues.and.migration.aids7" enabledByDefault="true" level="WEAK WARNING"
                      implementationClass="com.siyeh.ig.migration.EqualsReplaceableByObjectsCallInspection"/>
     <localInspection groupPath="Java" language="JAVA" shortName="EnumerationCanBeIteration" bundle="com.siyeh.InspectionGadgetsBundle"
                      key="enumeration.can.be.iteration.display.name" groupBundle="messages.InspectionsBundle"
diff --git a/plugins/InspectionGadgets/testsrc/com/siyeh/ig/fixes/migration/EqualsReplaceableByObjectsCallFixTest.java b/plugins/InspectionGadgets/testsrc/com/siyeh/ig/fixes/migration/EqualsReplaceableByObjectsCallFixTest.java
index 79cc1288fa46..3354a856ff7e 100644
--- a/plugins/InspectionGadgets/testsrc/com/siyeh/ig/fixes/migration/EqualsReplaceableByObjectsCallFixTest.java
+++ b/plugins/InspectionGadgets/testsrc/com/siyeh/ig/fixes/migration/EqualsReplaceableByObjectsCallFixTest.java
@@ -27,14 +27,16 @@ import com.siyeh.ig.migration.EqualsReplaceableByObjectsCallInspection;
  */
 public class EqualsReplaceableByObjectsCallFixTest extends IGQuickFixesTestCase {
 
-  public void testSimpleEquals() { doTest(); }
-  public void testSimpleNotEquals() { doTest(); }
+  private EqualsReplaceableByObjectsCallInspection myInspection;
 
-  public void testQualifiedArgument() { doTest(); }
+  public void testSimpleEquals() { doTestNoNullCheck(); }
+  public void testSimpleNotEquals() { doTestNoNullCheck(); }
+
+  public void testQualifiedArgument() { doTestNoNullCheck(); }
   public void testQualifiedReciever() { doTest(); }
 
-  public void testExpressionReciever() { doTest(); }
-  public void testExpressionArgument() { doTest(); }
+  public void testExpressionReciever() { doTestNoNullCheck(); }
+  public void testExpressionArgument() { doTestNoNullCheck(); }
   public void testExpressionArgument2() { doTest(); }
 
   public void testLongEquals() { doTest(); }
@@ -42,8 +44,8 @@ public class EqualsReplaceableByObjectsCallFixTest extends IGQuickFixesTestCase
   public void testShortEquals() { doTest(); }
   public void testShortNotEquals() { doTest(); }
 
-  public void testSuperEquals() { doTest(); }
-  public void testThisEquals() { doTest(); }
+  public void testSuperEquals() { doTestNoNullCheck(); }
+  public void testThisEquals() { doTestNoNullCheck(); }
 
   public void testQualifiedThisNotEqual() { doTest(); }
   public void testQualifiedSuperEqual() { doTest(); }
@@ -66,8 +68,14 @@ public class EqualsReplaceableByObjectsCallFixTest extends IGQuickFixesTestCase
   @Override
   public void setUp() throws Exception {
     super.setUp();
-    myFixture.enableInspections(new EqualsReplaceableByObjectsCallInspection());
+    myInspection = new EqualsReplaceableByObjectsCallInspection();
+    myFixture.enableInspections(myInspection);
     myRelativePath = "migration/equals_replaceable_by_objects_call";
     myDefaultHint = InspectionGadgetsBundle.message("equals.replaceable.by.objects.call.quickfix");
   }
+
+  private void doTestNoNullCheck() {
+    myInspection.checkNotNull = false;
+    doTest();
+  }
 }
diff --git a/plugins/InspectionGadgets/testsrc/com/siyeh/ig/migration/EqualsReplaceableByObjectsCallInspectionTest.java b/plugins/InspectionGadgets/testsrc/com/siyeh/ig/migration/EqualsReplaceableByObjectsCallInspectionTest.java
index 191c58e80ea1..b13d9ebc1bae 100644
--- a/plugins/InspectionGadgets/testsrc/com/siyeh/ig/migration/EqualsReplaceableByObjectsCallInspectionTest.java
+++ b/plugins/InspectionGadgets/testsrc/com/siyeh/ig/migration/EqualsReplaceableByObjectsCallInspectionTest.java
@@ -43,15 +43,21 @@ public class EqualsReplaceableByObjectsCallInspectionTest extends LightInspectio
   }
 
   public void testEqualsReplaceableByObjectsCall() {
-    doTest();
+    testEqualsReplaceable(false);
   }
 
   public void testEqualsReplaceableByObjectsCallCheckNull() {
+    testEqualsReplaceable(true);
+  }
+
+  protected void testEqualsReplaceable(boolean checkNotNull) {
+    boolean oldNotNull = myInspection.checkNotNull;
     try {
-      myInspection.checkNotNull = true;
+      myInspection.checkNotNull = checkNotNull;
       doTest();
-    } finally {
-      myInspection.checkNotNull = false;
+    }
+    finally {
+      myInspection.checkNotNull = oldNotNull;
     }
   }