apache/maven-mvnd
1
0
Fork 0
mirror of https://github.com/apache/maven-mvnd.git synced 2025-09-09 14:39:04 +00:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

Use String.join() instead of Collectors.joining() where applicable

Browse Source 
* the String.join() is more readable and there should not be any
   downsides (like performance or so)
This commit is contained in:
Petr Široký
2023-03-10 22:14:14 +01:00
committed by Guillaume Nodet
parent 50653ae7d9
commit 3657375e97
1 changed files with 8 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
common/src/main/java/org/mvndaemon/mvnd/common/OsUtils.java
View File

@@ -28,7 +28,6 @@ import java.util.List;
import java.util.concurrent.TimeUnit;
import java.util.function.Consumer;
import java.util.stream.Collectors;
import java.util.stream.Stream;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -79,14 +78,11 @@ public class OsUtils {
} catch (NumberFormatException e) {
LOGGER.warn(
"Could not parse the output of {} as a long:\n{}",
Stream.of(cmd).collect(Collectors.joining(" ")),
output.stream().collect(Collectors.joining("\n")));
String.join(" ", cmd),
String.join("\n", output));
}
} else {
LOGGER.warn(
"Unexpected output of {}:\n{}",
Stream.of(cmd).collect(Collectors.joining(" ")),
output.stream().collect(Collectors.joining("\n")));
LOGGER.warn("Unexpected output of {}:\n{}", String.join(" ", cmd), String.join("\n", output));
}
return -1;
} else if (os == Os.WINDOWS) {
@@ -101,14 +97,11 @@ public class OsUtils {
} catch (NumberFormatException e) {
LOGGER.warn(
"Could not parse the second line of {} output as a long:\n{}",
Stream.of(cmd).collect(Collectors.joining(" ")),
nonEmptyLines.stream().collect(Collectors.joining("\n")));
String.join(" ", cmd),
String.join("\n", nonEmptyLines));
}
} else {
LOGGER.warn(
"Unexpected output of {}:\n{}",
Stream.of(cmd).collect(Collectors.joining(" ")),
output.stream().collect(Collectors.joining("\n")));
LOGGER.warn("Unexpected output of {}:\n{}", String.join(" ", cmd), String.join("\n", output));
}
return -1;
} else {
@@ -140,14 +133,10 @@ public class OsUtils {
try (CommandProcess ps = new CommandProcess(builder.start(), output::add)) {
final int exitCode = ps.waitFor(1000);
if (exitCode != 0) {
LOGGER.warn(
"{} exited with {}:\n{}",
Stream.of(cmd).collect(Collectors.joining(" ")),
exitCode,
output.stream().collect(Collectors.joining("\n")));
LOGGER.warn("{} exited with {}:\n{}", String.join(" ", cmd), exitCode, String.join("\n", output));
}
} catch (IOException e) {
LOGGER.warn("Could not execute {}", Stream.of(cmd).collect(Collectors.joining(" ")));
LOGGER.warn("Could not execute {}", String.join(" ", cmd));
} catch (InterruptedException e) {
Thread.currentThread().interrupt();
}