summaryrefslogtreecommitdiffstats
path: root/vespa-feed-client-cli
diff options
context:
space:
mode:
authorBjørn Christian Seime <bjorncs@verizonmedia.com>2021-06-09 13:51:33 +0200
committerBjørn Christian Seime <bjorncs@verizonmedia.com>2021-06-09 13:51:33 +0200
commitc3eb4cce689e5657d66761d820a9f3dfc41d4a6a (patch)
tree8b7a23edee82ad274443d6618279804e6dd3ea1b /vespa-feed-client-cli
parentce0d7152953752769403555dc53adeb7bff809fd (diff)
Revert "Merge pull request #18173 from vespa-engine/revert-18172-bjorncs/json-feeder"
This reverts commit ce0d7152953752769403555dc53adeb7bff809fd, reversing changes made to 9294174b953b2092264cc8a9484368bc2cce5b7c.
Diffstat (limited to 'vespa-feed-client-cli')
-rw-r--r--vespa-feed-client-cli/src/main/java/ai/vespa/feed/client/CliClient.java10
1 files changed, 5 insertions, 5 deletions
diff --git a/vespa-feed-client-cli/src/main/java/ai/vespa/feed/client/CliClient.java b/vespa-feed-client-cli/src/main/java/ai/vespa/feed/client/CliClient.java
index e3f726eaf11..40c6ac56022 100644
--- a/vespa-feed-client-cli/src/main/java/ai/vespa/feed/client/CliClient.java
+++ b/vespa-feed-client-cli/src/main/java/ai/vespa/feed/client/CliClient.java
@@ -55,11 +55,11 @@ public class CliClient {
return 0;
}
try (InputStream in = createFeedInputStream(cliArgs);
- JsonStreamFeeder feeder = createJsonFeeder(cliArgs)) {
+ JsonFeeder feeder = createJsonFeeder(cliArgs)) {
if (cliArgs.benchmarkModeEnabled()) {
printBenchmarkResult(feeder.benchmark(in));
} else {
- feeder.feed(in);
+ feeder.feedMany(in);
}
}
return 0;
@@ -85,9 +85,9 @@ public class CliClient {
return builder.build();
}
- private static JsonStreamFeeder createJsonFeeder(CliArguments cliArgs) throws CliArguments.CliArgumentsException, IOException {
+ private static JsonFeeder createJsonFeeder(CliArguments cliArgs) throws CliArguments.CliArgumentsException, IOException {
FeedClient feedClient = createFeedClient(cliArgs);
- JsonStreamFeeder.Builder builder = JsonStreamFeeder.builder(feedClient);
+ JsonFeeder.Builder builder = JsonFeeder.builder(feedClient);
cliArgs.timeout().ifPresent(builder::withTimeout);
cliArgs.route().ifPresent(builder::withRoute);
cliArgs.traceLevel().ifPresent(builder::withTracelevel);
@@ -98,7 +98,7 @@ public class CliClient {
return cliArgs.readFeedFromStandardInput() ? systemIn : Files.newInputStream(cliArgs.inputFile().get());
}
- private void printBenchmarkResult(JsonStreamFeeder.BenchmarkResult result) throws IOException {
+ private void printBenchmarkResult(JsonFeeder.BenchmarkResult result) throws IOException {
JsonFactory factory = new JsonFactory();
try (JsonGenerator generator = factory.createGenerator(systemOut).useDefaultPrettyPrinter()) {
generator.writeStartObject();