From 69a61e135e5cd7da5b14c18bc2cfe4785a8bee81 Mon Sep 17 00:00:00 2001 From: Henning Baldersheim Date: Tue, 17 Jan 2023 22:27:25 +0100 Subject: Unify on Streams.toList() --- .../container/core/config/ApplicationBundleLoader.java | 3 +-- .../container/core/config/HandlersConfigurerDi.java | 2 +- .../di/componentgraph/core/ComponentGraph.java | 17 +++++++---------- .../container/http/filter/FilterChainRepository.java | 3 +-- .../src/main/java/com/yahoo/jdisc/http/Cookie.java | 6 ++---- .../jdisc/http/server/jetty/ConnectionThrottler.java | 4 +--- .../yahoo/jdisc/http/server/jetty/JettyHttpServer.java | 4 +--- 7 files changed, 14 insertions(+), 25 deletions(-) (limited to 'container-core') diff --git a/container-core/src/main/java/com/yahoo/container/core/config/ApplicationBundleLoader.java b/container-core/src/main/java/com/yahoo/container/core/config/ApplicationBundleLoader.java index 7311641b1bd..d0054f703c5 100644 --- a/container-core/src/main/java/com/yahoo/container/core/config/ApplicationBundleLoader.java +++ b/container-core/src/main/java/com/yahoo/container/core/config/ApplicationBundleLoader.java @@ -15,7 +15,6 @@ import java.util.List; import java.util.Map; import java.util.Set; import java.util.logging.Logger; -import java.util.stream.Collectors; /** * Manages the set of installed and active/inactive bundles. @@ -55,7 +54,7 @@ public class ApplicationBundleLoader { */ public synchronized List activeBundlesBsnVersion() { return activeBundles.values().stream().map(BsnVersion::new) - .collect(Collectors.toList()); + .toList(); } /** diff --git a/container-core/src/main/java/com/yahoo/container/core/config/HandlersConfigurerDi.java b/container-core/src/main/java/com/yahoo/container/core/config/HandlersConfigurerDi.java index 30c271309d1..06dce96e70a 100644 --- a/container-core/src/main/java/com/yahoo/container/core/config/HandlersConfigurerDi.java +++ b/container-core/src/main/java/com/yahoo/container/core/config/HandlersConfigurerDi.java @@ -143,7 +143,7 @@ public class HandlersConfigurerDi { return activeBundles.stream() .filter(bundle -> bundle.symbolicName().equals(bundleSpec.getName())) .map(BsnVersion::version) - .collect(Collectors.toList()); + .toList(); } } diff --git a/container-core/src/main/java/com/yahoo/container/di/componentgraph/core/ComponentGraph.java b/container-core/src/main/java/com/yahoo/container/di/componentgraph/core/ComponentGraph.java index 8a07ef0ae14..a735ed32774 100644 --- a/container-core/src/main/java/com/yahoo/container/di/componentgraph/core/ComponentGraph.java +++ b/container-core/src/main/java/com/yahoo/container/di/componentgraph/core/ComponentGraph.java @@ -92,8 +92,7 @@ public class ComponentGraph { return Optional.ofNullable(Iterables.get(components, 0)); } else { - List nonProviderComponents = components.stream().filter(c -> !Provider.class.isAssignableFrom(c.instanceType())) - .collect(Collectors.toList()); + var nonProviderComponents = components.stream().filter(c -> !Provider.class.isAssignableFrom(c.instanceType())).toList(); if (nonProviderComponents.isEmpty()) { throw new IllegalStateException("Multiple global component providers for class '" + clazz.getName() + "' found :" + components); } else if (nonProviderComponents.size() == 1) { @@ -125,7 +124,7 @@ public class ComponentGraph { } private Collection osgiComponentsOfClass(Class clazz) { - return componentNodes().stream().filter(node -> clazz.isAssignableFrom(node.componentType())).collect(Collectors.toList()); + return componentNodes().stream().filter(node -> clazz.isAssignableFrom(node.componentType())).toList(); } public List complete(Injector fallbackInjector) { @@ -198,9 +197,8 @@ public class ComponentGraph { return node.componentId(); } else if (parameterType instanceof Class && ConfigInstance.class.isAssignableFrom((Class) parameterType)) { return handleConfigParameter((ComponentNode) node, (Class) parameterType); - } else if (parameterType instanceof ParameterizedType + } else if (parameterType instanceof ParameterizedType registry && ((ParameterizedType) parameterType).getRawType().equals(ComponentRegistry.class)) { - ParameterizedType registry = (ParameterizedType) parameterType; return getComponentRegistry(registry.getActualTypeArguments()[0]); } else if (parameterType instanceof Class) { return handleComponentParameter(node, fallbackInjector, (Class) parameterType, annotations); @@ -219,8 +217,7 @@ public class ComponentGraph { private ComponentRegistryNode getComponentRegistry(Type componentType) { Class componentClass; - if (componentType instanceof WildcardType) { - WildcardType wildcardType = (WildcardType) componentType; + if (componentType instanceof WildcardType wildcardType) { if (wildcardType.getLowerBounds().length > 0 || wildcardType.getUpperBounds().length > 1) { throw new RuntimeException("Can't create ComponentRegistry of unknown wildcard type" + wildcardType); } @@ -289,7 +286,7 @@ public class ComponentGraph { private Node handleComponentParameter(Node node, Injector fallbackInjector, Class clazz, Collection annotations) { - List bindingAnnotations = annotations.stream().filter(ComponentGraph::isBindingAnnotation).collect(Collectors.toList()); + List bindingAnnotations = annotations.stream().filter(ComponentGraph::isBindingAnnotation).toList(); Key key = getKey(clazz, bindingAnnotations.stream().findFirst()); if (bindingAnnotations.size() > 1) { @@ -351,7 +348,7 @@ public class ComponentGraph { Annotation annotation = key.getAnnotation(); List filteredByClass = nodesOfType(nodes, nodeType).stream().filter(node -> clazz.isAssignableFrom(node.componentType())) - .collect(Collectors.toList()); + .toList(); if (filteredByClass.size() == 1) { return filteredByClass; @@ -359,7 +356,7 @@ public class ComponentGraph { List filteredByClassAndAnnotation = filteredByClass.stream() .filter(node -> (annotation == null && node.instanceKey().getAnnotation() == null) || annotation.equals(node.instanceKey().getAnnotation())) - .collect(Collectors.toList()); + .toList(); if (filteredByClassAndAnnotation.size() > 0) { return filteredByClassAndAnnotation; } else { diff --git a/container-core/src/main/java/com/yahoo/container/http/filter/FilterChainRepository.java b/container-core/src/main/java/com/yahoo/container/http/filter/FilterChainRepository.java index 1f933899e03..d1ebf774d9b 100644 --- a/container-core/src/main/java/com/yahoo/container/http/filter/FilterChainRepository.java +++ b/container-core/src/main/java/com/yahoo/container/http/filter/FilterChainRepository.java @@ -28,7 +28,6 @@ import java.util.Set; import java.util.logging.Logger; import static java.util.Collections.emptyList; -import static java.util.stream.Collectors.toList; import static java.util.stream.Collectors.toSet; /** @@ -100,7 +99,7 @@ public class FilterChainRepository extends AbstractComponent { checkFilterTypesCompatible(chain); List jdiscFilters = chain.components().stream() .map(filterWrapper -> filterWrapper.filter) - .collect(toList()); + .toList(); List wrappedFilters = wrapSecurityFilters(jdiscFilters); Object head = wrappedFilters.get(0); if (wrappedFilters.size() == 1) return head; diff --git a/container-core/src/main/java/com/yahoo/jdisc/http/Cookie.java b/container-core/src/main/java/com/yahoo/jdisc/http/Cookie.java index c2faa1cd10a..f4837d32014 100644 --- a/container-core/src/main/java/com/yahoo/jdisc/http/Cookie.java +++ b/container-core/src/main/java/com/yahoo/jdisc/http/Cookie.java @@ -14,8 +14,6 @@ import java.util.concurrent.TimeUnit; import java.util.stream.Collectors; import java.util.stream.StreamSupport; -import static java.util.stream.Collectors.toList; - /** * A RFC 6265 compliant cookie. * @@ -194,7 +192,7 @@ public class Cookie { cookie.setHttpOnly(servletCookie.isHttpOnly()); return cookie; }) - .collect(toList()); + .toList(); } public static List toSetCookieHeaders(Iterable cookies) { @@ -212,7 +210,7 @@ public class Cookie { 0, /* version */ Optional.ofNullable(cookie.getSameSite()).map(SameSite::jettySameSite).orElse(null) ).getRFC6265SetCookie()) - .collect(toList()); + .toList(); } public static Cookie fromSetCookieHeader(String headerVal) { diff --git a/container-core/src/main/java/com/yahoo/jdisc/http/server/jetty/ConnectionThrottler.java b/container-core/src/main/java/com/yahoo/jdisc/http/server/jetty/ConnectionThrottler.java index 61bc767c330..06d1a707be9 100644 --- a/container-core/src/main/java/com/yahoo/jdisc/http/server/jetty/ConnectionThrottler.java +++ b/container-core/src/main/java/com/yahoo/jdisc/http/server/jetty/ConnectionThrottler.java @@ -25,8 +25,6 @@ import java.util.Set; import java.util.concurrent.TimeUnit; import java.util.logging.Logger; -import static java.util.stream.Collectors.toList; - /** * Monitor various resource constraints and throttles new connections once a threshold is exceeded. * Implementation inspired by Jetty's {@link LowResourceMonitor}, {@link AcceptRateLimit} and {@link ConnectionLimit}. @@ -133,7 +131,7 @@ class ConnectionThrottler extends ContainerLifeCycle implements SelectorManager. .map(ResourceLimit::isThresholdExceeded) .filter(Optional::isPresent) .map(Optional::get) - .collect(toList()); + .toList(); } } diff --git a/container-core/src/main/java/com/yahoo/jdisc/http/server/jetty/JettyHttpServer.java b/container-core/src/main/java/com/yahoo/jdisc/http/server/jetty/JettyHttpServer.java index 7b723b3a48e..46fbc158f0a 100644 --- a/container-core/src/main/java/com/yahoo/jdisc/http/server/jetty/JettyHttpServer.java +++ b/container-core/src/main/java/com/yahoo/jdisc/http/server/jetty/JettyHttpServer.java @@ -41,8 +41,6 @@ import java.util.logging.Level; import java.util.logging.Logger; import java.util.stream.Collectors; -import static java.util.stream.Collectors.toList; - /** * @author Simon Thoresen Hult * @author bjorncs @@ -87,7 +85,7 @@ public class JettyHttpServer extends AbstractServerProvider { ServletHolder jdiscServlet = new ServletHolder(new JDiscHttpServlet(jDiscContext)); List connectors = Arrays.stream(server.getConnectors()) .map(JDiscServerConnector.class::cast) - .collect(toList()); + .toList(); server.setHandler(createRootHandler(serverConfig, connectors, jdiscServlet)); this.metricsReporter = new ServerMetricReporter(metric, server); } -- cgit v1.2.3