Stop passing duplicate original continuous resource
Change-Id: I3608b1cd362cca5e3c0534b6dfb18a7204c42aef
diff --git a/core/store/dist/src/main/java/org/onosproject/store/resource/impl/ConsistentContinuousResourceSubStore.java b/core/store/dist/src/main/java/org/onosproject/store/resource/impl/ConsistentContinuousResourceSubStore.java
index 9791878..7b4a4b5 100644
--- a/core/store/dist/src/main/java/org/onosproject/store/resource/impl/ConsistentContinuousResourceSubStore.java
+++ b/core/store/dist/src/main/java/org/onosproject/store/resource/impl/ConsistentContinuousResourceSubStore.java
@@ -107,7 +107,7 @@
return true;
}
- return allocation.value().hasEnoughResource(allocation.value().original(), resource);
+ return allocation.value().hasEnoughResource(resource);
}
<T> Stream<ContinuousResource> getAllocatedResources(DiscreteResourceId parent, Class<T> cls) {
diff --git a/core/store/dist/src/main/java/org/onosproject/store/resource/impl/ContinuousResourceAllocation.java b/core/store/dist/src/main/java/org/onosproject/store/resource/impl/ContinuousResourceAllocation.java
index 13446b0..f9e22dd 100644
--- a/core/store/dist/src/main/java/org/onosproject/store/resource/impl/ContinuousResourceAllocation.java
+++ b/core/store/dist/src/main/java/org/onosproject/store/resource/impl/ContinuousResourceAllocation.java
@@ -44,12 +44,11 @@
* Checks if there is enough resource volume to allocated the requested resource
* against the specified resource.
*
- * @param original original resource
* @param request requested resource
* @return true if there is enough resource volume. Otherwise, false.
*/
// computational complexity: O(n) where n is the number of allocations
- boolean hasEnoughResource(ContinuousResource original, ContinuousResource request) {
+ boolean hasEnoughResource(ContinuousResource request) {
double allocated = allocations.stream()
.filter(x -> x.resource() instanceof ContinuousResource)
.map(x -> (ContinuousResource) x.resource())
diff --git a/core/store/dist/src/main/java/org/onosproject/store/resource/impl/TransactionalContinuousResourceSubStore.java b/core/store/dist/src/main/java/org/onosproject/store/resource/impl/TransactionalContinuousResourceSubStore.java
index f70dd60..2c8e4d8 100644
--- a/core/store/dist/src/main/java/org/onosproject/store/resource/impl/TransactionalContinuousResourceSubStore.java
+++ b/core/store/dist/src/main/java/org/onosproject/store/resource/impl/TransactionalContinuousResourceSubStore.java
@@ -141,7 +141,7 @@
ContinuousResourceAllocation allocations = consumers.get(request.id());
if (!Optional.ofNullable(allocations)
.orElse(ContinuousResourceAllocation.empty(original))
- .hasEnoughResource(original, request)) {
+ .hasEnoughResource(request)) {
return false;
}