1 files changed, 8 insertions, 12 deletions
diff --git a/container-compiler-plugin/src/main/java/io/trygvis/container/compiler/model/Constructor.java b/container-compiler-plugin/src/main/java/io/trygvis/container/compiler/model/Constructor.java
index f669273..0f3ceeb 100644
--- a/container-compiler-plugin/src/main/java/io/trygvis/container/compiler/model/Constructor.java
+++ b/container-compiler-plugin/src/main/java/io/trygvis/container/compiler/model/Constructor.java
@@ -3,7 +3,8 @@ package io.trygvis.container.compiler.model;
 import java.util.ArrayList;
 import java.util.List;
 
-import static org.springframework.util.StringUtils.collectionToDelimitedString;
+import static io.trygvis.container.compiler.model.ClassG.addAll;
+import static org.apache.commons.lang.StringUtils.join;
 
 public class Constructor {
 
@@ -18,20 +19,15 @@ public class Constructor {
     }
 
     public List<String> write() {
-        List<String> body = new ArrayList<>();
-
         List<String> ps = new ArrayList<>();
-        for (ParameterRef p : parameters) {
-            ps.add(p.klass.name + " " + p.name);
+        for (Parameters.ParameterRef p : parameters) {
+            ps.add(p.klass + " " + p.name);
         }
 
-        String params = collectionToDelimitedString(ps, ", ");
-
-        body.add("    public " + g.type.className + "(" + params + ") {");
-        for (String s : this.body) {
-            body.add("        " + s);
-        }
-        body.add("    }");
+        List<String> body = new ArrayList<>();
+        body.add("public " + g.type.className + "(" + join(ps, ", ") + ") {");
+        addAll(1, body, this.body);
+        body.add("}");
 
         return body;
     }