diff options
9 files changed, 22 insertions, 31 deletions
diff --git a/application/src/main/java/com/yahoo/application/container/DocumentAccesses.java b/application/src/main/java/com/yahoo/application/container/DocumentAccesses.java index 90f87d0b37e..709b804fade 100644 --- a/application/src/main/java/com/yahoo/application/container/DocumentAccesses.java +++ b/application/src/main/java/com/yahoo/application/container/DocumentAccesses.java @@ -10,8 +10,6 @@ import com.yahoo.schema.derived.Deriver; import java.io.File; import java.util.stream.Stream; -import static java.util.stream.Collectors.toList; - /** * Utility for working with a {@link LocalDocumentAccess} for unit testing components which require a {@link DocumentAccess}. * @@ -37,7 +35,7 @@ public class DocumentAccesses { throw new IllegalArgumentException("No schema files found under " + schemaDirectory); DocumentmanagerConfig config = Deriver.getDocumentManagerConfig(Stream.of(schemasFiles) .map(File::toString) - .collect(toList())).build(); + .toList()).build(); return new LocalDocumentAccess(new DocumentAccessParams().setDocumentmanagerConfig(config)); } diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/deploy/HostedDeployTest.java b/configserver/src/test/java/com/yahoo/vespa/config/server/deploy/HostedDeployTest.java index 39b1a588a17..842416615e2 100644 --- a/configserver/src/test/java/com/yahoo/vespa/config/server/deploy/HostedDeployTest.java +++ b/configserver/src/test/java/com/yahoo/vespa/config/server/deploy/HostedDeployTest.java @@ -52,7 +52,6 @@ import static com.yahoo.vespa.config.server.deploy.DeployTester.CountingModelFac import static com.yahoo.vespa.config.server.deploy.DeployTester.createFailingModelFactory; import static com.yahoo.vespa.config.server.deploy.DeployTester.createHostedModelFactory; import static com.yahoo.yolean.Exceptions.uncheck; -import static java.util.stream.Collectors.toList; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertThrows; @@ -529,7 +528,7 @@ public class HostedDeployTest { private List<Host> createHosts(int count, String ... versions) { return IntStream.rangeClosed(1, count) .mapToObj(i -> createHost("host" + i, versions[Math.min(i, versions.length) - 1])) - .collect(toList()); + .toList(); } private Host createHost(String hostname, String version) { diff --git a/logserver/src/main/java/ai/vespa/logserver/protocol/ProtobufSerialization.java b/logserver/src/main/java/ai/vespa/logserver/protocol/ProtobufSerialization.java index a389ff24347..6fc46817bf1 100644 --- a/logserver/src/main/java/ai/vespa/logserver/protocol/ProtobufSerialization.java +++ b/logserver/src/main/java/ai/vespa/logserver/protocol/ProtobufSerialization.java @@ -10,8 +10,6 @@ import java.time.Instant; import java.util.List; import java.util.logging.Level; -import static java.util.stream.Collectors.toList; - /** * Utility class for serialization of log requests and responses. * @@ -26,7 +24,7 @@ class ProtobufSerialization { LogProtocol.LogRequest logRequest = LogProtocol.LogRequest.parseFrom(logRequestPayload); return logRequest.getLogMessagesList().stream() .map(ProtobufSerialization::fromLogRequest) - .collect(toList()); + .toList(); } catch (InvalidProtocolBufferException e) { throw new IllegalArgumentException("Unable to parse log request: " + e.getMessage(), e); } diff --git a/model-integration/src/main/java/ai/vespa/embedding/huggingface/HuggingFaceEmbedder.java b/model-integration/src/main/java/ai/vespa/embedding/huggingface/HuggingFaceEmbedder.java index 2b9e3a2ab60..81150fe99b0 100644 --- a/model-integration/src/main/java/ai/vespa/embedding/huggingface/HuggingFaceEmbedder.java +++ b/model-integration/src/main/java/ai/vespa/embedding/huggingface/HuggingFaceEmbedder.java @@ -14,7 +14,6 @@ import com.yahoo.embedding.huggingface.HuggingFaceEmbedderConfig; import java.io.*; import java.nio.file.Paths; import java.util.*; -import java.util.stream.Collectors; import org.slf4j.LoggerFactory; import org.slf4j.Logger; @@ -87,7 +86,7 @@ public class HuggingFaceEmbedder implements Embedder { public List<Integer> longToInteger(long[] values) { return Arrays.stream(values) .boxed().map(Long::intValue) - .collect(Collectors.toList()); + .toList(); } @Override diff --git a/model-integration/src/main/java/ai/vespa/rankingexpression/importer/operations/Squeeze.java b/model-integration/src/main/java/ai/vespa/rankingexpression/importer/operations/Squeeze.java index 9229d6af254..9c797a990bc 100644 --- a/model-integration/src/main/java/ai/vespa/rankingexpression/importer/operations/Squeeze.java +++ b/model-integration/src/main/java/ai/vespa/rankingexpression/importer/operations/Squeeze.java @@ -39,14 +39,14 @@ public class Squeeze extends IntermediateOperation { squeezeDimensions = inputType.type().dimensions().stream(). filter(dim -> OrderedTensorType.dimensionSize(dim) == 1). map(TensorType.Dimension::name). - collect(Collectors.toList()); + toList(); } else { squeezeDimensions = squeezeDimsAttr.get().stream().map(Value::asDouble).map(Double::intValue). map(i -> i < 0 ? inputType.type().dimensions().size() - i : i). map(i -> inputType.type().dimensions().get(i)). filter(dim -> OrderedTensorType.dimensionSize(dim) == 1). map(TensorType.Dimension::name). - collect(Collectors.toList()); + toList(); } return squeezeDimensions.isEmpty() ? inputType : reducedType(inputType); diff --git a/orchestrator/src/main/java/com/yahoo/vespa/orchestrator/OrchestratorImpl.java b/orchestrator/src/main/java/com/yahoo/vespa/orchestrator/OrchestratorImpl.java index 587875363d5..51f6379ae95 100644 --- a/orchestrator/src/main/java/com/yahoo/vespa/orchestrator/OrchestratorImpl.java +++ b/orchestrator/src/main/java/com/yahoo/vespa/orchestrator/OrchestratorImpl.java @@ -49,7 +49,6 @@ import java.util.logging.Level; import java.util.logging.Logger; import static com.yahoo.vespa.orchestrator.controller.ClusterControllerNodeState.MAINTENANCE; -import static java.util.stream.Collectors.toList; import static java.util.stream.Collectors.toSet; /** @@ -141,7 +140,7 @@ public class OrchestratorImpl implements Orchestrator { .serviceClusters().stream() .flatMap(cluster -> cluster.serviceInstances().stream()) .filter(serviceInstance -> hostName.equals(serviceInstance.hostName())) - .collect(toList()); + .toList(); HostInfo hostInfo = statusService.getHostInfo(applicationInstance.reference(), hostName); @@ -365,7 +364,7 @@ public class OrchestratorImpl implements Orchestrator { return nodeGroupMap.values().stream() .sorted(OrchestratorImpl::compareNodeGroupsForSuspend) - .collect(toList()); + .toList(); } private static int compareNodeGroupsForSuspend(NodeGroup leftNodeGroup, NodeGroup rightNodeGroup) { @@ -418,7 +417,7 @@ public class OrchestratorImpl implements Orchestrator { List<ServiceCluster> contentClusters = application.serviceClusters().stream() .filter(VespaModelUtil::isContent) - .collect(toList()); + .toList(); // For all content clusters, probe whether maintenance is OK. OrchestratorContext context = OrchestratorContext.createContextForBatchProbe(clock); diff --git a/orchestrator/src/main/java/com/yahoo/vespa/orchestrator/model/ApplicationApiImpl.java b/orchestrator/src/main/java/com/yahoo/vespa/orchestrator/model/ApplicationApiImpl.java index 380e34aab8d..478373c8bef 100644 --- a/orchestrator/src/main/java/com/yahoo/vespa/orchestrator/model/ApplicationApiImpl.java +++ b/orchestrator/src/main/java/com/yahoo/vespa/orchestrator/model/ApplicationApiImpl.java @@ -67,7 +67,7 @@ public class ApplicationApiImpl implements ApplicationApi { return getStorageNodesInGroupInClusterOrder().stream() .filter(storageNode -> getHostStatus(storageNode.hostName()).isSuspended()) .sorted(Comparator.reverseOrder()) - .collect(Collectors.toList()); + .toList(); } @Override @@ -81,7 +81,7 @@ public class ApplicationApiImpl implements ApplicationApi { .map(ClusterApi::storageNodeInGroup) .filter(Optional::isPresent) .map(Optional::get) - .collect(Collectors.toList()); + .toList(); } @Override @@ -91,7 +91,7 @@ public class ApplicationApiImpl implements ApplicationApi { .filter(Optional::isPresent) .map(Optional::get) .filter(x -> hostInfos.getOrNoRemarks(x.hostName()).status() == HostStatus.NO_REMARKS) - .collect(Collectors.toList()); + .toList(); } @Override @@ -108,7 +108,7 @@ public class ApplicationApiImpl implements ApplicationApi { public List<HostName> getNodesInGroupWith(Predicate<HostStatus> statusPredicate) { return nodeGroup.getHostNames().stream() .filter(hostName -> statusPredicate.test(getHostStatus(hostName))) - .collect(Collectors.toList()); + .toList(); } private List<ClusterApi> makeClustersInOrder(NodeGroup nodeGroup, diff --git a/orchestrator/src/main/java/com/yahoo/vespa/orchestrator/model/VespaModelUtil.java b/orchestrator/src/main/java/com/yahoo/vespa/orchestrator/model/VespaModelUtil.java index f2133d32867..914929f9cfb 100644 --- a/orchestrator/src/main/java/com/yahoo/vespa/orchestrator/model/VespaModelUtil.java +++ b/orchestrator/src/main/java/com/yahoo/vespa/orchestrator/model/VespaModelUtil.java @@ -103,7 +103,7 @@ public class VespaModelUtil { return controllerClusters.stream(). filter(cluster -> cluster.clusterId().equals(clusterControllerClusterId)). - collect(Collectors.toList()); + toList(); } public static Set<ServiceCluster> getClusterControllerServiceClusters(ApplicationInstance application) { diff --git a/predicate-search-core/src/main/java/com/yahoo/search/predicate/optimization/OrSimplifier.java b/predicate-search-core/src/main/java/com/yahoo/search/predicate/optimization/OrSimplifier.java index 0215ed63d73..a261c6696b7 100644 --- a/predicate-search-core/src/main/java/com/yahoo/search/predicate/optimization/OrSimplifier.java +++ b/predicate-search-core/src/main/java/com/yahoo/search/predicate/optimization/OrSimplifier.java @@ -7,12 +7,13 @@ import com.yahoo.document.predicate.FeatureSet; import com.yahoo.document.predicate.Negation; import com.yahoo.document.predicate.Predicate; +import java.util.ArrayList; import java.util.List; import java.util.Optional; +import java.util.stream.Collectors; import static java.util.stream.Collectors.groupingBy; import static java.util.stream.Collectors.reducing; -import static java.util.stream.Collectors.toList; /** * Simplifies Disjunction nodes where all children are of type FeatureSet. All FeatureSet that share the same key @@ -28,19 +29,16 @@ public class OrSimplifier implements PredicateProcessor { } public Predicate simplifyTree(Predicate predicate) { - if (predicate instanceof Disjunction) { - Disjunction disjunction = (Disjunction) predicate; + if (predicate instanceof Disjunction disjunction) { List<Predicate> newChildren = - disjunction.getOperands().stream().map(this::simplifyTree).collect(toList()); + disjunction.getOperands().stream().map(this::simplifyTree).toList(); return compressFeatureSets(newChildren); - } else if (predicate instanceof Negation) { - Negation negation = (Negation) predicate; + } else if (predicate instanceof Negation negation) { negation.setOperand(simplifyTree(negation.getOperand())); return negation; - } else if (predicate instanceof Conjunction) { - Conjunction conjunction = (Conjunction) predicate; + } else if (predicate instanceof Conjunction conjunction) { List<Predicate> newChildren = - conjunction.getOperands().stream().map(this::simplifyTree).collect(toList()); + conjunction.getOperands().stream().map(this::simplifyTree).toList(); conjunction.setOperands(newChildren); return conjunction; } else { @@ -50,7 +48,7 @@ public class OrSimplifier implements PredicateProcessor { // Groups and merges the feature sets based on key. private static Predicate compressFeatureSets(List<Predicate> children) { - List<Predicate> newChildren = children.stream().filter(p -> !(p instanceof FeatureSet)).collect(toList()); + List<Predicate> newChildren = children.stream().filter(p -> !(p instanceof FeatureSet)).collect(Collectors.toCollection(ArrayList::new)); children.stream() .filter(FeatureSet.class::isInstance) .map(FeatureSet.class::cast) |