mirror of
https://github.com/nosqlbench/nosqlbench.git
synced 2025-02-25 18:55:28 -06:00
Merge pull request #333 from XN137/jdk-string-join
prefer jdk over lib internals for String join
This commit is contained in:
commit
a02df22d41
@ -30,7 +30,6 @@ import io.nosqlbench.nb.api.errors.BasicError;
|
|||||||
import io.nosqlbench.nb.api.logging.NBLogLevel;
|
import io.nosqlbench.nb.api.logging.NBLogLevel;
|
||||||
import io.nosqlbench.nb.api.markdown.exporter.MarkdownExporter;
|
import io.nosqlbench.nb.api.markdown.exporter.MarkdownExporter;
|
||||||
import io.nosqlbench.virtdata.userlibs.apps.VirtDataMainApp;
|
import io.nosqlbench.virtdata.userlibs.apps.VirtDataMainApp;
|
||||||
import joptsimple.internal.Strings;
|
|
||||||
import org.apache.logging.log4j.LogManager;
|
import org.apache.logging.log4j.LogManager;
|
||||||
import org.apache.logging.log4j.Logger;
|
import org.apache.logging.log4j.Logger;
|
||||||
import org.apache.logging.log4j.core.config.ConfigurationFactory;
|
import org.apache.logging.log4j.core.config.ConfigurationFactory;
|
||||||
@ -299,7 +298,7 @@ public class NBCLI {
|
|||||||
.session(sessionName)
|
.session(sessionName)
|
||||||
.now()
|
.now()
|
||||||
.layer(Layer.CLI)
|
.layer(Layer.CLI)
|
||||||
.detail("cli", Strings.join(args, "\n"))
|
.detail("cli", String.join("\n", args))
|
||||||
.build()
|
.build()
|
||||||
);
|
);
|
||||||
|
|
||||||
|
@ -2,7 +2,6 @@ package io.nosqlbench.engine.cli;
|
|||||||
|
|
||||||
import io.nosqlbench.nb.api.NBEnvironment;
|
import io.nosqlbench.nb.api.NBEnvironment;
|
||||||
import io.nosqlbench.nb.api.errors.BasicError;
|
import io.nosqlbench.nb.api.errors.BasicError;
|
||||||
import joptsimple.internal.Strings;
|
|
||||||
import org.apache.logging.log4j.Logger;
|
import org.apache.logging.log4j.Logger;
|
||||||
|
|
||||||
import java.io.IOException;
|
import java.io.IOException;
|
||||||
@ -426,13 +425,13 @@ public class NBCLIArgsFile {
|
|||||||
String word = iter.next();
|
String word = iter.next();
|
||||||
if (word.startsWith("-")) {
|
if (word.startsWith("-")) {
|
||||||
if (element.size() > 0) {
|
if (element.size() > 0) {
|
||||||
lines.add(Strings.join(element, " "));
|
lines.add(String.join(" ", element));
|
||||||
element.clear();
|
element.clear();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
element.add(word);
|
element.add(word);
|
||||||
}
|
}
|
||||||
lines.add(Strings.join(element, " "));
|
lines.add(String.join(" ", element));
|
||||||
return lines;
|
return lines;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user