Merge branch 'bug-1464'

pmd-java/src/main/resources/rulesets/java/unnecessary.xml

@@ -70,7 +70,9 @@ tagged as such.
               <value>
     <![CDATA[
 //ClassOrInterfaceDeclaration[@Final='true' and @Interface='false']
-/ClassOrInterfaceBody/ClassOrInterfaceBodyDeclaration/MethodDeclaration[@Final='true']
+    /ClassOrInterfaceBody/ClassOrInterfaceBodyDeclaration
+        [count(./Annotation/MarkerAnnotation/Name[@Image='SafeVarargs' or @Image='java.lang.SafeVarargs']) = 0]
+    /MethodDeclaration[@Final='true']
     ]]>
               </value>
           </property>

pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/unnecessary/xml/UnnecessaryFinalModifier.xml

@@ -94,6 +94,25 @@ public final class Foo {
  public final class Bar {
   public final void buz() {}
  }
+}
+     ]]></code>
+    </test-code>
+
+    <test-code>
+        <description>#1464 UnnecessaryFinalModifier false positive on a @SafeVarargs method</description>
+        <expected-problems>0</expected-problems>
+        <code><![CDATA[
+public final class InboxContents<T> {
+    @SafeVarargs
+    public final InboxContents<T> conflateWith(T... values) { // false positive
+        return conflateWith(ImmutableList.copyOf(values));
+    }
+}
+public final class InboxContents2 {
+    @java.lang.SafeVarargs
+    public final InboxContents conflateWith(String... values) {
+        return conflateWith(ImmutableList.copyOf(values));
+    }
 }
         ]]></code>
     </test-code>

src/site/markdown/overview/changelog.md

@@ -78,6 +78,8 @@
     *   [#1443](https://sourceforge.net/p/pmd/bugs/1443/): RedundantFieldInitializer: False positive for small floats
 *   java-optimizations/UseStringBufferForStringAppends:
     *   [#1340](https://sourceforge.net/p/pmd/bugs/1340/): UseStringBufferForStringAppends False Positive with ternary operator
+*   java-unnecessary/UnnecessaryFinalModifier:
+    *   [#1464](https://sourceforge.net/p/pmd/bugs/1464/): UnnecessaryFinalModifier false positive on a @SafeVarargs method
 *   java-unnecessary/UselessQualifiedThis
     *   [#1422](https://sourceforge.net/p/pmd/bugs/1422/): UselessQualifiedThis: False positive with Java 8 Function
 *   java-unusedcode/UnusedFormalParameter: