-import akka.actor.Props;
-import akka.osgi.BundleDelegatingClassLoader;
-import com.typesafe.config.ConfigFactory;
-import org.opendaylight.controller.cluster.datastore.config.ConfigurationReader;
-import org.opendaylight.controller.cluster.datastore.shardstrategy.ShardStrategyFactory;
-import org.opendaylight.controller.sal.core.api.model.SchemaService;
-import org.osgi.framework.BundleContext;
-
-public class DistributedDataStoreFactory {
- private static final String ACTOR_SYSTEM_NAME = "opendaylight-cluster-data";
- private static final String CONFIGURATION_NAME = "odl-cluster-data";
-
- private static volatile ActorSystem persistentActorSystem = null;
-
- public static DistributedDataStore createInstance(SchemaService schemaService,
- DatastoreContext datastoreContext, BundleContext bundleContext) {
-
- ActorSystem actorSystem = getOrCreateInstance(bundleContext, datastoreContext.getConfigurationReader());
- Configuration config = new ConfigurationImpl("module-shards.conf", "modules.conf");
- final DistributedDataStore dataStore =
- new DistributedDataStore(actorSystem, new ClusterWrapperImpl(actorSystem),
- config, datastoreContext);
-
- ShardStrategyFactory.setConfiguration(config);
+import org.opendaylight.controller.cluster.ActorSystemProvider;
+import org.opendaylight.controller.cluster.databroker.ClientBackedDataStore;
+import org.opendaylight.controller.cluster.datastore.config.Configuration;
+import org.opendaylight.controller.cluster.datastore.config.ConfigurationImpl;
+import org.opendaylight.controller.cluster.datastore.persisted.DatastoreSnapshot;
+import org.opendaylight.mdsal.dom.api.DOMSchemaService;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public final class DistributedDataStoreFactory {
+
+ private static final Logger LOG = LoggerFactory.getLogger(DistributedDataStoreFactory.class);
+ private static final String DEFAULT_MODULE_SHARDS_PATH = "./configuration/initial/module-shards.conf";
+ private static final String DEFAULT_MODULES_PATH = "./configuration/initial/modules.conf";
+
+ private DistributedDataStoreFactory() {
+ }
+
+ public static AbstractDataStore createInstance(final DOMSchemaService schemaService,
+ final DatastoreContext initialDatastoreContext, final DatastoreSnapshotRestore datastoreSnapshotRestore,
+ final ActorSystemProvider actorSystemProvider, final DatastoreContextIntrospector introspector,
+ final DatastoreContextPropertiesUpdater updater) {
+ return createInstance(schemaService, initialDatastoreContext, datastoreSnapshotRestore, actorSystemProvider,
+ introspector, updater, null);
+ }
+
+ // TODO: separate out settle wait so it is better controlled
+ public static AbstractDataStore createInstance(final DOMSchemaService schemaService,
+ final DatastoreContext initialDatastoreContext, final DatastoreSnapshotRestore datastoreSnapshotRestore,
+ final ActorSystemProvider actorSystemProvider, final DatastoreContextIntrospector introspector,
+ final DatastoreContextPropertiesUpdater updater, final Configuration orgConfig) {
+
+ final AbstractDataStore dataStore = createInstance(actorSystemProvider, initialDatastoreContext,
+ introspector, datastoreSnapshotRestore, orgConfig);
+
+ updater.setListener(dataStore);
+