svn commit: r1549740 - /archiva/trunk/archiva-cli/src/main/java/org/apache/archiva/cli/ArchivaCli.java

[ol...@apache.org]

Author: olamy
Date: Tue Dec 10 02:03:04 2013
New Revision: 1549740

URL: http://svn.apache.org/r1549740
Log:
prevent casting

Modified:
    archiva/trunk/archiva-cli/src/main/java/org/apache/archiva/cli/ArchivaCli.java

Modified: archiva/trunk/archiva-cli/src/main/java/org/apache/archiva/cli/ArchivaCli.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-cli/src/main/java/org/apache/archiva/cli/ArchivaCli.java?rev=1549740&r1=1549739&r2=1549740&view=diff
==============================================================================
--- archiva/trunk/archiva-cli/src/main/java/org/apache/archiva/cli/ArchivaCli.java (original)
+++ archiva/trunk/archiva-cli/src/main/java/org/apache/archiva/cli/ArchivaCli.java Tue Dec 10 02:03:04 2013
@@ -161,8 +161,8 @@ public class ArchivaCli
     {
         // hack around poorly configurable project builder by pointing all repositories back at this location to be self
         // contained
-        PlexusSisuBridge plexusSisuBridge = applicationContext.getBean( PlexusSisuBridge.class );
-        WagonManager wagonManager = plexusSisuBridge.lookup( WagonManager.class );
+
+        WagonManager wagonManager = lookup( WagonManager.class );
         wagonManager.addMirror( "internal", "*", new File( path ).toURL().toExternalForm() );
 
         ManagedRepository repo = new ManagedRepository();
@@ -179,7 +179,7 @@ public class ArchivaCli
         List<String> ignoredContent = new ArrayList<String>();
         ignoredContent.addAll( Arrays.asList( RepositoryScanner.IGNORABLE_CONTENT ) );
 
-        RepositoryScanner scanner = (RepositoryScanner) lookup( RepositoryScanner.class );
+        RepositoryScanner scanner = lookup( RepositoryScanner.class );
 
         try
         {
@@ -194,7 +194,7 @@ public class ArchivaCli
         }
     }
 
-    private Object lookup( Class<?> clazz )
+    private <T>T lookup( Class<T> clazz )
         throws PlexusSisuBridgeException
     {
         PlexusSisuBridge plexusSisuBridge = applicationContext.getBean( PlexusSisuBridge.class );
@@ -232,8 +232,8 @@ public class ArchivaCli
 
         for ( Map.Entry<String, KnownRepositoryContentConsumer> entry : availableConsumers.entrySet() )
         {
-            String consumerHint = (String) entry.getKey();
-            RepositoryContentConsumer consumer = (RepositoryContentConsumer) entry.getValue();
+            String consumerHint = entry.getKey();
+            RepositoryContentConsumer consumer = entry.getValue();
             System.out.println(
                 "  " + consumerHint + ": " + consumer.getDescription() + " (" + consumer.getClass().getName() + ")" );
         }
@@ -262,8 +262,7 @@ public class ArchivaCli
     private void doConversion( String properties )
         throws FileNotFoundException, IOException, RepositoryConversionException, PlexusSisuBridgeException
     {
-        LegacyRepositoryConverter legacyRepositoryConverter =
-            (LegacyRepositoryConverter) lookup( LegacyRepositoryConverter.class );
+        LegacyRepositoryConverter legacyRepositoryConverter = lookup( LegacyRepositoryConverter.class );
 
         Properties p = new Properties();