Revert "Add missing null check on equals"

This reverts commit 3c5fec7277657389960231c8ee650256028a1d7a.

2 files changed, 8 insertions, 10 deletions

diff --git a/sonar-plugin-api/src/main/java/org/sonar/api/rules/ActiveRuleParam.java b/sonar-plugin-api/src/main/java/org/sonar/api/rules/ActiveRuleParam.java
index 770e212975c..7f83179429f 100644
--- a/sonar-plugin-api/src/main/java/org/sonar/api/rules/ActiveRuleParam.java
+++ b/sonar-plugin-api/src/main/java/org/sonar/api/rules/ActiveRuleParam.java
@@ -19,8 +19,6 @@
  */
 package org.sonar.api.rules;
 
-import javax.annotation.Nullable;
-
 public class ActiveRuleParam implements Cloneable {
 
   private Integer id;
@@ -105,13 +103,13 @@ public class ActiveRuleParam implements Cloneable {
   }
 
   @Override
-  public boolean equals(@Nullable Object obj) {
-    if (obj == null || this.getClass() != obj.getClass()) {
-      return false;
-    }
+  public boolean equals(Object obj) {
     if (this == obj) {
       return true;
     }
+    if (this.getClass() != obj.getClass()) {
+      return false;
+    }
     ActiveRuleParam other = (ActiveRuleParam) obj;
     return other.getKey().equals(getKey());
   }
diff --git a/sonar-plugin-api/src/main/java/org/sonar/api/server/debt/internal/DefaultDebtRemediationFunction.java b/sonar-plugin-api/src/main/java/org/sonar/api/server/debt/internal/DefaultDebtRemediationFunction.java
index f2f1d431a64..1445f50883d 100644
--- a/sonar-plugin-api/src/main/java/org/sonar/api/server/debt/internal/DefaultDebtRemediationFunction.java
+++ b/sonar-plugin-api/src/main/java/org/sonar/api/server/debt/internal/DefaultDebtRemediationFunction.java
@@ -100,13 +100,13 @@ public class DefaultDebtRemediationFunction implements DebtRemediationFunction {
   }
 
   @Override
-  public boolean equals(@Nullable Object o) {
-    if (o == null || this.getClass() != o.getClass()) {
-      return false;
-    }
+  public boolean equals(Object o) {
     if (this == o) {
       return true;
     }
+    if (this.getClass() != o.getClass()) {
+      return false;
+    }
     DefaultDebtRemediationFunction other = (DefaultDebtRemediationFunction) o;
     return new EqualsBuilder()
       .append(coefficient, other.coefficient())