Commit to undo the changes I've made since forked the original project. The reason is that I've made a mistake and created a unique PR to solve several issues, which is a bad practice.

Author: belingueres

src/main/java/org/codehaus/plexus/interpolation/multi/MultiDelimiterStringSearchInterpolator.java

@@ -201,16 +201,13 @@ private String interpolate( String input, RecursionInterceptor recursionIntercep
 
 if ( startIdx >= 0 && escapeString != null && escapeString.length() > 0 )
 {
-intstartEscapeIdx = (startIdx == 0) ? 0 : startIdx - escapeString.length();
+intstartEscapeIdx = startIdx == 0 ? 0 : startIdx - escapeString.length();
 if ( startEscapeIdx >= 0 )
 {
 Stringescape = input.substring( startEscapeIdx, startIdx );
 if ( escape != null && escapeString.equals( escape ) )
 {
 result.append( wholeExpr );
-if (startEscapeIdx > 0){
- --startEscapeIdx;
- }
 result.replace( startEscapeIdx, startEscapeIdx + escapeString.length(), "" );
 continue;
  }

src/main/java/org/codehaus/plexus/interpolation/reflection/ReflectionValueExtractor.java

@@ -1,13 +1,5 @@
 packageorg.codehaus.plexus.interpolation.reflection;
 
-importjava.lang.ref.WeakReference;
-importjava.lang.reflect.Array;
-importjava.lang.reflect.InvocationTargetException;
-importjava.lang.reflect.Method;
-importjava.util.List;
-importjava.util.Map;
-importjava.util.WeakHashMap;
-
 /*
  * Copyright 2001-2006 Codehaus Foundation.
  *
@@ -26,6 +18,13 @@
 
 importorg.codehaus.plexus.interpolation.util.StringUtils;
 
+importjava.lang.ref.SoftReference;
+importjava.lang.ref.WeakReference;
+importjava.lang.reflect.Method;
+importjava.util.Map;
+importjava.util.StringTokenizer;
+importjava.util.WeakHashMap;
+
 /**
  * <b>NOTE:</b> This class was copied from plexus-utils, to allow this library
  * to stand completely self-contained.
@@ -44,317 +43,90 @@ public class ReflectionValueExtractor
 privatestaticfinalObject[] OBJECT_ARGS = newObject[0];
 
 /**
- * Use a WeakHashMap here, so the keys (Class objects) can be garbage collected. This approach prevents permgen
- * space overflows due to retention of discarded classloaders.
+ * Use a WeakHashMap here, so the keys (Class objects) can be garbage collected.
+ * This approach prevents permgen space overflows due to retention of discarded
+ * classloaders.
  */
-privatestaticfinalMap<Class<?>, WeakReference<ClassMap>> classMaps =
-newWeakHashMap<Class<?>, WeakReference<ClassMap>>();
-
-staticfinalintEOF = -1;
-
-staticfinalcharPROPERTY_START = '.';
-
-staticfinalcharINDEXED_START = '[';
-
-staticfinalcharINDEXED_END = ']';
-
-staticfinalcharMAPPED_START = '(';
-
-staticfinalcharMAPPED_END = ')';
-
-staticclassTokenizer
-{
-finalStringexpression;
-
-intidx;
-
-publicTokenizer( Stringexpression )
-{
-this.expression = expression;
- }
-
-publicintpeekChar()
-{
-returnidx < expression.length() ? expression.charAt( idx ) : EOF;
- }
-
-publicintskipChar()
-{
-returnidx < expression.length() ? expression.charAt( idx++ ) : EOF;
- }
-
-publicStringnextToken( chardelimiter )
-{
-intstart = idx;
-
-while ( idx < expression.length() && delimiter != expression.charAt( idx ) )
-{
-idx++;
- }
-
-// delimiter MUST be present
-if ( idx <= start || idx >= expression.length() )
-{
-returnnull;
- }
-
-returnexpression.substring( start, idx++ );
- }
-
-publicStringnextPropertyName()
-{
-finalintstart = idx;
-
-while ( idx < expression.length() && Character.isJavaIdentifierPart( expression.charAt( idx ) ) )
-{
-idx++;
- }
-
-// property name does not require delimiter
-if ( idx <= start || idx > expression.length() )
-{
-returnnull;
- }
-
-returnexpression.substring( start, idx );
- }
-
-publicintgetPosition()
-{
-returnidx < expression.length() ? idx : EOF;
- }
-
-// to make tokenizer look pretty in debugger
-@Override
-publicStringtoString()
-{
-returnidx < expression.length() ? expression.substring( idx ) : "<EOF>";
- }
- }
+privatestaticfinalMap<Class<?>, WeakReference<ClassMap>> classMaps = newWeakHashMap<Class<?>, WeakReference<ClassMap>>();
 
 privateReflectionValueExtractor()
 {
  }
 
-/**
- * <p>
- * The implementation supports indexed, nested and mapped properties.
- * </p>
- * <ul>
- * <li>nested properties should be defined by a dot, i.e. "user.address.street"</li>
- * <li>indexed properties (java.util.List or array instance) should be contains <code>(\\w+)\\[(\\d+)\\]</code>
- * pattern, i.e. "user.addresses[1].street"</li>
- * <li>mapped properties should be contains <code>(\\w+)\\((.+)\\)</code> pattern, i.e.
- * "user.addresses(myAddress).street"</li>
- * <ul>
- * 
- * @param expression not null expression
- * @param root not null object
- * @return the object defined by the expression
- * @throws Exception if any
- */
 publicstaticObjectevaluate( Stringexpression, Objectroot )
 throwsException
 {
 returnevaluate( expression, root, true );
  }
 
-/**
- * <p>
- * The implementation supports indexed, nested and mapped properties.
- * </p>
- * <ul>
- * <li>nested properties should be defined by a dot, i.e. "user.address.street"</li>
- * <li>indexed properties (java.util.List or array instance) should be contains <code>(\\w+)\\[(\\d+)\\]</code>
- * pattern, i.e. "user.addresses[1].street"</li>
- * <li>mapped properties should be contains <code>(\\w+)\\((.+)\\)</code> pattern, i.e.
- * "user.addresses(myAddress).street"</li>
- * <ul>
- * 
- * @param expression not null expression
- * @param root not null object
- * @return the object defined by the expression
- * @throws Exception if any
- */
 // TODO: don't throw Exception
-publicstaticObjectevaluate( Stringexpression, finalObjectroot,finalbooleantrimRootToken )
+publicstaticObjectevaluate( Stringexpression, Objectroot, booleantrimRootToken )
 throwsException
 {
+// if the root token refers to the supplied root object parameter, remove it.
+if ( trimRootToken )
+{
+expression = expression.substring( expression.indexOf( '.' ) + 1 );
+ }
+
 Objectvalue = root;
 
 // ----------------------------------------------------------------------
 // Walk the dots and retrieve the ultimate value desired from the
 // MavenProject instance.
 // ----------------------------------------------------------------------
 
-if ( expression == null || "".equals(expression.trim()) || !Character.isJavaIdentifierStart( expression.charAt( 0 ) ) )
-{
-returnnull;
- }
+StringTokenizerparser = newStringTokenizer( expression, "." );
 
-booleanhasDots = expression.indexOf( PROPERTY_START ) >= 0;
-
-finalTokenizertokenizer;
-if ( trimRootToken && hasDots )
+while ( parser.hasMoreTokens() )
 {
-tokenizer = newTokenizer( expression );
-tokenizer.nextPropertyName();
-if ( tokenizer.getPosition() == EOF )
-{
-returnnull;
- }
- }
-else
-{
-tokenizer = newTokenizer( "." + expression );
- }
+Stringtoken = parser.nextToken();
 
-intpropertyPosition = tokenizer.getPosition();
-while ( value != null && tokenizer.peekChar() != EOF )
-{
-switch ( tokenizer.skipChar() )
+if ( value == null )
 {
-caseINDEXED_START:
-value =
-getIndexedValue( expression, propertyPosition, tokenizer.getPosition(), value,
-tokenizer.nextToken( INDEXED_END ) );
-break;
-caseMAPPED_START:
-value =
-getMappedValue( expression, propertyPosition, tokenizer.getPosition(), value,
-tokenizer.nextToken( MAPPED_END ) );
-break;
-casePROPERTY_START:
-propertyPosition = tokenizer.getPosition();
-value = getPropertyValue( value, tokenizer.nextPropertyName() );
-break;
-default:
-// could not parse expression
-returnnull;
+returnnull;
  }
- }
-
-returnvalue;
- }
 
-privatestaticObjectgetMappedValue( finalStringexpression, finalintfrom, finalintto, finalObjectvalue,
-finalStringkey )
-throwsException
-{
-if ( value == null || key == null )
-{
-returnnull;
- }
-
-if ( valueinstanceofMap )
-{
-Object[] localParams = newObject[]{key };
 ClassMapclassMap = getClassMap( value.getClass() );
-Methodmethod = classMap.findMethod( "get", localParams );
-returnmethod.invoke( value, localParams );
- }
 
-finalStringmessage =
-String.format( "The token '%s' at position '%d' refers to a java.util.Map, but the value seems is an instance of '%s'",
-expression.subSequence( from, to ), from, value.getClass() );
+StringmethodBase = StringUtils.capitalizeFirstLetter( token );
 
-thrownewException( message );
- }
+StringmethodName = "get" + methodBase;
 
-privatestaticObjectgetIndexedValue( finalStringexpression, finalintfrom, finalintto, finalObjectvalue,
-finalStringindexStr )
-throwsException
-{
-try
-{
-intindex = Integer.parseInt( indexStr );
+Methodmethod = classMap.findMethod( methodName, CLASS_ARGS );
 
-if ( value.getClass().isArray() )
+if ( method == null )
 {
-returnArray.get( value, index );
-}
+// perhaps this is a boolean property??
+methodName = "is" + methodBase;
 
-if ( valueinstanceofList )
-{
-ClassMapclassMap = getClassMap( value.getClass() );
-// use get method on List interface
-Object[] localParams = newObject[]{index };
-Methodmethod = classMap.findMethod( "get", localParams );
-returnmethod.invoke( value, localParams );
+method = classMap.findMethod( methodName, CLASS_ARGS );
  }
- }
-catch ( NumberFormatExceptione )
-{
-returnnull;
- }
-catch ( InvocationTargetExceptione )
-{
-// catch array index issues gracefully, otherwise release
-if ( e.getCause() instanceofIndexOutOfBoundsException )
+
+if ( method == null )
 {
 returnnull;
  }
 
-throwe;
- }
-
-finalStringmessage =
-String.format( "The token '%s' at position '%d' refers to a java.util.List or an array, but the value seems is an instance of '%s'",
-expression.subSequence( from, to ), from, value.getClass() );
-
-thrownewException( message );
- }
-
-privatestaticObjectgetPropertyValue( Objectvalue, Stringproperty )
-throwsException
-{
-if ( value == null || property == null )
-{
-returnnull;
+value = method.invoke( value, OBJECT_ARGS );
  }
 
-ClassMapclassMap = getClassMap( value.getClass() );
-StringmethodBase = StringUtils.capitalizeFirstLetter( property );
-StringmethodName = "get" + methodBase;
-Methodmethod = classMap.findMethod( methodName, CLASS_ARGS );
-
-if ( method == null )
-{
-// perhaps this is a boolean property??
-methodName = "is" + methodBase;
-
-method = classMap.findMethod( methodName, CLASS_ARGS );
- }
-
-if ( method == null )
-{
-returnnull;
- }
-
-try
-{
-returnmethod.invoke( value, OBJECT_ARGS );
- }
-catch ( InvocationTargetExceptione )
-{
-throwe;
- }
+returnvalue;
  }
 
 privatestaticClassMapgetClassMap( Class<?> clazz )
 {
-
-WeakReference<ClassMap> softRef = classMaps.get( clazz );
+WeakReference<ClassMap> ref = classMaps.get( clazz);
 
 ClassMapclassMap;
 
-if ( softRef == null || (classMap = softRef.get()) == null )
+if ( ref == null || (classMap = ref.get()) == null )
 {
 classMap = newClassMap( clazz );
 
-classMaps.put( clazz, newWeakReference<ClassMap>(classMap) );
+classMaps.put( clazz, newWeakReference<ClassMap>(classMap) );
  }
 
 returnclassMap;
  }
-}
+}