From a2897f86b3628d1ba8b7fe4a79eef46f2545f13e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Arnaud=20He=CC=81ritier?= Date: Tue, 11 Jun 2013 21:47:18 +0200 Subject: [PATCH] Code cleanup - Maven requires Java 5+ : Remove unnecessary unboxing --- .../repository/internal/util/ConsoleTransferListener.java | 2 +- .../maven/artifact/resolver/DefaultArtifactResolver.java | 2 +- .../main/java/org/apache/maven/project/ModelUtils.java | 8 ++++---- .../inheritance/DefaultModelInheritanceAssembler.java | 4 ++-- .../maven/repository/legacy/TransferListenerAdapter.java | 2 +- .../main/java/org/apache/maven/cli/CLIReportingUtils.java | 2 +- 6 files changed, 10 insertions(+), 10 deletions(-) diff --git a/maven-aether-provider/src/test/java/org/apache/maven/repository/internal/util/ConsoleTransferListener.java b/maven-aether-provider/src/test/java/org/apache/maven/repository/internal/util/ConsoleTransferListener.java index 1b77d4da82..fb442834be 100644 --- a/maven-aether-provider/src/test/java/org/apache/maven/repository/internal/util/ConsoleTransferListener.java +++ b/maven-aether-provider/src/test/java/org/apache/maven/repository/internal/util/ConsoleTransferListener.java @@ -69,7 +69,7 @@ public void transferProgressed( TransferEvent event ) for ( Map.Entry entry : downloads.entrySet() ) { long total = entry.getKey().getContentLength(); - long complete = entry.getValue().longValue(); + long complete = entry.getValue(); buffer.append( getStatus( complete, total ) ).append( " " ); } diff --git a/maven-compat/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactResolver.java b/maven-compat/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactResolver.java index 9a9b31afce..fff16e0417 100644 --- a/maven-compat/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactResolver.java +++ b/maven-compat/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactResolver.java @@ -101,7 +101,7 @@ public class DefaultArtifactResolver public DefaultArtifactResolver() { - int threads = Integer.getInteger( "maven.artifact.threads", 5 ).intValue(); + int threads = Integer.getInteger( "maven.artifact.threads", 5 ); if ( threads <= 1 ) { executor = new Executor() diff --git a/maven-compat/src/main/java/org/apache/maven/project/ModelUtils.java b/maven-compat/src/main/java/org/apache/maven/project/ModelUtils.java index 758c78fe10..92b5eb9df4 100644 --- a/maven-compat/src/main/java/org/apache/maven/project/ModelUtils.java +++ b/maven-compat/src/main/java/org/apache/maven/project/ModelUtils.java @@ -75,7 +75,7 @@ public static void mergePluginLists( PluginContainer childContainer, PluginConta String inherited = plugin.getInherited(); - if ( ( inherited != null ) && !Boolean.valueOf( inherited ).booleanValue() ) + if ( ( inherited != null ) && !Boolean.valueOf( inherited ) ) { it.remove(); } @@ -96,7 +96,7 @@ public static void mergePluginLists( PluginContainer childContainer, PluginConta // 2. the parent's flag is not set // 3. the parent's flag is set to true if ( !handleAsInheritance || ( parentInherited == null ) - || Boolean.valueOf( parentInherited ).booleanValue() ) + || Boolean.valueOf( parentInherited ) ) { Plugin childPlugin = (Plugin) childPlugins.get( parentPlugin.getKey() ); @@ -216,7 +216,7 @@ public static void mergePluginDefinitions( Plugin child, Plugin parent, boolean // from here to the end of the method is dealing with merging of the section. String parentInherited = parent.getInherited(); - boolean parentIsInherited = ( parentInherited == null ) || Boolean.valueOf( parentInherited ).booleanValue(); + boolean parentIsInherited = ( parentInherited == null ) || Boolean.valueOf( parentInherited ); List parentExecutions = parent.getExecutions(); @@ -233,7 +233,7 @@ public static void mergePluginDefinitions( Plugin child, Plugin parent, boolean String inherited = parentExecution.getInherited(); boolean parentExecInherited = - parentIsInherited && ( ( inherited == null ) || Boolean.valueOf( inherited ).booleanValue() ); + parentIsInherited && ( ( inherited == null ) || Boolean.valueOf( inherited ) ); if ( !handleAsInheritance || parentExecInherited ) { diff --git a/maven-compat/src/main/java/org/apache/maven/project/inheritance/DefaultModelInheritanceAssembler.java b/maven-compat/src/main/java/org/apache/maven/project/inheritance/DefaultModelInheritanceAssembler.java index b16e389d62..85f75268e1 100644 --- a/maven-compat/src/main/java/org/apache/maven/project/inheritance/DefaultModelInheritanceAssembler.java +++ b/maven-compat/src/main/java/org/apache/maven/project/inheritance/DefaultModelInheritanceAssembler.java @@ -389,7 +389,7 @@ private static void mergeReportPluginLists( Reporting child, Reporting parent, b String parentInherited = parentPlugin.getInherited(); if ( !handleAsInheritance || ( parentInherited == null ) - || Boolean.valueOf( parentInherited ).booleanValue() ) + || Boolean.valueOf( parentInherited ) ) { ReportPlugin assembledPlugin = parentPlugin; @@ -481,7 +481,7 @@ public static void mergeReportPluginDefinitions( ReportPlugin child, ReportPlugi // from here to the end of the method is dealing with merging of the section. String parentInherited = parent.getInherited(); - boolean parentIsInherited = ( parentInherited == null ) || Boolean.valueOf( parentInherited ).booleanValue(); + boolean parentIsInherited = ( parentInherited == null ) || Boolean.valueOf( parentInherited ); List parentReportSets = parent.getReportSets(); diff --git a/maven-compat/src/main/java/org/apache/maven/repository/legacy/TransferListenerAdapter.java b/maven-compat/src/main/java/org/apache/maven/repository/legacy/TransferListenerAdapter.java index d6836cbeb0..497828d386 100644 --- a/maven-compat/src/main/java/org/apache/maven/repository/legacy/TransferListenerAdapter.java +++ b/maven-compat/src/main/java/org/apache/maven/repository/legacy/TransferListenerAdapter.java @@ -74,7 +74,7 @@ public void transferCompleted( TransferEvent transferEvent ) } if ( transferred != null ) { - event.setTransferredBytes( transferred.longValue() ); + event.setTransferredBytes( transferred ); } synchronized ( artifacts ) diff --git a/maven-embedder/src/main/java/org/apache/maven/cli/CLIReportingUtils.java b/maven-embedder/src/main/java/org/apache/maven/cli/CLIReportingUtils.java index 6173959a1f..0ed30dc08a 100644 --- a/maven-embedder/src/main/java/org/apache/maven/cli/CLIReportingUtils.java +++ b/maven-embedder/src/main/java/org/apache/maven/cli/CLIReportingUtils.java @@ -87,7 +87,7 @@ static String createMavenVersionString( Properties buildProperties ) if ( timestamp != null ) { SimpleDateFormat fmt = new SimpleDateFormat( "yyyy-MM-dd HH:mm:ssZ" ); - String ts = fmt.format( new Date( Long.valueOf( timestamp ).longValue() ) ); + String ts = fmt.format( new Date( Long.valueOf( timestamp ) ) ); msg += ( rev != null ? "; " : "" ) + ts; } msg += ")";