From f3c0d39f66ce2bf999940623854a3399dfffc15d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B6rn=20Kautler?= <Bjoern@Kautler.net>
Date: Wed, 3 Apr 2019 12:00:40 +0200
Subject: [PATCH] Fix UseObjectForClearerAPI rule that treated String and
 String[] the same

---
 .../main/resources/category/java/design.xml   |  2 +-
 .../design/xml/UseObjectForClearerAPI.xml     | 20 +++++++++++++++++++
 2 files changed, 21 insertions(+), 1 deletion(-)

diff --git a/pmd-java/src/main/resources/category/java/design.xml b/pmd-java/src/main/resources/category/java/design.xml
index a6d1d06f69..41cc421ca4 100644
--- a/pmd-java/src/main/resources/category/java/design.xml
+++ b/pmd-java/src/main/resources/category/java/design.xml
@@ -1639,7 +1639,7 @@ your API.
                 <value>
 <![CDATA[
 //MethodDeclaration[@Public = 'true']/MethodDeclarator/FormalParameters[
-     count(FormalParameter/Type/ReferenceType/ClassOrInterfaceType[@Image = 'String']) > 3
+     count(FormalParameter/Type/ReferenceType/ClassOrInterfaceType[@Image = 'String' and @Array = 'false']) > 3
 ]
 ]]>
                 </value>
diff --git a/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/design/xml/UseObjectForClearerAPI.xml b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/design/xml/UseObjectForClearerAPI.xml
index a969d3e65e..c8989343d9 100644
--- a/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/design/xml/UseObjectForClearerAPI.xml
+++ b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/design/xml/UseObjectForClearerAPI.xml
@@ -86,6 +86,26 @@ public class MyClass {
     String databaseAdress)
   {
   }
+}
+           ]]>
+       </code>
+    </test-code>
+    <test-code>
+        <description>
+            <![CDATA[
+String[] should not be treated as String
+            ]]>
+        </description>
+        <expected-problems>0</expected-problems>
+        <code>
+            <![CDATA[
+public class MyClass {
+  public void connectProtected(String username,
+    String[] pssd,
+    String databaseName,
+    String databaseAdress)
+  {
+  }
 }
            ]]>
        </code>