diff options
author | Henning Baldersheim <balder@yahoo-inc.com> | 2022-12-04 23:02:42 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-12-04 23:02:42 +0100 |
commit | 5381962e747ea9ac515abcf51dc70ad40bbbf70d (patch) | |
tree | d25af24e6a007091bb4a321a63747f1c7b439045 /vespajlib/src/main/java/com/yahoo/tensor/functions | |
parent | 2555b49b4390ed9dac9eab3959d6cc6e3511515c (diff) |
Revert "Revert collect(Collectors.toList())"
Diffstat (limited to 'vespajlib/src/main/java/com/yahoo/tensor/functions')
4 files changed, 5 insertions, 5 deletions
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<NAMETYPE extends Name> extends CompositeTensorFunction<NAMETYP public Diag(TensorType type) { this.type = type; - this.diagFunction = ScalarFunctions.equal(dimensionNames().collect(Collectors.toList())); + this.diagFunction = ScalarFunctions.equal(dimensionNames().toList()); } @Override diff --git a/vespajlib/src/main/java/com/yahoo/tensor/functions/Range.java b/vespajlib/src/main/java/com/yahoo/tensor/functions/Range.java index 7053eeb0a1c..ae65dc929bd 100644 --- a/vespajlib/src/main/java/com/yahoo/tensor/functions/Range.java +++ b/vespajlib/src/main/java/com/yahoo/tensor/functions/Range.java @@ -24,7 +24,7 @@ public class Range<NAMETYPE extends Name> extends CompositeTensorFunction<NAMETY public Range(TensorType type) { this.type = type; - this.rangeFunction = ScalarFunctions.sum(dimensionNames().collect(Collectors.toList())); + this.rangeFunction = ScalarFunctions.sum(dimensionNames().toList()); } @Override diff --git a/vespajlib/src/main/java/com/yahoo/tensor/functions/ReduceJoin.java b/vespajlib/src/main/java/com/yahoo/tensor/functions/ReduceJoin.java index 1048e5ab10e..95987d9b886 100644 --- a/vespajlib/src/main/java/com/yahoo/tensor/functions/ReduceJoin.java +++ b/vespajlib/src/main/java/com/yahoo/tensor/functions/ReduceJoin.java @@ -294,7 +294,7 @@ public class ReduceJoin<NAMETYPE extends Name> extends CompositeTensorFunction<N if (reducingDimensions.isEmpty()) { reducingDimensions = dimensionsInCommon((IndexedTensor)a, (IndexedTensor)b).dimensions().stream() .map(TensorType.Dimension::name) - .collect(Collectors.toList()); + .toList(); } if (reducingDimensions.size() != 1) { return false; diff --git a/vespajlib/src/main/java/com/yahoo/tensor/functions/Slice.java b/vespajlib/src/main/java/com/yahoo/tensor/functions/Slice.java index 39bddc3a3cd..a9a6df6ed4d 100644 --- a/vespajlib/src/main/java/com/yahoo/tensor/functions/Slice.java +++ b/vespajlib/src/main/java/com/yahoo/tensor/functions/Slice.java @@ -116,7 +116,7 @@ public class Slice<NAMETYPE extends Name> extends PrimitiveTensorFunction<NAMETY } private List<String> findDimensions(List<TensorType.Dimension> dims, Predicate<TensorType.Dimension> 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<NAMETYPE extends Name> extends PrimitiveTensorFunction<NAMETY } } else { // general slicing - peekDimensions = subspaceAddress.stream().map(d -> d.dimension().get()).collect(Collectors.toList()); + peekDimensions = subspaceAddress.stream().map(d -> d.dimension().get()).toList(); } try { return TypeResolver.peek(argumentType, peekDimensions); |