Merge branch 'pr-1213'

docs/pages/release_notes.md

@@ -21,6 +21,9 @@ This is a minor release.
 
 ### Fixed Issues
 
+*   java-codestyle
+    *   [#1211](https://github.com/pmd/pmd/issues/1211): \[java] CommentDefaultAccessModifier false positive with nested interfaces (regression from 6.4.0)
+
 ### API Changes
 
 ### External Contributions

pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/codestyle/CommentDefaultAccessModifierRule.java

@@ -99,7 +99,7 @@ public class CommentDefaultAccessModifierRule extends AbstractCommentRule {
                 && decl instanceof ASTConstructorDeclaration;
 
         // ignore if it's an Interface / Annotation / Enum constructor
-        return (isConcreteClass || !isEnumConstructor)
+        return isConcreteClass && !isEnumConstructor
                 // check if the field/method/nested class has a default access
                 // modifier
                 && decl.isPackagePrivate()

pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/codestyle/xml/CommentDefaultAccessModifier.xml

@@ -206,6 +206,18 @@ public class Foo {
     @interface Bar {
         String baz();
     }
+}
+        ]]></code>
+    </test-code>
+
+    <test-code>
+        <description>#1211 [java] CommentDefaultAccessModifier false positive with nested interface</description>
+        <expected-problems>0</expected-problems>
+        <code><![CDATA[
+public interface A {
+    interface B {
+        default void b() {}
+    }
 }
         ]]></code>
     </test-code>