diff options
author | Henning Baldersheim <balder@yahoo-inc.com> | 2022-11-28 22:06:31 +0100 |
---|---|---|
committer | Henning Baldersheim <balder@yahoo-inc.com> | 2022-11-28 22:06:31 +0100 |
commit | 0316e548e511adb448f25eb2d869d392d789e28c (patch) | |
tree | b47a70da4ba1fcfed9a3faa713a187eef5162c1a /vespaclient-java | |
parent | da38b71fa425409c5c41615bbf6ea8bcca8b9af0 (diff) |
No need to bring in container dependencies in the feeder client.
Diffstat (limited to 'vespaclient-java')
5 files changed, 12 insertions, 74 deletions
diff --git a/vespaclient-java/pom.xml b/vespaclient-java/pom.xml index 230ddc5c7d3..6730f8b26d7 100644 --- a/vespaclient-java/pom.xml +++ b/vespaclient-java/pom.xml @@ -13,37 +13,14 @@ <version>8-SNAPSHOT</version> <dependencies> <dependency> - <groupId>org.mockito</groupId> - <artifactId>mockito-core</artifactId> - <scope>test</scope> - </dependency> - <dependency> <groupId>com.yahoo.vespa</groupId> <artifactId>vespaclient-core</artifactId> <version>${project.version}</version> </dependency> <dependency> <groupId>com.yahoo.vespa</groupId> - <artifactId>defaults</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>com.yahoo.vespa</groupId> - <artifactId>container-core</artifactId> - <scope>compile</scope> - <version>${project.version}</version> - </dependency> - <dependency> - <!-- TODO: remove dependency on container-dev, and instead depend directly on what this module needs! --> - <groupId>com.yahoo.vespa</groupId> - <artifactId>container-dev</artifactId> + <artifactId>vespalog</artifactId> <version>${project.version}</version> - <exclusions> - <exclusion> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - </exclusion> - </exclusions> </dependency> <dependency> <groupId>com.yahoo.vespa</groupId> @@ -51,16 +28,6 @@ <version>${project.version}</version> </dependency> <dependency> - <groupId>com.yahoo.vespa</groupId> - <artifactId>predicate-search-core</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>com.yahoo.vespa</groupId> - <artifactId>vespajlib</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> <groupId>commons-cli</groupId> <artifactId>commons-cli</artifactId> </dependency> @@ -69,6 +36,11 @@ <artifactId>junit-jupiter</artifactId> <scope>test</scope> </dependency> + <dependency> + <groupId>org.mockito</groupId> + <artifactId>mockito-core</artifactId> + <scope>test</scope> + </dependency> </dependencies> <build> <plugins> diff --git a/vespaclient-java/src/main/java/com/yahoo/vespafeeder/FileRequest.java b/vespaclient-java/src/main/java/com/yahoo/vespafeeder/FileRequest.java index 9d03a186ed8..47828915444 100755 --- a/vespaclient-java/src/main/java/com/yahoo/vespafeeder/FileRequest.java +++ b/vespaclient-java/src/main/java/com/yahoo/vespafeeder/FileRequest.java @@ -1,6 +1,8 @@ // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.vespafeeder; +import com.yahoo.feedhandler.InputStreamRequest; + import java.io.File; import java.io.FileInputStream; import java.io.FileNotFoundException; diff --git a/vespaclient-java/src/main/java/com/yahoo/vespafeeder/InputStreamRequest.java b/vespaclient-java/src/main/java/com/yahoo/vespafeeder/InputStreamRequest.java deleted file mode 100644 index e3c61dd26e9..00000000000 --- a/vespaclient-java/src/main/java/com/yahoo/vespafeeder/InputStreamRequest.java +++ /dev/null @@ -1,38 +0,0 @@ -// Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -package com.yahoo.vespafeeder; - -import com.yahoo.container.jdisc.HttpRequest; - -import java.io.InputStream; -import java.util.HashMap; -import java.util.Map; - -/** - * This is needed because whoever wrote this library moronically decided to pass in-process communication through - * the HTTP layer. As the feeded is being phased out in favor of the standalone HTTP client we don't bother to clean - * it up properly. - * - * @author bratseth - */ -public class InputStreamRequest { - - private InputStream input; - private Map<String, String> properties = new HashMap<>(); - - protected InputStreamRequest(InputStream input) { - this.input = input; - } - - public void setProperty(String key, String value) { - properties.put(key, value); - } - - public String getProperty(String key) { - return properties.get(key); - } - - public HttpRequest toRequest() { - return HttpRequest.createTestRequest("", com.yahoo.jdisc.http.HttpRequest.Method.POST, input, properties); - } - -} diff --git a/vespaclient-java/src/main/java/com/yahoo/vespafeeder/VespaFeeder.java b/vespaclient-java/src/main/java/com/yahoo/vespafeeder/VespaFeeder.java index 1208a18205f..188ca4321df 100755 --- a/vespaclient-java/src/main/java/com/yahoo/vespafeeder/VespaFeeder.java +++ b/vespaclient-java/src/main/java/com/yahoo/vespafeeder/VespaFeeder.java @@ -6,6 +6,7 @@ import com.yahoo.document.DocumentTypeManager; import com.yahoo.document.DocumentTypeManagerConfigurer; import com.yahoo.feedapi.FeedContext; import com.yahoo.feedhandler.FeedResponse; +import com.yahoo.feedhandler.InputStreamRequest; import com.yahoo.feedhandler.VespaFeedHandler; import com.yahoo.log.LogSetup; import com.yahoo.concurrent.SystemTimer; @@ -78,7 +79,7 @@ public class VespaFeeder { if (args.getFiles().isEmpty()) { InputStreamRequest req = new InputStreamRequest(input); setProperties(req, input); - FeedResponse response = handler.handle(req.toRequest(), createProgressCallback(output), args.getNumThreads()); + FeedResponse response = handler.handle(req, createProgressCallback(output), args.getNumThreads()); if ( ! response.isSuccess()) { throw renderErrors(response.getErrorList()); } @@ -96,7 +97,7 @@ public class VespaFeeder { final BufferedInputStream inputSnooper = new BufferedInputStream(new FileInputStream(fileName)); setProperties(req, inputSnooper); inputSnooper.close(); - FeedResponse response = handler.handle(req.toRequest(), createProgressCallback(output), args.getNumThreads()); + FeedResponse response = handler.handle(req, createProgressCallback(output), args.getNumThreads()); if (!response.isSuccess()) { throw renderErrors(response.getErrorList()); } diff --git a/vespaclient-java/src/test/java/com/yahoo/vespafeeder/VespaFeederTestCase.java b/vespaclient-java/src/test/java/com/yahoo/vespafeeder/VespaFeederTestCase.java index a26672c5f26..80782a82c4c 100644 --- a/vespaclient-java/src/test/java/com/yahoo/vespafeeder/VespaFeederTestCase.java +++ b/vespaclient-java/src/test/java/com/yahoo/vespafeeder/VespaFeederTestCase.java @@ -18,6 +18,7 @@ import com.yahoo.documentapi.messagebus.protocol.PutDocumentMessage; import com.yahoo.documentapi.messagebus.protocol.RemoveDocumentMessage; import com.yahoo.documentapi.messagebus.protocol.UpdateDocumentMessage; import com.yahoo.feedapi.DummySessionFactory; +import com.yahoo.feedhandler.InputStreamRequest; import com.yahoo.feedhandler.VespaFeedHandler; import com.yahoo.text.Utf8; import com.yahoo.vespaclient.config.FeederConfig; |