codehaus-plexus · slawekjaranowski · Jan 21, 2024 · Jan 15, 2024
diff --git a/modello-core/src/main/java/org/codehaus/modello/core/DefaultGeneratorPluginManager.java b/modello-core/src/main/java/org/codehaus/modello/core/DefaultGeneratorPluginManager.java
@@ -22,21 +22,25 @@
  * SOFTWARE.
  */
 
+import javax.inject.Inject;
+import javax.inject.Named;
+import javax.inject.Singleton;
+
 import java.util.Map;
 
 import org.codehaus.modello.ModelloRuntimeException;
 import org.codehaus.modello.plugin.AbstractPluginManager;
 import org.codehaus.modello.plugin.ModelloGenerator;
-import org.codehaus.plexus.component.annotations.Component;
-import org.codehaus.plexus.component.annotations.Requirement;
 
 /**
  * @author <a href="mailto:trygvis@inamo.no">Trygve Laugst&oslash;l</a>
  */
-@Component(role = GeneratorPluginManager.class)
+@Named
+@Singleton
 public class DefaultGeneratorPluginManager extends AbstractPluginManager<ModelloGenerator>
         implements GeneratorPluginManager {
-    @Requirement
+
+    @Inject
     private Map<String, ModelloGenerator> plugins;
 
     public Map<String, ModelloGenerator> getPlugins() {

diff --git a/modello-core/src/main/java/org/codehaus/modello/core/DefaultMetadataPluginManager.java b/modello-core/src/main/java/org/codehaus/modello/core/DefaultMetadataPluginManager.java
@@ -22,21 +22,25 @@
  * SOFTWARE.
  */
 
+import javax.inject.Inject;
+import javax.inject.Named;
+import javax.inject.Singleton;
+
 import java.util.Map;
 
 import org.codehaus.modello.ModelloRuntimeException;
 import org.codehaus.modello.metadata.MetadataPlugin;
 import org.codehaus.modello.plugin.AbstractPluginManager;
-import org.codehaus.plexus.component.annotations.Component;
-import org.codehaus.plexus.component.annotations.Requirement;
 
 /**
  * @author <a href="mailto:trygvis@inamo.no">Trygve Laugst&oslash;l</a>
  */
-@Component(role = MetadataPluginManager.class)
+@Named
+@Singleton
 public class DefaultMetadataPluginManager extends AbstractPluginManager<MetadataPlugin>
         implements MetadataPluginManager {
-    @Requirement
+
+    @Inject
     private Map<String, MetadataPlugin> plugins;
 
     public Map<String, MetadataPlugin> getPlugins() {

diff --git a/modello-core/src/main/java/org/codehaus/modello/core/DefaultModelloCore.java b/modello-core/src/main/java/org/codehaus/modello/core/DefaultModelloCore.java
@@ -22,6 +22,10 @@
  * SOFTWARE.
  */
 
+import javax.inject.Inject;
+import javax.inject.Named;
+import javax.inject.Singleton;
+
 import java.io.File;
 import java.io.IOException;
 import java.io.Reader;
@@ -49,20 +53,20 @@
 import org.codehaus.modello.model.ModelInterface;
 import org.codehaus.modello.model.ModelValidationException;
 import org.codehaus.modello.plugin.ModelloGenerator;
-import org.codehaus.plexus.component.annotations.Component;
-import org.codehaus.plexus.component.annotations.Requirement;
 import org.codehaus.plexus.util.ReaderFactory;
 
 /**
  * @author <a href="mailto:trygvis@inamo.no">Trygve Laugst&oslash;l</a>
  * @author <a href="mailto:evenisse@codehaus.org">Emmanuel Venisse</a>
  */
-@Component(role = ModelloCore.class)
+@Named
+@Singleton
 public class DefaultModelloCore extends AbstractModelloCore {
-    @Requirement
+
+    @Inject
     private MetadataPluginManager metadataPluginManager;
 
-    @Requirement
+    @Inject
     private GeneratorPluginManager generatorPluginManager;
 
     public MetadataPluginManager getMetadataPluginManager() {

diff --git a/modello-core/src/main/java/org/codehaus/modello/plugin/model/ModelMetadataPlugin.java b/modello-core/src/main/java/org/codehaus/modello/plugin/model/ModelMetadataPlugin.java
@@ -22,6 +22,9 @@
  * SOFTWARE.
  */
 
+import javax.inject.Named;
+import javax.inject.Singleton;
+
 import java.util.Map;
 
 import org.codehaus.modello.metadata.AbstractMetadataPlugin;
@@ -36,12 +39,12 @@
 import org.codehaus.modello.model.ModelClass;
 import org.codehaus.modello.model.ModelField;
 import org.codehaus.modello.model.ModelInterface;
-import org.codehaus.plexus.component.annotations.Component;
 
 /**
  * @author <a href="mailto:evenisse@codehaus.org">Emmanuel Venisse</a>
  */
-@Component(role = MetadataPlugin.class, hint = "model")
+@Named("model")
+@Singleton
 public class ModelMetadataPlugin extends AbstractMetadataPlugin implements MetadataPlugin {
     public static final String ROOT_ELEMENT = "rootElement";
 

diff --git a/modello-core/src/test/java/org/codehaus/modello/core/DefaultModelloCoreTest.java b/modello-core/src/test/java/org/codehaus/modello/core/DefaultModelloCoreTest.java
@@ -23,6 +23,8 @@
  */
 
 import org.codehaus.modello.ModelloRuntimeException;
+import org.codehaus.plexus.ContainerConfiguration;
+import org.codehaus.plexus.PlexusConstants;
 import org.codehaus.plexus.PlexusTestCase;
 
 /**
@@ -70,4 +72,10 @@ public void testRecursion() throws Exception {
 
         modello.loadModel(getTestFile("src/test/resources/models/recursion.mdo"));
     }
+
+    @Override
+    protected void customizeContainerConfiguration(ContainerConfiguration configuration) {
+        configuration.setAutoWiring(true);
+        configuration.setClassPathScanning(PlexusConstants.SCANNING_INDEX);
+    }
 }
diff --git a/modello-core/src/test/java/org/codehaus/modello/core/io/ModelReaderTest.java b/modello-core/src/test/java/org/codehaus/modello/core/io/ModelReaderTest.java
@@ -31,6 +31,8 @@
 import org.codehaus.modello.model.ModelField;
 import org.codehaus.modello.model.Version;
 import org.codehaus.modello.model.VersionRange;
+import org.codehaus.plexus.ContainerConfiguration;
+import org.codehaus.plexus.PlexusConstants;
 import org.codehaus.plexus.PlexusTestCase;
 
 /**
@@ -164,4 +166,10 @@ private void assertGirlAge(Object ageObject) {
 
         assertEquals("int", age.getType());
     }
+
+    @Override
+    protected void customizeContainerConfiguration(ContainerConfiguration configuration) {
+        configuration.setAutoWiring(true);
+        configuration.setClassPathScanning(PlexusConstants.SCANNING_INDEX);
+    }
 }
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
@@ -22,6 +22,9 @@
  * SOFTWARE.
  */
 
+import javax.inject.Named;
+import javax.inject.Singleton;
+
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Collections;
@@ -38,7 +41,6 @@
 import org.codehaus.modello.model.ModelField;
 import org.codehaus.modello.model.Version;
 import org.codehaus.modello.model.VersionDefinition;
-import org.codehaus.modello.plugin.ModelloGenerator;
 import org.codehaus.modello.plugin.java.AbstractJavaModelloGenerator;
 import org.codehaus.modello.plugin.java.javasource.JClass;
 import org.codehaus.modello.plugin.java.javasource.JInterface;
@@ -50,13 +52,13 @@
 import org.codehaus.modello.plugin.java.javasource.JType;
 import org.codehaus.modello.plugin.java.metadata.JavaClassMetadata;
 import org.codehaus.modello.plugin.java.metadata.JavaFieldMetadata;
-import org.codehaus.plexus.component.annotations.Component;
 import org.codehaus.plexus.util.IOUtil;
 
 /**
  * Generate a basic conversion class between two versions of a model.
  */
-@Component(role = ModelloGenerator.class, hint = "converters")
+@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
@@ -22,6 +22,9 @@
  * SOFTWARE.
  */
 
+import javax.inject.Named;
+import javax.inject.Singleton;
+
 import java.io.IOException;
 import java.util.List;
 import java.util.Properties;
@@ -32,7 +35,6 @@
 import org.codehaus.modello.model.ModelClass;
 import org.codehaus.modello.model.ModelDefault;
 import org.codehaus.modello.model.ModelField;
-import org.codehaus.modello.plugin.ModelloGenerator;
 import org.codehaus.modello.plugin.java.javasource.JClass;
 import org.codehaus.modello.plugin.java.javasource.JMethod;
 import org.codehaus.modello.plugin.java.javasource.JParameter;
@@ -42,7 +44,6 @@
 import org.codehaus.modello.plugins.xml.AbstractXmlJavaGenerator;
 import org.codehaus.modello.plugins.xml.metadata.XmlAssociationMetadata;
 import org.codehaus.modello.plugins.xml.metadata.XmlFieldMetadata;
-import org.codehaus.plexus.component.annotations.Component;
 import org.codehaus.plexus.util.StringUtils;
 
 /**
@@ -51,7 +52,8 @@
  *
  * @author <a href="mailto:brett@codehaus.org">Brett Porter</a>
  */
-@Component(role = ModelloGenerator.class, hint = "dom4j-reader")
+@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
@@ -22,6 +22,9 @@
  * SOFTWARE.
  */
 
+import javax.inject.Named;
+import javax.inject.Singleton;
+
 import java.io.IOException;
 import java.util.List;
 import java.util.Properties;
@@ -32,7 +35,6 @@
 import org.codehaus.modello.model.ModelClass;
 import org.codehaus.modello.model.ModelDefault;
 import org.codehaus.modello.model.ModelField;
-import org.codehaus.modello.plugin.ModelloGenerator;
 import org.codehaus.modello.plugin.java.javasource.JClass;
 import org.codehaus.modello.plugin.java.javasource.JMethod;
 import org.codehaus.modello.plugin.java.javasource.JParameter;
@@ -44,7 +46,6 @@
 import org.codehaus.modello.plugins.xml.metadata.XmlAssociationMetadata;
 import org.codehaus.modello.plugins.xml.metadata.XmlFieldMetadata;
 import org.codehaus.modello.plugins.xml.metadata.XmlModelMetadata;
-import org.codehaus.plexus.component.annotations.Component;
 
 /**
  * <p>
@@ -54,7 +55,8 @@
  *
  * @author <a href="mailto:brett@codehaus.org">Brett Porter</a>
  */
-@Component(role = ModelloGenerator.class, hint = "dom4j-writer")
+@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
@@ -22,6 +22,9 @@
  * SOFTWARE.
  */
 
+import javax.inject.Named;
+import javax.inject.Singleton;
+
 import java.io.IOException;
 import java.util.List;
 import java.util.Properties;
@@ -32,7 +35,6 @@
 import org.codehaus.modello.model.ModelClass;
 import org.codehaus.modello.model.ModelDefault;
 import org.codehaus.modello.model.ModelField;
-import org.codehaus.modello.plugin.ModelloGenerator;
 import org.codehaus.modello.plugin.java.javasource.JClass;
 import org.codehaus.modello.plugin.java.javasource.JConstructor;
 import org.codehaus.modello.plugin.java.javasource.JField;
@@ -47,13 +49,13 @@
 import org.codehaus.modello.plugins.xml.metadata.XmlAssociationMetadata;
 import org.codehaus.modello.plugins.xml.metadata.XmlClassMetadata;
 import org.codehaus.modello.plugins.xml.metadata.XmlFieldMetadata;
-import org.codehaus.plexus.component.annotations.Component;
 import org.codehaus.plexus.util.StringUtils;
 
 /**
  * @author <a href="mailto:simonetripodi@apache.org">Simone Tripodi</a>
  */
-@Component(role = ModelloGenerator.class, hint = "jackson-reader")
+@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
@@ -22,6 +22,9 @@
  * SOFTWARE.
  */
 
+import javax.inject.Named;
+import javax.inject.Singleton;
+
 import java.io.IOException;
 import java.util.List;
 import java.util.Properties;
@@ -32,7 +35,6 @@
 import org.codehaus.modello.model.ModelClass;
 import org.codehaus.modello.model.ModelDefault;
 import org.codehaus.modello.model.ModelField;
-import org.codehaus.modello.plugin.ModelloGenerator;
 import org.codehaus.modello.plugin.java.javasource.JClass;
 import org.codehaus.modello.plugin.java.javasource.JConstructor;
 import org.codehaus.modello.plugin.java.javasource.JField;
@@ -43,12 +45,12 @@
 import org.codehaus.modello.plugin.java.metadata.JavaFieldMetadata;
 import org.codehaus.modello.plugins.xml.metadata.XmlAssociationMetadata;
 import org.codehaus.modello.plugins.xml.metadata.XmlFieldMetadata;
-import org.codehaus.plexus.component.annotations.Component;
 
 /**
  * @author <a href="mailto:simonetripodi@apache.org">Simone Tripodi</a>
  */
-@Component(role = ModelloGenerator.class, hint = "jackson-writer")
+@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
@@ -22,6 +22,9 @@
  * SOFTWARE.
  */
 
+import javax.inject.Named;
+import javax.inject.Singleton;
+
 import java.io.IOException;
 import java.io.Serializable;
 import java.util.Arrays;
@@ -41,7 +44,6 @@
 import org.codehaus.modello.model.ModelDefault;
 import org.codehaus.modello.model.ModelField;
 import org.codehaus.modello.model.ModelInterface;
-import org.codehaus.modello.plugin.ModelloGenerator;
 import org.codehaus.modello.plugin.java.javasource.JArrayType;
 import org.codehaus.modello.plugin.java.javasource.JClass;
 import org.codehaus.modello.plugin.java.javasource.JCollectionType;
@@ -60,13 +62,13 @@
 import org.codehaus.modello.plugin.java.metadata.JavaClassMetadata;
 import org.codehaus.modello.plugin.java.metadata.JavaFieldMetadata;
 import org.codehaus.modello.plugin.model.ModelClassMetadata;
-import org.codehaus.plexus.component.annotations.Component;
 import org.codehaus.plexus.util.StringUtils;
 
 /**
  * @author <a href="mailto:jason@modello.org">Jason van Zyl</a>
  */
-@Component(role = ModelloGenerator.class, hint = "java")
+@Named("java")
+@Singleton
 public class JavaModelloGenerator extends AbstractJavaModelloGenerator {
 
     private Collection<String> immutableTypes = new HashSet<String>(Arrays.asList(new String[] {

diff --git a/...ugin-java/src/main/java/org/codehaus/modello/plugin/java/metadata/JavaMetadataPlugin.java b/...ugin-java/src/main/java/org/codehaus/modello/plugin/java/metadata/JavaMetadataPlugin.java
@@ -22,6 +22,9 @@
  * SOFTWARE.
  */
 
+import javax.inject.Named;
+import javax.inject.Singleton;
+
 import java.util.Map;
 
 import org.codehaus.modello.metadata.AbstractMetadataPlugin;
@@ -36,12 +39,12 @@
 import org.codehaus.modello.model.ModelClass;
 import org.codehaus.modello.model.ModelField;
 import org.codehaus.modello.model.ModelInterface;
-import org.codehaus.plexus.component.annotations.Component;
 
 /**
  * @author <a href="mailto:evenisse@codehaus.org">Emmanuel Venisse </a>
  */
-@Component(role = MetadataPlugin.class, hint = "java")
+@Named("java")
+@Singleton
 public class JavaMetadataPlugin extends AbstractMetadataPlugin implements MetadataPlugin {
     public static final String JAVA_ABSTRACT = "java.abstract";