Fix thread safety issues by not using singletons for generators (#415)

modello-plugins/modello-plugin-converters/src/main/java/org/codehaus/modello/plugin/converters/ConverterGenerator.java

@@ -23,7 +23,6 @@
  */
 
 import javax.inject.Named;
-import javax.inject.Singleton;
 
 import java.io.IOException;
 import java.util.ArrayList;
@@ -57,7 +56,6 @@
  * Generate a basic conversion class between two versions of a model.
  */
 @Named("converters")
-@Singleton
 public class ConverterGenerator extends AbstractJavaModelloGenerator {
     public void generate(Model model, Properties parameters) throws ModelloException {
         initialize(model, parameters);

modello-plugins/modello-plugin-dom4j/src/main/java/org/codehaus/modello/plugin/dom4j/Dom4jReaderGenerator.java

@@ -23,7 +23,6 @@
  */
 
 import javax.inject.Named;
-import javax.inject.Singleton;
 
 import java.io.IOException;
 import java.util.List;
@@ -53,7 +52,6 @@
  * @author <a href="mailto:[email protected]">Brett Porter</a>
  */
 @Named("dom4j-reader")
-@Singleton
 public class Dom4jReaderGenerator extends AbstractXmlJavaGenerator {
 
     private boolean requiresDomSupport;

modello-plugins/modello-plugin-dom4j/src/main/java/org/codehaus/modello/plugin/dom4j/Dom4jWriterGenerator.java

@@ -23,7 +23,6 @@
  */
 
 import javax.inject.Named;
-import javax.inject.Singleton;
 
 import java.io.IOException;
 import java.util.List;
@@ -56,7 +55,6 @@
  * @author <a href="mailto:[email protected]">Brett Porter</a>
  */
 @Named("dom4j-writer")
-@Singleton
 public class Dom4jWriterGenerator extends AbstractXmlJavaGenerator {
 
     private boolean requiresDomSupport;

modello-plugins/modello-plugin-jackson/src/main/java/org/codehaus/modello/plugin/jackson/JacksonReaderGenerator.java

@@ -23,7 +23,6 @@
  */
 
 import javax.inject.Named;
-import javax.inject.Singleton;
 
 import java.io.IOException;
 import java.util.List;
@@ -55,7 +54,6 @@
  * @author <a href="mailto:[email protected]">Simone Tripodi</a>
  */
 @Named("jackson-reader")
-@Singleton
 public class JacksonReaderGenerator extends AbstractJacksonGenerator {
 
     private static final String SOURCE_PARAM = "source";

modello-plugins/modello-plugin-jackson/src/main/java/org/codehaus/modello/plugin/jackson/JacksonWriterGenerator.java

@@ -23,7 +23,6 @@
  */
 
 import javax.inject.Named;
-import javax.inject.Singleton;
 
 import java.io.IOException;
 import java.util.List;
@@ -50,7 +49,6 @@
  * @author <a href="mailto:[email protected]">Simone Tripodi</a>
  */
 @Named("jackson-writer")
-@Singleton
 public class JacksonWriterGenerator extends AbstractJacksonGenerator {
 
     private boolean requiresDomSupport;

modello-plugins/modello-plugin-java/src/main/java/org/codehaus/modello/plugin/java/JavaModelloGenerator.java

@@ -23,7 +23,6 @@
  */
 
 import javax.inject.Named;
-import javax.inject.Singleton;
 
 import java.io.IOException;
 import java.io.Serializable;
@@ -69,7 +68,6 @@
  * @author <a href="mailto:[email protected]">Jason van Zyl</a>
  */
 @Named("java")
-@Singleton
 public class JavaModelloGenerator extends AbstractJavaModelloGenerator {
 
     private Collection<String> immutableTypes = new HashSet<String>(Arrays.asList(new String[] {

modello-plugins/modello-plugin-jdom/src/main/java/org/codehaus/modello/plugin/jdom/JDOMWriterGenerator.java

@@ -17,7 +17,6 @@
 package org.codehaus.modello.plugin.jdom;
 
 import javax.inject.Named;
-import javax.inject.Singleton;
 
 import java.io.IOException;
 import java.util.ArrayList;
@@ -48,7 +47,6 @@
  * @author [email protected]
  */
 @Named("jdom-writer")
-@Singleton
 public class JDOMWriterGenerator extends AbstractJDOMGenerator {
 
     private boolean requiresDomSupport;

modello-plugins/modello-plugin-jsonschema/src/main/java/org/codehaus/modello/plugin/jsonschema/JsonSchemaGenerator.java

@@ -23,7 +23,6 @@
  */
 
 import javax.inject.Named;
-import javax.inject.Singleton;
 
 import java.io.File;
 import java.io.IOException;
@@ -52,7 +51,6 @@
  * @since 1.8
  */
 @Named("jsonschema")
-@Singleton
 public final class JsonSchemaGenerator extends AbstractXmlJavaGenerator {
 
     public void generate(Model model, Properties parameters) throws ModelloException {

modello-plugins/modello-plugin-sax/src/main/java/org/codehaus/modello/plugin/sax/SaxWriterGenerator.java

@@ -23,7 +23,6 @@
  */
 
 import javax.inject.Named;
-import javax.inject.Singleton;
 
 import java.io.IOException;
 import java.util.List;
@@ -55,7 +54,6 @@
  * @author <a href="mailto:[email protected]">Simone Tripodi</a>
  */
 @Named("sax-writer")
-@Singleton
 public class SaxWriterGenerator extends AbstractXmlJavaGenerator {
 
     private boolean requiresDomSupport;

modello-plugins/modello-plugin-snakeyaml/src/main/java/org/codehaus/modello/plugin/snakeyaml/SnakeYamlExtendedReaderGenerator.java

@@ -23,7 +23,6 @@
  */
 
 import javax.inject.Named;
-import javax.inject.Singleton;
 
 import org.codehaus.modello.model.ModelClass;
 
@@ -33,7 +32,6 @@
  * @author <a href="mailto:[email protected]">Simone Tripodi</a>
  */
 @Named("snakeyaml-extended-reader")
-@Singleton
 public class SnakeYamlExtendedReaderGenerator extends SnakeYamlReaderGenerator {
 
     @Override

modello-plugins/modello-plugin-snakeyaml/src/main/java/org/codehaus/modello/plugin/snakeyaml/SnakeYamlReaderGenerator.java

@@ -23,7 +23,6 @@
  */
 
 import javax.inject.Named;
-import javax.inject.Singleton;
 
 import java.io.IOException;
 import java.util.List;
@@ -53,7 +52,6 @@
  * @author <a href="mailto:[email protected]">Simone Tripodi</a>
  */
 @Named("snakeyaml-reader")
-@Singleton
 public class SnakeYamlReaderGenerator extends AbstractSnakeYamlGenerator {
 
     private static final String SOURCE_PARAM = "source";

modello-plugins/modello-plugin-snakeyaml/src/main/java/org/codehaus/modello/plugin/snakeyaml/SnakeYamlWriterGenerator.java

@@ -23,7 +23,6 @@
  */
 
 import javax.inject.Named;
-import javax.inject.Singleton;
 
 import java.io.IOException;
 import java.util.List;
@@ -50,7 +49,6 @@
  * @author <a href="mailto:[email protected]">Simone Tripodi</a>
  */
 @Named("snakeyaml-writer")
-@Singleton
 public class SnakeYamlWriterGenerator extends AbstractSnakeYamlGenerator {
 
     public void generate(Model model, Properties parameters) throws ModelloException {

modello-plugins/modello-plugin-stax/src/main/java/org/codehaus/modello/plugin/stax/StaxReaderGenerator.java

@@ -23,7 +23,6 @@
  */
 
 import javax.inject.Named;
-import javax.inject.Singleton;
 
 import java.io.IOException;
 import java.util.Arrays;
@@ -58,7 +57,6 @@
  * @author <a href="mailto:[email protected]">Emmanuel Venisse</a>
  */
 @Named("stax-reader")
-@Singleton
 public class StaxReaderGenerator extends AbstractStaxGenerator {
 
     private boolean requiresDomSupport;

modello-plugins/modello-plugin-stax/src/main/java/org/codehaus/modello/plugin/stax/StaxSerializerGenerator.java

@@ -23,7 +23,6 @@
  */
 
 import javax.inject.Named;
-import javax.inject.Singleton;
 
 import java.io.IOException;
 import java.util.ArrayList;
@@ -48,7 +47,6 @@
  * @author Benjamin Bentmann
  */
 @Named("stax-serializer")
-@Singleton
 public class StaxSerializerGenerator extends AbstractStaxGenerator {
 
     public void generate(Model model, Properties parameters) throws ModelloException {

modello-plugins/modello-plugin-stax/src/main/java/org/codehaus/modello/plugin/stax/StaxWriterGenerator.java

@@ -24,7 +24,6 @@
 
 import javax.inject.Inject;
 import javax.inject.Named;
-import javax.inject.Singleton;
 
 import java.io.IOException;
 import java.util.List;
@@ -55,7 +54,6 @@
  * @author <a href="mailto:[email protected]">Emmanuel Venisse </a>
  */
 @Named("stax-writer")
-@Singleton
 public class StaxWriterGenerator extends AbstractStaxGenerator {
 
     private boolean requiresDomSupport;

modello-plugins/modello-plugin-xpp3/src/main/java/org/codehaus/modello/plugin/xpp3/Xpp3ExtendedReaderGenerator.java

@@ -23,7 +23,6 @@
  */
 
 import javax.inject.Named;
-import javax.inject.Singleton;
 
 import org.codehaus.modello.model.ModelClass;
 
@@ -33,7 +32,6 @@
  * @author Benjamin Bentmann
  */
 @Named("xpp3-extended-reader")
-@Singleton
 public class Xpp3ExtendedReaderGenerator extends Xpp3ReaderGenerator {
 
     @Override

modello-plugins/modello-plugin-xpp3/src/main/java/org/codehaus/modello/plugin/xpp3/Xpp3ExtendedWriterGenerator.java

@@ -23,7 +23,6 @@
  */
 
 import javax.inject.Named;
-import javax.inject.Singleton;
 
 import org.codehaus.modello.plugin.java.javasource.JClass;
 import org.codehaus.modello.plugin.java.javasource.JField;
@@ -39,7 +38,6 @@
  * @since 1.10
  */
 @Named("xpp3-extended-writer")
-@Singleton
 public class Xpp3ExtendedWriterGenerator extends Xpp3WriterGenerator {
     @Override
     protected boolean isLocationTracking() {

modello-plugins/modello-plugin-xpp3/src/main/java/org/codehaus/modello/plugin/xpp3/Xpp3ReaderGenerator.java

@@ -23,7 +23,6 @@
  */
 
 import javax.inject.Named;
-import javax.inject.Singleton;
 
 import java.io.IOException;
 import java.util.List;
@@ -58,7 +57,6 @@
  * @author <a href="mailto:[email protected]">Emmanuel Venisse</a>
  */
 @Named("xpp3-reader")
-@Singleton
 public class Xpp3ReaderGenerator extends AbstractXpp3Generator {
 
     private static final String SOURCE_PARAM = "source";

modello-plugins/modello-plugin-xpp3/src/main/java/org/codehaus/modello/plugin/xpp3/Xpp3WriterGenerator.java

@@ -23,7 +23,6 @@
  */
 
 import javax.inject.Named;
-import javax.inject.Singleton;
 
 import java.io.IOException;
 import java.util.List;
@@ -54,7 +53,6 @@
  * @author <a href="mailto:[email protected]">Emmanuel Venisse </a>
  */
 @Named("xpp3-writer")
-@Singleton
 public class Xpp3WriterGenerator extends AbstractXpp3Generator {
     private String extendedClassnameSuffix;
 

modello-plugins/modello-plugin-xsd/src/main/java/org/codehaus/modello/plugin/xsd/XsdGenerator.java

@@ -23,7 +23,6 @@
  */
 
 import javax.inject.Named;
-import javax.inject.Singleton;
 
 import java.io.File;
 import java.io.IOException;
@@ -52,7 +51,6 @@
  * @author <a href="mailto:[email protected]">Brett Porter</a>
  */
 @Named("xsd")
-@Singleton
 public class XsdGenerator extends AbstractXmlGenerator {
     /**
      * Value standing for any element name (used on xml.tagName)