Add multi-adders to most traits

Author: emilforslund

src/main/java/com/speedment/codegen/lang/interfaces/HasAnnotationUsage.java

@@ -17,6 +17,7 @@
 package com.speedment.codegen.lang.interfaces;
 
 import com.speedment.codegen.lang.models.AnnotationUsage;
+import java.util.Collection;
 import java.util.List;
 
 /**
@@ -28,7 +29,13 @@ public interface HasAnnotationUsage<T extends HasAnnotationUsage<T>> {
 
  @SuppressWarnings("unchecked")
  default T add(final AnnotationUsage annotation) {
- getAnnotations().add(annotation);
+ getAnnotations().add(annotation.copy());
+ return (T) this;
+ }
+ 
+ @SuppressWarnings("unchecked")
+ default T addAllAnnotations(final Collection<? extends AnnotationUsage> annotations) {
+ annotations.forEach(this::add);
  return (T) this;
  }
 

src/main/java/com/speedment/codegen/lang/interfaces/HasClasses.java

@@ -28,14 +28,14 @@
 public interface HasClasses<T extends HasClasses<T>> {
 
  @SuppressWarnings("unchecked")
- default T add(ClassOrInterface<?> member) {
- getClasses().add(member);
+ default T add(final ClassOrInterface<?> member) {
+ getClasses().add(member.copy());
  return (T) this;
  }
 
  @SuppressWarnings("unchecked")
- default T addAllClasses(Collection<? extends ClassOrInterface<?>> members) {
- getClasses().addAll(members);
+ default T addAllClasses(final Collection<? extends ClassOrInterface<?>> members) {
+ members.forEach(this::add);
  return (T) this;
  }
 

src/main/java/com/speedment/codegen/lang/interfaces/HasCode.java

@@ -16,6 +16,7 @@
  */
 package com.speedment.codegen.lang.interfaces;
 
