summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBjørn Christian Seime <bjorncs@verizonmedia.com>2021-06-08 17:05:21 +0200
committerBjørn Christian Seime <bjorncs@verizonmedia.com>2021-06-08 17:05:21 +0200
commitc2dde0aa56a1b20961db4e9b10a802a44b61b795 (patch)
treed3404222a13a62489d8ffe3495e26519e8e2c0a0
parent26b6320ab8fd8100028da9c1de6cf66c41f77a41 (diff)
Rename 'JsonStreamFeeder' to 'JsonFeeder'
-rw-r--r--vespa-feed-client-cli/src/main/java/ai/vespa/feed/client/CliClient.java8
-rw-r--r--vespa-feed-client/src/main/java/ai/vespa/feed/client/JsonFeeder.java (renamed from vespa-feed-client/src/main/java/ai/vespa/feed/client/JsonStreamFeeder.java)8
-rw-r--r--vespa-feed-client/src/test/java/ai/vespa/feed/client/JsonFeederTest.java (renamed from vespa-feed-client/src/test/java/ai/vespa/feed/client/JsonStreamFeederTest.java)4
3 files changed, 10 insertions, 10 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..5c98c986990 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,7 +55,7 @@ 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 {
@@ -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();
diff --git a/vespa-feed-client/src/main/java/ai/vespa/feed/client/JsonStreamFeeder.java b/vespa-feed-client/src/main/java/ai/vespa/feed/client/JsonFeeder.java
index 99d05a4bae8..a4d75a0a7c7 100644
--- a/vespa-feed-client/src/main/java/ai/vespa/feed/client/JsonStreamFeeder.java
+++ b/vespa-feed-client/src/main/java/ai/vespa/feed/client/JsonFeeder.java
@@ -31,12 +31,12 @@ import static java.util.Objects.requireNonNull;
/**
* @author jonmv
*/
-public class JsonStreamFeeder implements Closeable {
+public class JsonFeeder implements Closeable {
private final FeedClient client;
private final OperationParameters protoParameters;
- private JsonStreamFeeder(FeedClient client, OperationParameters protoParameters) {
+ private JsonFeeder(FeedClient client, OperationParameters protoParameters) {
this.client = client;
this.protoParameters = protoParameters;
}
@@ -341,8 +341,8 @@ public class JsonStreamFeeder implements Closeable {
return this;
}
- public JsonStreamFeeder build() {
- return new JsonStreamFeeder(client, parameters);
+ public JsonFeeder build() {
+ return new JsonFeeder(client, parameters);
}
}
diff --git a/vespa-feed-client/src/test/java/ai/vespa/feed/client/JsonStreamFeederTest.java b/vespa-feed-client/src/test/java/ai/vespa/feed/client/JsonFeederTest.java
index 28a50b88396..0f360fd94c7 100644
--- a/vespa-feed-client/src/test/java/ai/vespa/feed/client/JsonStreamFeederTest.java
+++ b/vespa-feed-client/src/test/java/ai/vespa/feed/client/JsonFeederTest.java
@@ -14,7 +14,7 @@ import static java.nio.charset.StandardCharsets.UTF_8;
import static java.util.stream.Collectors.joining;
import static org.junit.jupiter.api.Assertions.assertEquals;
-class JsonStreamFeederTest {
+class JsonFeederTest {
@Test
void test() throws IOException {
@@ -40,7 +40,7 @@ class JsonStreamFeederTest {
ByteArrayInputStream in = new ByteArrayInputStream(json.getBytes(UTF_8));
Set<String> ids = new HashSet<>();
long startNanos = System.nanoTime();
- JsonStreamFeeder.builder(new FeedClient() {
+ JsonFeeder.builder(new FeedClient() {
@Override
public CompletableFuture<Result> put(DocumentId documentId, String documentJson, OperationParameters params) {