Apply generics

Switch to plexus annotations

Author: rfscholte

pom.xml

@@ -9,7 +9,7 @@
   </parent>
 
   <artifactId>plexus-resources</artifactId>
-  <version>1.0.2-SNAPSHOT</version>
+  <version>1.1.0-SNAPSHOT</version>
 
   <name>Plexus Resource Component</name>
   <description>A component to transparently retrieve resources from the filesystem, classpath or internet.</description>
@@ -40,6 +40,11 @@
       <groupId>org.codehaus.plexus</groupId>
       <artifactId>plexus-container-default</artifactId>
     </dependency>
+    <dependency>
+      <groupId>org.codehaus.plexus</groupId>
+      <artifactId>plexus-component-annotations</artifactId>
+      <optional>true</optional>
+    </dependency>
 
     <!-- TEST -->
     <dependency>

src/main/java/org/codehaus/plexus/resource/DefaultResourceManager.java

@@ -24,6 +24,9 @@
  * SOFTWARE.
  */
 
+import org.codehaus.plexus.component.annotations.Component;
+import org.codehaus.plexus.component.annotations.Requirement;
+
 import org.codehaus.plexus.logging.AbstractLogEnabled;
 import org.codehaus.plexus.resource.loader.FileResourceCreationException;
 import org.codehaus.plexus.resource.loader.ResourceIOException;
@@ -37,24 +40,21 @@
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
-import java.util.Iterator;
 import java.util.Map;
 
 /**
  * @author <a href="mailto:[email protected]">Trygve Laugst&oslash;l</a>
  * @author Jason van Zyl
  * @version $Id$
- * @plexus.component instantiation-strategy="per-lookup"
  */
