Remove base (p0) partition in StorageManager
Change-Id: Idae636173a9638da19f391e203bec0bccb399328
diff --git a/core/store/primitives/src/main/java/org/onosproject/store/primitives/impl/NewDefaultConsistentMapBuilder.java b/core/store/primitives/src/main/java/org/onosproject/store/primitives/impl/NewDefaultConsistentMapBuilder.java
index 50b3fea..dfef62e 100644
--- a/core/store/primitives/src/main/java/org/onosproject/store/primitives/impl/NewDefaultConsistentMapBuilder.java
+++ b/core/store/primitives/src/main/java/org/onosproject/store/primitives/impl/NewDefaultConsistentMapBuilder.java
@@ -28,12 +28,10 @@
*/
public class NewDefaultConsistentMapBuilder<K, V> extends ConsistentMapBuilder<K, V> {
- private final DistributedPrimitiveCreator base;
- private final DistributedPrimitiveCreator federated;
+ private final DistributedPrimitiveCreator primitiveCreator;
- public NewDefaultConsistentMapBuilder(DistributedPrimitiveCreator base, DistributedPrimitiveCreator federated) {
- this.base = base;
- this.federated = federated;
+ public NewDefaultConsistentMapBuilder(DistributedPrimitiveCreator primitiveCreator) {
+ this.primitiveCreator = primitiveCreator;
}
@Override
@@ -43,8 +41,7 @@
@Override
public AsyncConsistentMap<K, V> buildAsyncMap() {
- DistributedPrimitiveCreator creator = partitionsDisabled() ? base : federated;
- AsyncConsistentMap<K, V> map = creator.newAsyncConsistentMap(name(), serializer());
+ AsyncConsistentMap<K, V> map = primitiveCreator.newAsyncConsistentMap(name(), serializer());
map = relaxedReadConsistency() ? DistributedPrimitives.newCachingMap(map) : map;
map = readOnly() ? DistributedPrimitives.newUnmodifiableMap(map) : map;
return meteringEnabled() ? DistributedPrimitives.newMeteredMap(map) : map;