diff options
Diffstat (limited to 'predicate-search/src/main/java/com/yahoo/search')
5 files changed, 5 insertions, 10 deletions
diff --git a/predicate-search/src/main/java/com/yahoo/search/predicate/PredicateIndexBuilder.java b/predicate-search/src/main/java/com/yahoo/search/predicate/PredicateIndexBuilder.java index d9153b24a87..f7ba462f7f2 100644 --- a/predicate-search/src/main/java/com/yahoo/search/predicate/PredicateIndexBuilder.java +++ b/predicate-search/src/main/java/com/yahoo/search/predicate/PredicateIndexBuilder.java @@ -28,7 +28,6 @@ import java.util.Set; import java.util.TreeMap; import static java.util.stream.Collectors.joining; -import static java.util.stream.Collectors.toList; /** * A builder for {@link PredicateIndex}. @@ -178,7 +177,7 @@ public class PredicateIndexBuilder { .forEach(entry -> boundsIndexBuilder.insert(entry.getKey(), new Posting(docId, intervalStoreBuilder.insert( - entry.getValue().stream().flatMap(IntervalWithBounds::stream).collect(toList()))))); + entry.getValue().stream().flatMap(IntervalWithBounds::stream).toList())))); } private void indexDocumentConjunctions( diff --git a/predicate-search/src/main/java/com/yahoo/search/predicate/benchmarks/HitsVerificationBenchmark.java b/predicate-search/src/main/java/com/yahoo/search/predicate/benchmarks/HitsVerificationBenchmark.java index f58360307aa..82387cbc665 100644 --- a/predicate-search/src/main/java/com/yahoo/search/predicate/benchmarks/HitsVerificationBenchmark.java +++ b/predicate-search/src/main/java/com/yahoo/search/predicate/benchmarks/HitsVerificationBenchmark.java @@ -35,7 +35,6 @@ import java.util.stream.Stream; import static com.yahoo.search.predicate.benchmarks.HitsVerificationBenchmark.BenchmarkArguments.*; import static java.util.stream.Collectors.joining; -import static java.util.stream.Collectors.toList; /** * A test that runs outputs the hits for each query into result file. @@ -108,7 +107,7 @@ public class HitsVerificationBenchmark { private static int writeHits(int i, Stream<Hit> hitStream, BufferedWriter writer) { try { - List<Hit> hits = hitStream.collect(toList()); + List<Hit> hits = hitStream.toList(); writer.append(Integer.toString(i)) .append(": ") .append(hits.stream() diff --git a/predicate-search/src/main/java/com/yahoo/search/predicate/benchmarks/PredicateIndexBenchmark.java b/predicate-search/src/main/java/com/yahoo/search/predicate/benchmarks/PredicateIndexBenchmark.java index 38f139cba9a..5f500b816cf 100644 --- a/predicate-search/src/main/java/com/yahoo/search/predicate/benchmarks/PredicateIndexBenchmark.java +++ b/predicate-search/src/main/java/com/yahoo/search/predicate/benchmarks/PredicateIndexBenchmark.java @@ -43,7 +43,6 @@ import java.util.concurrent.atomic.AtomicInteger; import static com.yahoo.search.predicate.benchmarks.PredicateIndexBenchmark.BenchmarkArguments.Algorithm; import static com.yahoo.search.predicate.benchmarks.PredicateIndexBenchmark.BenchmarkArguments.Format; -import static java.util.stream.Collectors.toList; /** * A benchmark that tests the indexing and search performance. @@ -187,7 +186,7 @@ public class PredicateIndexBenchmark { runners.add(new QueryRunner(shuffledQueries, index.searcher())); } long start = System.currentTimeMillis(); - List<Future<ResultMetrics>> futureResults = runners.stream().map(executor::submit).collect(toList()); + List<Future<ResultMetrics>> futureResults = runners.stream().map(executor::submit).toList(); waitAndShutdown(runtime, executor); long searchTime = System.currentTimeMillis() - start; getResult(futureResults).writeMetrics(output, searchTime); diff --git a/predicate-search/src/main/java/com/yahoo/search/predicate/serialization/PredicateQuerySerializer.java b/predicate-search/src/main/java/com/yahoo/search/predicate/serialization/PredicateQuerySerializer.java index 018f037603d..655ebaaafd3 100644 --- a/predicate-search/src/main/java/com/yahoo/search/predicate/serialization/PredicateQuerySerializer.java +++ b/predicate-search/src/main/java/com/yahoo/search/predicate/serialization/PredicateQuerySerializer.java @@ -14,7 +14,6 @@ import java.io.StringWriter; import java.io.Writer; import java.util.List; -import static java.util.stream.Collectors.toList; /** * Converts {@link PredicateQuery} to and from JSON @@ -99,7 +98,7 @@ public class PredicateQuerySerializer { return reader.lines() .limit(maxQueryCount) .map(serializer::fromJSON) - .collect(toList()); + .toList(); } } diff --git a/predicate-search/src/main/java/com/yahoo/search/predicate/utils/VespaQueryParser.java b/predicate-search/src/main/java/com/yahoo/search/predicate/utils/VespaQueryParser.java index d5ab21114d9..60d24744b63 100644 --- a/predicate-search/src/main/java/com/yahoo/search/predicate/utils/VespaQueryParser.java +++ b/predicate-search/src/main/java/com/yahoo/search/predicate/utils/VespaQueryParser.java @@ -12,7 +12,6 @@ import java.util.ArrayList; import java.util.List; import java.util.function.BiConsumer; -import static java.util.stream.Collectors.toList; /** * Parses query file containing Vespa queries using the deprecated predicate format (query properties - not YQL). @@ -29,7 +28,7 @@ public class VespaQueryParser { List<PredicateQuery> queries = reader.lines() .limit(maxQueryCount) .map(VespaQueryParser::parseQueryFromQueryProperties) - .collect(toList()); + .toList(); return queries; } } |