Repository: maven-surefire Updated Branches: refs/heads/master fd9f6e559 -> 5e9f5637c
refactoring and build fix Project: http://git-wip-us.apache.org/repos/asf/maven-surefire/repo Commit: http://git-wip-us.apache.org/repos/asf/maven-surefire/commit/5e9f5637 Tree: http://git-wip-us.apache.org/repos/asf/maven-surefire/tree/5e9f5637 Diff: http://git-wip-us.apache.org/repos/asf/maven-surefire/diff/5e9f5637 Branch: refs/heads/master Commit: 5e9f5637cead161f5e210b86febcc23d502d3f67 Parents: fd9f6e5 Author: Tibor17 <tibo...@lycos.com> Authored: Wed Oct 12 22:20:48 2016 +0200 Committer: Tibor17 <tibo...@lycos.com> Committed: Wed Oct 12 22:20:48 2016 +0200 ---------------------------------------------------------------------- .../surefire/booterclient/ForkStarter.java | 2 +- .../AbstractForkInputStream.java | 2 +- .../surefire/report/DefaultReporterFactory.java | 14 +++++----- .../apache/maven/surefire/booter/Command.java | 2 +- .../maven/surefire/booter/CommandReader.java | 2 +- .../surefire/booter/MasterProcessCommand.java | 2 +- .../surefire/util/internal/ObjectUtils.java | 1 + .../surefire/util/internal/StringUtils.java | 29 ++++---------------- 8 files changed, 19 insertions(+), 35 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/5e9f5637/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/ForkStarter.java ---------------------------------------------------------------------- diff --git a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/ForkStarter.java b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/ForkStarter.java index 2eb8259..d512f24 100644 --- a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/ForkStarter.java +++ b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/ForkStarter.java @@ -96,7 +96,7 @@ import static org.apache.maven.surefire.util.internal.ConcurrencyUtils.countDown import static org.apache.maven.surefire.util.internal.DaemonThreadFactory.newDaemonThread; import static org.apache.maven.surefire.util.internal.DaemonThreadFactory.newDaemonThreadFactory; import static org.apache.maven.surefire.util.internal.StringUtils.FORK_STREAM_CHARSET_NAME; -import static org.apache.maven.surefire.util.internal.StringUtils.requireNonNull; +import static org.apache.maven.surefire.util.internal.ObjectUtils.requireNonNull; /** * Starts the fork or runs in-process. http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/5e9f5637/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/lazytestprovider/AbstractForkInputStream.java ---------------------------------------------------------------------- diff --git a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/lazytestprovider/AbstractForkInputStream.java b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/lazytestprovider/AbstractForkInputStream.java index 281c05d..8cc0cdd 100644 --- a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/lazytestprovider/AbstractForkInputStream.java +++ b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/lazytestprovider/AbstractForkInputStream.java @@ -22,7 +22,7 @@ package org.apache.maven.plugin.surefire.booterclient.lazytestprovider; import java.io.IOException; import java.io.InputStream; -import static org.apache.maven.surefire.util.internal.StringUtils.requireNonNull; +import static org.apache.maven.surefire.util.internal.ObjectUtils.requireNonNull; /** * Reader stream sends bytes to forked jvm std-{@link InputStream input-stream}. http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/5e9f5637/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/DefaultReporterFactory.java ---------------------------------------------------------------------- diff --git a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/DefaultReporterFactory.java b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/DefaultReporterFactory.java index e011fee..2332856 100644 --- a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/DefaultReporterFactory.java +++ b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/DefaultReporterFactory.java @@ -21,6 +21,7 @@ package org.apache.maven.plugin.surefire.report; import org.apache.maven.plugin.surefire.StartupReportConfiguration; import org.apache.maven.plugin.surefire.log.api.ConsoleLogger; +import org.apache.maven.plugin.surefire.log.api.Level; import org.apache.maven.plugin.surefire.log.api.NullConsoleLogger; import org.apache.maven.plugin.surefire.runorder.StatisticsReporter; import org.apache.maven.shared.utils.logging.MessageBuilder; @@ -28,7 +29,6 @@ import org.apache.maven.surefire.report.ReporterFactory; import org.apache.maven.surefire.report.RunListener; import org.apache.maven.surefire.report.RunStatistics; import org.apache.maven.surefire.report.StackTraceWriter; -import org.apache.maven.plugin.surefire.log.api.Level; import org.apache.maven.surefire.suite.RunResult; import java.util.ArrayList; @@ -39,7 +39,7 @@ import java.util.Map; import java.util.TreeMap; import java.util.concurrent.ConcurrentLinkedQueue; -import static org.apache.commons.lang3.ObjectUtils.defaultIfNull; +import static org.apache.maven.plugin.surefire.log.api.Level.resolveLevel; import static org.apache.maven.plugin.surefire.report.ConsoleReporter.PLAIN; import static org.apache.maven.plugin.surefire.report.DefaultReporterFactory.TestResultType.error; import static org.apache.maven.plugin.surefire.report.DefaultReporterFactory.TestResultType.failure; @@ -50,8 +50,8 @@ import static org.apache.maven.plugin.surefire.report.DefaultReporterFactory.Tes import static org.apache.maven.plugin.surefire.report.ReportEntryType.ERROR; import static org.apache.maven.plugin.surefire.report.ReportEntryType.FAILURE; import static org.apache.maven.plugin.surefire.report.ReportEntryType.SUCCESS; -import static org.apache.maven.plugin.surefire.log.api.Level.resolveLevel; import static org.apache.maven.shared.utils.logging.MessageUtils.buffer; +import static org.apache.maven.surefire.util.internal.ObjectUtils.useNonNull; /** * Provides reporting modules on the plugin side. @@ -108,26 +108,26 @@ public class DefaultReporterFactory private FileReporter createFileReporter() { final FileReporter fileReporter = reportConfiguration.instantiateFileReporter(); - return defaultIfNull( fileReporter, NullFileReporter.INSTANCE ); + return useNonNull( fileReporter, NullFileReporter.INSTANCE ); } private StatelessXmlReporter createSimpleXMLReporter() { final StatelessXmlReporter xmlReporter = reportConfiguration.instantiateStatelessXmlReporter(); - return defaultIfNull( xmlReporter, NullStatelessXmlReporter.INSTANCE ); + return useNonNull( xmlReporter, NullStatelessXmlReporter.INSTANCE ); } private TestcycleConsoleOutputReceiver createConsoleOutputReceiver() { final TestcycleConsoleOutputReceiver consoleOutputReceiver = reportConfiguration.instantiateConsoleOutputFileReporter(); - return defaultIfNull( consoleOutputReceiver, NullConsoleOutputReceiver.INSTANCE ); + return useNonNull( consoleOutputReceiver, NullConsoleOutputReceiver.INSTANCE ); } private StatisticsReporter createStatisticsReporter() { final StatisticsReporter statisticsReporter = reportConfiguration.getStatisticsReporter(); - return defaultIfNull( statisticsReporter, NullStatisticsReporter.INSTANCE ); + return useNonNull( statisticsReporter, NullStatisticsReporter.INSTANCE ); } private boolean shouldReportToConsole() http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/5e9f5637/surefire-api/src/main/java/org/apache/maven/surefire/booter/Command.java ---------------------------------------------------------------------- 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 070980c..49ae52d 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 @@ -19,7 +19,7 @@ package org.apache.maven.surefire.booter; * under the License. */ -import static org.apache.maven.surefire.util.internal.StringUtils.requireNonNull; +import static org.apache.maven.surefire.util.internal.ObjectUtils.requireNonNull; import static org.apache.maven.surefire.util.internal.StringUtils.isBlank; import static org.apache.maven.surefire.booter.MasterProcessCommand.RUN_CLASS; import static org.apache.maven.surefire.booter.MasterProcessCommand.SHUTDOWN; http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/5e9f5637/surefire-api/src/main/java/org/apache/maven/surefire/booter/CommandReader.java ---------------------------------------------------------------------- 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 4287080..bdd6092 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 @@ -52,7 +52,7 @@ import static org.apache.maven.surefire.util.internal.DaemonThreadFactory.newDae import static org.apache.maven.surefire.util.internal.StringUtils.encodeStringForForkCommunication; 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.util.internal.StringUtils.requireNonNull; +import static org.apache.maven.surefire.util.internal.ObjectUtils.requireNonNull; /** * Reader of commands coming from plugin(master) process. http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/5e9f5637/surefire-api/src/main/java/org/apache/maven/surefire/booter/MasterProcessCommand.java ---------------------------------------------------------------------- diff --git a/surefire-api/src/main/java/org/apache/maven/surefire/booter/MasterProcessCommand.java b/surefire-api/src/main/java/org/apache/maven/surefire/booter/MasterProcessCommand.java index 5e6bca9..a53a046 100644 --- a/surefire-api/src/main/java/org/apache/maven/surefire/booter/MasterProcessCommand.java +++ b/surefire-api/src/main/java/org/apache/maven/surefire/booter/MasterProcessCommand.java @@ -29,7 +29,7 @@ import java.nio.charset.Charset; import static org.apache.maven.surefire.util.internal.StringUtils.FORK_STREAM_CHARSET_NAME; import static org.apache.maven.surefire.util.internal.StringUtils.encodeStringForForkCommunication; -import static org.apache.maven.surefire.util.internal.StringUtils.requireNonNull; +import static org.apache.maven.surefire.util.internal.ObjectUtils.requireNonNull; import static java.lang.String.format; /** http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/5e9f5637/surefire-api/src/main/java/org/apache/maven/surefire/util/internal/ObjectUtils.java ---------------------------------------------------------------------- diff --git a/surefire-api/src/main/java/org/apache/maven/surefire/util/internal/ObjectUtils.java b/surefire-api/src/main/java/org/apache/maven/surefire/util/internal/ObjectUtils.java new file mode 100644 index 0000000..93d914d --- /dev/null +++ b/surefire-api/src/main/java/org/apache/maven/surefire/util/internal/ObjectUtils.java @@ -0,0 +1 @@ +package org.apache.maven.surefire.util.internal; /* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information * regarding copyright ownership. The ASF licenses this file * to you under the Apache License, Version 2.0 (the * "License"); you may not use this file except in compliance * with the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY * KIND, either express or implied. See the License for the * specific language governing permissions and limitations * under the License. */ /** * Similar to Java 7 java.util.Objects. * * @author <a href="mailto:tibordig...@apache.org">Tibor Digana (tibor17)</a> * @since 2 .19.2 */ public final class ObjectUtils { private ObjectUtils() { throw new IllegalStateException( "no instantiable constructor" ); } public static <T> T useNonNull( T target, T fallback ) { return isNull( target ) ? fallback : target; } /* * In JDK7 use java.util.Objects instead. * todo * */ public static boolean isNull( Object target ) { return target == null; } /* * In JDK7 use java.util.Objects instead. * todo * */ public static boolean nonNull( Object target ) { return !isNull( target ); } /* * In JDK7 use java.util.Objects instead. * todo * */ public static <T> T requireNonNull( T obj, String message ) { if ( isNull( obj ) ) { throw new NullPointerException( message ); } return obj; } /* * In JDK7 use java.util.Objects instead. * todo * */ public static <T> T requireNonN ull( T obj ) { return requireNonNull( obj, null ); } } \ No newline at end of file http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/5e9f5637/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 07722a1..a955183 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 @@ -55,7 +55,7 @@ import java.util.StringTokenizer; * NOTE: This class is not part of any api and is public purely for technical reasons ! * @since 1.0 */ -public class StringUtils +public final class StringUtils { public static final String NL = System.getProperty( "line.separator" ); @@ -68,6 +68,11 @@ public class StringUtils // 8-bit charset Latin-1 public static final String FORK_STREAM_CHARSET_NAME = "ISO-8859-1"; + private StringUtils() + { + throw new IllegalStateException( "no instantiable constructor" ); + } + public static String[] split( String text, String separator ) { int max = -1; @@ -378,26 +383,4 @@ public class StringUtils throw new RuntimeException( "The JVM must support Charset " + FORK_STREAM_CHARSET_NAME, e ); } } - - /* - * In JDK7 use java.util.Objects instead. - * todo - * */ - public static <T> T requireNonNull( T obj, String message ) - { - if ( obj == null ) - { - throw new NullPointerException( message ); - } - return obj; - } - - /* - * In JDK7 use java.util.Objects instead. - * todo - * */ - public static <T> T requireNonNull( T obj ) - { - return requireNonNull( obj, null ); - } }