+import java.util.Collection;
 import java.util.List;
 
 /**
@@ -26,10 +27,16 @@
 public interface HasCode<T extends HasCode<T>> {
 
  @SuppressWarnings("unchecked")
- default T add(String row) {
+ default T add(final String row) {
  getCode().add(row);
  return (T) this;
  }
 
+ @SuppressWarnings("unchecked")
+ default T addAllRows(final Collection<String> rows) {
+ rows.forEach(this::add);
+ return (T) this;
+ }
+ 
  List<String> getCode();
 }

src/main/java/com/speedment/codegen/lang/interfaces/HasConstructors.java

@@ -17,6 +17,7 @@
 package com.speedment.codegen.lang.interfaces;
 
 import com.speedment.codegen.lang.models.Constructor;
+import java.util.Collection;
 import java.util.List;
 
 /**
@@ -28,7 +29,13 @@ public interface HasConstructors<T extends HasConstructors<T>> {
 
  @SuppressWarnings("unchecked")
  default T add(final Constructor constr) {
- getConstructors().add(constr);
+ getConstructors().add(constr.copy());
+ return (T) this;
+ }
+ 
+ @SuppressWarnings("unchecked")
+ default T addAllConstructors(final Collection<Constructor> constr) {
+ constr.forEach(this::add);
  return (T) this;
  }
 

src/main/java/com/speedment/codegen/lang/interfaces/HasFields.java

@@ -19,6 +19,7 @@
 import com.speedment.codegen.lang.models.Field;
 import java.util.Collection;
 import java.util.List;
+import java.util.stream.Stream;
 
 /**
  *
@@ -29,13 +30,13 @@ public interface HasFields<T extends HasFields<T>> {
 
  @SuppressWarnings("unchecked")
  default T add(final Field field) {
- getFields().add(field);
+ getFields().add(field.copy());
  return (T) this;
  }
 
  @SuppressWarnings("unchecked")
  default T addAllFields(final Collection<? extends Field> fields) {
- getFields().addAll(fields);
+ fields.forEach(this::add);
  return (T) this;
  }
 

src/main/java/com/speedment/codegen/lang/interfaces/HasGenerics.java

@@ -17,6 +17,7 @@
 package com.speedment.codegen.lang.interfaces;
 
 import com.speedment.codegen.lang.models.Generic;
+import java.util.Collection;
 import java.util.List;
 
 /**
@@ -28,7 +29,13 @@ public interface HasGenerics<T extends HasGenerics<T>> {
 
  @SuppressWarnings("unchecked")
  default T add(final Generic generic) {
- getGenerics().add(generic);
+ getGenerics().add(generic.copy());
+ return (T) this;
+ }
+ 
+ @SuppressWarnings("unchecked")
+ default T addAllGenerics(final Collection<? extends Generic> generics) {
+ generics.forEach(this::add);
  return (T) this;
  }
 

src/main/java/com/speedment/codegen/lang/interfaces/HasImplements.java

@@ -17,6 +17,7 @@
 package com.speedment.codegen.lang.interfaces;
 
 import com.speedment.codegen.lang.models.Type;
+import java.util.Collection;
 import java.util.List;
 
 /**
@@ -28,7 +29,13 @@ public interface HasImplements<T extends HasImplements<T>> {
 
  @SuppressWarnings("unchecked")
  default T add(final Type interf) {
- getInterfaces().add(interf);
+ getInterfaces().add(interf.copy());
+ return (T) this;
+ }
+ 
+ @SuppressWarnings("unchecked")
+ default T addAllImplements(final Collection<? extends Type> interf) {
+ interf.forEach(this::add);
  return (T) this;
  }
 

src/main/java/com/speedment/codegen/lang/interfaces/HasImports.java

@@ -17,6 +17,7 @@
 package com.speedment.codegen.lang.interfaces;
 
 import com.speedment.codegen.lang.models.Import;
+import java.util.Collection;
 import java.util.List;
 
 /**
@@ -28,7 +29,13 @@ public interface HasImports<T extends HasImports<T>> {
 
  @SuppressWarnings("unchecked")
  default T add(final Import dep) {
- getImports().add(dep);
+ getImports().add(dep.copy());
+ return (T) this;
+ }
+ 
+ @SuppressWarnings("unchecked")
+ default T addAllImports(final Collection<? extends Import> imports) {
+ imports.forEach(this::add);
  return (T) this;
  }
 

src/main/java/com/speedment/codegen/lang/interfaces/HasInitalizers.java

@@ -17,6 +17,7 @@
 package com.speedment.codegen.lang.interfaces;
 
 import com.speedment.codegen.lang.models.Initalizer;
+import java.util.Collection;
 import java.util.List;
 
 /**
@@ -27,8 +28,14 @@
 public interface HasInitalizers<T extends HasInitalizers<T>> {
 
  @SuppressWarnings("unchecked")
- default T add(final Initalizer dep) {
- getInitalizers().add(dep);
+ default T add(final Initalizer initalizer) {
+ getInitalizers().add(initalizer.copy());
+ return (T) this;
+ }
+ 
+ @SuppressWarnings("unchecked")
+ default T addAllInitalizers(final Collection<? extends Initalizer> initalizers) {
+ initalizers.forEach(this::add);
  return (T) this;
  }
 

src/main/java/com/speedment/codegen/lang/interfaces/HasMethods.java

@@ -17,6 +17,7 @@
 package com.speedment.codegen.lang.interfaces;
 
 import com.speedment.codegen.lang.models.Method;
+import java.util.Collection;
 import java.util.List;
 
 /**
@@ -28,7 +29,13 @@ public interface HasMethods<T extends HasMethods<T>> {
 
  @SuppressWarnings("unchecked")
  default T add(final Method meth) {
- getMethods().add(meth);
+ getMethods().add(meth.copy());
+ return (T) this;
+ }
+ 
+ @SuppressWarnings("unchecked")
+ default T addAllMethods(final Collection<? extends Method> methods) {
+ methods.forEach(this::add);
  return (T) this;
  }