+@Component( role = ResourceManager.class, instantiationStrategy = "per-lookup" )
 public class DefaultResourceManager
     extends AbstractLogEnabled
     implements ResourceManager
 {
+    @Requirement( role = ResourceLoader.class )
+    private Map<String, ResourceLoader> resourceLoaders;
 
-    /** @plexus.requirement role="org.codehaus.plexus.resource.loader.ResourceLoader" */
-    private Map resourceLoaders;
-
-    /** @plexus.configuration */
     private File outputDirectory;
 
     // ----------------------------------------------------------------------
@@ -150,10 +150,8 @@ public void addSearchPath( String id, String path )
     public PlexusResource getResource( String name )
         throws ResourceNotFoundException
     {
-        for ( Iterator i = resourceLoaders.values().iterator(); i.hasNext(); )
+        for ( ResourceLoader resourceLoader : resourceLoaders.values() )
         {
-            ResourceLoader resourceLoader = (ResourceLoader) i.next();
-
             try
             {
                 PlexusResource resource = resourceLoader.getResource( name );

src/main/java/org/codehaus/plexus/resource/loader/AbstractResourceLoader.java

@@ -40,8 +40,7 @@ public abstract class AbstractResourceLoader
     extends AbstractLogEnabled
     implements ResourceLoader
 {
-    /** @configuration */
-    protected List paths = new ArrayList();
+    protected List<String> paths = new ArrayList<String>();
 
     public void addSearchPath( String path )
     {

src/main/java/org/codehaus/plexus/resource/loader/FileResourceLoader.java

@@ -26,8 +26,8 @@
 
 import java.io.File;
 import java.io.IOException;
-import java.util.Iterator;
 
+import org.codehaus.plexus.component.annotations.Component;
 import org.codehaus.plexus.resource.PlexusResource;
 import org.codehaus.plexus.resource.loader.AbstractResourceLoader;
 import org.codehaus.plexus.resource.loader.ResourceNotFoundException;
@@ -37,8 +37,8 @@
  * @author <a href="mailto:[email protected]">Trygve Laugst&oslash;l</a>
  * @author Jason van Zyl
  * @version $Id$
- * @plexus.component role-hint="file" instantiation-strategy="per-lookup"
  */
+@Component( role = ResourceLoader.class, hint = "file", instantiationStrategy = "per-lookup" )
 public class FileResourceLoader
     extends AbstractResourceLoader
 {
@@ -51,10 +51,8 @@ public class FileResourceLoader
     public PlexusResource getResource( String name )
         throws ResourceNotFoundException
     {
-        for ( Iterator it = paths.iterator(); it.hasNext(); )
+        for ( String path : paths )
         {
-            String path = (String) it.next();
-
             final File file = new File( path, name );
 
             if ( file.canRead() )

src/main/java/org/codehaus/plexus/resource/loader/JarHolder.java

@@ -121,11 +121,11 @@ public InputStream getResource( String theentry )
 
     public Hashtable getEntries()
     {
-        Hashtable allEntries = new Hashtable( 559 );
+        Hashtable<String, String> allEntries = new Hashtable<String, String>( 559 );
 
         if ( theJar != null )
         {
-            Enumeration all = theJar.entries();
+            Enumeration<JarEntry> all = theJar.entries();
 
             while ( all.hasMoreElements() )
             {

src/main/java/org/codehaus/plexus/resource/loader/JarResourceLoader.java

@@ -1,5 +1,7 @@
 package org.codehaus.plexus.resource.loader;
 
+import org.codehaus.plexus.component.annotations.Component;
+
 /*
  * The MIT License
  *
@@ -32,8 +34,8 @@
 
 /**
  * @author Jason van Zyl
- * @plexus.component role-hint="jar" instantiation-strategy="per-lookup"
  */
+@Component( role = ResourceLoader.class, hint = "jar", instantiationStrategy = "per-lookup" )
 public class JarResourceLoader
     extends AbstractResourceLoader
 {
@@ -47,7 +49,7 @@ public class JarResourceLoader
     /**
      * Maps JAR URLs to the actual JAR (key = the JAR URL, value = the JAR).
      */
-    private Map jarfiles = new LinkedHashMap( 89 );
+    private Map<String, JarHolder> jarfiles = new LinkedHashMap<String, JarHolder>( 89 );
 
     private boolean initializeCalled;
 

src/main/java/org/codehaus/plexus/resource/loader/ThreadContextClasspathResourceLoader.java

@@ -26,15 +26,16 @@
 
 import java.net.URL;
 
+import org.codehaus.plexus.component.annotations.Component;
 import org.codehaus.plexus.resource.PlexusResource;
 import org.codehaus.plexus.resource.loader.AbstractResourceLoader;
 import org.codehaus.plexus.resource.loader.ResourceNotFoundException;
 
 /**
  * @author <a href="mailto:[email protected]">Trygve Laugst&oslash;l</a>
  * @version $Id$
- * @plexus.component role-hint="classloader"
  */
+@Component( role = ResourceLoader.class, hint = "classloader" )
 public class ThreadContextClasspathResourceLoader
     extends AbstractResourceLoader
 {

src/main/java/org/codehaus/plexus/resource/loader/URLResourceLoader.java

@@ -29,22 +29,22 @@
 import java.net.MalformedURLException;
 import java.net.URL;
 import java.util.HashMap;
-import java.util.Iterator;
 import java.util.Map;
 
+import org.codehaus.plexus.component.annotations.Component;
 import org.codehaus.plexus.resource.PlexusResource;
 
 /**
  * @author Jason van Zyl
- * @plexus.component role-hint="url" instantiation-strategy="per-lookup"
  */
+@Component( role = ResourceLoader.class, hint = "url", instantiationStrategy = "per-lookup" )
 public class URLResourceLoader
     extends AbstractResourceLoader
 {
 
     public static final String ID = "url";
 
-    protected Map templateRoots = new HashMap();
+    protected Map<String, String> templateRoots = new HashMap<String, String>();
 
     /**
      * Get an InputStream so that the Runtime can build a template with it.
@@ -61,10 +61,8 @@ public PlexusResource getResource( String name )
             throw new ResourceNotFoundException( "URLResourceLoader : No template name provided" );
         }
 
-        for ( Iterator i = paths.iterator(); i.hasNext(); )
+        for ( String path : paths )
         {
-            String path = (String) i.next();
-
             try
             {
                 URL u = new URL( path + name );