You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@archiva.apache.org by br...@apache.org on 2010/11/29 01:39:44 UTC
svn commit: r1039994 - in /archiva/trunk/archiva-modules:
archiva-base/archiva-artifact-converter/src/main/java/org/apache/maven/archiva/converter/artifact/
plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/
...
Author: brett
Date: Mon Nov 29 00:39:43 2010
New Revision: 1039994
URL: http://svn.apache.org/viewvc?rev=1039994&view=rev
Log:
[MRM-1435] fix up useless boxing issues
Submitted by: Dave Brosius
Modified:
archiva/trunk/archiva-modules/archiva-base/archiva-artifact-converter/src/main/java/org/apache/maven/archiva/converter/artifact/LegacyToDefaultConverter.java
archiva/trunk/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/Maven2RepositoryPathTranslator.java
archiva/trunk/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/MavenArtifactFacet.java
archiva/trunk/archiva-modules/plugins/metadata-repository-file/src/main/java/org/apache/archiva/metadata/repository/file/FileMetadataRepository.java
archiva/trunk/archiva-modules/plugins/repository-statistics/src/main/java/org/apache/archiva/metadata/repository/stats/RepositoryStatistics.java
Modified: archiva/trunk/archiva-modules/archiva-base/archiva-artifact-converter/src/main/java/org/apache/maven/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/maven/archiva/converter/artifact/LegacyToDefaultConverter.java?rev=1039994&r1=1039993&r2=1039994&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-base/archiva-artifact-converter/src/main/java/org/apache/maven/archiva/converter/artifact/LegacyToDefaultConverter.java (original)
+++ archiva/trunk/archiva-modules/archiva-base/archiva-artifact-converter/src/main/java/org/apache/maven/archiva/converter/artifact/LegacyToDefaultConverter.java Mon Nov 29 00:39:43 2010
@@ -145,7 +145,7 @@ public class LegacyToDefaultConverter
if ( matcher.matches() )
{
Snapshot snapshot = new Snapshot();
- snapshot.setBuildNumber( Integer.valueOf( matcher.group( 3 ) ).intValue() );
+ snapshot.setBuildNumber( Integer.parseInt( matcher.group( 3 ) ) );
snapshot.setTimestamp( matcher.group( 2 ) );
versioning.setSnapshot( snapshot );
}
@@ -520,7 +520,7 @@ public class LegacyToDefaultConverter
if ( metadata.getVersioning() != null && metadata.getVersioning().getSnapshot() != null )
{
Snapshot snapshot = metadata.getVersioning().getSnapshot();
- int build = Integer.valueOf( matcher.group( 3 ) ).intValue();
+ int build = Integer.parseInt( matcher.group( 3 ) );
String ts = matcher.group( 2 );
if ( build == snapshot.getBuildNumber() && ts.equals( snapshot.getTimestamp() ) )
{
Modified: archiva/trunk/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/Maven2RepositoryPathTranslator.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/Maven2RepositoryPathTranslator.java?rev=1039994&r1=1039993&r2=1039994&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/Maven2RepositoryPathTranslator.java (original)
+++ archiva/trunk/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/Maven2RepositoryPathTranslator.java Mon Nov 29 00:39:43 2010
@@ -196,7 +196,7 @@ public class Maven2RepositoryPathTransla
String timestamp = m.group( 1 );
String buildNumber = m.group( 2 );
facet.setTimestamp( timestamp );
- facet.setBuildNumber( Integer.valueOf( buildNumber ) );
+ facet.setBuildNumber( Integer.parseInt( buildNumber ) );
version = idSubStrFromVersion.substring( 0, mainVersionLength ) + timestamp + "-" + buildNumber;
}
catch ( IllegalStateException e )
Modified: archiva/trunk/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/MavenArtifactFacet.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/MavenArtifactFacet.java?rev=1039994&r1=1039993&r2=1039994&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/MavenArtifactFacet.java (original)
+++ archiva/trunk/archiva-modules/plugins/maven2-repository/src/main/java/org/apache/archiva/metadata/repository/storage/maven2/MavenArtifactFacet.java Mon Nov 29 00:39:43 2010
@@ -115,7 +115,7 @@ public class MavenArtifactFacet
String buildNumber = properties.get( "buildNumber" );
if ( buildNumber != null )
{
- this.buildNumber = Integer.valueOf( buildNumber );
+ this.buildNumber = Integer.parseInt( buildNumber );
}
}
}
Modified: archiva/trunk/archiva-modules/plugins/metadata-repository-file/src/main/java/org/apache/archiva/metadata/repository/file/FileMetadataRepository.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/plugins/metadata-repository-file/src/main/java/org/apache/archiva/metadata/repository/file/FileMetadataRepository.java?rev=1039994&r1=1039993&r2=1039994&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/plugins/metadata-repository-file/src/main/java/org/apache/archiva/metadata/repository/file/FileMetadataRepository.java (original)
+++ archiva/trunk/archiva-modules/plugins/metadata-repository-file/src/main/java/org/apache/archiva/metadata/repository/file/FileMetadataRepository.java Mon Nov 29 00:39:43 2010
@@ -255,7 +255,7 @@ public class FileMetadataRepository
File directory = new File( getDirectory( repoId ), namespace + "/" + projectId + "/" + projectVersion );
Properties properties = readOrCreateProperties( directory, PROJECT_VERSION_METADATA_KEY );
- int i = Integer.valueOf( properties.getProperty( "ref:lastReferenceNum", "-1" ) ) + 1;
+ int i = Integer.parseInt( properties.getProperty( "ref:lastReferenceNum", "-1" ) ) + 1;
setProperty( properties, "ref:lastReferenceNum", Integer.toString( i ) );
setProperty( properties, "ref:reference." + i + ".namespace", reference.getNamespace() );
setProperty( properties, "ref:reference." + i + ".projectId", reference.getProjectId() );
@@ -470,7 +470,7 @@ public class FileMetadataRepository
String value = (String) entry.getValue();
if ( "updated".equals( field ) )
{
- artifact.setFileLastModified( Long.valueOf( value ) );
+ artifact.setFileLastModified( Long.parseLong( value ) );
}
else if ( "size".equals( field ) )
{
@@ -478,7 +478,7 @@ public class FileMetadataRepository
}
else if ( "whenGathered".equals( field ) )
{
- artifact.setWhenGathered( new Date( Long.valueOf( value ) ) );
+ artifact.setWhenGathered( new Date( Long.parseLong( value ) ) );
}
else if ( "version".equals( field ) )
{
@@ -937,7 +937,7 @@ public class FileMetadataRepository
File directory = new File( getDirectory( repoId ), namespace + "/" + projectId + "/" + projectVersion );
Properties properties = readOrCreateProperties( directory, PROJECT_VERSION_METADATA_KEY );
- int numberOfRefs = Integer.valueOf( properties.getProperty( "ref:lastReferenceNum", "-1" ) ) + 1;
+ int numberOfRefs = Integer.parseInt( properties.getProperty( "ref:lastReferenceNum", "-1" ) ) + 1;
List<ProjectVersionReference> references = new ArrayList<ProjectVersionReference>();
for ( int i = 0; i < numberOfRefs; i++ )
Modified: archiva/trunk/archiva-modules/plugins/repository-statistics/src/main/java/org/apache/archiva/metadata/repository/stats/RepositoryStatistics.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/plugins/repository-statistics/src/main/java/org/apache/archiva/metadata/repository/stats/RepositoryStatistics.java?rev=1039994&r1=1039993&r2=1039994&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/plugins/repository-statistics/src/main/java/org/apache/archiva/metadata/repository/stats/RepositoryStatistics.java (original)
+++ archiva/trunk/archiva-modules/plugins/repository-statistics/src/main/java/org/apache/archiva/metadata/repository/stats/RepositoryStatistics.java Mon Nov 29 00:39:43 2010
@@ -176,14 +176,14 @@ public class RepositoryStatistics
public void fromProperties( Map<String, String> properties )
{
- scanEndTime = new Date( Long.valueOf( properties.get( "scanEndTime" ) ) );
- scanStartTime = new Date( Long.valueOf( properties.get( "scanStartTime" ) ) );
- totalArtifactCount = Long.valueOf( properties.get( "totalArtifactCount" ) );
- totalArtifactFileSize = Long.valueOf( properties.get( "totalArtifactFileSize" ) );
- totalFileCount = Long.valueOf( properties.get( "totalFileCount" ) );
- totalGroupCount = Long.valueOf( properties.get( "totalGroupCount" ) );
- totalProjectCount = Long.valueOf( properties.get( "totalProjectCount" ) );
- newFileCount = Long.valueOf( properties.get( "newFileCount" ) );
+ scanEndTime = new Date( Long.parseLong( properties.get( "scanEndTime" ) ) );
+ scanStartTime = new Date( Long.parseLong( properties.get( "scanStartTime" ) ) );
+ totalArtifactCount = Long.parseLong( properties.get( "totalArtifactCount" ) );
+ totalArtifactFileSize = Long.parseLong( properties.get( "totalArtifactFileSize" ) );
+ totalFileCount = Long.parseLong( properties.get( "totalFileCount" ) );
+ totalGroupCount = Long.parseLong( properties.get( "totalGroupCount" ) );
+ totalProjectCount = Long.parseLong( properties.get( "totalProjectCount" ) );
+ newFileCount = Long.parseLong( properties.get( "newFileCount" ) );
totalCountForType.clear();
for ( Map.Entry<String, String> entry : properties.entrySet() )
{