diff options
| author | Harald Musum <musum@verizonmedia.com> | 2022-12-05 10:06:35 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-12-05 10:06:35 +0100 |
| commit | f586fb9146b8176ba451778c025c4edb3905695e (patch) | |
| tree | b616d197818ab13527d66952266e2dc0d81cc5fb /model-integration | |
| parent | 608390a4472f4d3e77aa7177b4635399f8b1ce63 (diff) | |
| parent | 96b3f89ad27efd4c2306ca4e8b4bc07c4f0b2949 (diff) | |
Merge pull request #25104 from vespa-engine/revert-25103-balder/manual-revert-of-25097
Revert "Revert collect(Collectors.toList())"
Diffstat (limited to 'model-integration')
4 files changed, 4 insertions, 4 deletions
diff --git a/model-integration/src/main/java/ai/vespa/rankingexpression/importer/DimensionRenamer.java b/model-integration/src/main/java/ai/vespa/rankingexpression/importer/DimensionRenamer.java index a1bc0eb0492..19124e8920d 100644 --- a/model-integration/src/main/java/ai/vespa/rankingexpression/importer/DimensionRenamer.java +++ b/model-integration/src/main/java/ai/vespa/rankingexpression/importer/DimensionRenamer.java @@ -122,7 +122,7 @@ public class DimensionRenamer { constraintsPerOperation.entrySet().stream() .sorted(Comparator.comparingInt(entry -> - entry.getValue())) .map(Map.Entry::getKey) - .collect(Collectors.toList()); + .toList(); List<RenameTarget> targets = new ArrayList<>(); for (IntermediateOperation operation : prioritizedOperations) { diff --git a/model-integration/src/main/java/ai/vespa/rankingexpression/importer/OrderedTensorType.java b/model-integration/src/main/java/ai/vespa/rankingexpression/importer/OrderedTensorType.java index b77960ff3fb..ceb9a27924d 100644 --- a/model-integration/src/main/java/ai/vespa/rankingexpression/importer/OrderedTensorType.java +++ b/model-integration/src/main/java/ai/vespa/rankingexpression/importer/OrderedTensorType.java @@ -58,7 +58,7 @@ public class OrderedTensorType { } public List<String> dimensionNames() { - return dimensions.stream().map(TensorType.Dimension::name).collect(Collectors.toList()); + return dimensions.stream().map(TensorType.Dimension::name).toList(); } private int[] createDimensionMap() { diff --git a/model-integration/src/main/java/ai/vespa/rankingexpression/importer/onnx/GraphImporter.java b/model-integration/src/main/java/ai/vespa/rankingexpression/importer/onnx/GraphImporter.java index ec8c97bdf64..e959dfe479d 100644 --- a/model-integration/src/main/java/ai/vespa/rankingexpression/importer/onnx/GraphImporter.java +++ b/model-integration/src/main/java/ai/vespa/rankingexpression/importer/onnx/GraphImporter.java @@ -261,7 +261,7 @@ class GraphImporter { IntermediateGraph intermediateGraph) { return node.getInputList().stream() .map(nodeName -> importOperation(nodeName, onnxGraph, intermediateGraph)) - .collect(Collectors.toList()); + .toList(); } private static void verifyNoWarnings(IntermediateGraph intermediateGraph) { diff --git a/model-integration/src/main/java/ai/vespa/rankingexpression/importer/operations/IntermediateOperation.java b/model-integration/src/main/java/ai/vespa/rankingexpression/importer/operations/IntermediateOperation.java index e49ab274b5a..d33a2e3eeda 100644 --- a/model-integration/src/main/java/ai/vespa/rankingexpression/importer/operations/IntermediateOperation.java +++ b/model-integration/src/main/java/ai/vespa/rankingexpression/importer/operations/IntermediateOperation.java @@ -330,7 +330,7 @@ public abstract class IntermediateOperation { TensorType.Value resultValueType() { return TensorType.Value.largestOf(inputs.stream() .map(input -> input.type().get().type().valueType()) - .collect(Collectors.toList())); + .toList()); } public abstract IntermediateOperation withInputs(List<IntermediateOperation> inputs); |