You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by kr...@apache.org on 2014/10/18 19:33:48 UTC
svn commit: r1632824 - in /maven/shared/trunk/maven-shared-utils: pom.xml
src/main/java/org/apache/maven/shared/utils/introspection/ReflectionValueExtractor.java
src/test/java/org/apache/maven/shared/utils/introspection/ReflectionValueExtractorTest.java
Author: krosenvold
Date: Sat Oct 18 17:33:48 2014
New Revision: 1632824
URL: http://svn.apache.org/r1632824
Log:
[MSHARED-369] fixed regression
Modified:
maven/shared/trunk/maven-shared-utils/pom.xml
maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/introspection/ReflectionValueExtractor.java
maven/shared/trunk/maven-shared-utils/src/test/java/org/apache/maven/shared/utils/introspection/ReflectionValueExtractorTest.java
Modified: maven/shared/trunk/maven-shared-utils/pom.xml
URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-shared-utils/pom.xml?rev=1632824&r1=1632823&r2=1632824&view=diff
==============================================================================
--- maven/shared/trunk/maven-shared-utils/pom.xml (original)
+++ maven/shared/trunk/maven-shared-utils/pom.xml Sat Oct 18 17:33:48 2014
@@ -93,6 +93,12 @@
<version>2.2.1</version>
<scope>provided</scope>
</dependency>
+ <dependency>
+ <groupId>org.apache.maven.shared</groupId>
+ <artifactId>maven-plugin-testing-harness</artifactId>
+ <version>1.1</version>
+ <scope>test</scope>
+ </dependency>
</dependencies>
<build>
Modified: maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/introspection/ReflectionValueExtractor.java
URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/introspection/ReflectionValueExtractor.java?rev=1632824&r1=1632823&r2=1632824&view=diff
==============================================================================
--- maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/introspection/ReflectionValueExtractor.java (original)
+++ maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/introspection/ReflectionValueExtractor.java Sat Oct 18 17:33:48 2014
@@ -178,12 +178,14 @@ public class ReflectionValueExtractor {
// MavenProject instance.
// ----------------------------------------------------------------------
- if (org.codehaus.plexus.util.StringUtils.isEmpty(expression) || !Character.isJavaIdentifierStart(expression.charAt(0))) {
+ if (StringUtils.isEmpty(expression) || !Character.isJavaIdentifierStart(expression.charAt(0))) {
return null;
}
- final Tokenizer tokenizer;
- if (trimRootToken) {
+ boolean hasDots = expression.indexOf( PROPERTY_START ) >= 0;
+
+ final Tokenizer tokenizer;
+ if (trimRootToken && hasDots) {
tokenizer = new Tokenizer(expression);
tokenizer.nextPropertyName();
if (tokenizer.getPosition() == EOF) {
@@ -298,7 +300,7 @@ public class ReflectionValueExtractor {
}
ClassMap classMap = getClassMap(value.getClass());
- String methodBase = org.codehaus.plexus.util.StringUtils.capitalizeFirstLetter(property);
+ String methodBase = StringUtils.capitalizeFirstLetter(property);
String methodName = "get" + methodBase;
try {
Method method = classMap.findMethod(methodName, CLASS_ARGS);
Modified: maven/shared/trunk/maven-shared-utils/src/test/java/org/apache/maven/shared/utils/introspection/ReflectionValueExtractorTest.java
URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-shared-utils/src/test/java/org/apache/maven/shared/utils/introspection/ReflectionValueExtractorTest.java?rev=1632824&r1=1632823&r2=1632824&view=diff
==============================================================================
--- maven/shared/trunk/maven-shared-utils/src/test/java/org/apache/maven/shared/utils/introspection/ReflectionValueExtractorTest.java (original)
+++ maven/shared/trunk/maven-shared-utils/src/test/java/org/apache/maven/shared/utils/introspection/ReflectionValueExtractorTest.java Sat Oct 18 17:33:48 2014
@@ -27,6 +27,7 @@ import java.util.Map;
import junit.framework.Assert;
import junit.framework.TestCase;
+import org.apache.maven.plugin.testing.stubs.MavenProjectStub;
/**
* @author <a href="mailto:jason@maven.org">Jason van Zyl</a>
@@ -513,4 +514,13 @@ public class ReflectionValueExtractorTes
return value;
}
}
+
+ public void testRootPropertyRegression()
+ throws Exception
+ {
+ MavenProjectStub project = new MavenProjectStub( );
+ project.setDescription( "c:\\\\org\\apache\\test" );
+ Object evalued = ReflectionValueExtractor.evaluate( "description", project );
+ assertNotNull( evalued );
+ }
}