You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@archiva.apache.org by ol...@apache.org on 2012/01/09 13:44:04 UTC
svn commit: r1229118 [1/2] - in /archiva/trunk/archiva-modules:
archiva-base/archiva-artifact-converter/src/main/java/org/apache/archiva/converter/artifact/
archiva-base/archiva-checksum/src/main/java/org/apache/archiva/checksum/
archiva-base/archiva-c...
Author: olamy
Date: Mon Jan 9 12:44:02 2012
New Revision: 1229118
URL: http://svn.apache.org/viewvc?rev=1229118&view=rev
Log:
take care of some ArrayList size init
Modified:
archiva/trunk/archiva-modules/archiva-base/archiva-artifact-converter/src/main/java/org/apache/archiva/converter/artifact/LegacyToDefaultConverter.java
archiva/trunk/archiva-modules/archiva-base/archiva-checksum/src/main/java/org/apache/archiva/checksum/ChecksummedFile.java
archiva/trunk/archiva-modules/archiva-base/archiva-common/src/main/java/org/apache/archiva/common/utils/VersionComparator.java
archiva/trunk/archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/archiva/configuration/DefaultArchivaConfiguration.java
archiva/trunk/archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/archiva/configuration/FileTypes.java
archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/archiva/consumers/core/ArtifactMissingChecksumsConsumer.java
archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/archiva/consumers/core/AutoRemoveConsumer.java
archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/archiva/consumers/core/AutoRenameConsumer.java
archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/archiva/consumers/core/MetadataUpdaterConsumer.java
archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/archiva/consumers/core/ValidateChecksumConsumer.java
archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/archiva/consumers/core/repository/RepositoryPurgeConsumer.java
archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-lucene-consumers/src/main/java/org/apache/archiva/consumers/lucene/NexusIndexerConsumer.java
archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-metadata-consumer/src/main/java/org/apache/archiva/consumers/metadata/ArchivaMetadataCreationConsumer.java
archiva/trunk/archiva-modules/archiva-base/archiva-converter/src/main/java/org/apache/archiva/converter/legacy/DefaultLegacyRepositoryConverter.java
archiva/trunk/archiva-modules/archiva-base/archiva-converter/src/main/java/org/apache/archiva/converter/legacy/LegacyConverterArtifactConsumer.java
archiva/trunk/archiva-modules/archiva-base/archiva-model/src/main/java/org/apache/archiva/model/ArchivaModelCloner.java
archiva/trunk/archiva-modules/archiva-base/archiva-policies/src/main/java/org/apache/archiva/policies/AbstractUpdatePolicy.java
archiva/trunk/archiva-modules/archiva-base/archiva-policies/src/main/java/org/apache/archiva/policies/CachedFailuresPolicy.java
archiva/trunk/archiva-modules/archiva-base/archiva-policies/src/main/java/org/apache/archiva/policies/ChecksumPolicy.java
archiva/trunk/archiva-modules/archiva-base/archiva-policies/src/main/java/org/apache/archiva/policies/PropagateErrorsDownloadPolicy.java
archiva/trunk/archiva-modules/archiva-base/archiva-policies/src/main/java/org/apache/archiva/policies/PropagateErrorsOnUpdateDownloadPolicy.java
archiva/trunk/archiva-modules/archiva-base/archiva-proxy/src/main/java/org/apache/archiva/proxy/DefaultRepositoryProxyConnectors.java
archiva/trunk/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-api/src/main/java/org/apache/archiva/admin/model/AbstractRepositoryConnector.java
archiva/trunk/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-api/src/main/java/org/apache/archiva/admin/model/beans/FileType.java
archiva/trunk/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-api/src/main/java/org/apache/archiva/admin/model/beans/RepositoryGroup.java
archiva/trunk/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/main/java/org/apache/archiva/admin/repository/admin/DefaultArchivaAdministration.java
archiva/trunk/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/main/java/org/apache/archiva/admin/repository/group/DefaultRepositoryGroupAdmin.java
archiva/trunk/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/main/java/org/apache/archiva/admin/repository/networkproxy/DefaultNetworkProxyAdmin.java
archiva/trunk/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/main/java/org/apache/archiva/admin/repository/proxyconnector/DefaultProxyConnectorAdmin.java
archiva/trunk/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/main/java/org/apache/archiva/admin/repository/remote/DefaultRemoteRepositoryAdmin.java
archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultRepositoryGroupService.java
Modified: archiva/trunk/archiva-modules/archiva-base/archiva-artifact-converter/src/main/java/org/apache/archiva/converter/artifact/LegacyToDefaultConverter.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-artifact-converter/src/main/java/org/apache/archiva/converter/artifact/LegacyToDefaultConverter.java?rev=1229118&r1=1229117&r2=1229118&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-base/archiva-artifact-converter/src/main/java/org/apache/archiva/converter/artifact/LegacyToDefaultConverter.java (original)
+++ archiva/trunk/archiva-modules/archiva-base/archiva-artifact-converter/src/main/java/org/apache/archiva/converter/artifact/LegacyToDefaultConverter.java Mon Jan 9 12:44:02 2012
@@ -22,10 +22,10 @@ package org.apache.archiva.converter.art
import org.apache.archiva.common.plexusbridge.DigesterUtils;
import org.apache.archiva.common.plexusbridge.PlexusSisuBridge;
import org.apache.archiva.common.plexusbridge.PlexusSisuBridgeException;
-import org.apache.commons.io.FileUtils;
-import org.apache.commons.io.IOUtils;
import org.apache.archiva.transaction.FileTransaction;
import org.apache.archiva.transaction.TransactionException;
+import org.apache.commons.io.FileUtils;
+import org.apache.commons.io.IOUtils;
import org.apache.maven.artifact.Artifact;
import org.apache.maven.artifact.factory.ArtifactFactory;
import org.apache.maven.artifact.handler.manager.ArtifactHandlerManager;
@@ -75,7 +75,6 @@ public class LegacyToDefaultConverter
{
/**
* {@link List}<{@link Digester}
- *
*/
private List<? extends Digester> digesters;
@@ -701,7 +700,7 @@ public class LegacyToDefaultConverter
List<String> messages = warnings.get( artifact );
if ( messages == null )
{
- messages = new ArrayList<String>();
+ messages = new ArrayList<String>( 1 );
}
messages.add( message );
warnings.put( artifact, messages );
Modified: archiva/trunk/archiva-modules/archiva-base/archiva-checksum/src/main/java/org/apache/archiva/checksum/ChecksummedFile.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-checksum/src/main/java/org/apache/archiva/checksum/ChecksummedFile.java?rev=1229118&r1=1229117&r2=1229118&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-base/archiva-checksum/src/main/java/org/apache/archiva/checksum/ChecksummedFile.java (original)
+++ archiva/trunk/archiva-modules/archiva-base/archiva-checksum/src/main/java/org/apache/archiva/checksum/ChecksummedFile.java Mon Jan 9 12:44:02 2012
@@ -19,6 +19,12 @@ package org.apache.archiva.checksum;
* under the License.
*/
+import org.apache.commons.io.FileUtils;
+import org.apache.commons.io.IOUtils;
+import org.apache.commons.lang.StringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
import java.io.File;
import java.io.FileInputStream;
import java.io.IOException;
@@ -27,24 +33,18 @@ import java.util.List;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
-import org.apache.commons.io.FileUtils;
-import org.apache.commons.io.IOUtils;
-import org.apache.commons.lang.StringUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
/**
* ChecksummedFile
- *
+ * <p/>
* <dl>
- * <lh>Terminology:</lh>
- * <dt>Checksum File</dt>
- * <dd>The file that contains the previously calculated checksum value for the reference file.
- * This is a text file with the extension ".sha1" or ".md5", and contains a single entry
- * consisting of an optional reference filename, and a checksum string.
- * </dd>
- * <dt>Reference File</dt>
- * <dd>The file that is being referenced in the checksum file.</dd>
+ * <lh>Terminology:</lh>
+ * <dt>Checksum File</dt>
+ * <dd>The file that contains the previously calculated checksum value for the reference file.
+ * This is a text file with the extension ".sha1" or ".md5", and contains a single entry
+ * consisting of an optional reference filename, and a checksum string.
+ * </dd>
+ * <dt>Reference File</dt>
+ * <dd>The file that is being referenced in the checksum file.</dd>
* </dl>
*
* @version $Id$
@@ -57,7 +57,7 @@ public class ChecksummedFile
/**
* Construct a ChecksummedFile object.
- *
+ *
* @param referenceFile
*/
public ChecksummedFile( final File referenceFile )
@@ -67,7 +67,7 @@ public class ChecksummedFile
/**
* Calculate the checksum based on a given checksum.
- *
+ *
* @param checksumAlgorithm the algorithm to use.
* @return the checksum string for the file.
* @throws IOException if unable to calculate the checksum.
@@ -91,8 +91,8 @@ public class ChecksummedFile
/**
* Creates a checksum file of the provided referenceFile.
+ *
* @param checksumAlgorithm the hash to use.
- *
* @return the checksum File that was created.
* @throws IOException if there was a problem either reading the referenceFile, or writing the checksum file.
*/
@@ -107,7 +107,7 @@ public class ChecksummedFile
/**
* Get the checksum file for the reference file and hash.
- *
+ *
* @param checksumAlgorithm the hash that we are interested in.
* @return the checksum file to return
*/
@@ -120,11 +120,11 @@ public class ChecksummedFile
* <p>
* Given a checksum file, check to see if the file it represents is valid according to the checksum.
* </p>
- *
+ * <p/>
* <p>
* NOTE: Only supports single file checksums of type MD5 or SHA1.
* </p>
- *
+ *
* @param checksumFile the algorithms to check for.
* @return true if the checksum is valid for the file it represents. or if the checksum file does not exist.
* @throws IOException if the reading of the checksumFile or the file it refers to fails.
@@ -132,13 +132,13 @@ public class ChecksummedFile
public boolean isValidChecksum( ChecksumAlgorithm algorithm )
throws IOException
{
- return isValidChecksums( new ChecksumAlgorithm[] { algorithm } );
+ return isValidChecksums( new ChecksumAlgorithm[]{ algorithm } );
}
/**
* Of any checksum files present, validate that the reference file conforms
- * the to the checksum.
- *
+ * the to the checksum.
+ *
* @param algorithms the algorithms to check for.
* @return true if the checksums report that the the reference file is valid, false if invalid.
*/
@@ -147,7 +147,7 @@ public class ChecksummedFile
FileInputStream fis = null;
try
{
- List<Checksum> checksums = new ArrayList<Checksum>();
+ List<Checksum> checksums = new ArrayList<Checksum>( algorithms.length );
// Create checksum object for each algorithm.
for ( ChecksumAlgorithm checksumAlgorithm : algorithms )
{
@@ -214,13 +214,13 @@ public class ChecksummedFile
/**
* Fix or create checksum files for the reference file.
- *
+ *
* @param algorithms the hashes to check for.
* @return true if checksums were created successfully.
*/
- public boolean fixChecksums( ChecksumAlgorithm algorithms[] )
+ public boolean fixChecksums( ChecksumAlgorithm[] algorithms )
{
- List<Checksum> checksums = new ArrayList<Checksum>();
+ List<Checksum> checksums = new ArrayList<Checksum>( algorithms.length );
// Create checksum object for each algorithm.
for ( ChecksumAlgorithm checksumAlgorithm : algorithms )
{
@@ -267,7 +267,7 @@ public class ChecksummedFile
String rawChecksum = FileUtils.readFileToString( checksumFile );
String expectedChecksum = parseChecksum( rawChecksum, checksumAlgorithm, referenceFile.getName() );
- if ( ! StringUtils.equalsIgnoreCase( expectedChecksum, actualChecksum ) )
+ if ( !StringUtils.equalsIgnoreCase( expectedChecksum, actualChecksum ) )
{
// create checksum (again)
FileUtils.writeStringToFile( checksumFile, actualChecksum + " " + referenceFile.getName() );
@@ -294,21 +294,20 @@ public class ChecksummedFile
// check if it is a remote metadata file
Pattern pattern = Pattern.compile( "maven-metadata-\\S*.xml" );
Matcher m = pattern.matcher( path );
- if( m.matches() )
+ if ( m.matches() )
{
- return filename.endsWith( path ) || ( "-".equals( filename ) )
- || filename.endsWith( "maven-metadata.xml" );
+ return filename.endsWith( path ) || ( "-".equals( filename ) ) || filename.endsWith( "maven-metadata.xml" );
}
-
+
return filename.endsWith( path ) || ( "-".equals( filename ) );
}
/**
* Parse a checksum string.
- *
+ * <p/>
* Validate the expected path, and expected checksum algorithm, then return
- * the trimmed checksum hex string.
- *
+ * the trimmed checksum hex string.
+ *
* @param rawChecksumString
* @param expectedHash
* @param expectedPath
@@ -328,8 +327,8 @@ public class ChecksummedFile
String filename = m.group( 1 );
if ( !isValidChecksumPattern( filename, expectedPath ) )
{
- throw new IOException( "Supplied checksum file '" + filename + "' does not match expected file: '"
- + expectedPath + "'" );
+ throw new IOException(
+ "Supplied checksum file '" + filename + "' does not match expected file: '" + expectedPath + "'" );
}
trimmedChecksum = m.group( 2 );
}
@@ -342,8 +341,9 @@ public class ChecksummedFile
String filename = m.group( 2 );
if ( !isValidChecksumPattern( filename, expectedPath ) )
{
- throw new IOException( "Supplied checksum file '" + filename + "' does not match expected file: '"
- + expectedPath + "'" );
+ throw new IOException(
+ "Supplied checksum file '" + filename + "' does not match expected file: '" + expectedPath
+ + "'" );
}
trimmedChecksum = m.group( 1 );
}
Modified: archiva/trunk/archiva-modules/archiva-base/archiva-common/src/main/java/org/apache/archiva/common/utils/VersionComparator.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-common/src/main/java/org/apache/archiva/common/utils/VersionComparator.java?rev=1229118&r1=1229117&r2=1229118&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-base/archiva-common/src/main/java/org/apache/archiva/common/utils/VersionComparator.java (original)
+++ archiva/trunk/archiva-modules/archiva-base/archiva-common/src/main/java/org/apache/archiva/common/utils/VersionComparator.java Mon Jan 9 12:44:02 2012
@@ -58,7 +58,7 @@ public class VersionComparator
public VersionComparator()
{
- specialWords = new ArrayList<String>();
+ specialWords = new ArrayList<String>( 23 );
// ids that refer to LATEST
specialWords.add( "final" );
Modified: archiva/trunk/archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/archiva/configuration/DefaultArchivaConfiguration.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/archiva/configuration/DefaultArchivaConfiguration.java?rev=1229118&r1=1229117&r2=1229118&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/archiva/configuration/DefaultArchivaConfiguration.java (original)
+++ archiva/trunk/archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/archiva/configuration/DefaultArchivaConfiguration.java Mon Jan 9 12:44:02 2012
@@ -259,9 +259,9 @@ public class DefaultArchivaConfiguration
{
// Fix Proxy Connector Settings.
- List<ProxyConnectorConfiguration> proxyConnectorList = new ArrayList<ProxyConnectorConfiguration>();
// Create a copy of the list to read from (to prevent concurrent modification exceptions)
- proxyConnectorList.addAll( config.getProxyConnectors() );
+ List<ProxyConnectorConfiguration> proxyConnectorList =
+ new ArrayList<ProxyConnectorConfiguration>( config.getProxyConnectors() );
// Remove the old connector list.
config.getProxyConnectors().clear();
@@ -709,7 +709,8 @@ public class DefaultArchivaConfiguration
if ( !intersec.isEmpty() )
{
- List<String> knowContentConsumers = new ArrayList<String>();
+ List<String> knowContentConsumers =
+ new ArrayList<String>( configuration.getRepositoryScanning().getKnownContentConsumers().size() );
for ( String knowContentConsumer : configuration.getRepositoryScanning().getKnownContentConsumers() )
{
if ( !dbConsumers.contains( knowContentConsumer ) )
Modified: archiva/trunk/archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/archiva/configuration/FileTypes.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/archiva/configuration/FileTypes.java?rev=1229118&r1=1229117&r2=1229118&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/archiva/configuration/FileTypes.java (original)
+++ archiva/trunk/archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/archiva/configuration/FileTypes.java Mon Jan 9 12:44:02 2012
@@ -227,7 +227,7 @@ public class FileTypes
List<String> patterns = defaultTypeMap.get( filetype.getId() );
if ( patterns == null )
{
- patterns = new ArrayList<String>();
+ patterns = new ArrayList<String>( filetype.getPatterns().size() );
}
patterns.addAll( filetype.getPatterns() );
Modified: archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/archiva/consumers/core/ArtifactMissingChecksumsConsumer.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/archiva/consumers/core/ArtifactMissingChecksumsConsumer.java?rev=1229118&r1=1229117&r2=1229118&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/archiva/consumers/core/ArtifactMissingChecksumsConsumer.java (original)
+++ archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/archiva/consumers/core/ArtifactMissingChecksumsConsumer.java Mon Jan 9 12:44:02 2012
@@ -70,31 +70,30 @@ public class ArtifactMissingChecksumsCon
private File repositoryDir;
- private List<String> includes = new ArrayList<String>( );
+ private List<String> includes = new ArrayList<String>( 0 );
@Inject
- public ArtifactMissingChecksumsConsumer( ArchivaConfiguration configuration,
- FileTypes filetypes )
+ public ArtifactMissingChecksumsConsumer( ArchivaConfiguration configuration, FileTypes filetypes )
{
this.configuration = configuration;
this.filetypes = filetypes;
configuration.addChangeListener( this );
- initIncludes( );
+ initIncludes();
}
- public String getId( )
+ public String getId()
{
return this.id;
}
- public String getDescription( )
+ public String getDescription()
{
return this.description;
}
- public boolean isPermanent( )
+ public boolean isPermanent()
{
return false;
}
@@ -102,7 +101,7 @@ public class ArtifactMissingChecksumsCon
public void beginScan( ManagedRepository repo, Date whenGathered )
throws ConsumerException
{
- this.repositoryDir = new File( repo.getLocation( ) );
+ this.repositoryDir = new File( repo.getLocation() );
}
public void beginScan( ManagedRepository repo, Date whenGathered, boolean executeOnEntireRepo )
@@ -111,22 +110,22 @@ public class ArtifactMissingChecksumsCon
beginScan( repo, whenGathered );
}
- public void completeScan( )
+ public void completeScan()
{
/* do nothing */
}
public void completeScan( boolean executeOnEntireRepo )
{
- completeScan( );
+ completeScan();
}
- public List<String> getExcludes( )
+ public List<String> getExcludes()
{
- return getDefaultArtifactExclusions( );
+ return getDefaultArtifactExclusions();
}
- public List<String> getIncludes( )
+ public List<String> getIncludes()
{
return includes;
}
@@ -147,9 +146,9 @@ public class ArtifactMissingChecksumsCon
private void createFixChecksum( String path, ChecksumAlgorithm checksumAlgorithm[] )
{
File artifactFile = new File( this.repositoryDir, path );
- File checksumFile = new File( this.repositoryDir, path + checksumAlgorithm[0].getExt( ) );
+ File checksumFile = new File( this.repositoryDir, path + checksumAlgorithm[0].getExt() );
- if ( checksumFile.exists( ) )
+ if ( checksumFile.exists() )
{
checksum = new ChecksummedFile( artifactFile );
try
@@ -157,33 +156,33 @@ public class ArtifactMissingChecksumsCon
if ( !checksum.isValidChecksum( checksumAlgorithm[0] ) )
{
checksum.fixChecksums( checksumAlgorithm );
- triggerConsumerInfo( "Fixed checksum file " + checksumFile.getAbsolutePath( ) );
+ triggerConsumerInfo( "Fixed checksum file " + checksumFile.getAbsolutePath() );
}
}
catch ( IOException e )
{
triggerConsumerError( TYPE_CHECKSUM_CANNOT_CALC, "Cannot calculate checksum for file " + checksumFile +
- ": " + e.getMessage( ) );
+ ": " + e.getMessage() );
}
}
- else if ( !checksumFile.exists( ) )
+ else if ( !checksumFile.exists() )
{
checksum = new ChecksummedFile( artifactFile );
try
{
checksum.createChecksum( checksumAlgorithm[0] );
- triggerConsumerInfo( "Created missing checksum file " + checksumFile.getAbsolutePath( ) );
+ triggerConsumerInfo( "Created missing checksum file " + checksumFile.getAbsolutePath() );
}
catch ( IOException e )
{
triggerConsumerError( TYPE_CHECKSUM_CANNOT_CREATE, "Cannot create checksum for file " + checksumFile +
- ": " + e.getMessage( ) );
+ ": " + e.getMessage() );
}
}
else
{
triggerConsumerWarning( TYPE_CHECKSUM_NOT_FILE,
- "Checksum file " + checksumFile.getAbsolutePath( ) + " is not a file." );
+ "Checksum file " + checksumFile.getAbsolutePath() + " is not a file." );
}
}
@@ -191,7 +190,7 @@ public class ArtifactMissingChecksumsCon
{
if ( ConfigurationNames.isRepositoryScanning( propertyName ) )
{
- initIncludes( );
+ initIncludes();
}
}
@@ -200,18 +199,17 @@ public class ArtifactMissingChecksumsCon
/* do nothing */
}
- private void initIncludes( )
+ private void initIncludes()
{
- includes.clear( );
+ includes = new ArrayList<String>( filetypes.getFileTypePatterns( FileTypes.ARTIFACTS ) );
- includes.addAll( filetypes.getFileTypePatterns( FileTypes.ARTIFACTS ) );
}
@PostConstruct
- public void initialize( )
+ public void initialize()
{
configuration.addChangeListener( this );
- initIncludes( );
+ initIncludes();
}
}
Modified: archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/archiva/consumers/core/AutoRemoveConsumer.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/archiva/consumers/core/AutoRemoveConsumer.java?rev=1229118&r1=1229117&r2=1229118&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/archiva/consumers/core/AutoRemoveConsumer.java (original)
+++ archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/archiva/consumers/core/AutoRemoveConsumer.java Mon Jan 9 12:44:02 2012
@@ -43,8 +43,8 @@ import java.util.List;
*
* @version $Id$
*/
-@Service("knownRepositoryContentConsumer#auto-remove")
-@Scope("prototype")
+@Service( "knownRepositoryContentConsumer#auto-remove" )
+@Scope( "prototype" )
public class AutoRemoveConsumer
extends AbstractMonitoredConsumer
implements KnownRepositoryContentConsumer, RegistryListener
@@ -72,8 +72,8 @@ public class AutoRemoveConsumer
private FileTypes filetypes;
private File repositoryDir;
-
- private List<String> includes = new ArrayList<String>();
+
+ private List<String> includes = new ArrayList<String>( 0 );
public String getId()
{
@@ -136,11 +136,11 @@ public class AutoRemoveConsumer
public void processFile( String path, boolean executeOnEntireRepo )
throws ConsumerException
{
- processFile( path );
+ processFile( path );
}
public void afterConfigurationChange( Registry registry, String propertyName, Object propertyValue )
- {
+ {
if ( ConfigurationNames.isRepositoryScanning( propertyName ) )
{
initIncludes();
@@ -154,9 +154,7 @@ public class AutoRemoveConsumer
private void initIncludes()
{
- includes.clear();
-
- includes.addAll( filetypes.getFileTypePatterns( FileTypes.AUTO_REMOVE ) );
+ includes = new ArrayList<String>( filetypes.getFileTypePatterns( FileTypes.AUTO_REMOVE ) );
}
@PostConstruct
Modified: archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/archiva/consumers/core/AutoRenameConsumer.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/archiva/consumers/core/AutoRenameConsumer.java?rev=1229118&r1=1229117&r2=1229118&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/archiva/consumers/core/AutoRenameConsumer.java (original)
+++ archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/archiva/consumers/core/AutoRenameConsumer.java Mon Jan 9 12:44:02 2012
@@ -20,10 +20,10 @@ package org.apache.archiva.consumers.cor
*/
import org.apache.archiva.admin.model.beans.ManagedRepository;
-import org.apache.commons.io.FileUtils;
import org.apache.archiva.consumers.AbstractMonitoredConsumer;
import org.apache.archiva.consumers.ConsumerException;
import org.apache.archiva.consumers.KnownRepositoryContentConsumer;
+import org.apache.commons.io.FileUtils;
import org.springframework.context.annotation.Scope;
import org.springframework.stereotype.Service;
@@ -41,8 +41,8 @@ import java.util.Map;
*
* @version $Id$
*/
-@Service("knownRepositoryContentConsumer#auto-rename")
-@Scope("prototype")
+@Service( "knownRepositoryContentConsumer#auto-rename" )
+@Scope( "prototype" )
public class AutoRenameConsumer
extends AbstractMonitoredConsumer
implements KnownRepositoryContentConsumer
@@ -61,7 +61,7 @@ public class AutoRenameConsumer
private File repositoryDir;
- private List<String> includes = new ArrayList<String>();
+ private List<String> includes = new ArrayList<String>( 3 );
private Map<String, String> extensionRenameMap = new HashMap<String, String>();
@@ -159,6 +159,6 @@ public class AutoRenameConsumer
public void processFile( String path, boolean executeOnEntireRepo )
throws ConsumerException
{
- processFile( path );
+ processFile( path );
}
}
Modified: archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/archiva/consumers/core/MetadataUpdaterConsumer.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/archiva/consumers/core/MetadataUpdaterConsumer.java?rev=1229118&r1=1229117&r2=1229118&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/archiva/consumers/core/MetadataUpdaterConsumer.java (original)
+++ archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/archiva/consumers/core/MetadataUpdaterConsumer.java Mon Jan 9 12:44:02 2012
@@ -57,14 +57,14 @@ import java.util.List;
*
* @version $Id$
*/
-@Service("knownRepositoryContentConsumer#metadata-updater")
-@Scope("prototype")
+@Service( "knownRepositoryContentConsumer#metadata-updater" )
+@Scope( "prototype" )
public class MetadataUpdaterConsumer
extends AbstractMonitoredConsumer
implements KnownRepositoryContentConsumer, RegistryListener
{
private Logger log = LoggerFactory.getLogger( MetadataUpdaterConsumer.class );
-
+
/**
* default-value="metadata-updater"
*/
@@ -109,7 +109,7 @@ public class MetadataUpdaterConsumer
private File repositoryDir;
- private List<String> includes = new ArrayList<String>();
+ private List<String> includes = new ArrayList<String>( 0 );
private long scanStartTimestamp = 0;
@@ -222,18 +222,19 @@ public class MetadataUpdaterConsumer
}
catch ( LayoutException e )
{
- triggerConsumerWarning( TYPE_METADATA_BAD_INTERNAL_REF, "Unable to convert path [" + path
- + "] to an internal project reference: " + e.getMessage() );
+ triggerConsumerWarning( TYPE_METADATA_BAD_INTERNAL_REF,
+ "Unable to convert path [" + path + "] to an internal project reference: "
+ + e.getMessage() );
}
catch ( RepositoryMetadataException e )
{
- triggerConsumerError( TYPE_METADATA_WRITE_FAILURE, "Unable to write project metadata for artifact [" + path
- + "]: " + e.getMessage() );
+ triggerConsumerError( TYPE_METADATA_WRITE_FAILURE,
+ "Unable to write project metadata for artifact [" + path + "]: " + e.getMessage() );
}
catch ( IOException e )
{
- triggerConsumerWarning( TYPE_METADATA_IO, "Project metadata not written due to IO warning: "
- + e.getMessage() );
+ triggerConsumerWarning( TYPE_METADATA_IO,
+ "Project metadata not written due to IO warning: " + e.getMessage() );
}
catch ( ContentNotFoundException e )
{
@@ -268,18 +269,19 @@ public class MetadataUpdaterConsumer
}
catch ( LayoutException e )
{
- triggerConsumerWarning( TYPE_METADATA_BAD_INTERNAL_REF, "Unable to convert path [" + path
- + "] to an internal version reference: " + e.getMessage() );
+ triggerConsumerWarning( TYPE_METADATA_BAD_INTERNAL_REF,
+ "Unable to convert path [" + path + "] to an internal version reference: "
+ + e.getMessage() );
}
catch ( RepositoryMetadataException e )
{
- triggerConsumerError( TYPE_METADATA_WRITE_FAILURE, "Unable to write version metadata for artifact [" + path
- + "]: " + e.getMessage() );
+ triggerConsumerError( TYPE_METADATA_WRITE_FAILURE,
+ "Unable to write version metadata for artifact [" + path + "]: " + e.getMessage() );
}
catch ( IOException e )
{
- triggerConsumerWarning( TYPE_METADATA_IO, "Version metadata not written due to IO warning: "
- + e.getMessage() );
+ triggerConsumerWarning( TYPE_METADATA_IO,
+ "Version metadata not written due to IO warning: " + e.getMessage() );
}
catch ( ContentNotFoundException e )
{
@@ -309,9 +311,7 @@ public class MetadataUpdaterConsumer
private void initIncludes()
{
- includes.clear();
-
- includes.addAll( filetypes.getFileTypePatterns( FileTypes.ARTIFACTS ) );
+ includes = new ArrayList<String>( filetypes.getFileTypePatterns( FileTypes.ARTIFACTS ) );
}
@PostConstruct
Modified: archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/archiva/consumers/core/ValidateChecksumConsumer.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/archiva/consumers/core/ValidateChecksumConsumer.java?rev=1229118&r1=1229117&r2=1229118&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/archiva/consumers/core/ValidateChecksumConsumer.java (original)
+++ archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/archiva/consumers/core/ValidateChecksumConsumer.java Mon Jan 9 12:44:02 2012
@@ -88,7 +88,7 @@ public class ValidateChecksumConsumer
private File repositoryDir;
- private List<String> includes = new ArrayList<String>();
+ private List<String> includes;
public String getId()
{
@@ -175,6 +175,7 @@ public class ValidateChecksumConsumer
{
checksum = plexusSisuBridge.lookup( ChecksumFile.class );
List<Digester> allDigesters = new ArrayList<Digester>( digesterUtils.getAllDigesters() );
+ includes = new ArrayList<String>( allDigesters.size() );
for ( Digester digester : allDigesters )
{
includes.add( "**/*" + digester.getFilenameExtension() );
Modified: archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/archiva/consumers/core/repository/RepositoryPurgeConsumer.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/archiva/consumers/core/repository/RepositoryPurgeConsumer.java?rev=1229118&r1=1229117&r2=1229118&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/archiva/consumers/core/repository/RepositoryPurgeConsumer.java (original)
+++ archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/src/main/java/org/apache/archiva/consumers/core/repository/RepositoryPurgeConsumer.java Mon Jan 9 12:44:02 2012
@@ -21,19 +21,19 @@ package org.apache.archiva.consumers.cor
import org.apache.archiva.admin.model.beans.ManagedRepository;
import org.apache.archiva.admin.model.managed.ManagedRepositoryAdmin;
-import org.apache.archiva.metadata.repository.RepositorySession;
-import org.apache.archiva.metadata.repository.RepositorySessionFactory;
-import org.apache.archiva.repository.events.RepositoryListener;
import org.apache.archiva.configuration.ArchivaConfiguration;
import org.apache.archiva.configuration.ConfigurationNames;
import org.apache.archiva.configuration.FileTypes;
import org.apache.archiva.consumers.AbstractMonitoredConsumer;
import org.apache.archiva.consumers.ConsumerException;
import org.apache.archiva.consumers.KnownRepositoryContentConsumer;
+import org.apache.archiva.metadata.repository.RepositorySession;
+import org.apache.archiva.metadata.repository.RepositorySessionFactory;
import org.apache.archiva.repository.ManagedRepositoryContent;
import org.apache.archiva.repository.RepositoryContentFactory;
import org.apache.archiva.repository.RepositoryException;
import org.apache.archiva.repository.RepositoryNotFoundException;
+import org.apache.archiva.repository.events.RepositoryListener;
import org.apache.archiva.repository.metadata.MetadataTools;
import org.codehaus.plexus.registry.Registry;
import org.codehaus.plexus.registry.RegistryListener;
@@ -237,16 +237,12 @@ public class RepositoryPurgeConsumer
private void initIncludes()
{
- includes.clear();
-
- includes.addAll( filetypes.getFileTypePatterns( FileTypes.ARTIFACTS ) );
+ includes = new ArrayList<String>( filetypes.getFileTypePatterns( FileTypes.ARTIFACTS ) );
}
@PostConstruct
public void initialize()
{
- //this.listeners =
- // new ArrayList<RepositoryListener>( applicationContext.getBeansOfType( RepositoryListener.class ).values() );
configuration.addChangeListener( this );
initIncludes();
Modified: archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-lucene-consumers/src/main/java/org/apache/archiva/consumers/lucene/NexusIndexerConsumer.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-lucene-consumers/src/main/java/org/apache/archiva/consumers/lucene/NexusIndexerConsumer.java?rev=1229118&r1=1229117&r2=1229118&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-lucene-consumers/src/main/java/org/apache/archiva/consumers/lucene/NexusIndexerConsumer.java (original)
+++ archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-lucene-consumers/src/main/java/org/apache/archiva/consumers/lucene/NexusIndexerConsumer.java Mon Jan 9 12:44:02 2012
@@ -76,7 +76,7 @@ public class NexusIndexerConsumer
private NexusIndexer nexusIndexer;
- private List<String> includes = new ArrayList<String>();
+ private List<String> includes = new ArrayList<String>( 0 );
private ManagedRepository repository;
@@ -238,11 +238,14 @@ public class NexusIndexerConsumer
private void initIncludes()
{
- includes.clear();
+ List<String> indexable = filetypes.getFileTypePatterns( FileTypes.INDEXABLE_CONTENT );
+ List<String> artifacts = filetypes.getFileTypePatterns( FileTypes.ARTIFACTS );
- includes.addAll( filetypes.getFileTypePatterns( FileTypes.INDEXABLE_CONTENT ) );
+ includes = new ArrayList<String>( indexable.size() + artifacts.size() );
- includes.addAll( filetypes.getFileTypePatterns( FileTypes.ARTIFACTS ) );
+ includes.addAll( indexable );
+
+ includes.addAll( artifacts );
}
@PostConstruct
Modified: archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-metadata-consumer/src/main/java/org/apache/archiva/consumers/metadata/ArchivaMetadataCreationConsumer.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-metadata-consumer/src/main/java/org/apache/archiva/consumers/metadata/ArchivaMetadataCreationConsumer.java?rev=1229118&r1=1229117&r2=1229118&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-metadata-consumer/src/main/java/org/apache/archiva/consumers/metadata/ArchivaMetadataCreationConsumer.java (original)
+++ archiva/trunk/archiva-modules/archiva-base/archiva-consumers/archiva-metadata-consumer/src/main/java/org/apache/archiva/consumers/metadata/ArchivaMetadataCreationConsumer.java Mon Jan 9 12:44:02 2012
@@ -20,6 +20,13 @@ package org.apache.archiva.consumers.met
*/
import org.apache.archiva.admin.model.beans.ManagedRepository;
+import org.apache.archiva.common.utils.VersionUtil;
+import org.apache.archiva.configuration.ArchivaConfiguration;
+import org.apache.archiva.configuration.ConfigurationNames;
+import org.apache.archiva.configuration.FileTypes;
+import org.apache.archiva.consumers.AbstractMonitoredConsumer;
+import org.apache.archiva.consumers.ConsumerException;
+import org.apache.archiva.consumers.KnownRepositoryContentConsumer;
import org.apache.archiva.metadata.model.ArtifactMetadata;
import org.apache.archiva.metadata.model.ProjectMetadata;
import org.apache.archiva.metadata.model.ProjectVersionMetadata;
@@ -30,13 +37,6 @@ import org.apache.archiva.metadata.repos
import org.apache.archiva.metadata.repository.storage.RepositoryStorage;
import org.apache.archiva.metadata.repository.storage.RepositoryStorageMetadataInvalidException;
import org.apache.archiva.metadata.repository.storage.RepositoryStorageMetadataNotFoundException;
-import org.apache.archiva.common.utils.VersionUtil;
-import org.apache.archiva.configuration.ArchivaConfiguration;
-import org.apache.archiva.configuration.ConfigurationNames;
-import org.apache.archiva.configuration.FileTypes;
-import org.apache.archiva.consumers.AbstractMonitoredConsumer;
-import org.apache.archiva.consumers.ConsumerException;
-import org.apache.archiva.consumers.KnownRepositoryContentConsumer;
import org.codehaus.plexus.registry.Registry;
import org.codehaus.plexus.registry.RegistryListener;
import org.slf4j.Logger;
@@ -56,8 +56,8 @@ import java.util.List;
*
* @version $Id: ArtifactUpdateDatabaseConsumer.java 718864 2008-11-19 06:33:35Z brett $
*/
-@Service("knownRepositoryContentConsumer#create-archiva-metadata")
-@Scope("prototype")
+@Service( "knownRepositoryContentConsumer#create-archiva-metadata" )
+@Scope( "prototype" )
public class ArchivaMetadataCreationConsumer
extends AbstractMonitoredConsumer
implements KnownRepositoryContentConsumer, RegistryListener
@@ -84,11 +84,10 @@ public class ArchivaMetadataCreationCons
private Date whenGathered;
- private List<String> includes = new ArrayList<String>();
+ private List<String> includes = new ArrayList<String>( 0 );
/**
* FIXME: can be of other types
- *
*/
@Inject
private RepositorySessionFactory repositorySessionFactory;
@@ -96,10 +95,9 @@ public class ArchivaMetadataCreationCons
/**
* FIXME: this needs to be configurable based on storage type - and could also be instantiated per repo. Change to a
* factory.
- *
*/
@Inject
- @Named(value = "repositoryStorage#maven2")
+ @Named( value = "repositoryStorage#maven2" )
private RepositoryStorage repositoryStorage;
private static final Logger log = LoggerFactory.getLogger( ArchivaMetadataCreationConsumer.class );
@@ -242,9 +240,7 @@ public class ArchivaMetadataCreationCons
private void initIncludes()
{
- includes.clear();
-
- includes.addAll( filetypes.getFileTypePatterns( FileTypes.ARTIFACTS ) );
+ includes = new ArrayList<String>( filetypes.getFileTypePatterns( FileTypes.ARTIFACTS ) );
}
@PostConstruct
Modified: archiva/trunk/archiva-modules/archiva-base/archiva-converter/src/main/java/org/apache/archiva/converter/legacy/DefaultLegacyRepositoryConverter.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-converter/src/main/java/org/apache/archiva/converter/legacy/DefaultLegacyRepositoryConverter.java?rev=1229118&r1=1229117&r2=1229118&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-base/archiva-converter/src/main/java/org/apache/archiva/converter/legacy/DefaultLegacyRepositoryConverter.java (original)
+++ archiva/trunk/archiva-modules/archiva-base/archiva-converter/src/main/java/org/apache/archiva/converter/legacy/DefaultLegacyRepositoryConverter.java Mon Jan 9 12:44:02 2012
@@ -22,12 +22,12 @@ package org.apache.archiva.converter.leg
import org.apache.archiva.admin.model.beans.ManagedRepository;
import org.apache.archiva.common.plexusbridge.PlexusSisuBridge;
import org.apache.archiva.common.plexusbridge.PlexusSisuBridgeException;
-import org.apache.archiva.converter.RepositoryConversionException;
-import org.apache.archiva.repository.scanner.RepositoryScanner;
-import org.apache.archiva.repository.scanner.RepositoryScannerException;
import org.apache.archiva.common.utils.PathUtil;
import org.apache.archiva.consumers.InvalidRepositoryContentConsumer;
import org.apache.archiva.consumers.KnownRepositoryContentConsumer;
+import org.apache.archiva.converter.RepositoryConversionException;
+import org.apache.archiva.repository.scanner.RepositoryScanner;
+import org.apache.archiva.repository.scanner.RepositoryScannerException;
import org.apache.maven.artifact.repository.ArtifactRepository;
import org.apache.maven.artifact.repository.ArtifactRepositoryFactory;
import org.apache.maven.artifact.repository.layout.ArtifactRepositoryLayout;
@@ -101,12 +101,11 @@ public class DefaultLegacyRepositoryConv
legacyConverterConsumer.setExcludes( fileExclusionPatterns );
legacyConverterConsumer.setDestinationRepository( repository );
- List<KnownRepositoryContentConsumer> knownConsumers = new ArrayList<KnownRepositoryContentConsumer>();
+ List<KnownRepositoryContentConsumer> knownConsumers = new ArrayList<KnownRepositoryContentConsumer>( 1 );
knownConsumers.add( legacyConverterConsumer );
List<InvalidRepositoryContentConsumer> invalidConsumers = Collections.emptyList();
- List<String> ignoredContent = new ArrayList<String>();
- ignoredContent.addAll( Arrays.asList( RepositoryScanner.IGNORABLE_CONTENT ) );
+ List<String> ignoredContent = new ArrayList<String>( Arrays.asList( RepositoryScanner.IGNORABLE_CONTENT ) );
repoScanner.scan( legacyRepository, knownConsumers, invalidConsumers, ignoredContent,
RepositoryScanner.FRESH_SCAN );
Modified: archiva/trunk/archiva-modules/archiva-base/archiva-converter/src/main/java/org/apache/archiva/converter/legacy/LegacyConverterArtifactConsumer.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-converter/src/main/java/org/apache/archiva/converter/legacy/LegacyConverterArtifactConsumer.java?rev=1229118&r1=1229117&r2=1229118&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-base/archiva-converter/src/main/java/org/apache/archiva/converter/legacy/LegacyConverterArtifactConsumer.java (original)
+++ archiva/trunk/archiva-modules/archiva-base/archiva-converter/src/main/java/org/apache/archiva/converter/legacy/LegacyConverterArtifactConsumer.java Mon Jan 9 12:44:02 2012
@@ -81,7 +81,7 @@ public class LegacyConverterArtifactCons
public LegacyConverterArtifactConsumer( PlexusSisuBridge plexusSisuBridge )
throws PlexusSisuBridgeException
{
- includes = new ArrayList<String>();
+ includes = new ArrayList<String>( 3 );
includes.add( "**/*.jar" );
includes.add( "**/*.ear" );
includes.add( "**/*.war" );
Modified: archiva/trunk/archiva-modules/archiva-base/archiva-model/src/main/java/org/apache/archiva/model/ArchivaModelCloner.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-model/src/main/java/org/apache/archiva/model/ArchivaModelCloner.java?rev=1229118&r1=1229117&r2=1229118&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-base/archiva-model/src/main/java/org/apache/archiva/model/ArchivaModelCloner.java (original)
+++ archiva/trunk/archiva-modules/archiva-base/archiva-model/src/main/java/org/apache/archiva/model/ArchivaModelCloner.java Mon Jan 9 12:44:02 2012
@@ -25,7 +25,7 @@ import java.util.List;
import java.util.Properties;
/**
- * Utility methods for cloning various Archiva Model objects.
+ * Utility methods for cloning various Archiva Model objects.
*
* @version $Id$
*/
@@ -50,7 +50,7 @@ public class ArchivaModelCloner
return cloned;
}
- @SuppressWarnings("unchecked")
+ @SuppressWarnings( "unchecked" )
public static Properties clone( Properties properties )
{
if ( properties == null )
@@ -109,7 +109,7 @@ public class ArchivaModelCloner
return null;
}
- List<ArtifactReference> ret = new ArrayList<ArtifactReference>();
+ List<ArtifactReference> ret = new ArrayList<ArtifactReference>( artifactReferenceList.size() );
for ( ArtifactReference ref : artifactReferenceList )
{
@@ -126,7 +126,7 @@ public class ArchivaModelCloner
return null;
}
- List<String> ret = new ArrayList<String>();
+ List<String> ret = new ArrayList<String>( simple.size() );
for ( String txt : simple )
{
Modified: archiva/trunk/archiva-modules/archiva-base/archiva-policies/src/main/java/org/apache/archiva/policies/AbstractUpdatePolicy.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-policies/src/main/java/org/apache/archiva/policies/AbstractUpdatePolicy.java?rev=1229118&r1=1229117&r2=1229118&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-base/archiva-policies/src/main/java/org/apache/archiva/policies/AbstractUpdatePolicy.java (original)
+++ archiva/trunk/archiva-modules/archiva-base/archiva-policies/src/main/java/org/apache/archiva/policies/AbstractUpdatePolicy.java Mon Jan 9 12:44:02 2012
@@ -19,19 +19,19 @@ package org.apache.archiva.policies;
* under the License.
*/
+import org.apache.archiva.common.utils.VersionUtil;
+import org.apache.commons.lang.StringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
import java.io.File;
import java.util.ArrayList;
import java.util.Calendar;
import java.util.List;
import java.util.Properties;
-import org.apache.commons.lang.StringUtils;
-import org.apache.archiva.common.utils.VersionUtil;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
/**
- * AbstractUpdatePolicy
+ * AbstractUpdatePolicy
*
* @version $Id$
*/
@@ -39,12 +39,12 @@ public abstract class AbstractUpdatePoli
implements PreDownloadPolicy
{
private Logger log = LoggerFactory.getLogger( AbstractUpdatePolicy.class );
-
+
/**
* The ALWAYS policy setting means that the artifact is always uipdated from the remote repo.
*/
public static final String ALWAYS = "always";
-
+
/**
* The NEVER policy setting means that the artifact is never updated from the remote repo.
*/
@@ -56,8 +56,8 @@ public abstract class AbstractUpdatePoli
* the following conditions are met...
* </p>
* <ul>
- * <li>The local artifact is not present.</li>
- * <li>The local artifact has a last modified timestamp older than (now - 1 day).</li>
+ * <li>The local artifact is not present.</li>
+ * <li>The local artifact has a last modified timestamp older than (now - 1 day).</li>
* </ul>
*/
public static final String DAILY = "daily";
@@ -68,8 +68,8 @@ public abstract class AbstractUpdatePoli
* the following conditions are met...
* </p>
* <ul>
- * <li>The local artifact is not present.</li>
- * <li>The local artifact has a last modified timestamp older than (now - 1 hour).</li>
+ * <li>The local artifact is not present.</li>
+ * <li>The local artifact has a last modified timestamp older than (now - 1 hour).</li>
* </ul>
*/
public static final String HOURLY = "hourly";
@@ -81,7 +81,7 @@ public abstract class AbstractUpdatePoli
*/
public static final String ONCE = "once";
- private List<String> options = new ArrayList<String>();
+ private List<String> options = new ArrayList<String>( 5 );
public AbstractUpdatePolicy()
{
@@ -93,9 +93,9 @@ public abstract class AbstractUpdatePoli
}
protected abstract boolean isSnapshotPolicy();
-
+
protected abstract String getUpdateMode();
-
+
public List<String> getOptions()
{
return options;
@@ -109,7 +109,7 @@ public abstract class AbstractUpdatePoli
// Only process artifact file types.
return;
}
-
+
String version = request.getProperty( "version", "" );
boolean isSnapshotVersion = false;
@@ -121,8 +121,9 @@ public abstract class AbstractUpdatePoli
if ( !options.contains( policySetting ) )
{
// Not a valid code.
- throw new PolicyConfigurationException( "Unknown " + getUpdateMode() + " policy setting [" + policySetting
- + "], valid settings are [" + StringUtils.join( options.iterator(), "," ) + "]" );
+ throw new PolicyConfigurationException(
+ "Unknown " + getUpdateMode() + " policy setting [" + policySetting + "], valid settings are ["
+ + StringUtils.join( options.iterator(), "," ) + "]" );
}
if ( ALWAYS.equals( policySetting ) )
@@ -161,7 +162,8 @@ public abstract class AbstractUpdatePoli
if ( ONCE.equals( policySetting ) )
{
// File exists, but policy is once.
- throw new PolicyViolationException( "NO to update " + getUpdateMode() + ", policy is ONCE, and local file exist." );
+ throw new PolicyViolationException(
+ "NO to update " + getUpdateMode() + ", policy is ONCE, and local file exist." );
}
if ( DAILY.equals( policySetting ) )
@@ -171,7 +173,7 @@ public abstract class AbstractUpdatePoli
Calendar fileCal = Calendar.getInstance();
fileCal.setTimeInMillis( localFile.lastModified() );
- if( cal.after( fileCal ) )
+ if ( cal.after( fileCal ) )
{
// Its ok.
return;
@@ -179,7 +181,7 @@ public abstract class AbstractUpdatePoli
else
{
throw new PolicyViolationException( "NO to update " + getUpdateMode()
- + ", policy is DAILY, local file exist, and has been updated within the last day." );
+ + ", policy is DAILY, local file exist, and has been updated within the last day." );
}
}
@@ -190,7 +192,7 @@ public abstract class AbstractUpdatePoli
Calendar fileCal = Calendar.getInstance();
fileCal.setTimeInMillis( localFile.lastModified() );
- if( cal.after( fileCal ) )
+ if ( cal.after( fileCal ) )
{
// Its ok.
return;
@@ -198,11 +200,11 @@ public abstract class AbstractUpdatePoli
else
{
throw new PolicyViolationException( "NO to update " + getUpdateMode()
- + ", policy is HOURLY, local file exist, and has been updated within the last hour." );
+ + ", policy is HOURLY, local file exist, and has been updated within the last hour." );
}
}
- throw new PolicyConfigurationException( "Unable to process " + getUpdateMode()
- + " policy of [" + policySetting + "], please file a bug report." );
+ throw new PolicyConfigurationException(
+ "Unable to process " + getUpdateMode() + " policy of [" + policySetting + "], please file a bug report." );
}
}
Modified: archiva/trunk/archiva-modules/archiva-base/archiva-policies/src/main/java/org/apache/archiva/policies/CachedFailuresPolicy.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-policies/src/main/java/org/apache/archiva/policies/CachedFailuresPolicy.java?rev=1229118&r1=1229117&r2=1229118&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-base/archiva-policies/src/main/java/org/apache/archiva/policies/CachedFailuresPolicy.java (original)
+++ archiva/trunk/archiva-modules/archiva-base/archiva-policies/src/main/java/org/apache/archiva/policies/CachedFailuresPolicy.java Mon Jan 9 12:44:02 2012
@@ -19,30 +19,29 @@ package org.apache.archiva.policies;
* under the License.
*/
-import java.io.File;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Properties;
-
-import org.apache.commons.lang.StringUtils;
import org.apache.archiva.policies.urlcache.UrlFailureCache;
+import org.apache.commons.lang.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.stereotype.Service;
import javax.inject.Inject;
+import java.io.File;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Properties;
/**
* {@link PreDownloadPolicy} to check if the requested url has failed before.
*
* @version $Id$
*/
-@Service("preDownloadPolicy#cache-failures")
+@Service( "preDownloadPolicy#cache-failures" )
public class CachedFailuresPolicy
implements PreDownloadPolicy
{
private Logger log = LoggerFactory.getLogger( CachedFailuresPolicy.class );
-
+
/**
* The NO policy setting means that the the existence of old failures is <strong>not</strong> checked.
* All resource requests are allowed thru to the remote repo.
@@ -61,7 +60,7 @@ public class CachedFailuresPolicy
@Inject
private UrlFailureCache urlFailureCache;
- private List<String> options = new ArrayList<String>();
+ private List<String> options = new ArrayList<String>( 2 );
public CachedFailuresPolicy()
{
@@ -76,7 +75,8 @@ public class CachedFailuresPolicy
{
// Not a valid code.
throw new PolicyConfigurationException( "Unknown cache-failues policy setting [" + policySetting +
- "], valid settings are [" + StringUtils.join( options.iterator(), "," ) + "]" );
+ "], valid settings are [" + StringUtils.join(
+ options.iterator(), "," ) + "]" );
}
if ( NO.equals( policySetting ) )
Modified: archiva/trunk/archiva-modules/archiva-base/archiva-policies/src/main/java/org/apache/archiva/policies/ChecksumPolicy.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-policies/src/main/java/org/apache/archiva/policies/ChecksumPolicy.java?rev=1229118&r1=1229117&r2=1229118&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-base/archiva-policies/src/main/java/org/apache/archiva/policies/ChecksumPolicy.java (original)
+++ archiva/trunk/archiva-modules/archiva-base/archiva-policies/src/main/java/org/apache/archiva/policies/ChecksumPolicy.java Mon Jan 9 12:44:02 2012
@@ -19,11 +19,6 @@ package org.apache.archiva.policies;
* under the License.
*/
-import java.io.File;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Properties;
-
import org.apache.archiva.checksum.ChecksumAlgorithm;
import org.apache.archiva.checksum.ChecksummedFile;
import org.apache.commons.lang.StringUtils;
@@ -31,25 +26,30 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.stereotype.Service;
+import java.io.File;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Properties;
+
/**
* ChecksumPolicy - a policy applied after the download to see if the file has been downloaded
* successfully and completely (or not).
*
* @version $Id$
*/
-@Service("postDownloadPolicy#checksum")
+@Service( "postDownloadPolicy#checksum" )
public class ChecksumPolicy
implements PostDownloadPolicy
{
private Logger log = LoggerFactory.getLogger( ChecksumPolicy.class );
-
+
/**
* The IGNORE policy indicates that if the checksum policy is ignored, and
* the state of, contents of, or validity of the checksum files are not
* checked.
*/
public static final String IGNORE = "ignore";
-
+
/**
* The FAIL policy indicates that if the checksum does not match the
* downloaded file, then remove the downloaded artifact, and checksum
@@ -64,9 +64,9 @@ public class ChecksumPolicy
*/
public static final String FIX = "fix";
- private ChecksumAlgorithm[] algorithms = new ChecksumAlgorithm[] { ChecksumAlgorithm.SHA1, ChecksumAlgorithm.MD5 };
+ private ChecksumAlgorithm[] algorithms = new ChecksumAlgorithm[]{ ChecksumAlgorithm.SHA1, ChecksumAlgorithm.MD5 };
- private List<String> options = new ArrayList<String>();
+ private List<String> options = new ArrayList<String>( 3 );
public ChecksumPolicy()
{
@@ -82,12 +82,13 @@ public class ChecksumPolicy
{
return;
}
-
+
if ( !options.contains( policySetting ) )
{
// Not a valid code.
- throw new PolicyConfigurationException( "Unknown checksum policy setting [" + policySetting
- + "], valid settings are [" + StringUtils.join( options.iterator(), "," ) + "]" );
+ throw new PolicyConfigurationException(
+ "Unknown checksum policy setting [" + policySetting + "], valid settings are [" + StringUtils.join(
+ options.iterator(), "," ) + "]" );
}
if ( IGNORE.equals( policySetting ) )
@@ -100,8 +101,8 @@ public class ChecksumPolicy
if ( !localFile.exists() )
{
// Local File does not exist.
- throw new PolicyViolationException( "Checksum policy failure, local file " + localFile.getAbsolutePath()
- + " does not exist to check." );
+ throw new PolicyViolationException(
+ "Checksum policy failure, local file " + localFile.getAbsolutePath() + " does not exist to check." );
}
if ( FAIL.equals( policySetting ) )
@@ -120,29 +121,31 @@ public class ChecksumPolicy
file.delete();
}
}
-
+
localFile.delete();
- throw new PolicyViolationException( "Checksums do not match, policy set to FAIL, "
- + "deleting checksum files and local file " + localFile.getAbsolutePath() + "." );
+ throw new PolicyViolationException(
+ "Checksums do not match, policy set to FAIL, " + "deleting checksum files and local file "
+ + localFile.getAbsolutePath() + "." );
}
if ( FIX.equals( policySetting ) )
{
ChecksummedFile checksum = new ChecksummedFile( localFile );
- if( checksum.fixChecksums( algorithms ) )
+ if ( checksum.fixChecksums( algorithms ) )
{
log.debug( "Checksum policy set to FIX, checksum files have been updated." );
return;
}
else
{
- throw new PolicyViolationException( "Checksum policy set to FIX, "
- + "yet unable to update checksums for local file " + localFile.getAbsolutePath() + "." );
+ throw new PolicyViolationException(
+ "Checksum policy set to FIX, " + "yet unable to update checksums for local file "
+ + localFile.getAbsolutePath() + "." );
}
}
- throw new PolicyConfigurationException( "Unable to process checksum policy of [" + policySetting
- + "], please file a bug report." );
+ throw new PolicyConfigurationException(
+ "Unable to process checksum policy of [" + policySetting + "], please file a bug report." );
}
public String getDefaultOption()
Modified: archiva/trunk/archiva-modules/archiva-base/archiva-policies/src/main/java/org/apache/archiva/policies/PropagateErrorsDownloadPolicy.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-policies/src/main/java/org/apache/archiva/policies/PropagateErrorsDownloadPolicy.java?rev=1229118&r1=1229117&r2=1229118&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-base/archiva-policies/src/main/java/org/apache/archiva/policies/PropagateErrorsDownloadPolicy.java (original)
+++ archiva/trunk/archiva-modules/archiva-base/archiva-policies/src/main/java/org/apache/archiva/policies/PropagateErrorsDownloadPolicy.java Mon Jan 9 12:44:02 2012
@@ -19,26 +19,26 @@ package org.apache.archiva.policies;
* under the License.
*/
+import org.apache.commons.lang.StringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.stereotype.Service;
+
import java.io.File;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
import java.util.Properties;
-import org.apache.commons.lang.StringUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.stereotype.Service;
-
/**
* PropagateErrorsPolicy - a policy applied on error to determine how to treat the error.
*/
-@Service("downloadErrorPolicy#propagate-errors")
+@Service( "downloadErrorPolicy#propagate-errors" )
public class PropagateErrorsDownloadPolicy
implements DownloadErrorPolicy
{
private Logger log = LoggerFactory.getLogger( PropagateErrorsDownloadPolicy.class );
-
+
/**
* Signifies any error should stop searching for other proxies.
*/
@@ -54,7 +54,7 @@ public class PropagateErrorsDownloadPoli
*/
public static final String IGNORE = "ignore";
- private List<String> options = new ArrayList<String>();
+ private List<String> options = new ArrayList<String>( 3 );
public PropagateErrorsDownloadPolicy()
{
@@ -71,7 +71,8 @@ public class PropagateErrorsDownloadPoli
{
// Not a valid code.
throw new PolicyConfigurationException( "Unknown error policy setting [" + policySetting +
- "], valid settings are [" + StringUtils.join( options.iterator(), "," ) + "]" );
+ "], valid settings are [" + StringUtils.join(
+ options.iterator(), "," ) + "]" );
}
if ( IGNORE.equals( policySetting ) )
Modified: archiva/trunk/archiva-modules/archiva-base/archiva-policies/src/main/java/org/apache/archiva/policies/PropagateErrorsOnUpdateDownloadPolicy.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-policies/src/main/java/org/apache/archiva/policies/PropagateErrorsOnUpdateDownloadPolicy.java?rev=1229118&r1=1229117&r2=1229118&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-base/archiva-policies/src/main/java/org/apache/archiva/policies/PropagateErrorsOnUpdateDownloadPolicy.java (original)
+++ archiva/trunk/archiva-modules/archiva-base/archiva-policies/src/main/java/org/apache/archiva/policies/PropagateErrorsOnUpdateDownloadPolicy.java Mon Jan 9 12:44:02 2012
@@ -19,19 +19,19 @@ package org.apache.archiva.policies;
* under the License.
*/
+import org.apache.commons.lang.StringUtils;
+import org.springframework.stereotype.Service;
+
import java.io.File;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
import java.util.Properties;
-import org.apache.commons.lang.StringUtils;
-import org.springframework.stereotype.Service;
-
/**
* PropagateErrorsPolicy - a policy applied on error to determine how to treat the error.
*/
-@Service("downloadErrorPolicy#propagate-errors-on-update")
+@Service( "downloadErrorPolicy#propagate-errors-on-update" )
public class PropagateErrorsOnUpdateDownloadPolicy
implements DownloadErrorPolicy
{
@@ -45,7 +45,7 @@ public class PropagateErrorsOnUpdateDown
*/
public static final String NOT_PRESENT = "artifact not already present";
- private List<String> options = new ArrayList<String>();
+ private List<String> options = new ArrayList<String>( 2 );
public PropagateErrorsOnUpdateDownloadPolicy()
{
@@ -54,14 +54,15 @@ public class PropagateErrorsOnUpdateDown
}
public boolean applyPolicy( String policySetting, Properties request, File localFile, Exception exception,
- Map<String,Exception> previousExceptions )
+ Map<String, Exception> previousExceptions )
throws PolicyConfigurationException
{
if ( !options.contains( policySetting ) )
{
// Not a valid code.
- throw new PolicyConfigurationException( "Unknown error policy setting [" + policySetting
- + "], valid settings are [" + StringUtils.join( options.iterator(), "," ) + "]" );
+ throw new PolicyConfigurationException(
+ "Unknown error policy setting [" + policySetting + "], valid settings are [" + StringUtils.join(
+ options.iterator(), "," ) + "]" );
}
if ( ALWAYS.equals( policySetting ) )
@@ -76,8 +77,8 @@ public class PropagateErrorsOnUpdateDown
return !localFile.exists();
}
- throw new PolicyConfigurationException( "Unable to process checksum policy of [" + policySetting
- + "], please file a bug report." );
+ throw new PolicyConfigurationException(
+ "Unable to process checksum policy of [" + policySetting + "], please file a bug report." );
}
public String getDefaultOption()
Modified: archiva/trunk/archiva-modules/archiva-base/archiva-proxy/src/main/java/org/apache/archiva/proxy/DefaultRepositoryProxyConnectors.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-proxy/src/main/java/org/apache/archiva/proxy/DefaultRepositoryProxyConnectors.java?rev=1229118&r1=1229117&r2=1229118&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-base/archiva-proxy/src/main/java/org/apache/archiva/proxy/DefaultRepositoryProxyConnectors.java (original)
+++ archiva/trunk/archiva-modules/archiva-base/archiva-proxy/src/main/java/org/apache/archiva/proxy/DefaultRepositoryProxyConnectors.java Mon Jan 9 12:44:02 2012
@@ -20,13 +20,6 @@ package org.apache.archiva.proxy;
*/
import com.google.common.collect.Lists;
-import org.apache.archiva.proxy.common.WagonFactory;
-import org.apache.archiva.proxy.common.WagonFactoryException;
-import org.apache.archiva.scheduler.ArchivaTaskScheduler;
-import org.apache.archiva.scheduler.repository.RepositoryTask;
-import org.apache.commons.collections.CollectionUtils;
-import org.apache.commons.io.FileUtils;
-import org.apache.commons.lang.StringUtils;
import org.apache.archiva.configuration.ArchivaConfiguration;
import org.apache.archiva.configuration.ConfigurationNames;
import org.apache.archiva.configuration.NetworkProxyConfiguration;
@@ -42,6 +35,8 @@ import org.apache.archiva.policies.PostD
import org.apache.archiva.policies.PreDownloadPolicy;
import org.apache.archiva.policies.ProxyDownloadException;
import org.apache.archiva.policies.urlcache.UrlFailureCache;
+import org.apache.archiva.proxy.common.WagonFactory;
+import org.apache.archiva.proxy.common.WagonFactoryException;
import org.apache.archiva.repository.ManagedRepositoryContent;
import org.apache.archiva.repository.RemoteRepositoryContent;
import org.apache.archiva.repository.RepositoryContentFactory;
@@ -49,6 +44,11 @@ import org.apache.archiva.repository.Rep
import org.apache.archiva.repository.RepositoryNotFoundException;
import org.apache.archiva.repository.metadata.MetadataTools;
import org.apache.archiva.repository.metadata.RepositoryMetadataException;
+import org.apache.archiva.scheduler.ArchivaTaskScheduler;
+import org.apache.archiva.scheduler.repository.RepositoryTask;
+import org.apache.commons.collections.CollectionUtils;
+import org.apache.commons.io.FileUtils;
+import org.apache.commons.lang.StringUtils;
import org.apache.maven.wagon.ConnectionException;
import org.apache.maven.wagon.ResourceDoesNotExistException;
import org.apache.maven.wagon.Wagon;
@@ -195,7 +195,7 @@ public class DefaultRepositoryProxyConne
connector.setDisabled( proxyConfig.isDisabled() );
// Copy any blacklist patterns.
- List<String> blacklist = new ArrayList<String>();
+ List<String> blacklist = new ArrayList<String>( 0 );
if ( CollectionUtils.isNotEmpty( proxyConfig.getBlackListPatterns() ) )
{
blacklist.addAll( proxyConfig.getBlackListPatterns() );
@@ -203,7 +203,7 @@ public class DefaultRepositoryProxyConne
connector.setBlacklist( blacklist );
// Copy any whitelist patterns.
- List<String> whitelist = new ArrayList<String>();
+ List<String> whitelist = new ArrayList<String>( 0 );
if ( CollectionUtils.isNotEmpty( proxyConfig.getWhiteListPatterns() ) )
{
whitelist.addAll( proxyConfig.getWhiteListPatterns() );
@@ -215,7 +215,7 @@ public class DefaultRepositoryProxyConne
if ( connectors == null )
{
// Create if we are the first.
- connectors = new ArrayList<ProxyConnector>();
+ connectors = new ArrayList<ProxyConnector>( 1 );
}
// Add the connector.
@@ -959,9 +959,9 @@ public class DefaultRepositoryProxyConne
previousExceptions.remove( content.getId() );
}
- log.warn( "Transfer error from repository \"" + content.getRepository().getId() + "\" for artifact "
- + Keys.toKey( artifact ) + ", continuing to next repository. Error message: "
- + exception.getMessage() );
+ log.warn(
+ "Transfer error from repository \"" + content.getRepository().getId() + "\" for artifact " + Keys.toKey(
+ artifact ) + ", continuing to next repository. Error message: " + exception.getMessage() );
log.debug( "Full stack trace", exception );
}
@@ -1165,10 +1165,9 @@ public class DefaultRepositoryProxyConne
public void afterConfigurationChange( Registry registry, String propertyName, Object propertyValue )
{
- if ( ConfigurationNames.isNetworkProxy( propertyName )
- || ConfigurationNames.isManagedRepositories( propertyName )
- || ConfigurationNames.isRemoteRepositories( propertyName ) || ConfigurationNames.isProxyConnector(
- propertyName ) )
+ if ( ConfigurationNames.isNetworkProxy( propertyName ) || ConfigurationNames.isManagedRepositories(
+ propertyName ) || ConfigurationNames.isRemoteRepositories( propertyName )
+ || ConfigurationNames.isProxyConnector( propertyName ) )
{
initConnectorsAndNetworkProxies();
}
Modified: archiva/trunk/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-api/src/main/java/org/apache/archiva/admin/model/AbstractRepositoryConnector.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-api/src/main/java/org/apache/archiva/admin/model/AbstractRepositoryConnector.java?rev=1229118&r1=1229117&r2=1229118&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-api/src/main/java/org/apache/archiva/admin/model/AbstractRepositoryConnector.java (original)
+++ archiva/trunk/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-api/src/main/java/org/apache/archiva/admin/model/AbstractRepositoryConnector.java Mon Jan 9 12:44:02 2012
@@ -126,7 +126,7 @@ public abstract class AbstractRepository
{
if ( this.blackListPatterns == null )
{
- this.blackListPatterns = new ArrayList<String>();
+ this.blackListPatterns = new ArrayList<String>( 0 );
}
return this.blackListPatterns;
@@ -201,7 +201,7 @@ public abstract class AbstractRepository
{
if ( this.whiteListPatterns == null )
{
- this.whiteListPatterns = new ArrayList<String>();
+ this.whiteListPatterns = new ArrayList<String>( 0 );
}
return this.whiteListPatterns;
Modified: archiva/trunk/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-api/src/main/java/org/apache/archiva/admin/model/beans/FileType.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-api/src/main/java/org/apache/archiva/admin/model/beans/FileType.java?rev=1229118&r1=1229117&r2=1229118&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-api/src/main/java/org/apache/archiva/admin/model/beans/FileType.java (original)
+++ archiva/trunk/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-api/src/main/java/org/apache/archiva/admin/model/beans/FileType.java Mon Jan 9 12:44:02 2012
@@ -66,7 +66,7 @@ public class FileType
{
if ( patterns == null )
{
- this.patterns = new ArrayList<String>();
+ this.patterns = new ArrayList<String>( 0 );
}
return patterns;
}
Modified: archiva/trunk/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-api/src/main/java/org/apache/archiva/admin/model/beans/RepositoryGroup.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-api/src/main/java/org/apache/archiva/admin/model/beans/RepositoryGroup.java?rev=1229118&r1=1229117&r2=1229118&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-api/src/main/java/org/apache/archiva/admin/model/beans/RepositoryGroup.java (original)
+++ archiva/trunk/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-api/src/main/java/org/apache/archiva/admin/model/beans/RepositoryGroup.java Mon Jan 9 12:44:02 2012
@@ -77,11 +77,11 @@ public class RepositoryGroup
*
* @return List
*/
- public java.util.List<String> getRepositories()
+ public List<String> getRepositories()
{
if ( this.repositories == null )
{
- this.repositories = new ArrayList<String>();
+ this.repositories = new ArrayList<String>( 0 );
}
return this.repositories;
Modified: archiva/trunk/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/main/java/org/apache/archiva/admin/repository/admin/DefaultArchivaAdministration.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/admin/DefaultArchivaAdministration.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/admin/DefaultArchivaAdministration.java (original)
+++ archiva/trunk/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/main/java/org/apache/archiva/admin/repository/admin/DefaultArchivaAdministration.java Mon Jan 9 12:44:02 2012
@@ -64,7 +64,8 @@ public class DefaultArchivaAdministratio
public List<LegacyArtifactPath> getLegacyArtifactPaths()
throws RepositoryAdminException
{
- List<LegacyArtifactPath> legacyArtifactPaths = new ArrayList<LegacyArtifactPath>();
+ List<LegacyArtifactPath> legacyArtifactPaths = new ArrayList<LegacyArtifactPath>(
+ getArchivaConfiguration().getConfiguration().getLegacyArtifactPaths().size() );
for ( org.apache.archiva.configuration.LegacyArtifactPath legacyArtifactPath : getArchivaConfiguration().getConfiguration().getLegacyArtifactPaths() )
{
legacyArtifactPaths.add(
@@ -113,7 +114,8 @@ public class DefaultArchivaAdministratio
if ( fileType.getPatterns().contains( pattern ) )
{
- throw new RepositoryAdminException( "File type [" + fileTypeId + "] already contains pattern [" + pattern + "]" );
+ throw new RepositoryAdminException(
+ "File type [" + fileTypeId + "] already contains pattern [" + pattern + "]" );
}
fileType.addPattern( pattern );
@@ -255,7 +257,7 @@ public class DefaultArchivaAdministratio
{
return Collections.emptyList();
}
- List<FileType> fileTypes = new ArrayList<FileType>();
+ List<FileType> fileTypes = new ArrayList<FileType>( configFileTypes.size() );
for ( org.apache.archiva.configuration.FileType fileType : configFileTypes )
{
fileTypes.add( new BeanReplicator().replicateBean( fileType, FileType.class ) );
Modified: archiva/trunk/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/main/java/org/apache/archiva/admin/repository/group/DefaultRepositoryGroupAdmin.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/group/DefaultRepositoryGroupAdmin.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/group/DefaultRepositoryGroupAdmin.java (original)
+++ archiva/trunk/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/main/java/org/apache/archiva/admin/repository/group/DefaultRepositoryGroupAdmin.java Mon Jan 9 12:44:02 2012
@@ -26,9 +26,9 @@ import org.apache.archiva.admin.model.gr
import org.apache.archiva.admin.model.managed.ManagedRepositoryAdmin;
import org.apache.archiva.admin.repository.AbstractRepositoryAdmin;
import org.apache.archiva.audit.AuditEvent;
-import org.apache.commons.lang.StringUtils;
import org.apache.archiva.configuration.Configuration;
import org.apache.archiva.configuration.RepositoryGroupConfiguration;
+import org.apache.commons.lang.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.stereotype.Service;
@@ -61,7 +61,8 @@ public class DefaultRepositoryGroupAdmin
public List<RepositoryGroup> getRepositoriesGroups()
throws RepositoryAdminException
{
- List<RepositoryGroup> repositoriesGroups = new ArrayList<RepositoryGroup>();
+ List<RepositoryGroup> repositoriesGroups =
+ new ArrayList<RepositoryGroup>( getArchivaConfiguration().getConfiguration().getRepositoryGroups().size() );
for ( RepositoryGroupConfiguration repositoryGroupConfiguration : getArchivaConfiguration().getConfiguration().getRepositoryGroups() )
{