Author: krosenvold
Date: Mon Oct 13 19:08:50 2014
New Revision: 1631511
URL: http://svn.apache.org/r1631511
Log:
Cleaned up wrt code analysis
Modified:
maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/io/Java7Support.java
maven/shared/trunk/maven-shared-utils/src/test/java/org/apache/maven/shared/utils/reflection/ReflectorTest.java
maven/shared/trunk/maven-shared-utils/src/test/java/org/apache/maven/shared/utils/reflection/ReflectorTestHelper.java
maven/shared/trunk/maven-shared-utils/src/test/java/org/apache/maven/shared/utils/xml/PrettyPrintXmlWriterTest.java
Modified:
maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/io/Java7Support.java
URL:
http://svn.apache.org/viewvc/maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/io/Java7Support.java?rev=1631511&r1=1631510&r2=1631511&view=diff
==============================================================================
---
maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/io/Java7Support.java
(original)
+++
maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/io/Java7Support.java
Mon Oct 13 19:08:50 2014
@@ -19,18 +19,12 @@ package org.apache.maven.shared.utils.io
* under the License.
*/
-import com.sun.org.apache.xalan.internal.xsltc.compiler.sym;
-
import javax.annotation.Nonnull;
import java.io.File;
import java.io.IOException;
import java.lang.reflect.Array;
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
-import java.nio.file.Files;
-import java.nio.file.LinkOption;
-import java.nio.file.Path;
-import java.nio.file.attribute.FileAttribute;
/**
* Java7 feature detection
@@ -137,7 +131,7 @@ public class Java7Support
{
Object path = toPath.invoke( file );
final Object invoke = exists.invoke( null, path, emptyLinkOpts );
- return ((Boolean)invoke).booleanValue();
+ return (Boolean) invoke;
}
catch ( IllegalAccessException e )
{
Modified:
maven/shared/trunk/maven-shared-utils/src/test/java/org/apache/maven/shared/utils/reflection/ReflectorTest.java
URL:
http://svn.apache.org/viewvc/maven/shared/trunk/maven-shared-utils/src/test/java/org/apache/maven/shared/utils/reflection/ReflectorTest.java?rev=1631511&r1=1631510&r2=1631511&view=diff
==============================================================================
---
maven/shared/trunk/maven-shared-utils/src/test/java/org/apache/maven/shared/utils/reflection/ReflectorTest.java
(original)
+++
maven/shared/trunk/maven-shared-utils/src/test/java/org/apache/maven/shared/utils/reflection/ReflectorTest.java
Mon Oct 13 19:08:50 2014
@@ -102,7 +102,7 @@ public class ReflectorTest
public void newInstanceProtectedConstructor()
throws Exception
{
- reflector.newInstance( ReflectorTestHelper.class, new Object[]{
Integer.valueOf( 0 ) } );
+ reflector.newInstance( ReflectorTestHelper.class, new Object[]{ 0 } );
}
@Test( expected = IllegalArgumentException.class )
@@ -110,7 +110,7 @@ public class ReflectorTest
public void newInstanceProtectedConstructorThrowsSomething()
throws Exception
{
- reflector.newInstance( ReflectorTestHelper.class, new Object[]{
Integer.valueOf( 1 ) } );
+ reflector.newInstance( ReflectorTestHelper.class, new Object[]{ 1 } );
}
@Test
@@ -208,7 +208,7 @@ public class ReflectorTest
public void getSingletonProtectedMethod()
throws Exception
{
- reflector.getSingleton( ReflectorTestHelper.class, new Object[]{
Integer.valueOf( 0 ) } );
+ reflector.getSingleton( ReflectorTestHelper.class, new Object[]{ 0 } );
}
@Test( expected = IllegalArgumentException.class )
@@ -216,7 +216,7 @@ public class ReflectorTest
public void getSingletonProtectedMethodThrowsSomething()
throws Exception
{
- reflector.getSingleton( ReflectorTestHelper.class, new Object[]{
Integer.valueOf( 1 ) } );
+ reflector.getSingleton( ReflectorTestHelper.class, new Object[]{ 1 } );
}
@Test
@@ -320,7 +320,7 @@ public class ReflectorTest
throws Exception
{
Object object = new Object();
- assertThat( reflector.invoke( object, "hashCode", null ), is( (Object)
Integer.valueOf( object.hashCode() ) ) );
+ assertThat( reflector.invoke( object, "hashCode", null ), is( (Object)
object.hashCode() ) );
}
@Test
@@ -329,7 +329,7 @@ public class ReflectorTest
{
Object object = new Object();
assertThat( reflector.invoke( object, "hashCode", new Object[0] ),
- is( (Object) Integer.valueOf( object.hashCode() ) ) );
+ is( (Object) object.hashCode() ) );
}
@Test( expected = ReflectorException.class )
@@ -852,7 +852,7 @@ public class ReflectorTest
public void invokeStaticProtectedMethod()
throws Exception
{
- reflector.invokeStatic( ReflectorTestHelper.class, "getInstance", new
Object[]{ Integer.valueOf( 0 ) } );
+ reflector.invokeStatic( ReflectorTestHelper.class, "getInstance", new
Object[]{ 0 } );
}
@Test( expected = IllegalArgumentException.class )
@@ -860,7 +860,7 @@ public class ReflectorTest
public void invokeStaticProtectedMethodThrowsSomething()
throws Exception
{
- reflector.invokeStatic( ReflectorTestHelper.class, "getInstance", new
Object[]{ Integer.valueOf( 1 ) } );
+ reflector.invokeStatic( ReflectorTestHelper.class, "getInstance", new
Object[]{ 1 } );
}
@Test
Modified:
maven/shared/trunk/maven-shared-utils/src/test/java/org/apache/maven/shared/utils/reflection/ReflectorTestHelper.java
URL:
http://svn.apache.org/viewvc/maven/shared/trunk/maven-shared-utils/src/test/java/org/apache/maven/shared/utils/reflection/ReflectorTestHelper.java?rev=1631511&r1=1631510&r2=1631511&view=diff
==============================================================================
---
maven/shared/trunk/maven-shared-utils/src/test/java/org/apache/maven/shared/utils/reflection/ReflectorTestHelper.java
(original)
+++
maven/shared/trunk/maven-shared-utils/src/test/java/org/apache/maven/shared/utils/reflection/ReflectorTestHelper.java
Mon Oct 13 19:08:50 2014
@@ -43,7 +43,7 @@ class ReflectorTestHelper
protected ReflectorTestHelper( Integer throwCount )
{
- if ( throwCount != null && throwCount.intValue() > 0 )
+ if ( throwCount != null && throwCount > 0 )
{
throw new HelperException( "Something" );
}
@@ -73,7 +73,7 @@ class ReflectorTestHelper
protected static ReflectorTestHelper getInstance( Integer throwCount )
{
- if ( throwCount != null && throwCount.intValue() > 0 )
+ if ( throwCount != null && throwCount > 0 )
{
throw new HelperException( "Something" );
}
Modified:
maven/shared/trunk/maven-shared-utils/src/test/java/org/apache/maven/shared/utils/xml/PrettyPrintXmlWriterTest.java
URL:
http://svn.apache.org/viewvc/maven/shared/trunk/maven-shared-utils/src/test/java/org/apache/maven/shared/utils/xml/PrettyPrintXmlWriterTest.java?rev=1631511&r1=1631510&r2=1631511&view=diff
==============================================================================
---
maven/shared/trunk/maven-shared-utils/src/test/java/org/apache/maven/shared/utils/xml/PrettyPrintXmlWriterTest.java
(original)
+++
maven/shared/trunk/maven-shared-utils/src/test/java/org/apache/maven/shared/utils/xml/PrettyPrintXmlWriterTest.java
Mon Oct 13 19:08:50 2014
@@ -184,7 +184,7 @@ public class PrettyPrintXmlWriterTest
private String expectedResult( String lineIndenter, String lineSeparator )
{
- StringBuffer expected = new StringBuffer();
+ StringBuilder expected = new StringBuilder();
expected.append( "<html>" ).append( lineSeparator );
expected.append( StringUtils.repeat( lineIndenter, 1 ) ).append(
"<head>" ).append( lineSeparator );
