Interfaces must be public in Java (#158)

raboof · web-flow · commit 602b2fca3151 · 2018-12-13T17:11:43.000+01:00
diff --git a/plugin/src/main/scala/com/typesafe/genjavadoc/AST.scala b/plugin/src/main/scala/com/typesafe/genjavadoc/AST.scala
@@ -160,10 +160,11 @@ trait AST { this: TransformCake ⇒
   }
 
   private def access(m: Modifiers, topLevel: Boolean): String = {
-    if (m.isPublic) "public"
+    if (m.isTrait || m.isInterface) "public"
+    else if (m.isPublic) "public"
     else if (m.isProtected && !topLevel) "protected"
     else if (m.isPrivate && !topLevel) {
-      if (m.isInterface || m.hasStaticFlag) "" else "private"
+      if (m.hasStaticFlag) "" else "private"
     }
     else if (strictVisibility && m.privateWithin != tpnme.EMPTY) ""
     else "public" // this is the case for top level classes
diff --git a/plugin/src/test/resources/expected_output/basic/akka/actor/dsl/Inbox.java b/plugin/src/test/resources/expected_output/basic/akka/actor/dsl/Inbox.java
@@ -0,0 +1,6 @@
+package akka.actor.dsl;
+public  interface Inbox {
+  public  interface InboxExtension {
+    public  int DSLInboxQueueSize ()  ;
+  }
+}
diff --git a/plugin/src/test/resources/input/basic/akka/actor/dsl/Inbox.scala b/plugin/src/test/resources/input/basic/akka/actor/dsl/Inbox.scala
@@ -0,0 +1,7 @@
+package akka.actor.dsl
+
+trait Inbox {
+  protected trait InboxExtension {
+    val DSLInboxQueueSize = 42
+  }
+}
diff --git a/plugin/src/test/resources/patches/2.12.0.patch b/plugin/src/test/resources/patches/2.12.0.patch
@@ -80,3 +80,12 @@
    public  Object messageId ()  { throw new RuntimeException(); }
    // not preceding
    public   Identify (Object messageId)  { throw new RuntimeException(); }
+--- target/expected_output/basic/akka/actor/dsl/Inbox.java    2018-12-13 15:51:52.473679518 +0100
++++ target/expected_output/basic/akka/actor/dsl/Inbox.java 2018-12-13 15:51:51.473673128 +0100
+@@ -2,5 +2,6 @@
+ public  interface Inbox {
+   public  interface InboxExtension {
+     public  int DSLInboxQueueSize ()  ;
++    public  void akka$actor$dsl$Inbox$InboxExtension$_setter_$DSLInboxQueueSize_$eq (int x$1)  ;
+   }
+ }
diff --git a/plugin/src/test/resources/patches/2.12.1.patch b/plugin/src/test/resources/patches/2.12.1.patch
@@ -80,3 +80,12 @@
    public  Object messageId ()  { throw new RuntimeException(); }
    // not preceding
    public   Identify (Object messageId)  { throw new RuntimeException(); }
+--- target/expected_output/basic/akka/actor/dsl/Inbox.java    2018-12-13 15:51:52.473679518 +0100
++++ target/expected_output/basic/akka/actor/dsl/Inbox.java 2018-12-13 15:51:51.473673128 +0100
+@@ -2,5 +2,6 @@
+ public  interface Inbox {
+   public  interface InboxExtension {
+     public  int DSLInboxQueueSize ()  ;
++    public  void akka$actor$dsl$Inbox$InboxExtension$_setter_$DSLInboxQueueSize_$eq (int x$1)  ;
+   }
+ }
diff --git a/plugin/src/test/resources/patches/2.12.2.patch b/plugin/src/test/resources/patches/2.12.2.patch
@@ -80,3 +80,12 @@
    public  Object messageId ()  { throw new RuntimeException(); }
    // not preceding
    public   Identify (Object messageId)  { throw new RuntimeException(); }
+--- target/expected_output/basic/akka/actor/dsl/Inbox.java    2018-12-13 15:51:52.473679518 +0100
++++ target/expected_output/basic/akka/actor/dsl/Inbox.java 2018-12-13 15:51:51.473673128 +0100
+@@ -2,5 +2,6 @@
+ public  interface Inbox {
+   public  interface InboxExtension {
+     public  int DSLInboxQueueSize ()  ;
++    public  void akka$actor$dsl$Inbox$InboxExtension$_setter_$DSLInboxQueueSize_$eq (int x$1)  ;
+   }
+ }
diff --git a/plugin/src/test/resources/patches/2.12.3.patch b/plugin/src/test/resources/patches/2.12.3.patch
@@ -80,3 +80,12 @@
    public  Object messageId ()  { throw new RuntimeException(); }
    // not preceding
    public   Identify (Object messageId)  { throw new RuntimeException(); }
+--- target/expected_output/basic/akka/actor/dsl/Inbox.java    2018-12-13 15:51:52.473679518 +0100
++++ target/expected_output/basic/akka/actor/dsl/Inbox.java 2018-12-13 15:51:51.473673128 +0100
+@@ -2,5 +2,6 @@
+ public  interface Inbox {
+   public  interface InboxExtension {
+     public  int DSLInboxQueueSize ()  ;
++    public  void akka$actor$dsl$Inbox$InboxExtension$_setter_$DSLInboxQueueSize_$eq (int x$1)  ;
+   }
+ }
diff --git a/plugin/src/test/resources/patches/2.12.4.patch b/plugin/src/test/resources/patches/2.12.4.patch
@@ -80,3 +80,12 @@
    public  Object messageId ()  { throw new RuntimeException(); }
    // not preceding
    public   Identify (Object messageId)  { throw new RuntimeException(); }
+--- target/expected_output/basic/akka/actor/dsl/Inbox.java    2018-12-13 15:51:52.473679518 +0100
++++ target/expected_output/basic/akka/actor/dsl/Inbox.java 2018-12-13 15:51:51.473673128 +0100
+@@ -2,5 +2,6 @@
+ public  interface Inbox {
+   public  interface InboxExtension {
+     public  int DSLInboxQueueSize ()  ;
++    public  void akka$actor$dsl$Inbox$InboxExtension$_setter_$DSLInboxQueueSize_$eq (int x$1)  ;
+   }
+ }
diff --git a/plugin/src/test/resources/patches/2.12.5.patch b/plugin/src/test/resources/patches/2.12.5.patch
@@ -80,3 +80,12 @@
    public  Object messageId ()  { throw new RuntimeException(); }
    // not preceding
    public   Identify (Object messageId)  { throw new RuntimeException(); }
+--- target/expected_output/basic/akka/actor/dsl/Inbox.java    2018-12-13 15:51:52.473679518 +0100
++++ target/expected_output/basic/akka/actor/dsl/Inbox.java 2018-12-13 15:51:51.473673128 +0100
+@@ -2,5 +2,6 @@
+ public  interface Inbox {
+   public  interface InboxExtension {
+     public  int DSLInboxQueueSize ()  ;
++    public  void akka$actor$dsl$Inbox$InboxExtension$_setter_$DSLInboxQueueSize_$eq (int x$1)  ;
+   }
+ }
diff --git a/plugin/src/test/resources/patches/2.12.6.patch b/plugin/src/test/resources/patches/2.12.6.patch
@@ -80,3 +80,12 @@
    public  Object messageId ()  { throw new RuntimeException(); }
    // not preceding
    public   Identify (Object messageId)  { throw new RuntimeException(); }
+--- target/expected_output/basic/akka/actor/dsl/Inbox.java    2018-12-13 15:51:52.473679518 +0100
++++ target/expected_output/basic/akka/actor/dsl/Inbox.java 2018-12-13 15:51:51.473673128 +0100
+@@ -2,5 +2,6 @@
+ public  interface Inbox {
+   public  interface InboxExtension {
+     public  int DSLInboxQueueSize ()  ;
++    public  void akka$actor$dsl$Inbox$InboxExtension$_setter_$DSLInboxQueueSize_$eq (int x$1)  ;
+   }
+ }
diff --git a/plugin/src/test/resources/patches/2.12.7.patch b/plugin/src/test/resources/patches/2.12.7.patch
@@ -80,3 +80,12 @@
    public  Object messageId ()  { throw new RuntimeException(); }
    // not preceding
    public   Identify (Object messageId)  { throw new RuntimeException(); }
+--- target/expected_output/basic/akka/actor/dsl/Inbox.java    2018-12-13 15:51:52.473679518 +0100
++++ target/expected_output/basic/akka/actor/dsl/Inbox.java 2018-12-13 15:51:51.473673128 +0100
+@@ -2,5 +2,6 @@
+ public  interface Inbox {
+   public  interface InboxExtension {
+     public  int DSLInboxQueueSize ()  ;
++    public  void akka$actor$dsl$Inbox$InboxExtension$_setter_$DSLInboxQueueSize_$eq (int x$1)  ;
+   }
+ }
diff --git a/plugin/src/test/resources/patches/2.12.8.patch b/plugin/src/test/resources/patches/2.12.8.patch
@@ -80,3 +80,12 @@
    public  Object messageId ()  { throw new RuntimeException(); }
    // not preceding
    public   Identify (Object messageId)  { throw new RuntimeException(); }
+--- target/expected_output/basic/akka/actor/dsl/Inbox.java    2018-12-13 15:51:52.473679518 +0100
++++ target/expected_output/basic/akka/actor/dsl/Inbox.java 2018-12-13 15:51:51.473673128 +0100
+@@ -2,5 +2,6 @@
+ public  interface Inbox {
+   public  interface InboxExtension {
+     public  int DSLInboxQueueSize ()  ;
++    public  void akka$actor$dsl$Inbox$InboxExtension$_setter_$DSLInboxQueueSize_$eq (int x$1)  ;
+   }
+ }
diff --git a/plugin/src/test/resources/patches/2.12.9.patch b/plugin/src/test/resources/patches/2.12.9.patch
@@ -80,3 +80,12 @@
    public  Object messageId ()  { throw new RuntimeException(); }
    // not preceding
    public   Identify (Object messageId)  { throw new RuntimeException(); }
+--- target/expected_output/basic/akka/actor/dsl/Inbox.java    2018-12-13 15:51:52.473679518 +0100
++++ target/expected_output/basic/akka/actor/dsl/Inbox.java 2018-12-13 15:51:51.473673128 +0100
+@@ -2,5 +2,6 @@
+ public  interface Inbox {
+   public  interface InboxExtension {
+     public  int DSLInboxQueueSize ()  ;
++    public  void akka$actor$dsl$Inbox$InboxExtension$_setter_$DSLInboxQueueSize_$eq (int x$1)  ;
+   }
+ }
diff --git a/plugin/src/test/resources/patches/2.13.0.patch b/plugin/src/test/resources/patches/2.13.0.patch
@@ -181,16 +181,6 @@ index b0dd497..4950950 100644
      public  int hashCode () { throw new RuntimeException(); }
 --- target/expected_output/basic/akka/actor/Identify.java
 +++ target/expected_output/akka/actor/Identify.java
-@@ -12,6 +12,7 @@
-   public  java.lang.String productPrefix ()  { throw new RuntimeException(); }
-   public  int productArity ()  { throw new RuntimeException(); }
-   public  Object productElement (int x$1)  { throw new RuntimeException(); }
-+  public  java.lang.String productElementName (int x$1)  { throw new RuntimeException(); }
-   public  scala.collection.Iterator<java.lang.Object> productIterator ()  { throw new RuntimeException(); }
-   public  boolean canEqual (Object x$1)  { throw new RuntimeException(); }
-   public  int hashCode ()  { throw new RuntimeException(); }
---- target/expected_output/basic/akka/actor/Identify.java
-+++ target/expected_output/akka/actor/Identify.java
 @@ -3,6 +3,30 @@
    static public  akka.actor.Identify apply (Object messageId)  { throw new RuntimeException(); }
    static public  scala.Option<java.lang.Object> unapply (akka.actor.Identify x$0)  { throw new RuntimeException(); }
@@ -221,3 +211,21 @@ index b0dd497..4950950 100644
 +  static public  void apply$mcVJ$sp (long v1)  { throw new RuntimeException(); }
    public  Object messageId ()  { throw new RuntimeException(); }
    // not preceding
+   public   Identify (Object messageId)  { throw new RuntimeException(); }
+@@ -12,6 +12,7 @@
+   public  java.lang.String productPrefix ()  { throw new RuntimeException(); }
+   public  int productArity ()  { throw new RuntimeException(); }
+   public  Object productElement (int x$1)  { throw new RuntimeException(); }
++  public  java.lang.String productElementName (int x$1)  { throw new RuntimeException(); }
+   public  scala.collection.Iterator<java.lang.Object> productIterator ()  { throw new RuntimeException(); }
+   public  boolean canEqual (Object x$1)  { throw new RuntimeException(); }
+   public  int hashCode ()  { throw new RuntimeException(); }
+--- target/expected_output/basic/akka/actor/dsl/Inbox.java    2018-12-13 15:51:52.473679518 +0100
++++ target/expected_output/basic/akka/actor/dsl/Inbox.java 2018-12-13 15:51:51.473673128 +0100
+@@ -2,5 +2,6 @@
+ public  interface Inbox {
+   public  interface InboxExtension {
+     public  int DSLInboxQueueSize ()  ;
++    public  void akka$actor$dsl$Inbox$InboxExtension$_setter_$DSLInboxQueueSize_$eq (int x$1)  ;
+   }
+ }

Original file line number	Diff line number	Diff line change
`@@ -160,10 +160,11 @@ trait AST { this: TransformCake ⇒`
`160`	`160`	`}`
`161`	`161`
`162`	`162`	`private def access(m: Modifiers, topLevel: Boolean): String = {`
`163`		`- if (m.isPublic) "public"`
	`163`	`+ if (m.isTrait \|\| m.isInterface) "public"`
	`164`	`+ else if (m.isPublic) "public"`
`164`	`165`	`else if (m.isProtected && !topLevel) "protected"`
`165`	`166`	`else if (m.isPrivate && !topLevel) {`
`166`		`- if (m.isInterface \|\| m.hasStaticFlag) "" else "private"`
	`167`	`+ if (m.hasStaticFlag) "" else "private"`
`167`	`168`	`}`
`168`	`169`	`else if (strictVisibility && m.privateWithin != tpnme.EMPTY) ""`
`169`	`170`	`else "public" // this is the case for top level classes`