Author: krosenvold
Date: Wed Oct 10 20:06:51 2012
New Revision: 1396768
URL: http://svn.apache.org/viewvc?rev=1396768&view=rev
Log:
o Further minor fixes
Modified:
maven/shared/trunk/maven-shared-io/src/test/java/org/apache/maven/shared/io/TestUtils.java
maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/introspection/ReflectionValueExtractor.java
maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/io/FileUtils.java
maven/shared/trunk/maven-shared-utils/src/test/java/org/apache/maven/shared/utils/StringUtilsTest.java
maven/shared/trunk/maven-shared-utils/src/test/java/org/apache/maven/shared/utils/introspection/ReflectionValueExtractorTest.java
Modified:
maven/shared/trunk/maven-shared-io/src/test/java/org/apache/maven/shared/io/TestUtils.java
URL:
http://svn.apache.org/viewvc/maven/shared/trunk/maven-shared-io/src/test/java/org/apache/maven/shared/io/TestUtils.java?rev=1396768&r1=1396767&r2=1396768&view=diff
==============================================================================
---
maven/shared/trunk/maven-shared-io/src/test/java/org/apache/maven/shared/io/TestUtils.java
(original)
+++
maven/shared/trunk/maven-shared-io/src/test/java/org/apache/maven/shared/io/TestUtils.java
Wed Oct 10 20:06:51 2012
@@ -106,7 +106,7 @@ public final class TestUtils
{
StringWriter buffer = new StringWriter();
- Reader reader = new XmlStreamReader( file );
+ Reader reader = ReaderFactory.newXmlReader( file );
IOUtil.copy( reader, buffer );
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=1396768&r1=1396767&r2=1396768&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
Wed Oct 10 20:06:51 2012
@@ -50,7 +50,7 @@ public class ReflectionValueExtractor
* This approach prevents permgen space overflows due to retention of
discarded
* classloaders.
*/
- private static final Map classMaps = new WeakHashMap();
+ private static final Map<Class,ClassMap> classMaps = new
WeakHashMap<Class,ClassMap>();
/**
* Indexed properties pattern, ie <code>(\\w+)\\[(\\d+)\\]</code>
@@ -234,7 +234,7 @@ public class ReflectionValueExtractor
private static ClassMap getClassMap( Class clazz )
{
- ClassMap classMap = (ClassMap) classMaps.get( clazz );
+ ClassMap classMap = classMaps.get( clazz );
if ( classMap == null )
{
Modified:
maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/io/FileUtils.java
URL:
http://svn.apache.org/viewvc/maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/io/FileUtils.java?rev=1396768&r1=1396767&r2=1396768&view=diff
==============================================================================
---
maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/io/FileUtils.java
(original)
+++
maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/io/FileUtils.java
Wed Oct 10 20:06:51 2012
@@ -365,6 +365,20 @@ public class FileUtils
}
/**
+ * @param file the file path
+ * @return the file content lines as String[] using the systems default
encoding.
+ * An empty List if the file didn't exist.
+ * @throws IOException
+ */
+ public static String[] fileReadArray( File file )
+ throws IOException
+ {
+ List<String> files = loadFile( file );
+
+ return files.toArray( new String[files.size()] );
+ }
+
+ /**
* Appends data to a file. The file will be created if it does not exist.
* Note: the data is written with platform encoding
*
Modified:
maven/shared/trunk/maven-shared-utils/src/test/java/org/apache/maven/shared/utils/StringUtilsTest.java
URL:
http://svn.apache.org/viewvc/maven/shared/trunk/maven-shared-utils/src/test/java/org/apache/maven/shared/utils/StringUtilsTest.java?rev=1396768&r1=1396767&r2=1396768&view=diff
==============================================================================
---
maven/shared/trunk/maven-shared-utils/src/test/java/org/apache/maven/shared/utils/StringUtilsTest.java
(original)
+++
maven/shared/trunk/maven-shared-utils/src/test/java/org/apache/maven/shared/utils/StringUtilsTest.java
Wed Oct 10 20:06:51 2012
@@ -763,7 +763,7 @@ public class StringUtilsTest extends Ass
@Test
public void testInterpolate()
{
- Map variables = new HashMap<String,String>();
+ Map<String,String> variables = new HashMap<String,String>();
assertThat( StringUtils.interpolate( "This ${text} will get replaced",
variables )
, is( "This ${text} will get replaced" ) );
@@ -1052,7 +1052,7 @@ public class StringUtilsTest extends Ass
@Test
public void testJoin_Iterator()
{
- ArrayList list = new ArrayList();
+ ArrayList<String> list = new ArrayList<String>();
assertThat( StringUtils.join( list.iterator(), null )
, is( "" ) );
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=1396768&r1=1396767&r2=1396768&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
Wed Oct 10 20:06:51 2012
@@ -16,15 +16,14 @@ package org.apache.maven.shared.utils.in
* limitations under the License.
*/
-import junit.framework.Assert;
-import junit.framework.TestCase;
-
import java.util.ArrayList;
import java.util.HashMap;
-import java.util.Iterator;
import java.util.List;
import java.util.Map;
+import junit.framework.Assert;
+import junit.framework.TestCase;
+
/**
* @author <a href="mailto:ja...@maven.org";>Jason van Zyl</a>
* @version $Id$
@@ -154,7 +153,7 @@ public class ReflectionValueExtractorTes
private Scm scm;
- private final List dependencies = new ArrayList();
+ private final List<Dependency> dependencies = new
ArrayList<Dependency>();
private Build build;
@@ -219,7 +218,7 @@ public class ReflectionValueExtractorTes
return groupId;
}
- public List getDependencies()
+ public List<Dependency> getDependencies()
{
return dependencies;
}
@@ -246,13 +245,13 @@ public class ReflectionValueExtractorTes
public Dependency[] getDependenciesAsArray()
{
- List list = getDependencies();
- return (Dependency[]) list.toArray(new Dependency[list.size()]);
+ List<Dependency> list = getDependencies();
+ return list.toArray(new Dependency[list.size()]);
}
- public Map getDependenciesAsMap()
+ public Map<String, Dependency> getDependenciesAsMap()
{
- Map ret = new HashMap();
+ Map<String, Dependency> ret = new HashMap<String, Dependency>();
for ( Object o : getDependencies() )
{
Dependency dep = (Dependency) o;
