aboutsummaryrefslogtreecommitdiffstats
path: root/container-core/src/main/java/com/yahoo/container/di
diff options
context:
space:
mode:
authorHenning Baldersheim <balder@yahoo-inc.com>2022-12-04 22:42:13 +0100
committerHenning Baldersheim <balder@yahoo-inc.com>2022-12-04 22:42:13 +0100
commitfd54b4e4b136b05b67b471dca3ca6ce3dd116710 (patch)
tree88ab77cc41620eb2b8639b10b7edd1e57b901f12 /container-core/src/main/java/com/yahoo/container/di
parentfae49834f53500587921196e86ee4af4c670d8c9 (diff)
Revert collect(Collectors.toList())
Diffstat (limited to 'container-core/src/main/java/com/yahoo/container/di')
-rw-r--r--container-core/src/main/java/com/yahoo/container/di/componentgraph/core/ComponentNode.java2
-rw-r--r--container-core/src/main/java/com/yahoo/container/di/componentgraph/core/ComponentRegistryNode.java4
-rw-r--r--container-core/src/main/java/com/yahoo/container/di/componentgraph/cycle/CycleFinder.java2
3 files changed, 4 insertions, 4 deletions
diff --git a/container-core/src/main/java/com/yahoo/container/di/componentgraph/core/ComponentNode.java b/container-core/src/main/java/com/yahoo/container/di/componentgraph/core/ComponentNode.java
index e2748c592b8..e5a66fea8d1 100644
--- a/container-core/src/main/java/com/yahoo/container/di/componentgraph/core/ComponentNode.java
+++ b/container-core/src/main/java/com/yahoo/container/di/componentgraph/core/ComponentNode.java
@@ -112,7 +112,7 @@ public class ComponentNode extends Node {
if (Provider.class.isAssignableFrom(clazz)) {
//TODO: Test what happens if you ask for something that isn't a class, e.g. a parameterized type.
- List<Type> allGenericInterfaces = allSuperClasses(clazz).stream().flatMap(c -> Arrays.stream(c.getGenericInterfaces())).toList();
+ List<Type> allGenericInterfaces = allSuperClasses(clazz).stream().flatMap(c -> Arrays.stream(c.getGenericInterfaces())).collect(Collectors.toList());
for (Type t : allGenericInterfaces) {
if (t instanceof ParameterizedType && ((ParameterizedType) t).getRawType().equals(Provider.class)) {
Type[] typeArgs = ((ParameterizedType) t).getActualTypeArguments();
diff --git a/container-core/src/main/java/com/yahoo/container/di/componentgraph/core/ComponentRegistryNode.java b/container-core/src/main/java/com/yahoo/container/di/componentgraph/core/ComponentRegistryNode.java
index ae06275fd2b..244327ab4ec 100644
--- a/container-core/src/main/java/com/yahoo/container/di/componentgraph/core/ComponentRegistryNode.java
+++ b/container-core/src/main/java/com/yahoo/container/di/componentgraph/core/ComponentRegistryNode.java
@@ -96,8 +96,8 @@ public class ComponentRegistryNode extends Node {
public static boolean equalNodeEdges(List<Node> edges, List<Node> otherEdges) {
if (edges.size() == otherEdges.size()) {
- List<ComponentId> left = edges.stream().map(Node::componentId).sorted().toList();
- List<ComponentId> right = otherEdges.stream().map(Node::componentId).sorted().toList();
+ List<ComponentId> left = edges.stream().map(Node::componentId).sorted().collect(Collectors.toList());
+ List<ComponentId> right = otherEdges.stream().map(Node::componentId).sorted().collect(Collectors.toList());
return left.equals(right);
} else {
return false;
diff --git a/container-core/src/main/java/com/yahoo/container/di/componentgraph/cycle/CycleFinder.java b/container-core/src/main/java/com/yahoo/container/di/componentgraph/cycle/CycleFinder.java
index 353613a8a4f..d8c9f0ce98c 100644
--- a/container-core/src/main/java/com/yahoo/container/di/componentgraph/cycle/CycleFinder.java
+++ b/container-core/src/main/java/com/yahoo/container/di/componentgraph/cycle/CycleFinder.java
@@ -89,7 +89,7 @@ public class CycleFinder<T> {
T cycleStart = pathWithCycle.get(pathWithCycle.size() - 1);
return pathWithCycle.stream()
.dropWhile(vertex -> ! vertex.equals(cycleStart))
- .toList();
+ .collect(Collectors.toList());
}
}