summaryrefslogtreecommitdiffstats
path: root/vespajlib/src/main/java/com/yahoo/tensor
diff options
context:
space:
mode:
authorHenning Baldersheim <balder@yahoo-inc.com>2022-12-02 22:37:16 +0000
committerHenning Baldersheim <balder@yahoo-inc.com>2022-12-02 22:37:16 +0000
commit6954a0d10fddb9bee32931ba69b2d4b427ee71e2 (patch)
tree21e6aad059615f27c6357227e6af608a7b965ec5 /vespajlib/src/main/java/com/yahoo/tensor
parentafcf1bb71cb7b87a03149d197f724cfc7603ef92 (diff)
collect(Collectors.toList()) -> toList()
Diffstat (limited to 'vespajlib/src/main/java/com/yahoo/tensor')
-rw-r--r--vespajlib/src/main/java/com/yahoo/tensor/TensorType.java2
-rw-r--r--vespajlib/src/main/java/com/yahoo/tensor/functions/Diag.java2
-rw-r--r--vespajlib/src/main/java/com/yahoo/tensor/functions/Range.java2
-rw-r--r--vespajlib/src/main/java/com/yahoo/tensor/functions/ReduceJoin.java2
-rw-r--r--vespajlib/src/main/java/com/yahoo/tensor/functions/Slice.java4
-rw-r--r--vespajlib/src/main/java/com/yahoo/tensor/serialization/JsonFormat.java2
-rw-r--r--vespajlib/src/main/java/com/yahoo/tensor/serialization/MixedBinaryFormat.java8
7 files changed, 11 insertions, 11 deletions
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<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);
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<TensorType.Dimension> sparseDimensions = tensor.type().dimensions().stream().filter(d -> !d.isIndexed()).collect(Collectors.toList());
+ List<TensorType.Dimension> 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<TensorType.Dimension> denseDimensions = tensor.type().dimensions().stream().filter(d -> d.isIndexed()).collect(Collectors.toList());
+ List<TensorType.Dimension> 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<Double> consumer) {
- List<TensorType.Dimension> sparseDimensions = tensor.type().dimensions().stream().filter(d -> !d.isIndexed()).collect(Collectors.toList());
+ List<TensorType.Dimension> 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<Double> supplier) {
- List<TensorType.Dimension> sparseDimensions = type.dimensions().stream().filter(d -> !d.isIndexed()).collect(Collectors.toList());
+ List<TensorType.Dimension> sparseDimensions = type.dimensions().stream().filter(d -> !d.isIndexed()).toList();
TensorType sparseType = MixedTensor.createPartialType(type.valueType(), sparseDimensions);
long denseSubspaceSize = builder.denseSubspaceSize();