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

[MRM-560] Dependency Tree causes an Exception 

Improving exception messages on bad ArchivaArtifact to include what details it does have.



git-svn-id: https://svn.apache.org/repos/asf/maven/archiva/trunk@588805 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Joakim Erdfelt 2007-10-26 23:49:53 +00:00
parent 103874e80e
commit 40001e82b1
2 changed files with 21 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
archiva-base/archiva-model/src/main/java/org/apache/maven/archiva/model/ArchivaArtifact.java
View File

@ -41,22 +41,26 @@ public class ArchivaArtifact
{ {
if ( empty( groupId ) ) if ( empty( groupId ) )
{ {
throw new IllegalArgumentException( "Unable to create ArchivaArtifact with empty groupId." ); throw new IllegalArgumentException( "Unable to create ArchivaArtifact with empty groupId ["
+ Keys.toKey( groupId, artifactId, version, classifier, type ) + "]" );
} }
if ( empty( artifactId ) ) if ( empty( artifactId ) )
{ {
throw new IllegalArgumentException( "Unable to create ArchivaArtifact with empty artifactId." ); throw new IllegalArgumentException( "Unable to create ArchivaArtifact with empty artifactId ["
+ Keys.toKey( groupId, artifactId, version, classifier, type ) + "]" );
} }
if ( empty( version ) ) if ( empty( version ) )
{ {
throw new IllegalArgumentException( "Unable to create ArchivaArtifact with empty version." ); throw new IllegalArgumentException( "Unable to create ArchivaArtifact with empty version ["
+ Keys.toKey( groupId, artifactId, version, classifier, type ) + "]" );
} }
if ( empty( type ) ) if ( empty( type ) )
{ {
throw new IllegalArgumentException( "Unable to create ArchivaArtifact with empty type." ); throw new IllegalArgumentException( "Unable to create ArchivaArtifact with empty type ["
+ Keys.toKey( groupId, artifactId, version, classifier, type ) + "]" );
} }
model = new ArchivaArtifactModel(); model = new ArchivaArtifactModel();

25
archiva-base/archiva-model/src/main/java/org/apache/maven/archiva/model/Keys.java
View File

@ -35,19 +35,24 @@ public class Keys
return toKey( model.getGroupId(), model.getArtifactId(), model.getVersion() ); return toKey( model.getGroupId(), model.getArtifactId(), model.getVersion() );
} }
public static String toKey( ArtifactReference ref ) public static String toKey( String groupId, String artifactId, String version, String classifier, String type )
{ {
StringBuffer key = new StringBuffer(); StringBuffer key = new StringBuffer();
key.append( ref.getGroupId() ).append( ":" ); key.append( groupId ).append( ":" );
key.append( ref.getArtifactId() ).append( ":" ); key.append( artifactId ).append( ":" );
key.append( ref.getVersion() ).append( ":" ); key.append( version ).append( ":" );
key.append( StringUtils.defaultString( ref.getClassifier() ) ).append( ":" ); key.append( StringUtils.defaultString( classifier ) ).append( ":" );
key.append( ref.getType() ); key.append( type );
return key.toString(); return key.toString();
} }
public static String toKey( ArtifactReference ref )
{
return toKey( ref.getGroupId(), ref.getArtifactId(), ref.getVersion(), ref.getClassifier(), ref.getType() );
}
public static String toKey( ProjectReference ref ) public static String toKey( ProjectReference ref )
{ {
StringBuffer key = new StringBuffer(); StringBuffer key = new StringBuffer();
@ -71,12 +76,6 @@ public class Keys
public static String toKey( VersionedReference ref ) public static String toKey( VersionedReference ref )
{ {
StringBuffer key = new StringBuffer(); return toKey( ref.getGroupId(), ref.getArtifactId(), ref.getVersion() );
key.append( ref.getGroupId() ).append( ":" );
key.append( ref.getArtifactId() ).append( ":" );
key.append( ref.getVersion() );
return key.toString();
} }
} }