- DatastoreContext datastoreContext = newDatastoreContext(getOperationalProperties());
-
- return DistributedDataStoreFactory.createInstance(getOperationalSchemaServiceDependency(),
- datastoreContext, DatastoreSnapshotRestore.instance(),
- getOperationalActorSystemProviderDependency(), bundleContext);
+ // The DistributedOperDataStore is provided via blueprint so wait for and return it here for
+ // backwards compatibility
+ WaitingServiceTracker<DistributedDataStoreInterface> tracker = WaitingServiceTracker.create(
+ DistributedDataStoreInterface.class, bundleContext, "(type=distributed-operational)");
+ DistributedDataStoreInterface delegate = tracker.waitForService(WaitingServiceTracker.FIVE_MINUTES);
+ return new ForwardingDistributedDataStore(delegate, tracker);