ISSUES-4 factory use mockBuilder

jbock-java · Nov 30, 2023 · 0597cb3 · 0597cb3
1 parent b9a62fb
commit 0597cb3
Show file tree

Hide file tree

Showing 3 changed files with 34 additions and 29 deletions.
diff --git a/compiler/src/main/java/io/jbock/simple/processor/writing/MockBuilder.java b/compiler/src/main/java/io/jbock/simple/processor/writing/MockBuilder.java
@@ -62,32 +62,39 @@ ClassName getClassName() {
     }
 
     private MethodSpec buildMethod() {
-        List<CodeBlock> constructorParameters = new ArrayList<>();
         MethodSpec.Builder method = MethodSpec.methodBuilder("build");
-        for (NamedBinding namedBinding : sorted.values()) {
-            Binding b = namedBinding.binding();
-            Key key = b.key();
-            CodeBlock invocation = b.invocation(names);
-            ParameterSpec param = names.apply(key);
-            if (namedBinding.isComponentRequest()) {
-                constructorParameters.add(CodeBlock.of("$N", names.apply(key)));
-            }
-            if (b instanceof ParameterBinding) {
-                method.addParameter(names.apply(b.key()));
-            } else if (!key.typeName().isPrimitive()) {
-                method.addStatement("$1T $2N = this.$2N != null ? this.$2N : $3L", key.typeName(), param, invocation);
-            } else {
-                FieldSpec auxField = FieldSpec.builder(TypeName.BOOLEAN, namedBinding.auxName(), PRIVATE).build();
-                method.addStatement("$1T $2N = this.$3N ? this.$2N : $4L", key.typeName(), param, auxField, invocation);
+        method.addModifiers(modifiers);
+        component.factoryElement().ifPresent(factory -> {
+            method.returns(TypeName.get(factory.element().asType()));
+            method.addStatement("return new $T(this)", factory.generatedClass());
+        });
+        component.builderElement().ifPresent(builder -> {
+            method.returns(TypeName.get(builder.element().asType()));
+            method.addStatement("return new $T(this)", builder.generatedClass());
+        });
+        if (component.factoryElement().isEmpty() && component.builderElement().isEmpty()) {
+            method.returns(TypeName.get(component.element().asType()));
+            List<CodeBlock> constructorParameters = new ArrayList<>();
+            for (NamedBinding namedBinding : sorted.values()) {
+                Binding b = namedBinding.binding();
+                Key key = b.key();
+                CodeBlock invocation = b.invocation(names);
+                ParameterSpec param = names.apply(key);
+                if (namedBinding.isComponentRequest()) {
+                    constructorParameters.add(CodeBlock.of("$N", names.apply(key)));
+                }
+                if (!key.typeName().isPrimitive()) {
+                    method.addStatement("$1T $2N = this.$2N != null ? this.$2N : $3L", key.typeName(), param, invocation);
+                } else {
+                    FieldSpec auxField = FieldSpec.builder(TypeName.BOOLEAN, namedBinding.auxName(), PRIVATE).build();
+                    method.addStatement("$1T $2N = this.$3N ? this.$2N : $4L", key.typeName(), param, auxField, invocation);
+                }
             }
+            method.addStatement("return new $T($L)",
+                    component.generatedClass(),
+                    constructorParameters.stream().collect(CodeBlock.joining(", ")));
         }
-        return method
-                .addModifiers(modifiers)
-                .returns(TypeName.get(component.element().asType()))
-                .addStatement("return new $T($L)",
-                        component.generatedClass(),
-                        constructorParameters.stream().collect(CodeBlock.joining(", ")))
-                .build();
+        return method.build();
     }
 
     private List<FieldSpec> getFields() {

diff --git a/compiler/src/test/java/io/jbock/simple/processor/JakartaQualifierTest.java b/compiler/src/test/java/io/jbock/simple/processor/JakartaQualifierTest.java
@@ -62,8 +62,8 @@ void qualifiedIdentity() {
                         "  }",
                         "",
                         "  static final class MockBuilder {",
-                        "    TestClass.AComponent build(String a, String b) {",
-                        "      return new TestClass_AComponent_Impl(a);",
+                        "    TestClass.AComponent.Factory build() {",
+                        "      return new Factory_Impl(this);",
                         "    }",
                         "  }",
                         "}");

diff --git a/compiler/src/test/java/io/jbock/simple/processor/PrimitiveTest.java b/compiler/src/test/java/io/jbock/simple/processor/PrimitiveTest.java
@@ -104,10 +104,8 @@ void providesPrimitive() {
                         "    private boolean b_isSet;",
                         "    private TestClass.A a;",
                         "",
-                        "    TestClass.AComponent build(int i) {",
-                        "      int b = this.b_isSet ? this.b : TestClass.AComponent.getB(i);",
-                        "      TestClass.A a = this.a != null ? this.a : new TestClass.A(b);",
-                        "      return new TestClass_AComponent_Impl(a);",
+                        "    TestClass.AComponent.Factory build() {",
+                        "      return new Factory_Impl(this);",
                         "    }",
                         "",
                         "    void b(int b) {",