diff options
author | Jon Bratseth <bratseth@verizonmedia.com> | 2019-03-22 14:03:58 +0100 |
---|---|---|
committer | Jon Bratseth <bratseth@verizonmedia.com> | 2019-03-22 14:03:58 +0100 |
commit | 0f16f5bb7869dec2f2c4677d3b3e07d1ec788408 (patch) | |
tree | e2dbf2f27acfbbfbb02a03042d947e4bdead299b /vespa-http-client | |
parent | 257007e69b3b3bc08f534b132b3b6a279bcb447a (diff) |
Remove vespajlib dependency
Diffstat (limited to 'vespa-http-client')
4 files changed, 77 insertions, 60 deletions
diff --git a/vespa-http-client/pom.xml b/vespa-http-client/pom.xml index 6334fc0db9b..34392548de7 100644 --- a/vespa-http-client/pom.xml +++ b/vespa-http-client/pom.xml @@ -43,11 +43,6 @@ <scope>test</scope> </dependency> <dependency> - <groupId>com.yahoo.vespa</groupId> - <artifactId>vespajlib</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> <groupId>org.mockito</groupId> <artifactId>mockito-all</artifactId> <version>1.8.4</version> diff --git a/vespa-http-client/src/main/java/com/yahoo/vespa/http/client/FeedClient.java b/vespa-http-client/src/main/java/com/yahoo/vespa/http/client/FeedClient.java index e800fbea584..433fee69e4e 100644 --- a/vespa-http-client/src/main/java/com/yahoo/vespa/http/client/FeedClient.java +++ b/vespa-http-client/src/main/java/com/yahoo/vespa/http/client/FeedClient.java @@ -14,9 +14,10 @@ import java.util.concurrent.atomic.AtomicInteger; * * A {@link FeedClientFactory} is provided to instantiate Sessions. * + * See com.yahoo.text.Text.stripInvalidCharacters(String) to remove invalid characters from string fields before feeding + * * @author dybis * @see FeedClientFactory - * @see com.yahoo.text.Text#stripInvalidCharacters(String) to remove invalid characters from string fields before feeding */ public interface FeedClient extends AutoCloseable { diff --git a/vespa-http-client/src/main/java/com/yahoo/vespa/http/client/runner/package-info.java b/vespa-http-client/src/main/java/com/yahoo/vespa/http/client/runner/package-info.java index 506273cc6cd..00012f0f52f 100644 --- a/vespa-http-client/src/main/java/com/yahoo/vespa/http/client/runner/package-info.java +++ b/vespa-http-client/src/main/java/com/yahoo/vespa/http/client/runner/package-info.java @@ -1,3 +1,2 @@ // Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -@com.yahoo.api.annotations.PackageMarker package com.yahoo.vespa.http.client.runner; diff --git a/vespa-http-client/src/test/java/com/yahoo/vespa/http/client/core/operationProcessor/IncompleteResultsThrottlerTest.java b/vespa-http-client/src/test/java/com/yahoo/vespa/http/client/core/operationProcessor/IncompleteResultsThrottlerTest.java index 47aeb4d3b0f..1267514b0d8 100644 --- a/vespa-http-client/src/test/java/com/yahoo/vespa/http/client/core/operationProcessor/IncompleteResultsThrottlerTest.java +++ b/vespa-http-client/src/test/java/com/yahoo/vespa/http/client/core/operationProcessor/IncompleteResultsThrottlerTest.java @@ -1,9 +1,7 @@ // Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.vespa.http.client.core.operationProcessor; -import com.yahoo.collections.Tuple2; import com.yahoo.vespa.http.client.core.ThrottlePolicy; -import com.yahoo.vespa.http.client.core.operationProcessor.IncompleteResultsThrottler; import org.junit.Test; import java.util.ArrayList; @@ -35,57 +33,6 @@ public class IncompleteResultsThrottlerTest { } /** - * A mock 'gateway' this is slower with more requests in-flight. It starts to become really much slower at - * 'breakPoint' number of parallel requests. - */ - class MockServer { - final LinkedList<Tuple2<Long, IncompleteResultsThrottler> > messageDoneByTime = new LinkedList<>(); - final int breakPoint; - final Random random = new Random(); - long time = 0; - - MockServer(int breakPoint) { - this.breakPoint = breakPoint; - } - - /** - * Figures out when next processed data will be ready. - * @return time in ms for next request to be finished. - */ - long nextRequestFinished() { - if (messageDoneByTime.isEmpty()) { - return Integer.MAX_VALUE; - } - return messageDoneByTime.peek().first; - } - - /** - * Advance simulation time and call finished on any requests. - * @param time to move to - */ - void moveTime(long time) { - this.time = time; - while (!messageDoneByTime.isEmpty() && messageDoneByTime.peek().first <= time) { - messageDoneByTime.pop().second.resultReady(true); - } - } - - /** - * New request. - * @param blocker do callback on blocker when request is done. - */ - void newRequest(IncompleteResultsThrottler blocker) { - long nextTime = (long)(20 + 0.1 * messageDoneByTime.size()); - - if (messageDoneByTime.size() > breakPoint) { - nextTime += (long) (40 + (random.nextDouble()) * 0.01 * messageDoneByTime.size()* messageDoneByTime.size()); - } - nextTime += time + random.nextInt()%4; - messageDoneByTime.push(new Tuple2<>(nextTime, blocker)); - } - } - - /** * Simulate running requests. * @param clientCount number of parallel clients. * @param breakPoint how many requests the server should handle in parallel before it gets slower. @@ -267,4 +214,79 @@ public class IncompleteResultsThrottlerTest { int distance = Math.abs(sweetSpot - size); return 1 + 20 * distance; } + + /** + * A mock 'gateway' this is slower with more requests in-flight. It starts to become really much slower at + * 'breakPoint' number of parallel requests. + */ + class MockServer { + final LinkedList<Tuple2<Long, IncompleteResultsThrottler> > messageDoneByTime = new LinkedList<>(); + final int breakPoint; + final Random random = new Random(); + long time = 0; + + MockServer(int breakPoint) { + this.breakPoint = breakPoint; + } + + /** + * Figures out when next processed data will be ready. + * @return time in ms for next request to be finished. + */ + long nextRequestFinished() { + if (messageDoneByTime.isEmpty()) { + return Integer.MAX_VALUE; + } + return messageDoneByTime.peek().first; + } + + /** + * Advance simulation time and call finished on any requests. + * @param time to move to + */ + void moveTime(long time) { + this.time = time; + while (!messageDoneByTime.isEmpty() && messageDoneByTime.peek().first <= time) { + messageDoneByTime.pop().second.resultReady(true); + } + } + + /** + * New request. + * @param blocker do callback on blocker when request is done. + */ + void newRequest(IncompleteResultsThrottler blocker) { + long nextTime = (long)(20 + 0.1 * messageDoneByTime.size()); + + if (messageDoneByTime.size() > breakPoint) { + nextTime += (long) (40 + (random.nextDouble()) * 0.01 * messageDoneByTime.size()* messageDoneByTime.size()); + } + nextTime += time + random.nextInt()%4; + messageDoneByTime.push(new Tuple2<>(nextTime, blocker)); + } + } + + private static class Tuple2<T1, T2> { + + public final T1 first; + public final T2 second; + + public Tuple2(final T1 first, final T2 second) { + this.first = first; + this.second = second; + } + + @Override + public int hashCode() { throw new UnsupportedOperationException(); } + + @Override + public boolean equals(final Object obj) { throw new UnsupportedOperationException(); } + + @Override + public String toString() { + return "Tuple2(" + first + ", " + second + ")"; + } + + } + } |