Avoid nested interfaces in classes with the same name

Author: raboof

plugin/src/main/scala/com/typesafe/genjavadoc/AST.scala

@@ -39,6 +39,9 @@ trait AST { this: TransformCake ⇒
       ret
     }
 
+    def classMembers = members.collect { case classInfo: ClassInfo => classInfo }
+    def methodMembers = members.collect { case methodInfo: MethodInfo => methodInfo }
+
     override def toString =
       s"ClassInfo($name, ${pattern("XXXXX", "AAAAA")}, module=$module, pckg=$pckg, ${filepattern("FFFFFF")}, interface=$interface, static=$static)" +
         comment.mkString("\n  ", "\n  ", "\n  ") + members.mkString("\n  ")

plugin/src/main/scala/com/typesafe/genjavadoc/BasicTransform.scala

@@ -18,7 +18,7 @@ trait BasicTransform { this: TransformCake ⇒
 
   def newTransformUnit(unit: CompilationUnit): Unit = {
     superTransformUnit(unit)
-    for (c ← flatten(classes)) {
+    for (c ← flatten(classes).flatMap(liftInterface)) {
       val out = file(c.file)
       try {
         if (c.pckg != "<empty>") out.println(s"package ${c.pckg};")

plugin/src/main/scala/com/typesafe/genjavadoc/Output.scala

@@ -55,6 +55,27 @@ trait Output { this: TransformCake ⇒
     }
   }
 
+  /**
+    * Lift nested interfaces with the same name as their parent class to the parent
+    * level, as Java does not allow this, mangling their name accordingly
+    *
+    * Also applied recursively to members
+    */
+  def liftInterface(c: ClassInfo): Seq[ClassInfo] = {
+    c.members.find {
+      case member: ClassInfo => member.name == c.name && member.interface
+      case _ => false
+    } match {
+      case Some(nestedInterface: ClassInfo) =>
+        Seq(
+          c.copy(members = c.classMembers.filterNot(_ == nestedInterface).flatMap(liftInterface) ++ c.methodMembers),
+          nestedInterface.copy(name = s"${nestedInterface.name}$$${nestedInterface.name}")
+        )
+      case _ =>
+        Seq(c.copy(members = c.classMembers.flatMap(liftInterface) ++ c.methodMembers))
+    }
+  }
+
   /**
    * This method is supposed to do the transformation of `object` into
    *

plugin/src/test/resources/expected_output/basic/akka/rk/buh/is/it/Actor.java

@@ -0,0 +1,10 @@
+package akka.rk.buh.is.it;
+public  class Actor {
+  public  class Status {
+    public   Status () { throw new RuntimeException(); }
+  }
+  public  interface Status$Status extends scala.Serializable {
+  }
+  public  akka.rk.buh.is.it.Actor.Status$ Status ()  { throw new RuntimeException(); }
+  public   Actor ()  { throw new RuntimeException(); }
+}

plugin/src/test/resources/input/basic/test.scala

@@ -8,6 +8,12 @@ package buh.is.it
 import scala.annotation.varargs
 import scala.concurrent.duration.FiniteDuration
 
+class Actor {
+  object Status {
+    sealed trait Status extends Serializable
+  }
+}
+
 /**
  * @tparam A I am a type parameter description
  */