This is an automated email from the ASF dual-hosted git repository.
tibordigana pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven-surefire.git
The following commit(s) were added to refs/heads/master by this push:
new 72aa2c1 Delete is{Not}Blank from internal StringUtils
72aa2c1 is described below
commit 72aa2c16411358aadb63d7e1513aad03926e8e6b
Author: Marc Philipp <m...@marcphilipp.de>
AuthorDate: Mon Jan 20 15:05:32 2020 +0100
Delete is{Not}Blank from internal StringUtils
Use org.apache.maven.surefire.shared.utils.StringUtils instead.
---
.../failsafe/util/FailsafeSummaryXmlUtils.java | 2 +-
.../maven/plugin/surefire/SurefireProperties.java | 2 +-
.../surefire/booterclient/output/ForkClient.java | 4 ++--
.../booterclient/output/ForkedChannelDecoder.java | 4 ++--
.../maven/plugin/surefire/report/FileReporter.java | 2 +-
.../surefire/report/StatelessXmlReporter.java | 2 +-
.../plugin/surefire/report/WrappedReportEntry.java | 2 +-
.../maven/plugin/surefire/util/FileScanner.java | 2 +-
.../org/apache/maven/surefire/booter/Command.java | 2 +-
.../maven/surefire/booter/CommandReader.java | 4 ++--
.../maven/surefire/util/internal/ClassMethod.java | 2 +-
.../maven/surefire/util/internal/StringUtils.java | 26 ----------------------
.../maven/surefire/booter/ProcessCheckerType.java | 2 +-
.../maven/surefire/booter/PropertiesWrapper.java | 2 +-
.../booter/SurefireBooterForkException.java | 2 +-
.../surefire/extensions/ConsoleOutputReporter.java | 2 +-
.../surefire/extensions/StatelessReporter.java | 2 +-
.../common/junit4/JUnit4RunListenerFactory.java | 2 +-
.../surefire/common/junit48/FilterFactory.java | 2 +-
.../surefire/testng/TestNGDirectoryTestSuite.java | 2 +-
.../maven/surefire/testng/TestNGExecutor.java | 2 +-
21 files changed, 23 insertions(+), 49 deletions(-)
diff --git
a/maven-failsafe-plugin/src/main/java/org/apache/maven/plugin/failsafe/util/FailsafeSummaryXmlUtils.java
b/maven-failsafe-plugin/src/main/java/org/apache/maven/plugin/failsafe/util/FailsafeSummaryXmlUtils.java
index f7c9cef..f8f1579 100644
---
a/maven-failsafe-plugin/src/main/java/org/apache/maven/plugin/failsafe/util/FailsafeSummaryXmlUtils.java
+++
b/maven-failsafe-plugin/src/main/java/org/apache/maven/plugin/failsafe/util/FailsafeSummaryXmlUtils.java
@@ -39,7 +39,7 @@ import static java.lang.String.format;
import static java.nio.charset.StandardCharsets.UTF_8;
import static
org.apache.maven.surefire.shared.lang3.StringEscapeUtils.escapeXml10;
import static
org.apache.maven.surefire.shared.lang3.StringEscapeUtils.unescapeXml;
-import static org.apache.maven.surefire.util.internal.StringUtils.isBlank;
+import static org.apache.maven.surefire.shared.utils.StringUtils.isBlank;
/**
* @author <a href="mailto:tibordig...@apache.org";>Tibor Digana (tibor17)</a>
diff --git
a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/SurefireProperties.java
b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/SurefireProperties.java
index b1dc25c..a880c0d 100644
---
a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/SurefireProperties.java
+++
b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/SurefireProperties.java
@@ -35,7 +35,7 @@ import java.util.Set;
import org.apache.maven.surefire.booter.Classpath;
import org.apache.maven.surefire.booter.KeyValueSource;
-import org.apache.maven.surefire.util.internal.StringUtils;
+import org.apache.maven.surefire.shared.utils.StringUtils;
import static java.util.Arrays.asList;
diff --git
a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/output/ForkClient.java
b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/output/ForkClient.java
index 86ad955..18cfe28 100644
---
a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/output/ForkClient.java
+++
b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/output/ForkClient.java
@@ -47,8 +47,8 @@ import static java.lang.System.currentTimeMillis;
import static java.util.Collections.unmodifiableMap;
import static org.apache.maven.surefire.booter.Shutdown.KILL;
import static
org.apache.maven.surefire.report.CategorizedReportEntry.reportEntry;
-import static org.apache.maven.surefire.util.internal.StringUtils.isBlank;
-import static org.apache.maven.surefire.util.internal.StringUtils.isNotBlank;
+import static org.apache.maven.surefire.shared.utils.StringUtils.isBlank;
+import static org.apache.maven.surefire.shared.utils.StringUtils.isNotBlank;
// todo move to the same package with ForkStarter
diff --git
a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/output/ForkedChannelDecoder.java
b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/output/ForkedChannelDecoder.java
index b7950d0..f0c96e3 100644
---
a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/output/ForkedChannelDecoder.java
+++
b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/output/ForkedChannelDecoder.java
@@ -54,8 +54,8 @@ import static
org.apache.maven.surefire.booter.ForkedProcessEvent.BOOTERCODE_TES
import static org.apache.maven.surefire.booter.ForkedProcessEvent.EVENTS;
import static
org.apache.maven.surefire.report.CategorizedReportEntry.reportEntry;
import static org.apache.maven.surefire.report.RunMode.MODES;
-import static org.apache.maven.surefire.util.internal.StringUtils.isBlank;
-import static org.apache.maven.surefire.util.internal.StringUtils.isNotBlank;
+import static org.apache.maven.surefire.shared.utils.StringUtils.isBlank;
+import static org.apache.maven.surefire.shared.utils.StringUtils.isNotBlank;
import static java.util.Objects.requireNonNull;
/**
diff --git
a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/FileReporter.java
b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/FileReporter.java
index 2301e34..7444dd5 100644
---
a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/FileReporter.java
+++
b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/FileReporter.java
@@ -32,7 +32,7 @@ import java.nio.charset.Charset;
import java.util.List;
import static
org.apache.maven.plugin.surefire.report.FileReporterUtils.stripIllegalFilenameChars;
-import static org.apache.maven.surefire.util.internal.StringUtils.isNotBlank;
+import static org.apache.maven.surefire.shared.utils.StringUtils.isNotBlank;
/**
* Base class for file reporters.
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 d537d2c..1637b24 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
@@ -46,7 +46,7 @@ import static java.nio.charset.StandardCharsets.UTF_8;
import static
org.apache.maven.plugin.surefire.report.DefaultReporterFactory.TestResultType;
import static
org.apache.maven.plugin.surefire.report.FileReporterUtils.stripIllegalFilenameChars;
import static org.apache.maven.plugin.surefire.report.ReportEntryType.SUCCESS;
-import static org.apache.maven.surefire.util.internal.StringUtils.isBlank;
+import static org.apache.maven.surefire.shared.utils.StringUtils.isBlank;
@SuppressWarnings( { "javadoc", "checkstyle:javadoctype" } )
// CHECKSTYLE_OFF: LineLength
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 102eea4..3fe274a 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
@@ -29,7 +29,7 @@ import java.util.Map;
import static java.util.Collections.unmodifiableMap;
import static
org.apache.maven.plugin.surefire.report.ReporterUtils.formatElapsedTime;
import static org.apache.maven.surefire.util.internal.StringUtils.NL;
-import static org.apache.maven.surefire.util.internal.StringUtils.isBlank;
+import static org.apache.maven.surefire.shared.utils.StringUtils.isBlank;
/**
* @author Kristian Rosenvold
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 8f4f0fd..faabcac 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
@@ -24,7 +24,7 @@ import org.apache.maven.surefire.testset.TestFilter;
import java.io.File;
import java.util.Collection;
-import static org.apache.maven.surefire.util.internal.StringUtils.isBlank;
+import static org.apache.maven.surefire.shared.utils.StringUtils.isBlank;
final class FileScanner
{
diff --git
a/surefire-api/src/main/java/org/apache/maven/surefire/booter/Command.java
b/surefire-api/src/main/java/org/apache/maven/surefire/booter/Command.java
index c5e5857..f05c0f6 100644
--- a/surefire-api/src/main/java/org/apache/maven/surefire/booter/Command.java
+++ b/surefire-api/src/main/java/org/apache/maven/surefire/booter/Command.java
@@ -20,7 +20,7 @@ package org.apache.maven.surefire.booter;
*/
import static java.util.Objects.requireNonNull;
-import static org.apache.maven.surefire.util.internal.StringUtils.isBlank;
+import static org.apache.maven.surefire.shared.utils.StringUtils.isBlank;
import static org.apache.maven.surefire.booter.MasterProcessCommand.RUN_CLASS;
import static org.apache.maven.surefire.booter.MasterProcessCommand.SHUTDOWN;
import static org.apache.maven.surefire.booter.Shutdown.DEFAULT;
diff --git
a/surefire-api/src/main/java/org/apache/maven/surefire/booter/CommandReader.java
b/surefire-api/src/main/java/org/apache/maven/surefire/booter/CommandReader.java
index 2e735d9..b51f713 100644
---
a/surefire-api/src/main/java/org/apache/maven/surefire/booter/CommandReader.java
+++
b/surefire-api/src/main/java/org/apache/maven/surefire/booter/CommandReader.java
@@ -49,8 +49,8 @@ import static
org.apache.maven.surefire.booter.MasterProcessCommand.SKIP_SINCE_N
import static
org.apache.maven.surefire.booter.MasterProcessCommand.TEST_SET_FINISHED;
import static org.apache.maven.surefire.booter.MasterProcessCommand.decode;
import static
org.apache.maven.surefire.util.internal.DaemonThreadFactory.newDaemonThread;
-import static org.apache.maven.surefire.util.internal.StringUtils.isBlank;
-import static org.apache.maven.surefire.util.internal.StringUtils.isNotBlank;
+import static org.apache.maven.surefire.shared.utils.StringUtils.isBlank;
+import static org.apache.maven.surefire.shared.utils.StringUtils.isNotBlank;
/**
* Reader of commands coming from plugin(master) process.
diff --git
a/surefire-api/src/main/java/org/apache/maven/surefire/util/internal/ClassMethod.java
b/surefire-api/src/main/java/org/apache/maven/surefire/util/internal/ClassMethod.java
index 03f9620..611b849 100644
---
a/surefire-api/src/main/java/org/apache/maven/surefire/util/internal/ClassMethod.java
+++
b/surefire-api/src/main/java/org/apache/maven/surefire/util/internal/ClassMethod.java
@@ -21,7 +21,7 @@ package org.apache.maven.surefire.util.internal;
import java.util.Objects;
-import static org.apache.maven.surefire.util.internal.StringUtils.isBlank;
+import static org.apache.maven.surefire.shared.utils.StringUtils.isBlank;
/**
* Data transfer object of class and method literals.
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 6f49690..e877a24 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
@@ -80,32 +80,6 @@ public final class StringUtils
}
/**
- * <p>
- * Checks if a (trimmed) String is {@code null} or blank.
- * </p>
- *
- * @param str the String to check
- * @return {@code true} if the String is {@code null}, or length zero once
trimmed
- */
- public static boolean isBlank( String str )
- {
- return str == null || str.trim().isEmpty();
- }
-
- /**
- * <p>
- * Checks if a (trimmed) String is not {@code null} and not blank.
- * </p>
- *
- * @param str the String to check
- * @return {@code true} if the String is not {@code null} and length of
trimmed {@code str} is not zero.
- */
- public static boolean isNotBlank( String str )
- {
- return !isBlank( str );
- }
-
- /**
* Determines if {@code buffer} starts with specific literal(s).
*
* @param buffer Examined StringBuffer
diff --git
a/surefire-booter/src/main/java/org/apache/maven/surefire/booter/ProcessCheckerType.java
b/surefire-booter/src/main/java/org/apache/maven/surefire/booter/ProcessCheckerType.java
index 547e330..03a0e88 100644
---
a/surefire-booter/src/main/java/org/apache/maven/surefire/booter/ProcessCheckerType.java
+++
b/surefire-booter/src/main/java/org/apache/maven/surefire/booter/ProcessCheckerType.java
@@ -19,7 +19,7 @@ package org.apache.maven.surefire.booter;
* under the License.
*/
-import static org.apache.maven.surefire.util.internal.StringUtils.isBlank;
+import static org.apache.maven.surefire.shared.utils.StringUtils.isBlank;
/**
*
diff --git
a/surefire-booter/src/main/java/org/apache/maven/surefire/booter/PropertiesWrapper.java
b/surefire-booter/src/main/java/org/apache/maven/surefire/booter/PropertiesWrapper.java
index 570eea0..c0004e5 100644
---
a/surefire-booter/src/main/java/org/apache/maven/surefire/booter/PropertiesWrapper.java
+++
b/surefire-booter/src/main/java/org/apache/maven/surefire/booter/PropertiesWrapper.java
@@ -23,7 +23,7 @@ import java.io.File;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
-import org.apache.maven.surefire.util.internal.StringUtils;
+import org.apache.maven.surefire.shared.utils.StringUtils;
/**
* @author Kristian Rosenvold
diff --git
a/surefire-booter/src/main/java/org/apache/maven/surefire/booter/SurefireBooterForkException.java
b/surefire-booter/src/main/java/org/apache/maven/surefire/booter/SurefireBooterForkException.java
index 5f78ef5..8d3790b 100644
---
a/surefire-booter/src/main/java/org/apache/maven/surefire/booter/SurefireBooterForkException.java
+++
b/surefire-booter/src/main/java/org/apache/maven/surefire/booter/SurefireBooterForkException.java
@@ -22,7 +22,7 @@ package org.apache.maven.surefire.booter;
import org.apache.maven.surefire.suite.RunResult;
-import static org.apache.maven.surefire.util.internal.StringUtils.isNotBlank;
+import static org.apache.maven.surefire.shared.utils.StringUtils.isNotBlank;
/**
* Encapsulates exceptions thrown during Surefire forking.
diff --git
a/surefire-extensions-api/src/main/java/org/apache/maven/surefire/extensions/ConsoleOutputReporter.java
b/surefire-extensions-api/src/main/java/org/apache/maven/surefire/extensions/ConsoleOutputReporter.java
index 382eaf3..ae9d927 100644
---
a/surefire-extensions-api/src/main/java/org/apache/maven/surefire/extensions/ConsoleOutputReporter.java
+++
b/surefire-extensions-api/src/main/java/org/apache/maven/surefire/extensions/ConsoleOutputReporter.java
@@ -22,7 +22,7 @@ package org.apache.maven.surefire.extensions;
import java.io.File;
import java.io.PrintStream;
-import static org.apache.maven.surefire.util.internal.StringUtils.isBlank;
+import static org.apache.maven.surefire.shared.utils.StringUtils.isBlank;
/**
* Extension for logger.
diff --git
a/surefire-extensions-api/src/main/java/org/apache/maven/surefire/extensions/StatelessReporter.java
b/surefire-extensions-api/src/main/java/org/apache/maven/surefire/extensions/StatelessReporter.java
index 60cee59..b02240a 100644
---
a/surefire-extensions-api/src/main/java/org/apache/maven/surefire/extensions/StatelessReporter.java
+++
b/surefire-extensions-api/src/main/java/org/apache/maven/surefire/extensions/StatelessReporter.java
@@ -21,7 +21,7 @@ package org.apache.maven.surefire.extensions;
import org.apache.maven.surefire.report.TestSetReportEntry;
-import static org.apache.maven.surefire.util.internal.StringUtils.isBlank;
+import static org.apache.maven.surefire.shared.utils.StringUtils.isBlank;
/**
* Extension for stateless reporter.
diff --git
a/surefire-providers/common-junit4/src/main/java/org/apache/maven/surefire/common/junit4/JUnit4RunListenerFactory.java
b/surefire-providers/common-junit4/src/main/java/org/apache/maven/surefire/common/junit4/JUnit4RunListenerFactory.java
index d98895e..794c448 100644
---
a/surefire-providers/common-junit4/src/main/java/org/apache/maven/surefire/common/junit4/JUnit4RunListenerFactory.java
+++
b/surefire-providers/common-junit4/src/main/java/org/apache/maven/surefire/common/junit4/JUnit4RunListenerFactory.java
@@ -26,7 +26,7 @@ import org.apache.maven.surefire.util.ReflectionUtils;
import org.junit.runner.notification.RunListener;
-import static org.apache.maven.surefire.util.internal.StringUtils.isNotBlank;
+import static org.apache.maven.surefire.shared.utils.StringUtils.isNotBlank;
/**
* @author Kristian Rosenvold
diff --git
a/surefire-providers/common-junit48/src/main/java/org/apache/maven/surefire/common/junit48/FilterFactory.java
b/surefire-providers/common-junit48/src/main/java/org/apache/maven/surefire/common/junit48/FilterFactory.java
index 6ebff47..8ded759 100644
---
a/surefire-providers/common-junit48/src/main/java/org/apache/maven/surefire/common/junit48/FilterFactory.java
+++
b/surefire-providers/common-junit48/src/main/java/org/apache/maven/surefire/common/junit48/FilterFactory.java
@@ -31,7 +31,7 @@ import java.util.Map;
import static
org.apache.maven.surefire.booter.ProviderParameterNames.TESTNG_EXCLUDEDGROUPS_PROP;
import static
org.apache.maven.surefire.booter.ProviderParameterNames.TESTNG_GROUPS_PROP;
-import static org.apache.maven.surefire.util.internal.StringUtils.isNotBlank;
+import static org.apache.maven.surefire.shared.utils.StringUtils.isNotBlank;
/**
* @author Todd Lipcon
diff --git
a/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/TestNGDirectoryTestSuite.java
b/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/TestNGDirectoryTestSuite.java
index f4cc1b9..18e8b92 100644
---
a/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/TestNGDirectoryTestSuite.java
+++
b/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/TestNGDirectoryTestSuite.java
@@ -35,7 +35,7 @@ import
org.apache.maven.surefire.testset.TestSetFailedException;
import org.apache.maven.surefire.util.TestsToRun;
import static org.apache.maven.surefire.testng.TestNGExecutor.run;
-import static org.apache.maven.surefire.util.internal.StringUtils.isBlank;
+import static org.apache.maven.surefire.shared.utils.StringUtils.isBlank;
/**
* Test suite for TestNG based on a directory of Java test classes. Can also
execute JUnit tests.
diff --git
a/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/TestNGExecutor.java
b/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/TestNGExecutor.java
index 6bc30a3..19ad157 100644
---
a/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/TestNGExecutor.java
+++
b/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/TestNGExecutor.java
@@ -28,7 +28,7 @@ import
org.apache.maven.surefire.testng.utils.FailFastListener;
import org.apache.maven.surefire.testng.utils.Stoppable;
import org.apache.maven.surefire.testset.TestListResolver;
import org.apache.maven.surefire.testset.TestSetFailedException;
-import org.apache.maven.surefire.util.internal.StringUtils;
+import org.apache.maven.surefire.shared.utils.StringUtils;
import org.testng.TestNG;
import org.testng.annotations.Test;
import org.testng.xml.XmlClass;
