From a720616e2f80c81364026e500c875306cfee92ea Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cl=C3=A9ment=20Fournier?= <clement.fournier76@gmail.com>
Date: Fri, 25 Jun 2021 17:21:55 +0200
Subject: [PATCH] Move to codestyle

other 'unnecessary*' rule are there
---
 .../UnnecessaryConversionRule.java            |  6 ++--
 .../resources/category/java/bestpractices.xml | 31 -------------------
 .../resources/category/java/codestyle.xml     | 30 ++++++++++++++++++
 .../UnnecessaryConversionTest.java            |  4 +--
 .../xml/UnnecessaryConversion.xml             |  5 ++-
 5 files changed, 39 insertions(+), 37 deletions(-)
 rename pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/{bestpractices => codestyle}/UnnecessaryConversionRule.java (96%)
 rename pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/{bestpractices => codestyle}/UnnecessaryConversionTest.java (79%)
 rename pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/{bestpractices => codestyle}/xml/UnnecessaryConversion.xml (97%)

diff --git a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/bestpractices/UnnecessaryConversionRule.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/codestyle/UnnecessaryConversionRule.java
similarity index 96%
rename from pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/bestpractices/UnnecessaryConversionRule.java
rename to pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/codestyle/UnnecessaryConversionRule.java
index d6f1f8f422..d8803369da 100644
--- a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/bestpractices/UnnecessaryConversionRule.java
+++ b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/codestyle/UnnecessaryConversionRule.java
@@ -2,7 +2,7 @@
  * BSD-style license; for more info see http://pmd.sourceforge.net/license.html
  */
 
-package net.sourceforge.pmd.lang.java.rule.bestpractices;
+package net.sourceforge.pmd.lang.java.rule.codestyle;
 
 import static net.sourceforge.pmd.util.CollectionUtil.setOf;
 
@@ -131,9 +131,9 @@ public class UnnecessaryConversionRule extends AbstractJavaRulechainRule {
                 boolean simpleConv = isReferenceSubtype(sourceType, conversionInput);
 
                 final String reason;
-                if (simpleConv && conversionInput.unbox() == conversionOutput) {
+                if (simpleConv && conversionInput.unbox().equals(conversionOutput)) {
                     reason = "explicit unboxing";
-                } else if (simpleConv && conversionInput.box() == conversionOutput) {
+                } else if (simpleConv && conversionInput.box().equals(conversionOutput)) {
                     reason = "explicit boxing";
                 } else if (sourceType.equals(conversionOutput)) {
                     reason = "boxing of boxed value";
diff --git a/pmd-java/src/main/resources/category/java/bestpractices.xml b/pmd-java/src/main/resources/category/java/bestpractices.xml
index 8506686bf4..645c321a74 100644
--- a/pmd-java/src/main/resources/category/java/bestpractices.xml
+++ b/pmd-java/src/main/resources/category/java/bestpractices.xml
@@ -1358,37 +1358,6 @@ class Foo{
         </example>
     </rule>
 
-
-    <rule name="UnnecessaryConversion"
-          language="java"
-          since="7.0.0"
-          message="Unnecessary {0}"
-          class="net.sourceforge.pmd.lang.java.rule.bestpractices.UnnecessaryConversionRule"
-          externalInfoUrl="${pmd.website.baseurl}/pmd_rules_java_bestpractices.html#unnecessaryboxing">
-        <description>
-            Reports explicit conversions that may safely be removed, either because
-            they would implicitly take place (eg widening a `byte` to an `int`), or
-            because they're semantically a noop (eg unboxing a value to rebox it immediately).
-
-            This handles widening conversion between primitives, boxing and unboxing
-            conversions (which since Java 5 are inserted by the compiler implicitly),
-            and unnecessary casts.
-        </description>
-        <priority>3</priority>
-        <example><![CDATA[
-            {
-                // Instead of
-                Integer integer = Integer.valueOf(2);
-                // you may just write
-                Integer integer = 2;
-
-                int i = integer.intValue(); // similarly for unboxing
-                // todo cast examples
-            }
-        ]]>
-        </example>
-    </rule>
-
     <rule name="UnusedAssignment"
           language="java"
           since="6.26.0"
diff --git a/pmd-java/src/main/resources/category/java/codestyle.xml b/pmd-java/src/main/resources/category/java/codestyle.xml
index 7224ec5cfb..d7a26f2042 100644
--- a/pmd-java/src/main/resources/category/java/codestyle.xml
+++ b/pmd-java/src/main/resources/category/java/codestyle.xml
@@ -1572,6 +1572,36 @@ public class Foo {
         </example>
     </rule>
 
+    <rule name="UnnecessaryConversion"
+          language="java"
+          since="7.0.0"
+          message="Unnecessary {0}"
+          class="net.sourceforge.pmd.lang.java.rule.codestyle.UnnecessaryConversionRule"
+          externalInfoUrl="${pmd.website.baseurl}/pmd_rules_java_bestpractices.html#unnecessaryboxing">
+        <description>
+            Reports explicit conversions that may safely be removed, either because
+            they would implicitly take place (eg widening a `byte` to an `int`), or
+            because they're semantically a noop (eg unboxing a value to rebox it immediately).
+
+            This handles widening conversion between primitives, boxing and unboxing
+            conversions (which since Java 5 are inserted by the compiler implicitly).
+            Unnecessary casts that command a conversion are reported by {% rule UnnecessaryCast %}
+            instead.
+        </description>
+        <priority>3</priority>
+        <example><![CDATA[
+            {
+                    // Instead of
+                    Integer integer = Integer.valueOf(2);
+                    // you may just write
+                    Integer integer = 2;
+
+                    int i = integer.intValue(); // similarly for unboxing
+            }
+            ]]>
+        </example>
+    </rule>
+
     <rule name="UnnecessaryFullyQualifiedName"
           language="java"
           since="5.0"
diff --git a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/bestpractices/UnnecessaryConversionTest.java b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/codestyle/UnnecessaryConversionTest.java
similarity index 79%
rename from pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/bestpractices/UnnecessaryConversionTest.java
rename to pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/codestyle/UnnecessaryConversionTest.java
index 201cda99ee..de8f66f15c 100644
--- a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/bestpractices/UnnecessaryConversionTest.java
+++ b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/rule/codestyle/UnnecessaryConversionTest.java
@@ -1,8 +1,8 @@
-/**
+/*
  * BSD-style license; for more info see http://pmd.sourceforge.net/license.html
  */
 
-package net.sourceforge.pmd.lang.java.rule.bestpractices;
+package net.sourceforge.pmd.lang.java.rule.codestyle;
 
 import net.sourceforge.pmd.testframework.PmdRuleTst;
 
diff --git a/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/bestpractices/xml/UnnecessaryConversion.xml b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/codestyle/xml/UnnecessaryConversion.xml
similarity index 97%
rename from pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/bestpractices/xml/UnnecessaryConversion.xml
rename to pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/codestyle/xml/UnnecessaryConversion.xml
index 2d0766f615..04a216d383 100644
--- a/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/bestpractices/xml/UnnecessaryConversion.xml
+++ b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/codestyle/xml/UnnecessaryConversion.xml
@@ -144,7 +144,10 @@ public class Foo {
     <test-code>
         <!-- Casts are left to UnnecessaryCast -->
         <description>Unnecessary (primitive -> primitive) casts</description>
-        <expected-problems>0</expected-problems>
+        <expected-problems>1</expected-problems>
+        <expected-messages>
+            <message>Unnecessary explicit boxing</message>
+        </expected-messages>
         <code><![CDATA[
             class Scratch {
                 public static void main(String[] args) {