Pull out ContinuousResourceAllocation from ConsistentResourceStore

Change-Id: I30eeb84f3e3237aa191d41896b60da8f789ea8ea

@@ -37,7 +37,6 @@ import java.util.List;
 import java.util.Set;
 import java.util.Set;
 import java.util.stream.Stream;
 import java.util.stream.Stream;
 
 
-import static org.onosproject.store.resource.impl.ConsistentResourceStore.ContinuousResourceAllocation;
 import static org.onosproject.store.resource.impl.ConsistentResourceStore.MAX_RETRIES;
 import static org.onosproject.store.resource.impl.ConsistentResourceStore.MAX_RETRIES;
 import static org.onosproject.store.resource.impl.ConsistentResourceStore.RETRY_DELAY;
 import static org.onosproject.store.resource.impl.ConsistentResourceStore.RETRY_DELAY;
 import static org.onosproject.store.resource.impl.ConsistentResourceStore.SERIALIZER;
 import static org.onosproject.store.resource.impl.ConsistentResourceStore.SERIALIZER;

@@ -16,7 +16,6 @@
 package org.onosproject.store.resource.impl;
 package org.onosproject.store.resource.impl;
 
 
 import com.google.common.annotations.Beta;
 import com.google.common.annotations.Beta;
-import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableSet;
 import com.google.common.collect.ImmutableSet;
 import org.apache.felix.scr.annotations.Activate;
 import org.apache.felix.scr.annotations.Activate;
 import org.apache.felix.scr.annotations.Component;
 import org.apache.felix.scr.annotations.Component;
@@ -390,24 +389,4 @@ public class ConsistentResourceStore extends AbstractStore<ResourceEvent, Resour
         return discreteTxStore.unregister(key, discreteValues)
         return discreteTxStore.unregister(key, discreteValues)
                 && continuousTxStore.unregister(key, continuousValues);
                 && continuousTxStore.unregister(key, continuousValues);
     }
     }
-
-    // internal use only
-    static final class ContinuousResourceAllocation {
-        private final ContinuousResource original;
-        private final ImmutableList<ResourceAllocation> allocations;
-
-        ContinuousResourceAllocation(ContinuousResource original,
-                                     ImmutableList<ResourceAllocation> allocations) {
-            this.original = original;
-            this.allocations = allocations;
-        }
-
-        ContinuousResource original() {
-            return original;
-        }
-
-        ImmutableList<ResourceAllocation> allocations() {
-            return allocations;
-        }
-    }
 }
 }

+/*
+ * Copyright 2016-present Open Networking Laboratory
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.onosproject.store.resource.impl;
+
+import com.google.common.collect.ImmutableList;
+import org.onosproject.net.resource.ContinuousResource;
+import org.onosproject.net.resource.ResourceAllocation;
+
+// internal use only
+final class ContinuousResourceAllocation {
+    private final ContinuousResource original;
+    private final ImmutableList<ResourceAllocation> allocations;
+
+    ContinuousResourceAllocation(ContinuousResource original,
+                                 ImmutableList<ResourceAllocation> allocations) {
+        this.original = original;
+        this.allocations = allocations;
+    }
+
+    ContinuousResource original() {
+        return original;
+    }
+
+    ImmutableList<ResourceAllocation> allocations() {
+        return allocations;
+    }
+}

@@ -33,7 +33,7 @@ final class ResourceStoreUtil {
     // computational complexity: O(n) where n is the number of allocations
     // computational complexity: O(n) where n is the number of allocations
     static boolean hasEnoughResource(ContinuousResource original,
     static boolean hasEnoughResource(ContinuousResource original,
                                      ContinuousResource request,
                                      ContinuousResource request,
-                                     ConsistentResourceStore.ContinuousResourceAllocation allocation) {
+                                     ContinuousResourceAllocation allocation) {
         if (allocation == null) {
         if (allocation == null) {
             return request.value() <= original.value();
             return request.value() <= original.value();
         }
         }

@@ -24,7 +24,6 @@ import org.onosproject.net.resource.DiscreteResourceId;
 import org.onosproject.net.resource.Resource;
 import org.onosproject.net.resource.Resource;
 import org.onosproject.net.resource.ResourceAllocation;
 import org.onosproject.net.resource.ResourceAllocation;
 import org.onosproject.net.resource.ResourceConsumer;
 import org.onosproject.net.resource.ResourceConsumer;
-import org.onosproject.store.resource.impl.ConsistentResourceStore.ContinuousResourceAllocation;
 import org.onosproject.store.service.TransactionContext;
 import org.onosproject.store.service.TransactionContext;
 import org.onosproject.store.service.TransactionalMap;
 import org.onosproject.store.service.TransactionalMap;
 import org.slf4j.Logger;
 import org.slf4j.Logger;