Issue #46: public empty array has been moved to another class and bec…

…ome private
checkstyle · Sep 16, 2015 · e29dc4d · e29dc4d
1 parent ca15d3d
commit e29dc4d
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 6 deletions.
diff --git a/config/pmd.xml b/config/pmd.xml
@@ -242,7 +242,12 @@
   </rule>
 
   <rule ref="rulesets/java/strings.xml"/>
-  <rule ref="rulesets/java/sunsecure.xml"/>
+  <rule ref="rulesets/java/sunsecure.xml/MethodReturnsInternalArray">
+    <properties>
+      <!--It's not imoprtant when array is empty-->
+      <property name="violationSuppressXPath" value="//ClassOrInterfaceDeclaration[@Image='JavadocNodeImpl']"/>
+    </properties>
+  </rule>
   <rule ref="rulesets/java/typeresolution.xml"/>
   <rule ref="rulesets/java/unnecessary.xml"/>
   <rule ref="rulesets/java/unusedcode.xml"/>

diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/javadoc/JavadocNodeImpl.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/javadoc/JavadocNodeImpl.java
@@ -31,6 +31,12 @@
  *
  */
 public class JavadocNodeImpl implements DetailNode {
+
+    /**
+     * Empty array of {@link DetailNode} type.
+     */
+    private static final DetailNode[] EMPTY_DETAIL_NODE_ARRAY = new DetailNode[0];
+
     /**
      * Node index among parent's children.
      */
@@ -89,7 +95,7 @@ public int getColumnNumber() {
     @Override
     public DetailNode[] getChildren() {
         if (children == null) {
-            return JavadocUtils.EMPTY_DETAIL_NODE_ARRAY;
+            return EMPTY_DETAIL_NODE_ARRAY;
         }
         else {
             return Arrays.copyOf(children, children.length);

diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/utils/JavadocUtils.java b/src/main/java/com/puppycrawl/tools/checkstyle/utils/JavadocUtils.java
@@ -43,10 +43,6 @@
  * @author Lyle Hanson
  */
 public final class JavadocUtils {
-    /**
-     * Empty array of {@link DetailNode} type.
-     */
-    public static final DetailNode[] EMPTY_DETAIL_NODE_ARRAY = new DetailNode[0];
     /** Maps from a token name to value. */
     private static final ImmutableMap<String, Integer> TOKEN_NAME_TO_VALUE;
     /** Maps from a token value to name. */