From eb95804ea8b7506a4a3803ba0fe4e3fb49c143cb Mon Sep 17 00:00:00 2001
From: Vishva007 <vishva1994@gmail.com>
Date: Thu, 4 Oct 2018 00:03:38 +0530
Subject: [PATCH 1/3] Static Modifier on Interface pmd #1356

---
 .../rule/codestyle/UnnecessaryModifierRule.java    |  2 +-
 .../rule/codestyle/xml/UnnecessaryModifier.xml     | 14 ++++++++++++++
 2 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/codestyle/UnnecessaryModifierRule.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/codestyle/UnnecessaryModifierRule.java
index ea61b03767..79a85447cb 100644
--- a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/codestyle/UnnecessaryModifierRule.java
+++ b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/codestyle/UnnecessaryModifierRule.java
@@ -169,7 +169,7 @@ public class UnnecessaryModifierRule extends AbstractJavaRule {
 
         if ((node.isInterface() || isParentInterfaceOrAnnotation) && node.isStatic()) {
             // a static interface or class nested within an interface
-            reportUnnecessaryModifiers(data, node, Modifier.PUBLIC, "types nested within an interface type are implicitly static");
+            reportUnnecessaryModifiers(data, node, Modifier.STATIC, "types nested within an interface type are implicitly static");
         }
 
         return data;
diff --git a/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/codestyle/xml/UnnecessaryModifier.xml b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/codestyle/xml/UnnecessaryModifier.xml
index c3212d803a..ecdcc6d02e 100644
--- a/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/codestyle/xml/UnnecessaryModifier.xml
+++ b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/codestyle/xml/UnnecessaryModifier.xml
@@ -673,6 +673,20 @@ enum Foo {
     private Foo(String s) {
         name = s;
     }
+}
+        ]]></code>
+    </test-code>
+    <test-code>
+        <description>Static Modifier on interface</description>
+        <expected-problems>1</expected-problems>
+        <expected-messages>
+            <message>Unnecessary modifier 'static' on interface 'B': types nested within an interface type are implicitly static</message>
+        </expected-messages>
+        <code><![CDATA[
+class Foo{
+    public static interface Bar{
+        void method(){ }
+    }
 }
         ]]></code>
     </test-code>

From 33f58b328248098cf45c5f615571c190007ba22f Mon Sep 17 00:00:00 2001
From: Vishva007 <vishva1994@gmail.com>
Date: Thu, 4 Oct 2018 00:28:10 +0530
Subject: [PATCH 2/3] bar spell

---
 .../pmd/lang/java/rule/codestyle/xml/UnnecessaryModifier.xml    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/codestyle/xml/UnnecessaryModifier.xml b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/codestyle/xml/UnnecessaryModifier.xml
index ecdcc6d02e..936436a89e 100644
--- a/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/codestyle/xml/UnnecessaryModifier.xml
+++ b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/codestyle/xml/UnnecessaryModifier.xml
@@ -680,7 +680,7 @@ enum Foo {
         <description>Static Modifier on interface</description>
         <expected-problems>1</expected-problems>
         <expected-messages>
-            <message>Unnecessary modifier 'static' on interface 'B': types nested within an interface type are implicitly static</message>
+            <message>Unnecessary modifier 'static' on interface 'Bar': types nested within an interface type are implicitly static</message>
         </expected-messages>
         <code><![CDATA[
 class Foo{

From d6d03ca86833a2c08950e291002b925ec01446b4 Mon Sep 17 00:00:00 2001
From: Andreas Dangel <andreas.dangel@adangel.org>
Date: Thu, 4 Oct 2018 19:03:15 +0200
Subject: [PATCH 3/3] Update release notes, refs #1366, fixes #1356

---
 docs/pages/release_notes.md | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/docs/pages/release_notes.md b/docs/pages/release_notes.md
index b8f8783555..7e7ada589c 100644
--- a/docs/pages/release_notes.md
+++ b/docs/pages/release_notes.md
@@ -16,9 +16,14 @@ This is a {{ site.pmd.release_type }} release.
 
 ### Fixed Issues
 
+*   java-codestyle
+    *   [#1356](https://github.com/pmd/pmd/issues/1356): \[java] UnnecessaryModifier wrong message public->static
+
 ### API Changes
 
 ### External Contributions
 
+*   [#1366](https://github.com/pmd/pmd/pull/1366): \[Java] Static Modifier on Internal Interface pmd #1356 - [avishvat](https://github.com/vishva007)
+
 {% endtocmaker %}