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

codehaus-plexus · Feb 17, 2024 · 9a4a130 · 9a4a130
1 parent b128a31
commit 9a4a130
Show file tree

Hide file tree

Showing 20 changed files with 0 additions and 40 deletions.
diff --git a/...n-converters/src/main/java/org/codehaus/modello/plugin/converters/ConverterGenerator.java b/...n-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);

diff --git a/...lo-plugin-dom4j/src/main/java/org/codehaus/modello/plugin/dom4j/Dom4jReaderGenerator.java b/...lo-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:brett@codehaus.org">Brett Porter</a>
  */
 @Named("dom4j-reader")
-@Singleton
 public class Dom4jReaderGenerator extends AbstractXmlJavaGenerator {
 
     private boolean requiresDomSupport;

diff --git a/...lo-plugin-dom4j/src/main/java/org/codehaus/modello/plugin/dom4j/Dom4jWriterGenerator.java b/...lo-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:brett@codehaus.org">Brett Porter</a>
  */
 @Named("dom4j-writer")
-@Singleton
 public class Dom4jWriterGenerator extends AbstractXmlJavaGenerator {
 
     private boolean requiresDomSupport;

diff --git a/...gin-jackson/src/main/java/org/codehaus/modello/plugin/jackson/JacksonReaderGenerator.java b/...gin-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:simonetripodi@apache.org">Simone Tripodi</a>
  */
 @Named("jackson-reader")
-@Singleton
 public class JacksonReaderGenerator extends AbstractJacksonGenerator {
 
     private static final String SOURCE_PARAM = "source";

diff --git a/...gin-jackson/src/main/java/org/codehaus/modello/plugin/jackson/JacksonWriterGenerator.java b/...gin-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:simonetripodi@apache.org">Simone Tripodi</a>
  */
 @Named("jackson-writer")
-@Singleton
 public class JacksonWriterGenerator extends AbstractJacksonGenerator {
 
     private boolean requiresDomSupport;

diff --git a/...ello-plugin-java/src/main/java/org/codehaus/modello/plugin/java/JavaModelloGenerator.java b/...ello-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:jason@modello.org">Jason van Zyl</a>
  */
 @Named("java")
-@Singleton
 public class JavaModelloGenerator extends AbstractJavaModelloGenerator {
 
     private Collection<String> immutableTypes = new HashSet<String>(Arrays.asList(new String[] {

diff --git a/...dello-plugin-jdom/src/main/java/org/codehaus/modello/plugin/jdom/JDOMWriterGenerator.java b/...dello-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 mkleint@codehaus.org
  */
 @Named("jdom-writer")
-@Singleton
 public class JDOMWriterGenerator extends AbstractJDOMGenerator {
 
     private boolean requiresDomSupport;

diff --git a/...-jsonschema/src/main/java/org/codehaus/modello/plugin/jsonschema/JsonSchemaGenerator.java b/...-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 {

diff --git a/.../modello-plugin-sax/src/main/java/org/codehaus/modello/plugin/sax/SaxWriterGenerator.java b/.../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:simonetripodi@apache.org">Simone Tripodi</a>
  */
 @Named("sax-writer")
-@Singleton
 public class SaxWriterGenerator extends AbstractXmlJavaGenerator {
 
     private boolean requiresDomSupport;

diff --git a/...src/main/java/org/codehaus/modello/plugin/snakeyaml/SnakeYamlExtendedReaderGenerator.java b/...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:simonetripodi@apache.org">Simone Tripodi</a>
  */
 @Named("snakeyaml-extended-reader")
-@Singleton
 public class SnakeYamlExtendedReaderGenerator extends SnakeYamlReaderGenerator {
 
     @Override

diff --git a/...akeyaml/src/main/java/org/codehaus/modello/plugin/snakeyaml/SnakeYamlReaderGenerator.java b/...akeyaml/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:simonetripodi@apache.org">Simone Tripodi</a>
  */
 @Named("snakeyaml-reader")
-@Singleton
 public class SnakeYamlReaderGenerator extends AbstractSnakeYamlGenerator {
 
     private static final String SOURCE_PARAM = "source";

diff --git a/...akeyaml/src/main/java/org/codehaus/modello/plugin/snakeyaml/SnakeYamlWriterGenerator.java b/...akeyaml/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:simonetripodi@apache.org">Simone Tripodi</a>
  */
 @Named("snakeyaml-writer")
-@Singleton
 public class SnakeYamlWriterGenerator extends AbstractSnakeYamlGenerator {
 
     public void generate(Model model, Properties parameters) throws ModelloException {

diff --git a/...dello-plugin-stax/src/main/java/org/codehaus/modello/plugin/stax/StaxReaderGenerator.java b/...dello-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:evenisse@codehaus.org">Emmanuel Venisse</a>
  */
 @Named("stax-reader")
-@Singleton
 public class StaxReaderGenerator extends AbstractStaxGenerator {
 
     private boolean requiresDomSupport;

diff --git a/...o-plugin-stax/src/main/java/org/codehaus/modello/plugin/stax/StaxSerializerGenerator.java b/...o-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 {

diff --git a/...dello-plugin-stax/src/main/java/org/codehaus/modello/plugin/stax/StaxWriterGenerator.java b/...dello-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:evenisse@codehaus.org">Emmanuel Venisse </a>
  */
 @Named("stax-writer")
-@Singleton
 public class StaxWriterGenerator extends AbstractStaxGenerator {
 
     private boolean requiresDomSupport;

diff --git a/...ugin-xpp3/src/main/java/org/codehaus/modello/plugin/xpp3/Xpp3ExtendedReaderGenerator.java b/...ugin-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

diff --git a/...ugin-xpp3/src/main/java/org/codehaus/modello/plugin/xpp3/Xpp3ExtendedWriterGenerator.java b/...ugin-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() {

diff --git a/...dello-plugin-xpp3/src/main/java/org/codehaus/modello/plugin/xpp3/Xpp3ReaderGenerator.java b/...dello-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:evenisse@codehaus.org">Emmanuel Venisse</a>
  */
 @Named("xpp3-reader")
-@Singleton
 public class Xpp3ReaderGenerator extends AbstractXpp3Generator {
 
     private static final String SOURCE_PARAM = "source";

diff --git a/...dello-plugin-xpp3/src/main/java/org/codehaus/modello/plugin/xpp3/Xpp3WriterGenerator.java b/...dello-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:evenisse@codehaus.org">Emmanuel Venisse </a>
  */
 @Named("xpp3-writer")
-@Singleton
 public class Xpp3WriterGenerator extends AbstractXpp3Generator {
     private String extendedClassnameSuffix;
 

diff --git a/...lugins/modello-plugin-xsd/src/main/java/org/codehaus/modello/plugin/xsd/XsdGenerator.java b/...lugins/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:brett@codehaus.org">Brett Porter</a>
  */
 @Named("xsd")
-@Singleton
 public class XsdGenerator extends AbstractXmlGenerator {
     /**
      * Value standing for any element name (used on xml.tagName)