jdk7 (multicatch diamond) Project: http://git-wip-us.apache.org/repos/asf/archiva/repo Commit: http://git-wip-us.apache.org/repos/asf/archiva/commit/1d929b31 Tree: http://git-wip-us.apache.org/repos/asf/archiva/tree/1d929b31 Diff: http://git-wip-us.apache.org/repos/asf/archiva/diff/1d929b31
Branch: refs/heads/master Commit: 1d929b31fb2db2a28c3ea10f135f4b841041a513 Parents: 145c89e Author: Eric Barboni <[email protected]> Authored: Thu Apr 17 22:13:54 2014 +0200 Committer: Eric Barboni <[email protected]> Committed: Thu Apr 17 22:13:54 2014 +0200 ---------------------------------------------------------------------- .../configuration/DefaultArchivaConfiguration.java | 17 +++++------------ 1 file changed, 5 insertions(+), 12 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/archiva/blob/1d929b31/archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/archiva/configuration/DefaultArchivaConfiguration.java ---------------------------------------------------------------------- diff --git a/archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/archiva/configuration/DefaultArchivaConfiguration.java b/archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/archiva/configuration/DefaultArchivaConfiguration.java index bea3eff..6373a50 100644 --- a/archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/archiva/configuration/DefaultArchivaConfiguration.java +++ b/archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/archiva/configuration/DefaultArchivaConfiguration.java @@ -147,12 +147,12 @@ public class DefaultArchivaConfiguration /** * Configuration Listeners we've registered. */ - private Set<ConfigurationListener> listeners = new HashSet<ConfigurationListener>(); + private Set<ConfigurationListener> listeners = new HashSet<>(); /** * Registry Listeners we've registered. */ - private Set<RegistryListener> registryListeners = new HashSet<RegistryListener>(); + private Set<RegistryListener> registryListeners = new HashSet<>(); /** * Boolean to help determine if the configuration exists as a result of pulling in @@ -204,9 +204,8 @@ public class DefaultArchivaConfiguration config.getRepositoryGroupsAsMap(); if ( !config.getRepositories().isEmpty() ) { - for ( Iterator<V1RepositoryConfiguration> i = config.getRepositories().iterator(); i.hasNext(); ) + for ( V1RepositoryConfiguration r : config.getRepositories() ) { - V1RepositoryConfiguration r = i.next(); r.setScanned( r.isIndexed() ); if ( StringUtils.startsWith( r.getUrl(), "file://" ) ) @@ -699,11 +698,7 @@ public class DefaultArchivaConfiguration loadConfiguration(); handleUpgradeConfiguration(); } - catch ( IndeterminateConfigurationException e ) - { - throw new RuntimeException( "failed during upgrade from previous version" + e.getMessage(), e ); - } - catch ( RegistryException e ) + catch ( IndeterminateConfigurationException | RegistryException e ) { throw new RuntimeException( "failed during upgrade from previous version" + e.getMessage(), e ); } @@ -814,9 +809,7 @@ public class DefaultArchivaConfiguration private Configuration unescapeExpressions( Configuration config ) { // TODO: for commons-configuration 1.3 only - for ( Iterator<ManagedRepositoryConfiguration> i = config.getManagedRepositories().iterator(); i.hasNext(); ) - { - ManagedRepositoryConfiguration c = i.next(); + for ( ManagedRepositoryConfiguration c : config.getManagedRepositories() ) { c.setLocation( removeExpressions( c.getLocation() ) ); c.setRefreshCronExpression( unescapeCronExpression( c.getRefreshCronExpression() ) ); }
