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

[MNG-6631] - Make DefaultArtifactVersion faster 

Use if-statements instead of exception-based control flow.
Throwing exceptions is very expensive and should not be used
for normal flow.
This commit is contained in:
Stefan Oehme 2019-04-09 15:49:56 +02:00 committed by Hervé Boutemy
parent ebac165990
commit 44ad1aafa6
1 changed files with 58 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

96
maven-artifact/src/main/java/org/apache/maven/artifact/versioning/DefaultArtifactVersion.java
View File

@ -20,8 +20,8 @@ package org.apache.maven.artifact.versioning;
*/
import java.util.StringTokenizer;
import java.util.regex.Pattern;
import java.util.NoSuchElementException;
import static org.apache.commons.lang3.math.NumberUtils.isDigits;
/**
* Default implementation of artifact versioning.
@ -128,18 +128,15 @@ public class DefaultArtifactVersion
if ( part2 != null )
{
try
if ( part2.length() == 1 || !part2.startsWith( "0" ) )
{
if ( ( part2.length() == 1 ) || !part2.startsWith( "0" ) )
{
buildNumber = Integer.valueOf( part2 );
}
else
buildNumber = tryParseInt( part2 );
if ( buildNumber == null )
{
qualifier = part2;
}
}
catch ( NumberFormatException e )
else
{
qualifier = part2;
}
@ -147,11 +144,8 @@ public class DefaultArtifactVersion
if ( ( !part1.contains( "." ) ) && !part1.startsWith( "0" ) )
{
try
{
majorVersion = Integer.valueOf( part1 );
}
catch ( NumberFormatException e )
majorVersion = tryParseInt( part1 );
if ( majorVersion == null )
{
// qualifier is the whole version, including "-"
qualifier = version;
@ -163,30 +157,42 @@ public class DefaultArtifactVersion
boolean fallback = false;
StringTokenizer tok = new StringTokenizer( part1, "." );
try
if ( tok.hasMoreTokens() )
{
majorVersion = getNextIntegerToken( tok );
if ( tok.hasMoreTokens() )
{
minorVersion = getNextIntegerToken( tok );
}
if ( tok.hasMoreTokens() )
{
incrementalVersion = getNextIntegerToken( tok );
}
if ( tok.hasMoreTokens() )
{
qualifier = tok.nextToken();
fallback = Pattern.compile( "\\d+" ).matcher( qualifier ).matches();
}
// string tokenizer won't detect these and ignores them
if ( part1.contains( ".." ) || part1.startsWith( "." ) || part1.endsWith( "." ) )
if ( majorVersion == null )
{
fallback = true;
}
}
catch ( NumberFormatException e )
else
{
fallback = true;
}
if ( tok.hasMoreTokens() )
{
minorVersion = getNextIntegerToken( tok );
if ( minorVersion == null )
{
fallback = true;
}
}
if ( tok.hasMoreTokens() )
{
incrementalVersion = getNextIntegerToken( tok );
if ( incrementalVersion == null )
{
fallback = true;
}
}
if ( tok.hasMoreTokens() )
{
qualifier = tok.nextToken();
fallback = isDigits( qualifier );
}
// string tokenizer won't detect these and ignores them
if ( part1.contains( ".." ) || part1.startsWith( "." ) || part1.endsWith( "." ) )
{
fallback = true;
}
@ -204,19 +210,33 @@ public class DefaultArtifactVersion
}
private static Integer getNextIntegerToken( StringTokenizer tok )
{
try
{
String s = tok.nextToken();
if ( ( s.length() > 1 ) && s.startsWith( "0" ) )
{
throw new NumberFormatException( "Number part has a leading 0: '" + s + "'" );
return null;
}
return Integer.valueOf( s );
return tryParseInt( s );
}
catch ( NoSuchElementException e )
private static Integer tryParseInt( String s )
{
throw new NumberFormatException( "Number is invalid" );
try
{
if ( !isDigits( s ) )
{
return null;
}
long longValue = Long.parseLong( s );
if ( longValue > Integer.MAX_VALUE )
{
return null;
}
return (int) longValue;
}
catch ( NumberFormatException e )
{
return null;
}
}