diff options
author | Martin Polden <mpolden@mpolden.no> | 2019-03-01 14:34:55 +0100 |
---|---|---|
committer | Martin Polden <mpolden@mpolden.no> | 2019-03-01 15:10:58 +0100 |
commit | 127a8b5d6c3e82c0167f89e7077de28da220d57e (patch) | |
tree | da2ef24ccc3f6bf6448c97edff47934b17c5c054 /node-repository | |
parent | 5fa808b3f65c3391831bc71cd83e03b6085909bf (diff) |
Simplify
Diffstat (limited to 'node-repository')
-rw-r--r-- | node-repository/src/main/java/com/yahoo/vespa/hosted/provision/lb/LoadBalancerList.java | 20 |
1 files changed, 9 insertions, 11 deletions
diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/lb/LoadBalancerList.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/lb/LoadBalancerList.java index 0bccc0d3ab6..ba7a83169ad 100644 --- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/lb/LoadBalancerList.java +++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/lb/LoadBalancerList.java @@ -1,18 +1,16 @@ // Copyright 2018 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.vespa.hosted.provision.lb; -import com.google.common.collect.ImmutableList; import com.yahoo.config.provision.ApplicationId; import java.util.Collection; import java.util.List; import java.util.Objects; import java.util.stream.Collectors; - -import static java.util.stream.Collectors.collectingAndThen; +import java.util.stream.Stream; /** - * A filterable load balancer list + * A filterable load balancer list. * * @author mpolden */ @@ -21,25 +19,25 @@ public class LoadBalancerList { private final List<LoadBalancer> loadBalancers; public LoadBalancerList(Collection<LoadBalancer> loadBalancers) { - this.loadBalancers = ImmutableList.copyOf(Objects.requireNonNull(loadBalancers, "loadBalancers must be non-null")); + this.loadBalancers = List.copyOf(Objects.requireNonNull(loadBalancers, "loadBalancers must be non-null")); } /** Returns the subset of load balancers owned by given application */ public LoadBalancerList owner(ApplicationId application) { - return loadBalancers.stream() - .filter(lb -> lb.id().application().equals(application)) - .collect(collectingAndThen(Collectors.toList(), LoadBalancerList::new)); + return of(loadBalancers.stream().filter(lb -> lb.id().application().equals(application))); } /** Returns the subset of load balancers that are inactive */ public LoadBalancerList inactive() { - return loadBalancers.stream() - .filter(LoadBalancer::inactive) - .collect(collectingAndThen(Collectors.toList(), LoadBalancerList::new)); + return of(loadBalancers.stream().filter(LoadBalancer::inactive)); } public List<LoadBalancer> asList() { return loadBalancers; } + private static LoadBalancerList of(Stream<LoadBalancer> stream) { + return new LoadBalancerList(stream.collect(Collectors.toUnmodifiableList())); + } + } |