Modified: archiva/trunk/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/main/java/org/apache/archiva/admin/repository/networkproxy/DefaultNetworkProxyAdmin.java URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/main/java/org/apache/archiva/admin/repository/networkproxy/DefaultNetworkProxyAdmin.java?rev=1229118&r1=1229117&r2=1229118&view=diff ============================================================================== --- archiva/trunk/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/main/java/org/apache/archiva/admin/repository/networkproxy/DefaultNetworkProxyAdmin.java (original) +++ archiva/trunk/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/main/java/org/apache/archiva/admin/repository/networkproxy/DefaultNetworkProxyAdmin.java Mon Jan 9 12:44:02 2012 @@ -25,13 +25,12 @@ import org.apache.archiva.admin.model.be import org.apache.archiva.admin.model.networkproxy.NetworkProxyAdmin; import org.apache.archiva.admin.repository.AbstractRepositoryAdmin; import org.apache.archiva.audit.AuditEvent; -import org.apache.archiva.configuration.RemoteRepositoryConfiguration; -import org.apache.commons.lang.StringUtils; import org.apache.archiva.configuration.Configuration; import org.apache.archiva.configuration.NetworkProxyConfiguration; +import org.apache.archiva.configuration.RemoteRepositoryConfiguration; +import org.apache.commons.lang.StringUtils; import org.springframework.stereotype.Service; -import java.rmi.Remote; import java.util.ArrayList; import java.util.List; @@ -48,7 +47,8 @@ public class DefaultNetworkProxyAdmin public List<NetworkProxy> getNetworkProxies() throws RepositoryAdminException { - List<NetworkProxy> networkProxies = new ArrayList<NetworkProxy>(); + List<NetworkProxy> networkProxies = + new ArrayList<NetworkProxy>( getArchivaConfiguration().getConfiguration().getNetworkProxies().size() ); for ( NetworkProxyConfiguration networkProxyConfiguration : getArchivaConfiguration().getConfiguration().getNetworkProxies() ) { networkProxies.add( getNetworkProxy( networkProxyConfiguration ) ); @@ -126,9 +126,9 @@ public class DefaultNetworkProxyAdmin NetworkProxyConfiguration networkProxyConfiguration = getNetworkProxyConfiguration( networkProxy ); configuration.removeNetworkProxy( networkProxyConfiguration ); - for ( RemoteRepositoryConfiguration rrc : configuration.getRemoteRepositories()) + for ( RemoteRepositoryConfiguration rrc : configuration.getRemoteRepositories() ) { - if (StringUtils.equals( rrc.getRemoteDownloadNetworkProxyId(), networkProxyId )) + if ( StringUtils.equals( rrc.getRemoteDownloadNetworkProxyId(), networkProxyId ) ) { rrc.setRemoteDownloadNetworkProxyId( null ); }
Modified: archiva/trunk/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/main/java/org/apache/archiva/admin/repository/proxyconnector/DefaultProxyConnectorAdmin.java URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/main/java/org/apache/archiva/admin/repository/proxyconnector/DefaultProxyConnectorAdmin.java?rev=1229118&r1=1229117&r2=1229118&view=diff ============================================================================== --- archiva/trunk/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/main/java/org/apache/archiva/admin/repository/proxyconnector/DefaultProxyConnectorAdmin.java (original) +++ archiva/trunk/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/main/java/org/apache/archiva/admin/repository/proxyconnector/DefaultProxyConnectorAdmin.java Mon Jan 9 12:44:02 2012 @@ -28,11 +28,11 @@ import org.apache.archiva.admin.model.pr import org.apache.archiva.admin.model.remote.RemoteRepositoryAdmin; import org.apache.archiva.admin.repository.AbstractRepositoryAdmin; import org.apache.archiva.audit.AuditEvent; -import org.apache.commons.collections.CollectionUtils; -import org.apache.commons.lang.StringUtils; import org.apache.archiva.configuration.Configuration; import org.apache.archiva.configuration.ProxyConnectorConfiguration; import org.apache.archiva.configuration.functors.ProxyConnectorSelectionPredicate; +import org.apache.commons.collections.CollectionUtils; +import org.apache.commons.lang.StringUtils; import org.springframework.stereotype.Service; import javax.inject.Inject; @@ -148,16 +148,17 @@ public class DefaultProxyConnectorAdmin protected List<String> unescapePatterns( List<String> patterns ) { - List<String> rawPatterns = new ArrayList<String>(); if ( patterns != null ) { + List<String> rawPatterns = new ArrayList<String>( patterns.size() ); for ( String pattern : patterns ) { rawPatterns.add( StringUtils.replace( pattern, "\\\\", "\\" ) ); } + return rawPatterns; } - return rawPatterns; + return Collections.emptyList(); } public Map<String, List<ProxyConnector>> getProxyConnectorAsMap() @@ -174,7 +175,7 @@ public class DefaultProxyConnectorAdmin List<ProxyConnector> connectors = proxyConnectorMap.get( key ); if ( connectors == null ) { - connectors = new ArrayList<ProxyConnector>(); + connectors = new ArrayList<ProxyConnector>( 1 ); proxyConnectorMap.put( key, connectors ); } Modified: archiva/trunk/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/main/java/org/apache/archiva/admin/repository/remote/DefaultRemoteRepositoryAdmin.java URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/main/java/org/apache/archiva/admin/repository/remote/DefaultRemoteRepositoryAdmin.java?rev=1229118&r1=1229117&r2=1229118&view=diff ============================================================================== --- archiva/trunk/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/main/java/org/apache/archiva/admin/repository/remote/DefaultRemoteRepositoryAdmin.java (original) +++ archiva/trunk/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/main/java/org/apache/archiva/admin/repository/remote/DefaultRemoteRepositoryAdmin.java Mon Jan 9 12:44:02 2012 @@ -114,7 +114,8 @@ public class DefaultRemoteRepositoryAdmi public List<RemoteRepository> getRemoteRepositories() throws RepositoryAdminException { - List<RemoteRepository> remoteRepositories = new ArrayList<RemoteRepository>(); + List<RemoteRepository> remoteRepositories = new ArrayList<RemoteRepository>( + getArchivaConfiguration().getConfiguration().getRemoteRepositories().size() ); for ( RemoteRepositoryConfiguration repositoryConfiguration : getArchivaConfiguration().getConfiguration().getRemoteRepositories() ) { RemoteRepository remoteRepository = Modified: archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultRepositoryGroupService.java URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultRepositoryGroupService.java?rev=1229118&r1=1229117&r2=1229118&view=diff ============================================================================== --- archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultRepositoryGroupService.java (original) +++ archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultRepositoryGroupService.java Mon Jan 9 12:44:02 2012 @@ -47,7 +47,8 @@ public class DefaultRepositoryGroupServi { try { - List<RepositoryGroup> repositoriesGroups = new ArrayList<RepositoryGroup>(); + List<RepositoryGroup> repositoriesGroups = + new ArrayList<RepositoryGroup>( repositoryGroupAdmin.getRepositoriesGroups().size() ); for ( org.apache.archiva.admin.model.beans.RepositoryGroup repoGroup : repositoryGroupAdmin.getRepositoriesGroups() ) { repositoriesGroups.add(
