ISSUES-36 factory method returns factory interface (#42)

jbock-java · Dec 11, 2023 · b469a5d · b469a5d
1 parent d7e904b
commit b469a5d
Show file tree

Hide file tree

Showing 6 changed files with 22 additions and 16 deletions.
diff --git a/compiler/src/main/java/io/jbock/simple/processor/writing/ComponentImpl.java b/compiler/src/main/java/io/jbock/simple/processor/writing/ComponentImpl.java
@@ -68,14 +68,7 @@ TypeSpec generate() {
                 .addModifiers(FINAL)
                 .addSuperinterface(component.element().asType());
         spec.addFields(getFields());
-        for (DependencyRequest r : component.requests()) {
-            MethodSpec.Builder method = MethodSpec.methodBuilder(r.requestingElement().getSimpleName().toString());
-            method.addStatement("return $L", sorted.get(r.key()).name());
-            method.returns(r.key().typeName());
-            method.addAnnotation(Override.class);
-            method.addModifiers(PUBLIC);
-            spec.addMethod(method.build());
-        }
+        spec.addMethods(generateGetters());
         component.factoryElement().ifPresent(factory -> {
             spec.addMethod(generateFactoryMethod(factory));
             spec.addType(factoryImpl.generate(factory));
@@ -105,6 +98,19 @@ TypeSpec generate() {
         return spec.build();
     }
 
+    private List<MethodSpec> generateGetters() {
+        List<MethodSpec> result = new ArrayList<>(component.requests().size());
+        for (DependencyRequest r : component.requests()) {
+            MethodSpec.Builder method = MethodSpec.methodBuilder(r.requestingElement().getSimpleName().toString());
+            method.addStatement("return $L", sorted.get(r.key()).name());
+            method.returns(r.key().typeName());
+            method.addAnnotation(Override.class);
+            method.addModifiers(PUBLIC);
+            result.add(method.build());
+        }
+        return result;
+    }
+
     private String getComments() {
         String version = Objects.toString(getClass().getPackage().getImplementationVersion(), "");
         return "https://github.com/jbock-java/simple-component" + (version.isEmpty() ? "" : " " + version);
@@ -114,7 +120,7 @@ private MethodSpec generateFactoryMethod(FactoryElement factory) {
         MethodSpec.Builder spec = MethodSpec.methodBuilder(FACTORY_METHOD)
                 .addModifiers(STATIC)
                 .addModifiers(modifiers)
-                .returns(factory.generatedClass());
+                .returns(TypeName.get(factory.element().asType()));
         spec.addStatement("return new $T()", factory.generatedClass());
         return spec.build();
     }

diff --git a/compiler/src/test/java/io/jbock/simple/processor/FactoryTest.java b/compiler/src/test/java/io/jbock/simple/processor/FactoryTest.java
@@ -53,7 +53,7 @@ void noParameters() {
                         "    return a;",
                         "  }",
                         "",
-                        "  static Factory_Impl factory() {",
+                        "  static TestClass.AComponent.Factory factory() {",
                         "    return new Factory_Impl();",
                         "  }",
                         "",
@@ -105,7 +105,7 @@ void factoryParameterIdentity() {
                         "    return s;",
                         "  }",
                         "",
-                        "  public static Factory_Impl factory() {",
+                        "  public static TestClass.AComponent.Factory factory() {",
                         "    return new Factory_Impl();",
                         "  }",
                         "",
@@ -160,7 +160,7 @@ void factoryParameter() {
                         "    return a;",
                         "  }",
                         "",
-                        "  static Factory_Impl factory() {",
+                        "  static TestClass.AComponent.Factory factory() {",
                         "    return new Factory_Impl();",
                         "  }",
                         "",

diff --git a/compiler/src/test/java/io/jbock/simple/processor/JakartaQualifierTest.java b/compiler/src/test/java/io/jbock/simple/processor/JakartaQualifierTest.java
@@ -50,7 +50,7 @@ void qualifiedIdentity() {
                         "    return a;",
                         "  }",
                         "",
-                        "  static Factory_Impl factory() {",
+                        "  static TestClass.AComponent.Factory factory() {",
                         "    return new Factory_Impl();",
                         "  }",
                         "",

diff --git a/compiler/src/test/java/io/jbock/simple/processor/JavaxQualifierTest.java b/compiler/src/test/java/io/jbock/simple/processor/JavaxQualifierTest.java
@@ -50,7 +50,7 @@ void qualifiedIdentity() {
                         "    return a;",
                         "  }",
                         "",
-                        "  static Factory_Impl factory() {",
+                        "  static TestClass.AComponent.Factory factory() {",
                         "    return new Factory_Impl();",
                         "  }",
                         "",

diff --git a/compiler/src/test/java/io/jbock/simple/processor/PrimitiveTest.java b/compiler/src/test/java/io/jbock/simple/processor/PrimitiveTest.java
@@ -86,7 +86,7 @@ void providesPrimitive() {
                         "    return a;",
                         "  }",
                         "",
-                        "  public static Factory_Impl factory() {",
+                        "  public static TestClass.AComponent.Factory factory() {",
                         "    return new Factory_Impl();",
                         "  }",
                         "",

diff --git a/compiler/src/test/java/io/jbock/simple/processor/QualifierTest.java b/compiler/src/test/java/io/jbock/simple/processor/QualifierTest.java
@@ -79,7 +79,7 @@ void qualifiedIdentity() {
                         "    return a;",
                         "  }",
                         "",
-                        "  static Factory_Impl factory() {",
+                        "  static TestClass.AComponent.Factory factory() {",
                         "    return new Factory_Impl();",
                         "  }",
                         "",