commit | 56151262f8a07eddb6bb48b6dc4646d21cd101e2 | [log] [tgz] |
---|---|---|
author | Jonathan Hart <jono@onlab.us> | Thu Feb 11 09:48:50 2016 -0800 |
committer | Gerrit Code Review <gerrit@onlab.us> | Thu Feb 11 20:18:21 2016 +0000 |
tree | 7ecaa9dd243463e0589ef2d654c8ed81169b4afa | |
parent | 7d9d4399e8a62a99667671aca91d84964c504774 [diff] [blame] |
Roll back resource API changes that triggered a bug in the Java compiler Change-Id: I9e6891fe156148692e59476cb2bec6defb1f9a70
diff --git a/core/net/src/test/java/org/onosproject/net/intent/impl/compiler/MockResourceService.java b/core/net/src/test/java/org/onosproject/net/intent/impl/compiler/MockResourceService.java index b3ad768..4083f5b 100644 --- a/core/net/src/test/java/org/onosproject/net/intent/impl/compiler/MockResourceService.java +++ b/core/net/src/test/java/org/onosproject/net/intent/impl/compiler/MockResourceService.java
@@ -44,7 +44,7 @@ private final Map<Resource, ResourceConsumer> assignment = new HashMap<>(); @Override - public List<ResourceAllocation> allocate(ResourceConsumer consumer, List<? extends Resource> resources) { + public List<ResourceAllocation> allocate(ResourceConsumer consumer, List<Resource> resources) { assignment.putAll( resources.stream().collect(Collectors.toMap(x -> x, x -> consumer)) );