Rename arguments to be more descriptive
Change-Id: If5c51aa2d713414839650e689ed8c4050a53c3a2
diff --git a/core/store/dist/src/main/java/org/onosproject/store/resource/impl/ConsistentResourceStore.java b/core/store/dist/src/main/java/org/onosproject/store/resource/impl/ConsistentResourceStore.java
index 0ecc108..c5a1d03 100644
--- a/core/store/dist/src/main/java/org/onosproject/store/resource/impl/ConsistentResourceStore.java
+++ b/core/store/dist/src/main/java/org/onosproject/store/resource/impl/ConsistentResourceStore.java
@@ -22,8 +22,8 @@
import org.apache.felix.scr.annotations.Reference;
import org.apache.felix.scr.annotations.ReferenceCardinality;
import org.apache.felix.scr.annotations.Service;
-import org.onlab.util.Tools;
import org.onlab.util.KryoNamespace;
+import org.onlab.util.Tools;
import org.onosproject.net.resource.ContinuousResource;
import org.onosproject.net.resource.ContinuousResourceId;
import org.onosproject.net.resource.DiscreteResource;
@@ -334,28 +334,28 @@
* Appends the values to the existing values associated with the specified key.
* If the map already has all the given values, appending will not happen.
*
- * @param key key specifying values
- * @param values values to be appended
+ * @param parent resource ID of the parent under which the given resources are registered
+ * @param resources resources to be registered
* @return true if the operation succeeds, false otherwise.
*/
// computational complexity: O(n) where n is the number of the specified value
private boolean register(TransactionalDiscreteResourceSubStore discreteTxStore,
TransactionalContinuousResourceSubStore continuousTxStore,
- DiscreteResourceId key, List<Resource> values) {
+ DiscreteResourceId parent, List<Resource> resources) {
// it's assumed that the passed "values" is non-empty
// This is 2-pass scan. Nicer to have 1-pass scan
- Set<DiscreteResource> discreteValues = values.stream()
+ Set<DiscreteResource> discreteResources = resources.stream()
.filter(x -> x instanceof DiscreteResource)
.map(x -> (DiscreteResource) x)
.collect(Collectors.toCollection(LinkedHashSet::new));
- Set<ContinuousResource> continuousValues = values.stream()
+ Set<ContinuousResource> continuousResources = resources.stream()
.filter(x -> x instanceof ContinuousResource)
.map(x -> (ContinuousResource) x)
.collect(Collectors.toCollection(LinkedHashSet::new));
- return discreteTxStore.register(key, discreteValues)
- && continuousTxStore.register(key, continuousValues);
+ return discreteTxStore.register(parent, discreteResources)
+ && continuousTxStore.register(parent, continuousResources);
}
/**
@@ -364,26 +364,26 @@
*
* @param discreteTxStore map holding multiple discrete resources for a key
* @param continuousTxStore map holding multiple continuous resources for a key
- * @param key key specifying values
- * @param values values to be removed
+ * @param parent resource ID of the parent under which the given resources are unregistered
+ * @param resources resources to be unregistered
* @return true if the operation succeeds, false otherwise
*/
private boolean unregister(TransactionalDiscreteResourceSubStore discreteTxStore,
TransactionalContinuousResourceSubStore continuousTxStore,
- DiscreteResourceId key, List<Resource> values) {
+ DiscreteResourceId parent, List<Resource> resources) {
// it's assumed that the passed "values" is non-empty
// This is 2-pass scan. Nicer to have 1-pass scan
- Set<DiscreteResource> discreteValues = values.stream()
+ Set<DiscreteResource> discreteResources = resources.stream()
.filter(x -> x instanceof DiscreteResource)
.map(x -> (DiscreteResource) x)
.collect(Collectors.toCollection(LinkedHashSet::new));
- Set<ContinuousResource> continuousValues = values.stream()
+ Set<ContinuousResource> continuousResources = resources.stream()
.filter(x -> x instanceof ContinuousResource)
.map(x -> (ContinuousResource) x)
.collect(Collectors.toCollection(LinkedHashSet::new));
- return discreteTxStore.unregister(key, discreteValues)
- && continuousTxStore.unregister(key, continuousValues);
+ return discreteTxStore.unregister(parent, discreteResources)
+ && continuousTxStore.unregister(parent, continuousResources);
}
}