diff options
Diffstat (limited to 'infra/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/data')
2 files changed, 12 insertions, 12 deletions
diff --git a/infra/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/data/DataTreeProvider.java b/infra/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/data/DataTreeProvider.java index 039a0ad82..34d3916fc 100644 --- a/infra/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/data/DataTreeProvider.java +++ b/infra/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/data/DataTreeProvider.java @@ -21,8 +21,7 @@ import io.fd.honeycomb.binding.init.ProviderTrait; import io.fd.honeycomb.infra.distro.cfgattrs.HoneycombConfiguration; import org.opendaylight.controller.sal.core.api.model.SchemaService; import org.opendaylight.yangtools.yang.data.api.schema.tree.DataTree; -import org.opendaylight.yangtools.yang.data.api.schema.tree.TipProducingDataTree; -import org.opendaylight.yangtools.yang.data.api.schema.tree.TreeType; +import org.opendaylight.yangtools.yang.data.api.schema.tree.DataTreeConfiguration; import org.opendaylight.yangtools.yang.data.impl.schema.tree.InMemoryDataTreeFactory; public abstract class DataTreeProvider extends ProviderTrait<DataTree> { @@ -33,26 +32,26 @@ public abstract class DataTreeProvider extends ProviderTrait<DataTree> { private HoneycombConfiguration config; @Override - public TipProducingDataTree create() { - TipProducingDataTree delegate = InMemoryDataTreeFactory.getInstance().create(getType()); + public DataTree create() { + DataTree delegate = new InMemoryDataTreeFactory().create(getType()); delegate.setSchemaContext(schemaService.getGlobalContext()); return delegate; } - public abstract TreeType getType(); + public abstract DataTreeConfiguration getType(); public static class ConfigDataTreeProvider extends DataTreeProvider { @Override - public TreeType getType() { - return TreeType.CONFIGURATION; + public DataTreeConfiguration getType() { + return DataTreeConfiguration.DEFAULT_CONFIGURATION; } } public static class ContextDataTreeProvider extends DataTreeProvider { @Override - public TreeType getType() { - return TreeType.OPERATIONAL; + public DataTreeConfiguration getType() { + return DataTreeConfiguration.DEFAULT_OPERATIONAL; } } diff --git a/infra/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/data/InmemoryDOMDataBrokerProvider.java b/infra/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/data/InmemoryDOMDataBrokerProvider.java index 550b9bec5..5f12358a6 100644 --- a/infra/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/data/InmemoryDOMDataBrokerProvider.java +++ b/infra/minimal-distribution-core/src/main/java/io/fd/honeycomb/infra/distro/data/InmemoryDOMDataBrokerProvider.java @@ -47,8 +47,9 @@ public final class InmemoryDOMDataBrokerProvider extends ProviderTrait<DOMDataBr protected SerializedDOMDataBroker create() { // This Databroker is dedicated for netconf metadata, not expected to be under heavy load ExecutorService listenableFutureExecutor = - SpecialExecutors.newBlockingBoundedCachedThreadPool(1, 100, "commits"); - ExecutorService commitExecutor = SpecialExecutors.newBoundedSingleThreadExecutor(100, "WriteTxCommit"); + SpecialExecutors.newBlockingBoundedCachedThreadPool(1, 100, "commits", getClass()); + ExecutorService commitExecutor = + SpecialExecutors.newBoundedSingleThreadExecutor(100, "WriteTxCommit", getClass()); // TODO HONEYCOMB-164 try to provide more lightweight implementation of DataBroker Map<LogicalDatastoreType, DOMStore> map = new LinkedHashMap<>(); @@ -56,6 +57,6 @@ public final class InmemoryDOMDataBrokerProvider extends ProviderTrait<DOMDataBr map.put(LogicalDatastoreType.OPERATIONAL, operDataStore); return new SerializedDOMDataBroker(map, new DeadlockDetectingListeningExecutorService(commitExecutor, - TransactionCommitDeadlockException.DEADLOCK_EXCEPTION_SUPPLIER, listenableFutureExecutor)); + TransactionCommitDeadlockException.DEADLOCK_EXCEPTION_SUPPLIER, listenableFutureExecutor)); } } |