1 files changed, 8 insertions, 9 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;
         }
 
     }