diff options
author | Olivier Lamy <olamy@apache.org> | 2014-04-10 23:11:38 +1000 |
---|---|---|
committer | Olivier Lamy <olamy@apache.org> | 2014-04-10 23:11:38 +1000 |
commit | d6c28781b0b0f9de8142c8b96b810ab6c415cb26 (patch) | |
tree | 99e10f3e0058db84f706d5dc5998a64e75357e98 /archiva-cli | |
parent | b244153061054a1efd45e2d07d69b751070660f2 (diff) | |
download | archiva-d6c28781b0b0f9de8142c8b96b810ab6c415cb26.tar.gz archiva-d6c28781b0b0f9de8142c8b96b810ab6c415cb26.zip |
more diamond
Diffstat (limited to 'archiva-cli')
-rw-r--r-- | archiva-cli/src/main/java/org/apache/archiva/cli/ArchivaCli.java | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/archiva-cli/src/main/java/org/apache/archiva/cli/ArchivaCli.java b/archiva-cli/src/main/java/org/apache/archiva/cli/ArchivaCli.java index 73662e6b5..e899562b0 100644 --- a/archiva-cli/src/main/java/org/apache/archiva/cli/ArchivaCli.java +++ b/archiva-cli/src/main/java/org/apache/archiva/cli/ArchivaCli.java @@ -53,8 +53,8 @@ import java.util.Properties; /** * ArchivaCli - * - * + * <p/> + * <p/> * TODO add back reading of archiva.xml from a given location */ public class ArchivaCli @@ -75,8 +75,6 @@ public class ArchivaCli throws IOException { - - try (InputStream pomStream = ArchivaCli.class.getResourceAsStream( POM_PROPERTIES )) { if ( pomStream == null ) @@ -190,7 +188,7 @@ public class ArchivaCli } } - private <T>T lookup( Class<T> clazz ) + private <T> T lookup( Class<T> clazz ) throws PlexusSisuBridgeException { PlexusSisuBridge plexusSisuBridge = applicationContext.getBean( PlexusSisuBridge.class ); @@ -244,8 +242,7 @@ public class ArchivaCli // we use a naming conventions knownRepositoryContentConsumer#hint // with plexus we used only hint so remove before# - Map<String, KnownRepositoryContentConsumer> smallNames = - new HashMap<String, KnownRepositoryContentConsumer>( beans.size() ); + Map<String, KnownRepositoryContentConsumer> smallNames = new HashMap<>( beans.size() ); for ( Map.Entry<String, KnownRepositoryContentConsumer> entry : beans.entrySet() ) { @@ -262,8 +259,7 @@ public class ArchivaCli Properties p = new Properties(); - - try(FileInputStream fis = new FileInputStream( properties )) + try (FileInputStream fis = new FileInputStream( properties )) { p.load( fis ); } |