From 248b9837d6cb8408e9d2e7006c0943b3b93cc4a0 Mon Sep 17 00:00:00 2001
From: oowekyala <clement.fournier76@gmail.com>
Date: Wed, 16 Aug 2017 17:25:15 +0200
Subject: [PATCH] Corrections for PR #554

---
 .../pmd/RuleSetFactoryCompatibility.java      |  2 +-
 .../unnecessary/xml/UselessParentheses.xml    | 34 ++++++++++++-------
 2 files changed, 23 insertions(+), 13 deletions(-)

diff --git a/pmd-core/src/main/java/net/sourceforge/pmd/RuleSetFactoryCompatibility.java b/pmd-core/src/main/java/net/sourceforge/pmd/RuleSetFactoryCompatibility.java
index ffbdc1d4b4..af39be8cf4 100644
--- a/pmd-core/src/main/java/net/sourceforge/pmd/RuleSetFactoryCompatibility.java
+++ b/pmd-core/src/main/java/net/sourceforge/pmd/RuleSetFactoryCompatibility.java
@@ -70,7 +70,7 @@ public class RuleSetFactoryCompatibility {
 
         // PMD 6.0.0
         addFilterRuleMoved("java", "controversial", "unnecessary", "UnnecessaryParentheses");
-        addFilterRuleMoved("java", "unnecessary", "UnnecessaryParentheses", "UselessParentheses");
+        addFilterRuleRenamed("java", "unnecessary", "UnnecessaryParentheses", "UselessParentheses");
 
     }
 
diff --git a/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/unnecessary/xml/UselessParentheses.xml b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/unnecessary/xml/UselessParentheses.xml
index 8117737399..bde1e112fa 100644
--- a/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/unnecessary/xml/UselessParentheses.xml
+++ b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/unnecessary/xml/UselessParentheses.xml
@@ -371,18 +371,6 @@ public class Useless {
         ]]></code>
     </test-code>
 
-    <test-code>
-        <description>From controversial/UnnecessaryParentheses: Typecast</description>
-        <expected-problems>0</expected-problems>
-        <code><![CDATA[
-        public class Foo {
-          public void bar(Object o) {
-            return ((Exception) o).getMessage();
-          }
-        }
-        ]]></code>
-    </test-code>
-
     <test-code>
         <description>From controversial/UnnecessaryParentheses: #537 Trivial case with additive expression</description>
         <expected-problems>1</expected-problems>
@@ -445,6 +433,28 @@ public class Useless {
         ]]></code>
     </test-code>
 
+    <test-code>
+        <description>From controversial/UnnecessaryParentheses: bad, returning variable in parens</description>
+        <expected-problems>1</expected-problems>
+        <code><![CDATA[
+        public class Foo {
+          int bar(int y) {
+            return (y);
+          }
+        }
+        ]]></code>
+    </test-code>
 
+    <test-code>
+        <description>From controversial/UnnecessaryParentheses: Failure case, returning literal</description>
+        <expected-problems>1</expected-problems>
+        <code><![CDATA[
+        public class Foo {
+          int bar() {
+            String a = ((String) "foo");
+          }
+        }
+        ]]></code>
+    </test-code>
 
 </test-data>