commit 7ecf5ea64a885758c592f37b288f3ddc8c5f99f6
author Sho SHIMIZU <sshimizu@us.fujitsu.com> Fri May 13 15:28:59 2016 -0700
committer Sho SHIMIZU <sshimizu@us.fujitsu.com> Fri May 13 15:28:59 2016 -0700
tree 20a6a94bc954419306917b9050526bea3f36adaa
parent efb75110ee3a77a7ae579ca9b28eb36b6ca58f08

Rename class by replacing Store with SubStore

Change-Id: I3775d930f593eab983a8da8a4823bae8d45645cb

core/store/dist/src/main/java/org/onosproject/store/resource/impl/ConsistentResourceStore.java

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 a11aabc..664374c 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
@@ -80,13 +80,13 @@
     @Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY)
     protected StorageService service;
 
-    private ConsistentDiscreteResourceStore discreteStore;
-    private ConsistentContinuousResourceStore continuousStore;
+    private ConsistentDiscreteResourceSubStore discreteStore;
+    private ConsistentContinuousResourceSubStore continuousStore;
 
     @Activate
     public void activate() {
-        discreteStore = new ConsistentDiscreteResourceStore(service);
-        continuousStore = new ConsistentContinuousResourceStore(service);
+        discreteStore = new ConsistentDiscreteResourceSubStore(service);
+        continuousStore = new ConsistentContinuousResourceSubStore(service);
 
         log.info("Started");
     }
@@ -120,8 +120,8 @@
                 .filter(x -> x.parent().isPresent())
                 .collect(Collectors.groupingBy(x -> x.parent().get(), LinkedHashMap::new, Collectors.toList()));
 
-        TransactionalDiscreteResourceStore discreteTxStore = discreteStore.transactional(tx);
-        TransactionalContinuousResourceStore continuousTxStore = continuousStore.transactional(tx);
+        TransactionalDiscreteResourceSubStore discreteTxStore = discreteStore.transactional(tx);
+        TransactionalContinuousResourceSubStore continuousTxStore = continuousStore.transactional(tx);
         for (Map.Entry<DiscreteResource, List<Resource>> entry : resourceMap.entrySet()) {
             DiscreteResourceId parentId = entry.getKey().id();
             if (!discreteTxStore.lookup(parentId).isPresent()) {
@@ -154,8 +154,8 @@
         TransactionContext tx = service.transactionContextBuilder().build();
         tx.begin();
 
-        TransactionalDiscreteResourceStore discreteTxStore = discreteStore.transactional(tx);
-        TransactionalContinuousResourceStore continuousTxStore = continuousStore.transactional(tx);
+        TransactionalDiscreteResourceSubStore discreteTxStore = discreteStore.transactional(tx);
+        TransactionalContinuousResourceSubStore continuousTxStore = continuousStore.transactional(tx);
         // Look up resources by resource IDs
         List<Resource> resources = ids.stream()
                 .filter(x -> x.parent().isPresent())
@@ -205,8 +205,8 @@
         TransactionContext tx = service.transactionContextBuilder().build();
         tx.begin();
 
-        TransactionalDiscreteResourceStore discreteTxStore = discreteStore.transactional(tx);
-        TransactionalContinuousResourceStore continuousTxStore = continuousStore.transactional(tx);
+        TransactionalDiscreteResourceSubStore discreteTxStore = discreteStore.transactional(tx);
+        TransactionalContinuousResourceSubStore continuousTxStore = continuousStore.transactional(tx);
         for (Resource resource : resources) {
             if (resource instanceof DiscreteResource) {
                 if (!discreteTxStore.allocate(consumer.consumerId(), (DiscreteResource) resource)) {
@@ -229,8 +229,8 @@
         TransactionContext tx = service.transactionContextBuilder().build();
         tx.begin();
 
-        TransactionalDiscreteResourceStore discreteTxStore = discreteStore.transactional(tx);
-        TransactionalContinuousResourceStore continuousTxStore = continuousStore.transactional(tx);
+        TransactionalDiscreteResourceSubStore discreteTxStore = discreteStore.transactional(tx);
+        TransactionalContinuousResourceSubStore continuousTxStore = continuousStore.transactional(tx);
         for (ResourceAllocation allocation : allocations) {
             Resource resource = allocation.resource();
             ResourceConsumerId consumerId = allocation.consumerId();
@@ -323,8 +323,8 @@
      * @return true if the operation succeeds, false otherwise.
      */
     // computational complexity: O(n) where n is the number of the specified value
-    private boolean register(TransactionalDiscreteResourceStore discreteTxStore,
-                             TransactionalContinuousResourceStore continuousTxStore,
+    private boolean register(TransactionalDiscreteResourceSubStore discreteTxStore,
+                             TransactionalContinuousResourceSubStore continuousTxStore,
                              DiscreteResourceId key, List<Resource> values) {
         // it's assumed that the passed "values" is non-empty
 
@@ -352,8 +352,8 @@
      * @param values            values to be removed
      * @return true if the operation succeeds, false otherwise
      */
-    private boolean unregister(TransactionalDiscreteResourceStore discreteTxStore,
-                               TransactionalContinuousResourceStore continuousTxStore,
+    private boolean unregister(TransactionalDiscreteResourceSubStore discreteTxStore,
+                               TransactionalContinuousResourceSubStore continuousTxStore,
                                DiscreteResourceId key, List<Resource> values) {
         // it's assumed that the passed "values" is non-empty