Apache
/
maven
mirror of https://github.com/apache/maven.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

use MavenMetadata.read(File) API instead of duplicating code

This commit is contained in:
Hervé Boutemy 2013-01-19 09:04:29 +01:00
parent 9a1d22fa40
commit 1408254fb8
3 changed files with 3 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
maven-aether-provider/src/main/java/org/apache/maven/repository/internal/DefaultVersionRangeResolver.java
View File

@ -246,7 +246,7 @@ public class DefaultVersionRangeResolver
{ {
syncContext.acquire( null, Collections.singleton( metadata ) ); syncContext.acquire( null, Collections.singleton( metadata ) );
versioning = DefaultVersionResolver.readMavenRepositoryMetadataVersioning( metadata.getFile() ); versioning = MavenMetadata.read( metadata.getFile() ).getVersioning();
} }
catch ( Exception e ) catch ( Exception e )
{ {

31
maven-aether-provider/src/main/java/org/apache/maven/repository/internal/DefaultVersionResolver.java
View File

@ -20,9 +20,7 @@ package org.apache.maven.repository.internal;
*/ */
import java.io.File; import java.io.File;
import java.io.FileInputStream;
import java.io.IOException; import java.io.IOException;
import java.io.InputStream;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Collections; import java.util.Collections;
import java.util.HashMap; import java.util.HashMap;
@ -32,12 +30,9 @@ import java.util.Map;
import org.apache.maven.artifact.repository.metadata.Snapshot; import org.apache.maven.artifact.repository.metadata.Snapshot;
import org.apache.maven.artifact.repository.metadata.SnapshotVersion; import org.apache.maven.artifact.repository.metadata.SnapshotVersion;
import org.apache.maven.artifact.repository.metadata.Versioning; import org.apache.maven.artifact.repository.metadata.Versioning;
import org.apache.maven.artifact.repository.metadata.io.xpp3.MetadataXpp3Reader;
import org.codehaus.plexus.component.annotations.Component; import org.codehaus.plexus.component.annotations.Component;
import org.codehaus.plexus.component.annotations.Requirement; import org.codehaus.plexus.component.annotations.Requirement;
import org.codehaus.plexus.util.IOUtil;
import org.codehaus.plexus.util.StringUtils; import org.codehaus.plexus.util.StringUtils;
import org.codehaus.plexus.util.xml.pull.XmlPullParserException;
import org.sonatype.aether.RepositoryCache; import org.sonatype.aether.RepositoryCache;
import org.sonatype.aether.RepositoryEvent.EventType; import org.sonatype.aether.RepositoryEvent.EventType;
import org.sonatype.aether.RepositorySystemSession; import org.sonatype.aether.RepositorySystemSession;
@ -324,7 +319,7 @@ public class DefaultVersionResolver
{ {
syncContext.acquire( null, Collections.singleton( metadata ) ); syncContext.acquire( null, Collections.singleton( metadata ) );
versioning = readMavenRepositoryMetadataVersioning( metadata.getFile() ); versioning = MavenMetadata.read( metadata.getFile() ).getVersioning();
/* /*
* NOTE: Users occasionally misuse the id "local" for remote repos which screws up the metadata * NOTE: Users occasionally misuse the id "local" for remote repos which screws up the metadata
@ -363,30 +358,6 @@ public class DefaultVersionResolver
return ( versioning != null ) ? versioning : new Versioning(); return ( versioning != null ) ? versioning : new Versioning();
} }
static Versioning readMavenRepositoryMetadataVersioning( File metadataFile )
throws IOException, XmlPullParserException
{
if ( metadataFile == null ||! metadataFile.exists() )
{
return null;
}
InputStream is = null;
try
{
is = new FileInputStream( metadataFile );
MetadataXpp3Reader reader = new MetadataXpp3Reader();
org.apache.maven.artifact.repository.metadata.Metadata m = reader.read( is, false );
return m.getVersioning();
}
finally
{
IOUtil.close( is );
}
}
private void invalidMetadata( RepositorySystemSession session, RequestTrace trace, Metadata metadata, private void invalidMetadata( RepositorySystemSession session, RequestTrace trace, Metadata metadata,
ArtifactRepository repository, Exception exception ) ArtifactRepository repository, Exception exception )
{ {

2
maven-aether-provider/src/main/java/org/apache/maven/repository/internal/MavenMetadata.java
View File

@ -84,7 +84,7 @@ abstract class MavenMetadata
protected abstract void merge( Metadata recessive ); protected abstract void merge( Metadata recessive );
private Metadata read( File metadataFile ) static Metadata read( File metadataFile )
throws RepositoryException throws RepositoryException
{ {
if ( metadataFile.length() <= 0 ) if ( metadataFile.length() <= 0 )