Merge pull request #117 from lightbend/nestedInterfaces

Avoid nested interfaces in classes with the same name

Author: ktoso

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

@@ -17,7 +17,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,30 @@ 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}",
+            static = false
+          )
+        )
+      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/Status$.java

@@ -0,0 +1,8 @@
+package akka.rk.buh.is.it;
+public  class Status$ {
+  /**
+   * Static reference to the singleton instance of this Scala object.
+   */
+  public static final Status$ MODULE$ = null;
+  public   Status$ ()  { throw new RuntimeException(); }
+}

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

@@ -0,0 +1,3 @@
+package akka.rk.buh.is.it;
+public  interface Status$Status extends scala.Serializable {
+}

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

@@ -0,0 +1,3 @@
+package akka.rk.buh.is.it;
+public  class Status {
+}

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

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