Simplify generated code.

christian-schlichtherle · Aug 18, 2023 · c3382e5 · c3382e5
1 parent 25b81fc
commit c3382e5
Show file tree

Hide file tree

Showing 5 changed files with 22 additions and 16 deletions.
diff --git a/java-sample/src/main/java/bali/java/sample/naming/Nameable.java b/java-sample/src/main/java/bali/java/sample/naming/Nameable.java
@@ -0,0 +1,12 @@
+package bali.java.sample.naming;
+
+public interface Nameable {
+
+    default String qualified() {
+        return getClass().getName();
+    }
+
+    default String simple() {
+        return getClass().getSimpleName();
+    }
+}
diff --git a/java-sample/src/main/java/bali/java/sample/naming/NamingModule.java b/java-sample/src/main/java/bali/java/sample/naming/NamingModule.java
@@ -3,19 +3,7 @@
 import bali.Module;
 
 @Module
-public interface NamingModule {
-
-    @SuppressWarnings("unused")
-    interface WhatsMyName<Complication> {
-
-        default String qualified() {
-            return getClass().getName();
-        }
-
-        default String simple() {
-            return getClass().getSimpleName();
-        }
-    }
+public interface NamingModule extends Nameable {
 
     WhatsMyName<String> name1();
 

diff --git a/java-sample/src/main/java/bali/java/sample/naming/WhatsMyName.java b/java-sample/src/main/java/bali/java/sample/naming/WhatsMyName.java
@@ -0,0 +1,5 @@
+package bali.java.sample.naming;
+
+@SuppressWarnings("unused")
+public interface WhatsMyName<T> extends Nameable {
+}
diff --git a/java-sample/src/test/scala/bali/java/sample/naming/NamingModuleSpec.scala b/java-sample/src/test/scala/bali/java/sample/naming/NamingModuleSpec.scala
@@ -9,11 +9,13 @@ class NamingModuleSpec extends AnyWordSpec {
     val module = NamingModule$.new$
 
     "yield the expected simple names" in {
+      module.simple shouldBe "NamingModule$$"
       module.name1.simple shouldBe "WhatsMyName"
       module.name2.simple shouldBe "WhatsMyName"
     }
 
     "yield the expected qualified names" in {
+      module.qualified should endWith(".NamingModule$$")
       module.name1.qualified should endWith(".NamingModule$$1WhatsMyName")
       module.name2.qualified should endWith(".NamingModule$$2WhatsMyName")
     }

diff --git a/java/src/main/java/bali/java/TypeVisitor.java b/java/src/main/java/bali/java/TypeVisitor.java
@@ -33,8 +33,7 @@ public Consumer<Output> visitModuleInterface4CompanionInterface(ModuleInterface
                 out
                         .nl()
                         .ad("static ").ad(m.getTypeParametersWithBoundsList()).ad(m.getLocalDeclaredType()).ad(" new$() {").nl()
-                        .ad("    return new ").ad(m.getSimpleName()).ad("$$").ad(m.getTypeParametersWithoutBoundsList()).ad("() {").nl()
-                        .ad("    };").nl()
+                        .ad("    return new ").ad(m.getSimpleName()).ad("$$();").nl()
                         .ad("}").nl();
             }
             m.forAllModuleMethods4CompanionInterface().accept(out);
@@ -48,7 +47,7 @@ public Consumer<Output> visitModuleInterface4CompanionClass(ModuleInterface m) {
                     .ad("package ").ad(m.getPackageName()).ad(";").nl()
                     .nl()
                     .ad(m.generated()).nl()
-                    .ad(m.getModifiers().toString()).ad("abstract class ").ad(m.getSimpleName()).ad(m.getTypeParametersWithBoundsList().isEmpty() ? "$$ " : "$$").ad(m.getTypeParametersWithBoundsList()).ad("implements ").ad(m.getSimpleName()).ad(m.getTypeParametersWithoutBoundsList().isEmpty() ? "$ " : "$").ad(m.getTypeParametersWithoutBoundsList()).ad("{").nl()
+                    .ad(m.getModifiers().toString()).ad(m.hasAbstractMethods() ? "abstract " : "").ad("class ").ad(m.getSimpleName()).ad(m.getTypeParametersWithBoundsList().isEmpty() ? "$$ " : "$$").ad(m.getTypeParametersWithBoundsList()).ad("implements ").ad(m.getSimpleName()).ad(m.getTypeParametersWithoutBoundsList().isEmpty() ? "$ " : "$").ad(m.getTypeParametersWithoutBoundsList()).ad("{").nl()
                     .in();
             m.forAllModuleMethods4CompanionClass().accept(out);
             out.out().ad("}").nl();