SONARJAVA-3455 FN in S2111 for boxed Double and Float

quentin-jaquier-sonarsource · Wohops · commit defc8ee79ff7 · 2020-07-07T08:25:15.000+02:00
diff --git a/java-checks-test-sources/src/main/java/checks/BigDecimalDoubleConstructorCheck.java b/java-checks-test-sources/src/main/java/checks/BigDecimalDoubleConstructorCheck.java
@@ -1,17 +1,41 @@
 package checks;
 
 import java.math.BigDecimal;
+import java.math.BigInteger;
 import java.math.MathContext;
 
 class BigDecimalDoubleConstructorCheck {
   MathContext mc;
   BigDecimal bd1 = new BigDecimal("1");
+  BigDecimal bd1_1 = new BigDecimal("2", mc);
+  BigDecimal bd1_2 = new BigDecimal(new BigInteger("10"), mc);
+  BigDecimal bd1_3 = new BigDecimal(1);
   BigDecimal bd2 = new BigDecimal(2.0); // Noncompliant [[sc=20;ec=39]] {{Use "BigDecimal.valueOf" instead.}}
   BigDecimal bd4 = new BigDecimal(2.0, mc); // Noncompliant {{Use "BigDecimal.valueOf" instead.}}
   BigDecimal bd5 = new BigDecimal(2.0f); // Noncompliant {{Use "BigDecimal.valueOf" instead.}}
   BigDecimal bd6 = new BigDecimal(2.0f, mc); // Noncompliant {{Use "BigDecimal.valueOf" instead.}}
   BigDecimal bd3 = BigDecimal.valueOf(2.0);
 
+  Double d = 0.1;
+  BigDecimal bd7 = new BigDecimal(d); // Noncompliant
+  BigDecimal bd8 = new BigDecimal((Double) 0.1); // Noncompliant
 
+  double d2 = 0.1;
+  BigDecimal bd7_2 = new BigDecimal(d2); // Noncompliant
+  BigDecimal bd8_2 = new BigDecimal((double) 0.1); // Noncompliant
 
+  Float f = 0.1f;
+  BigDecimal bd9 = new BigDecimal(f); // Noncompliant
+  BigDecimal bd10 = new BigDecimal((Float) 0.1f); // Noncompliant
+
+  float f2 = 0.1f;
+  BigDecimal bd9_2 = new BigDecimal(f2); // Noncompliant
+  BigDecimal bd10_2 = new BigDecimal((float) 0.1); // Noncompliant
+
+  Object myDoubleObject = 23.5d;
+  BigDecimal bd11 = new BigDecimal((Double) myDoubleObject); // Noncompliant
+
+  Object myIntObject = 12;
+  BigDecimal bd12 = new BigDecimal((Integer) myIntObject);
+  BigDecimal bd13 = new BigDecimal((Integer) 1);
 }
diff --git a/java-checks/src/main/java/org/sonar/java/checks/BigDecimalDoubleConstructorCheck.java b/java-checks/src/main/java/org/sonar/java/checks/BigDecimalDoubleConstructorCheck.java
@@ -19,38 +19,35 @@
  */
 package org.sonar.java.checks;
 
+import java.util.Collections;
+import java.util.List;
 import org.sonar.check.Rule;
 import org.sonar.plugins.java.api.IssuableSubscriptionVisitor;
-import org.sonar.plugins.java.api.semantic.Type;
+import org.sonar.plugins.java.api.semantic.MethodMatchers;
 import org.sonar.plugins.java.api.tree.NewClassTree;
 import org.sonar.plugins.java.api.tree.Tree;
 
-import java.util.Collections;
-import java.util.List;
-
 @Rule(key = "S2111")
 public class BigDecimalDoubleConstructorCheck extends IssuableSubscriptionVisitor {
 
+  private static final MethodMatchers BIG_DECIMAL_DOUBLE_FLOAT =
+    MethodMatchers.create().ofTypes("java.math.BigDecimal")
+      .constructor()
+      .addParametersMatcher("double")
+      .addParametersMatcher("float")
+      .addParametersMatcher("double", MethodMatchers.ANY)
+      .addParametersMatcher("float", MethodMatchers.ANY)
+      .build();
+
   @Override
   public List<Tree.Kind> nodesToVisit() {
     return Collections.singletonList(Tree.Kind.NEW_CLASS);
   }
 
   @Override
   public void visitNode(Tree tree) {
-    if (hasSemantic()) {
-      NewClassTree nct = (NewClassTree) tree;
-      if (nct.symbolType().is("java.math.BigDecimal") && isDoubleConstructor(nct)) {
-        reportIssue(tree, "Use \"BigDecimal.valueOf\" instead.");
-      }
-    }
-  }
-
-  private static boolean isDoubleConstructor(NewClassTree nct) {
-    if (!nct.arguments().isEmpty() && nct.arguments().size() <= 2) {
-      Type argumentType = nct.arguments().get(0).symbolType();
-      return argumentType.is("double") || argumentType.is("float");
+    if (BIG_DECIMAL_DOUBLE_FLOAT.matches((NewClassTree) tree)) {
+      reportIssue(tree, "Use \"BigDecimal.valueOf\" instead.");
     }
-    return false;
   }
 }
