You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by ti...@apache.org on 2017/09/09 11:20:59 UTC
maven-surefire git commit: [SUREFIRE-1411] Improve calls
String.length == 0 to Java 1.6 call String.isEmpty
Repository: maven-surefire
Updated Branches:
refs/heads/master ead22a3d3 -> 8a63486f8
[SUREFIRE-1411] Improve calls String.length == 0 to Java 1.6 call String.isEmpty
Project: http://git-wip-us.apache.org/repos/asf/maven-surefire/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven-surefire/commit/8a63486f
Tree: http://git-wip-us.apache.org/repos/asf/maven-surefire/tree/8a63486f
Diff: http://git-wip-us.apache.org/repos/asf/maven-surefire/diff/8a63486f
Branch: refs/heads/master
Commit: 8a63486f8efc721d0003cb5685e590a98369704a
Parents: ead22a3
Author: Tibor17 <ti...@apache.org>
Authored: Sat Sep 9 13:20:46 2017 +0200
Committer: Tibor17 <ti...@apache.org>
Committed: Sat Sep 9 13:20:46 2017 +0200
----------------------------------------------------------------------
.../maven/plugin/surefire/AbstractSurefireMojo.java | 4 ++--
.../plugin/surefire/report/StatelessXmlReporter.java | 4 ++--
.../plugin/surefire/report/WrappedReportEntry.java | 2 +-
.../apache/maven/plugin/surefire/util/FileScanner.java | 6 +++---
.../maven/surefire/booter/ForkingRunListener.java | 2 +-
.../apache/maven/surefire/testset/TestListResolver.java | 12 ++++++------
.../maven/surefire/util/internal/StringUtils.java | 2 +-
.../org/apache/maven/surefire/booter/Classpath.java | 2 +-
.../apache/maven/surefire/booter/TypeEncodedValue.java | 3 +--
.../maven/surefire/group/match/SingleGroupMatcher.java | 2 +-
.../maven/surefire/its/fixture/SurefireLauncher.java | 2 +-
.../maven/surefire/common/junit48/RequestedTest.java | 2 +-
.../maven/surefire/junitcore/JUnitCoreWrapper.java | 2 +-
.../testng/utils/GroupMatcherMethodSelector.java | 4 ++--
14 files changed, 24 insertions(+), 25 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/8a63486f/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 29b4402..88b223a 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
@@ -1307,7 +1307,7 @@ public abstract class AbstractSurefireMojo
protected boolean isAnyConcurrencySelected()
{
- return this.getParallel() != null && this.getParallel().trim().length() > 0;
+ return getParallel() != null && !getParallel().trim().isEmpty();
}
protected boolean isAnyGroupsSelected()
@@ -1869,7 +1869,7 @@ public abstract class AbstractSurefireMojo
if ( item != null )
{
item = item.trim();
- if ( item.length() != 0 )
+ if ( !item.isEmpty() )
{
result.add( item );
}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/8a63486f/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/StatelessXmlReporter.java
----------------------------------------------------------------------
diff --git a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/StatelessXmlReporter.java b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/StatelessXmlReporter.java
index 629778b..7a7681f 100644
--- a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/StatelessXmlReporter.java
+++ b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/StatelessXmlReporter.java
@@ -333,7 +333,7 @@ public class StatelessXmlReporter
}
if ( report.getSourceName() != null )
{
- if ( reportNameSuffix != null && reportNameSuffix.length() > 0 )
+ if ( reportNameSuffix != null && !reportNameSuffix.isEmpty() )
{
ppw.addAttribute( "classname", report.getSourceName() + "(" + reportNameSuffix + ")" );
}
@@ -379,7 +379,7 @@ public class StatelessXmlReporter
String stackTrace = report.getStackTrace( trimStackTrace );
- if ( report.getMessage() != null && report.getMessage().length() > 0 )
+ if ( report.getMessage() != null && !report.getMessage().isEmpty() )
{
ppw.addAttribute( "message", extraEscape( report.getMessage(), true ) );
}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/8a63486f/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/WrappedReportEntry.java
----------------------------------------------------------------------
diff --git a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/WrappedReportEntry.java b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/WrappedReportEntry.java
index 402fda0..4565099 100644
--- a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/WrappedReportEntry.java
+++ b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/WrappedReportEntry.java
@@ -147,7 +147,7 @@ public class WrappedReportEntry
public String getReportName( String suffix )
{
- return suffix != null && suffix.length() > 0 ? getReportName() + "(" + suffix + ")" : getReportName();
+ return suffix != null && !suffix.isEmpty() ? getReportName() + "(" + suffix + ")" : getReportName();
}
public String getOutput( boolean trimStackTrace )
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/8a63486f/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/util/FileScanner.java
----------------------------------------------------------------------
diff --git a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/util/FileScanner.java b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/util/FileScanner.java
index 6636f29..8f4f0fd 100644
--- a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/util/FileScanner.java
+++ b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/util/FileScanner.java
@@ -62,7 +62,7 @@ final class FileScanner
for ( File fileOrDir : filesAndDirs )
{
String name = fileOrDir.getName();
- if ( name.length() != 0 )
+ if ( !name.isEmpty() )
{
if ( fileOrDir.isFile() )
{
@@ -74,7 +74,7 @@ final class FileScanner
if ( filter.shouldRun( toFile( path, simpleClassName ), null ) )
{
String fullyQualifiedClassName =
- pAckage.length() == 0 ? simpleClassName : pAckage + '.' + simpleClassName;
+ pAckage.isEmpty() ? simpleClassName : pAckage + '.' + simpleClassName;
scannedJavaClassNames.add( fullyQualifiedClassName );
}
}
@@ -122,7 +122,7 @@ final class FileScanner
private String toFile( String path, String fileNameWithoutExtension )
{
String pathWithoutExtension =
- path.length() == 0 ? fileNameWithoutExtension : path + '/' + fileNameWithoutExtension;
+ path.isEmpty() ? fileNameWithoutExtension : path + '/' + fileNameWithoutExtension;
return pathWithoutExtension + ext;
}
}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/8a63486f/surefire-api/src/main/java/org/apache/maven/surefire/booter/ForkingRunListener.java
----------------------------------------------------------------------
diff --git a/surefire-api/src/main/java/org/apache/maven/surefire/booter/ForkingRunListener.java b/surefire-api/src/main/java/org/apache/maven/surefire/booter/ForkingRunListener.java
index 55395c0..7eb7fa8 100644
--- a/surefire-api/src/main/java/org/apache/maven/surefire/booter/ForkingRunListener.java
+++ b/surefire-api/src/main/java/org/apache/maven/surefire/booter/ForkingRunListener.java
@@ -369,7 +369,7 @@ public class ForkingRunListener
private static void nullableEncoding( StringBuilder stringBuilder, String source )
{
- if ( source == null || source.length() == 0 )
+ if ( source == null || source.isEmpty() )
{
stringBuilder.append( "null" );
}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/8a63486f/surefire-api/src/main/java/org/apache/maven/surefire/testset/TestListResolver.java
----------------------------------------------------------------------
diff --git a/surefire-api/src/main/java/org/apache/maven/surefire/testset/TestListResolver.java b/surefire-api/src/main/java/org/apache/maven/surefire/testset/TestListResolver.java
index 359ac94..b860c3b 100644
--- a/surefire-api/src/main/java/org/apache/maven/surefire/testset/TestListResolver.java
+++ b/surefire-api/src/main/java/org/apache/maven/surefire/testset/TestListResolver.java
@@ -74,7 +74,7 @@ public class TestListResolver
for ( String request : split( csvTests, "," ) )
{
request = request.trim();
- if ( request.length() != 0 && !request.equals( "!" ) )
+ if ( !request.isEmpty() && !request.equals( "!" ) )
{
resolveTestRequest( request, patterns, includedFilters, excludedFilters );
}
@@ -319,7 +319,7 @@ public class TestListResolver
static String removeExclamationMark( String s )
{
- return s.length() != 0 && s.charAt( 0 ) == '!' ? s.substring( 1 ) : s;
+ return !s.isEmpty() && s.charAt( 0 ) == '!' ? s.substring( 1 ) : s;
}
private static void updatedFilters( boolean isExcluded, ResolvedTest test, IncludedExcludedPatterns patterns,
@@ -344,7 +344,7 @@ public class TestListResolver
for ( ResolvedTest test : tests )
{
String readableTest = test.toString();
- if ( readableTest.length() != 0 )
+ if ( !readableTest.isEmpty() )
{
if ( aggregatedTest.length() != 0 )
{
@@ -367,7 +367,7 @@ public class TestListResolver
if ( exc != null )
{
exc = exc.trim();
- if ( exc.length() != 0 )
+ if ( !exc.isEmpty() )
{
if ( exc.contains( "!" ) )
{
@@ -467,8 +467,8 @@ public class TestListResolver
if ( isRegexPrefixedPattern( request ) )
{
final String[] unwrapped = unwrapRegex( request );
- final boolean hasClass = unwrapped[0].length() != 0;
- final boolean hasMethod = unwrapped[1].length() != 0;
+ final boolean hasClass = !unwrapped[0].isEmpty();
+ final boolean hasMethod = !unwrapped[1].isEmpty();
if ( hasClass && hasMethod )
{
test = new ResolvedTest( unwrapped[0], unwrapped[1], true );
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/8a63486f/surefire-api/src/main/java/org/apache/maven/surefire/util/internal/StringUtils.java
----------------------------------------------------------------------
diff --git a/surefire-api/src/main/java/org/apache/maven/surefire/util/internal/StringUtils.java b/surefire-api/src/main/java/org/apache/maven/surefire/util/internal/StringUtils.java
index 8f16513..b32d5d0 100644
--- a/surefire-api/src/main/java/org/apache/maven/surefire/util/internal/StringUtils.java
+++ b/surefire-api/src/main/java/org/apache/maven/surefire/util/internal/StringUtils.java
@@ -107,7 +107,7 @@ public final class StringUtils
*/
public static boolean isBlank( String str )
{
- return str == null || str.trim().length() == 0;
+ return str == null || str.trim().isEmpty();
}
/**
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/8a63486f/surefire-booter/src/main/java/org/apache/maven/surefire/booter/Classpath.java
----------------------------------------------------------------------
diff --git a/surefire-booter/src/main/java/org/apache/maven/surefire/booter/Classpath.java b/surefire-booter/src/main/java/org/apache/maven/surefire/booter/Classpath.java
index 609be0f..7b22712 100644
--- a/surefire-booter/src/main/java/org/apache/maven/surefire/booter/Classpath.java
+++ b/surefire-booter/src/main/java/org/apache/maven/surefire/booter/Classpath.java
@@ -84,7 +84,7 @@ public class Classpath implements Iterable<String>
for ( String element : elements )
{
element = element.trim();
- if ( element.length() != 0 )
+ if ( !element.isEmpty() )
{
newCp.add( element );
}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/8a63486f/surefire-booter/src/main/java/org/apache/maven/surefire/booter/TypeEncodedValue.java
----------------------------------------------------------------------
diff --git a/surefire-booter/src/main/java/org/apache/maven/surefire/booter/TypeEncodedValue.java b/surefire-booter/src/main/java/org/apache/maven/surefire/booter/TypeEncodedValue.java
index b5ad18f..00ad2e9 100644
--- a/surefire-booter/src/main/java/org/apache/maven/surefire/booter/TypeEncodedValue.java
+++ b/surefire-booter/src/main/java/org/apache/maven/surefire/booter/TypeEncodedValue.java
@@ -53,8 +53,7 @@ public class TypeEncodedValue
public Object getDecodedValue( ClassLoader classLoader )
{
- // todo: use jdk6 switch case
- if ( type.trim().length() == 0 )
+ if ( type.trim().isEmpty() )
{
return null;
}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/8a63486f/surefire-grouper/src/main/java/org/apache/maven/surefire/group/match/SingleGroupMatcher.java
----------------------------------------------------------------------
diff --git a/surefire-grouper/src/main/java/org/apache/maven/surefire/group/match/SingleGroupMatcher.java b/surefire-grouper/src/main/java/org/apache/maven/surefire/group/match/SingleGroupMatcher.java
index 72fc801..65181fa 100644
--- a/surefire-grouper/src/main/java/org/apache/maven/surefire/group/match/SingleGroupMatcher.java
+++ b/surefire-grouper/src/main/java/org/apache/maven/surefire/group/match/SingleGroupMatcher.java
@@ -111,7 +111,7 @@ public class SingleGroupMatcher
{
for ( String cat : cats )
{
- if ( cat == null || cat.trim().length() < 1 )
+ if ( cat == null || cat.trim().isEmpty() )
{
continue;
}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/8a63486f/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/fixture/SurefireLauncher.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/fixture/SurefireLauncher.java b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/fixture/SurefireLauncher.java
index e2356f4..163aaac 100755
--- a/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/fixture/SurefireLauncher.java
+++ b/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/fixture/SurefireLauncher.java
@@ -70,7 +70,7 @@ public final class SurefireLauncher
public SurefireLauncher setInProcessJavaHome()
{
String javaHome = System.getenv( "JAVA_HOME" );
- if ( javaHome != null && javaHome.length() > 0 )
+ if ( javaHome != null && !javaHome.isEmpty() )
{
try
{
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/8a63486f/surefire-providers/common-junit48/src/main/java/org/apache/maven/surefire/common/junit48/RequestedTest.java
----------------------------------------------------------------------
diff --git a/surefire-providers/common-junit48/src/main/java/org/apache/maven/surefire/common/junit48/RequestedTest.java b/surefire-providers/common-junit48/src/main/java/org/apache/maven/surefire/common/junit48/RequestedTest.java
index 0eca387..52c2d52 100644
--- a/surefire-providers/common-junit48/src/main/java/org/apache/maven/surefire/common/junit48/RequestedTest.java
+++ b/surefire-providers/common-junit48/src/main/java/org/apache/maven/surefire/common/junit48/RequestedTest.java
@@ -59,7 +59,7 @@ final class RequestedTest
public String describe()
{
String description = test.toString();
- return description.length() == 0 ? "*" : description;
+ return description.isEmpty() ? "*" : description;
}
@Override
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/8a63486f/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/JUnitCoreWrapper.java
----------------------------------------------------------------------
diff --git a/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/JUnitCoreWrapper.java b/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/JUnitCoreWrapper.java
index 2abfa58..656d55b 100644
--- a/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/JUnitCoreWrapper.java
+++ b/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/JUnitCoreWrapper.java
@@ -140,7 +140,7 @@ final class JUnitCoreWrapper
if ( computer instanceof ParallelComputer )
{
String timeoutMessage = ( (ParallelComputer) computer ).describeElapsedTimeout();
- if ( timeoutMessage.length() != 0 )
+ if ( !timeoutMessage.isEmpty() )
{
throw new TestSetFailedException( timeoutMessage );
}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/8a63486f/surefire-providers/surefire-testng-utils/src/main/java/org/apache/maven/surefire/testng/utils/GroupMatcherMethodSelector.java
----------------------------------------------------------------------
diff --git a/surefire-providers/surefire-testng-utils/src/main/java/org/apache/maven/surefire/testng/utils/GroupMatcherMethodSelector.java b/surefire-providers/surefire-testng-utils/src/main/java/org/apache/maven/surefire/testng/utils/GroupMatcherMethodSelector.java
index 0017b54..e801b06 100644
--- a/surefire-providers/surefire-testng-utils/src/main/java/org/apache/maven/surefire/testng/utils/GroupMatcherMethodSelector.java
+++ b/surefire-providers/surefire-testng-utils/src/main/java/org/apache/maven/surefire/testng/utils/GroupMatcherMethodSelector.java
@@ -79,7 +79,7 @@ public class GroupMatcherMethodSelector
{
AndGroupMatcher matcher = new AndGroupMatcher();
GroupMatcher in = null;
- if ( groups != null && groups.trim().length() > 0 )
+ if ( groups != null && !groups.trim().isEmpty() )
{
in = new GroupMatcherParser( groups ).parse();
}
@@ -90,7 +90,7 @@ public class GroupMatcherMethodSelector
}
GroupMatcher ex = null;
- if ( excludedGroups != null && excludedGroups.trim().length() > 0 )
+ if ( excludedGroups != null && !excludedGroups.trim().isEmpty() )
{
ex = new GroupMatcherParser( excludedGroups ).parse();
}