From 6954a0d10fddb9bee32931ba69b2d4b427ee71e2 Mon Sep 17 00:00:00 2001 From: Henning Baldersheim Date: Fri, 2 Dec 2022 22:37:16 +0000 Subject: collect(Collectors.toList()) -> toList() --- vespajlib/src/main/java/com/yahoo/path/Path.java | 2 +- vespajlib/src/main/java/com/yahoo/tensor/TensorType.java | 2 +- vespajlib/src/main/java/com/yahoo/tensor/functions/Diag.java | 2 +- vespajlib/src/main/java/com/yahoo/tensor/functions/Range.java | 2 +- .../src/main/java/com/yahoo/tensor/functions/ReduceJoin.java | 2 +- vespajlib/src/main/java/com/yahoo/tensor/functions/Slice.java | 4 ++-- .../src/main/java/com/yahoo/tensor/serialization/JsonFormat.java | 2 +- .../java/com/yahoo/tensor/serialization/MixedBinaryFormat.java | 8 ++++---- .../src/main/java/com/yahoo/transaction/NestedTransaction.java | 4 ++-- 9 files changed, 14 insertions(+), 14 deletions(-) (limited to 'vespajlib/src/main') diff --git a/vespajlib/src/main/java/com/yahoo/path/Path.java b/vespajlib/src/main/java/com/yahoo/path/Path.java index 737a27c57d8..5a835b1059f 100644 --- a/vespajlib/src/main/java/com/yahoo/path/Path.java +++ b/vespajlib/src/main/java/com/yahoo/path/Path.java @@ -55,7 +55,7 @@ public final class Path { * Add path elements by splitting based on delimiter and appending to elements. */ private static List elementsOf(String path, String delimiter) { - return Arrays.stream(path.split(delimiter)).filter(e -> !"".equals(e)).collect(Collectors.toList()); + return Arrays.stream(path.split(delimiter)).filter(e -> !"".equals(e)).toList(); } /** diff --git a/vespajlib/src/main/java/com/yahoo/tensor/TensorType.java b/vespajlib/src/main/java/com/yahoo/tensor/TensorType.java index dfbcb06c365..36693280183 100644 --- a/vespajlib/src/main/java/com/yahoo/tensor/TensorType.java +++ b/vespajlib/src/main/java/com/yahoo/tensor/TensorType.java @@ -100,7 +100,7 @@ public class TensorType { else if (dimensionList.stream().noneMatch(d -> d.isIndexed())) mappedSubtype = this; else - mappedSubtype = new TensorType(valueType, dimensions.stream().filter(d -> ! d.isIndexed()).collect(Collectors.toList())); + mappedSubtype = new TensorType(valueType, dimensions.stream().filter(d -> ! d.isIndexed()).toList()); } static public Value combinedValueType(TensorType ... types) { diff --git a/vespajlib/src/main/java/com/yahoo/tensor/functions/Diag.java b/vespajlib/src/main/java/com/yahoo/tensor/functions/Diag.java index 7218375de89..2aee7baa0cc 100644 --- a/vespajlib/src/main/java/com/yahoo/tensor/functions/Diag.java +++ b/vespajlib/src/main/java/com/yahoo/tensor/functions/Diag.java @@ -23,7 +23,7 @@ public class Diag extends CompositeTensorFunction extends CompositeTensorFunction extends CompositeTensorFunction extends PrimitiveTensorFunction findDimensions(List dims, Predicate pred) { - return dims.stream().filter(pred).map(TensorType.Dimension::name).collect(Collectors.toList()); + return dims.stream().filter(pred).map(TensorType.Dimension::name).toList(); } private TensorType resultType(TensorType argumentType) { @@ -138,7 +138,7 @@ public class Slice extends PrimitiveTensorFunction d.dimension().get()).collect(Collectors.toList()); + peekDimensions = subspaceAddress.stream().map(d -> d.dimension().get()).toList(); } try { return TypeResolver.peek(argumentType, peekDimensions); diff --git a/vespajlib/src/main/java/com/yahoo/tensor/serialization/JsonFormat.java b/vespajlib/src/main/java/com/yahoo/tensor/serialization/JsonFormat.java index b683519988c..a7afc1efc6d 100644 --- a/vespajlib/src/main/java/com/yahoo/tensor/serialization/JsonFormat.java +++ b/vespajlib/src/main/java/com/yahoo/tensor/serialization/JsonFormat.java @@ -124,7 +124,7 @@ public class JsonFormat { private static void encodeBlocks(MixedTensor tensor, Cursor cursor) { var mappedDimensions = tensor.type().dimensions().stream().filter(d -> d.isMapped()) - .map(d -> TensorType.Dimension.mapped(d.name())).collect(Collectors.toList()); + .map(d -> TensorType.Dimension.mapped(d.name())).toList(); if (mappedDimensions.size() < 1) { throw new IllegalArgumentException("Should be ensured by caller"); } diff --git a/vespajlib/src/main/java/com/yahoo/tensor/serialization/MixedBinaryFormat.java b/vespajlib/src/main/java/com/yahoo/tensor/serialization/MixedBinaryFormat.java index 2a55ac658b1..c18e9f179d6 100644 --- a/vespajlib/src/main/java/com/yahoo/tensor/serialization/MixedBinaryFormat.java +++ b/vespajlib/src/main/java/com/yahoo/tensor/serialization/MixedBinaryFormat.java @@ -43,7 +43,7 @@ class MixedBinaryFormat implements BinaryFormat { } private void encodeSparseDimensions(GrowableByteBuffer buffer, MixedTensor tensor) { - List sparseDimensions = tensor.type().dimensions().stream().filter(d -> !d.isIndexed()).collect(Collectors.toList()); + List sparseDimensions = tensor.type().dimensions().stream().filter(d -> !d.isIndexed()).toList(); buffer.putInt1_4Bytes(sparseDimensions.size()); for (TensorType.Dimension dimension : sparseDimensions) { buffer.putUtf8String(dimension.name()); @@ -51,7 +51,7 @@ class MixedBinaryFormat implements BinaryFormat { } private void encodeDenseDimensions(GrowableByteBuffer buffer, MixedTensor tensor) { - List denseDimensions = tensor.type().dimensions().stream().filter(d -> d.isIndexed()).collect(Collectors.toList()); + List denseDimensions = tensor.type().dimensions().stream().filter(d -> d.isIndexed()).toList(); buffer.putInt1_4Bytes(denseDimensions.size()); for (TensorType.Dimension dimension : denseDimensions) { buffer.putUtf8String(dimension.name()); @@ -71,7 +71,7 @@ class MixedBinaryFormat implements BinaryFormat { } private void encodeCells(GrowableByteBuffer buffer, MixedTensor tensor, Consumer consumer) { - List sparseDimensions = tensor.type().dimensions().stream().filter(d -> !d.isIndexed()).collect(Collectors.toList()); + List sparseDimensions = tensor.type().dimensions().stream().filter(d -> !d.isIndexed()).toList(); long denseSubspaceSize = tensor.denseSubspaceSize(); if (sparseDimensions.size() > 0) { buffer.putInt1_4Bytes((int)(tensor.size() / denseSubspaceSize)); // XXX: Size truncation @@ -137,7 +137,7 @@ class MixedBinaryFormat implements BinaryFormat { } private void decodeCells(GrowableByteBuffer buffer, MixedTensor.BoundBuilder builder, TensorType type, Supplier supplier) { - List sparseDimensions = type.dimensions().stream().filter(d -> !d.isIndexed()).collect(Collectors.toList()); + List sparseDimensions = type.dimensions().stream().filter(d -> !d.isIndexed()).toList(); TensorType sparseType = MixedTensor.createPartialType(type.valueType(), sparseDimensions); long denseSubspaceSize = builder.denseSubspaceSize(); diff --git a/vespajlib/src/main/java/com/yahoo/transaction/NestedTransaction.java b/vespajlib/src/main/java/com/yahoo/transaction/NestedTransaction.java index 25e6222486c..7b9de25954d 100644 --- a/vespajlib/src/main/java/com/yahoo/transaction/NestedTransaction.java +++ b/vespajlib/src/main/java/com/yahoo/transaction/NestedTransaction.java @@ -96,7 +96,7 @@ public final class NestedTransaction implements AutoCloseable { @Override public String toString() { - return String.join(",", transactions.stream().map(Object::toString).collect(Collectors.toList())); + return String.join(",", transactions.stream().map(Object::toString).toList()); } private List organizeTransactions(List transactions) { @@ -166,7 +166,7 @@ public final class NestedTransaction implements AutoCloseable { private List findAllOrderingConstraintsFrom(Class transactionType, List constraints) { - return constraints.stream().filter(c -> c.before().equals(transactionType)).collect(Collectors.toList()); + return constraints.stream().filter(c -> c.before().equals(transactionType)).toList(); } private static class ConstrainedTransaction { -- cgit v1.2.3