Repository: maven-surefire Updated Branches: refs/heads/master 7466f0985 -> 8b5984961
[SUREFIRE] code cleanup Project: http://git-wip-us.apache.org/repos/asf/maven-surefire/repo Commit: http://git-wip-us.apache.org/repos/asf/maven-surefire/commit/8b598496 Tree: http://git-wip-us.apache.org/repos/asf/maven-surefire/tree/8b598496 Diff: http://git-wip-us.apache.org/repos/asf/maven-surefire/diff/8b598496 Branch: refs/heads/master Commit: 8b59849619ba3dc16a7d4c4de2dac8b061130a45 Parents: 7466f09 Author: Tibor17 <tibo...@lycos.com> Authored: Wed Jan 13 03:52:37 2016 +0100 Committer: Tibor17 <tibo...@lycos.com> Committed: Wed Jan 13 03:52:37 2016 +0100 ---------------------------------------------------------------------- .../maven/plugin/surefire/AbstractSurefireMojo.java | 16 +++++----------- .../lazytestprovider/TestLessInputStream.java | 14 -------------- .../maven/plugin/surefire/util/Relocator.java | 10 ++++------ .../maven/plugin/surefire/util/ScannerUtil.java | 6 ++---- 4 files changed, 11 insertions(+), 35 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/8b598496/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/AbstractSurefireMojo.java ---------------------------------------------------------------------- diff --git a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/AbstractSurefireMojo.java b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/AbstractSurefireMojo.java index 3b3af1d..111c9c5 100644 --- a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/AbstractSurefireMojo.java +++ b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/AbstractSurefireMojo.java @@ -1607,8 +1607,7 @@ public abstract class AbstractSurefireMojo return StringUtils.isNotBlank( getTest() ); } - @SuppressWarnings( "checkstyle:modifierorder" ) - private @Nonnull List<String> readListFromFile( @Nonnull final File file ) + @Nonnull private List<String> readListFromFile( @Nonnull final File file ) { getLog().debug( "Reading list from: " + file ); @@ -1645,8 +1644,7 @@ public abstract class AbstractSurefireMojo } } - @SuppressWarnings( "checkstyle:modifierorder" ) - private @Nonnull List<String> getExcludeList() + @Nonnull private List<String> getExcludeList() throws MojoFailureException { List<String> actualExcludes = null; @@ -1752,8 +1750,7 @@ public abstract class AbstractSurefireMojo return specificTests; } - @SuppressWarnings( "checkstyle:modifierorder" ) - private @Nonnull List<String> filterNulls( @Nonnull List<String> toFilter ) + @Nonnull private List<String> filterNulls( @Nonnull List<String> toFilter ) { List<String> result = new ArrayList<String>( toFilter.size() ); for ( String item : toFilter ) @@ -2471,8 +2468,7 @@ public abstract class AbstractSurefireMojo this.testNgArtifact = testNgArtifact; } - @SuppressWarnings( "checkstyle:modifierorder" ) - public @Nonnull String getProviderName() + @Nonnull public String getProviderName() { return "org.apache.maven.surefire.testng.TestNGProvider"; } @@ -2664,7 +2660,6 @@ public abstract class AbstractSurefireMojo this.dynamicProvider = dynamicProviderInfo; } - @SuppressWarnings( "checkstyle:modifierorder" ) @Nonnull List<ProviderInfo> resolve() { List<ProviderInfo> providersToRun = new ArrayList<ProviderInfo>(); @@ -2679,8 +2674,7 @@ public abstract class AbstractSurefireMojo return manuallyConfiguredProviders.isEmpty() ? autoDetectOneProvider() : providersToRun; } - @SuppressWarnings( "checkstyle:modifierorder" ) - private @Nonnull List<ProviderInfo> autoDetectOneProvider() + @Nonnull private List<ProviderInfo> autoDetectOneProvider() { List<ProviderInfo> providersToRun = new ArrayList<ProviderInfo>(); for ( ProviderInfo wellKnownProvider : wellKnownProviders ) http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/8b598496/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/lazytestprovider/TestLessInputStream.java ---------------------------------------------------------------------- diff --git a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/lazytestprovider/TestLessInputStream.java b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/lazytestprovider/TestLessInputStream.java index 04d39b3..b6ae42c 100644 --- a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/lazytestprovider/TestLessInputStream.java +++ b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/lazytestprovider/TestLessInputStream.java @@ -237,20 +237,6 @@ public final class TestLessInputStream } @SuppressWarnings( "checkstyle:innerassignment" ) - private void addTailNode( Command command ) - { - Node newTail = new Node( command ); - Node currentTail = head; - do - { - for ( Node successor; ( successor = currentTail.next.get() ) != null; ) - { - currentTail = successor; - } - } while ( !currentTail.next.compareAndSet( null, newTail ) ); - } - - @SuppressWarnings( "checkstyle:innerassignment" ) private boolean addTailNodeIfAbsent( Command command ) { Node newTail = new Node( command ); http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/8b598496/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/util/Relocator.java ---------------------------------------------------------------------- diff --git a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/util/Relocator.java b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/util/Relocator.java index eb5964c..89117af 100644 --- a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/util/Relocator.java +++ b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/util/Relocator.java @@ -30,8 +30,8 @@ import javax.annotation.Nullable; */ public class Relocator { - @SuppressWarnings( "checkstyle:modifierorder" ) - private final @Nullable String relocation; + @Nullable + private final String relocation; private static final String RELOCATION_BASE = "org.apache.maven.surefire."; @@ -46,14 +46,12 @@ public class Relocator relocation = "shadefire"; } - @SuppressWarnings( "checkstyle:modifierorder" ) - private @Nullable String getRelocation() + @Nullable private String getRelocation() { return relocation; } - @SuppressWarnings( "checkstyle:modifierorder" ) - public @Nonnull String relocate( @Nonnull String className ) + @Nonnull public String relocate( @Nonnull String className ) { if ( relocation == null ) { http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/8b598496/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/util/ScannerUtil.java ---------------------------------------------------------------------- diff --git a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/util/ScannerUtil.java b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/util/ScannerUtil.java index 4ec6689..9989176 100644 --- a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/util/ScannerUtil.java +++ b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/util/ScannerUtil.java @@ -36,15 +36,13 @@ final class ScannerUtil @Deprecated private static final boolean IS_NON_UNIX_FS = ( !FS.equals( "/" ) ); - @SuppressWarnings( "checkstyle:modifierorder" ) - public static @Nonnull String convertJarFileResourceToJavaClassName( @Nonnull String test ) + @Nonnull public static String convertJarFileResourceToJavaClassName( @Nonnull String test ) { return StringUtils.removeEnd( test, ".class" ).replace( "/", "." ); } - @SuppressWarnings( "checkstyle:modifierorder" ) @Deprecated - public static @Nonnull String convertSlashToSystemFileSeparator( @Nonnull String path ) + @Nonnull public static String convertSlashToSystemFileSeparator( @Nonnull String path ) { return ( IS_NON_UNIX_FS ? path.replace( "/", FS ) : path ); }
