Use correct type for builder in generated introspections (#11511)

core-processor/src/main/java/io/micronaut/inject/beans/visitor/IntrospectedTypeElementVisitor.java

@@ -241,7 +241,7 @@ private void processBuilderDefinition(ClassElement element, VisitorContext conte
                         creatorMethod,
                         writePrefixes,
                         methodElement,
-                        element.getDefaultConstructor().orElse(null),
+                        returnType.getDefaultConstructor().orElse(null),
                         returnType,
                         methodMetadata,
                         index,

test-suite/src/test/java/io/micronaut/test/lombok/BarCommand.java

@@ -0,0 +1,23 @@
+package io.micronaut.test.lombok;
+
+import io.micronaut.core.annotation.Introspected;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import lombok.ToString;
+
+@Introspected
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+@ToString
+public class BarCommand {
+
+    private String foo;
+
+    private String bar;
+
+    private String baz;
+}

test-suite/src/test/java/io/micronaut/test/lombok/LombokIntrospectedBuilderTest.java

@@ -15,6 +15,19 @@
 
 public class LombokIntrospectedBuilderTest {
 
+    @Test
+    void testNoArgsAndAllArgsConstructor() {
+        BeanIntrospection<BarCommand> introspection = BeanIntrospection.getIntrospection(BarCommand.class);
+
+        BeanIntrospection.Builder<BarCommand> builder = introspection.builder();
+
+        builder.with("foo", "one");
+        builder.with("bar", "two");
+        builder.with("baz", "three");
+        BarCommand result = builder.build();
+        assertEquals("BarCommand(foo=one, bar=two, baz=three)", result.toString());
+    }
+
     @Test
     void testLombokNoArgsConstructor() {
         BeanIntrospection<Book> introspection = BeanIntrospection.getIntrospection(Book.class);