X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;ds=sidebyside;f=common%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Ftransportpce%2Fcommon%2FDataStoreContextImpl.java;h=983d52729eaa78706b3ff4debcbd05e66fb843f5;hb=243c08d8b7ad90b0cbaec76a33a639d6fa96f5c8;hp=c5f5aa00672b13d00a7716d68afb341d9119cd24;hpb=2ddff782c0d3b191b8722499de68999de7c8dbc6;p=transportpce.git

diff --git a/common/src/main/java/org/opendaylight/transportpce/common/DataStoreContextImpl.java b/common/src/main/java/org/opendaylight/transportpce/common/DataStoreContextImpl.java
index c5f5aa006..983d52729 100644
--- a/common/src/main/java/org/opendaylight/transportpce/common/DataStoreContextImpl.java
+++ b/common/src/main/java/org/opendaylight/transportpce/common/DataStoreContextImpl.java
@@ -18,7 +18,6 @@ import java.util.Map;
 import java.util.ServiceLoader;
 import java.util.concurrent.Executors;
 import org.eclipse.jdt.annotation.NonNull;
-import org.opendaylight.binding.runtime.api.BindingRuntimeContext;
 import org.opendaylight.binding.runtime.spi.BindingRuntimeHelpers;
 import org.opendaylight.mdsal.binding.api.DataBroker;
 import org.opendaylight.mdsal.binding.api.NotificationPublishService;
@@ -28,9 +27,7 @@ import org.opendaylight.mdsal.binding.dom.adapter.BindingDOMDataBrokerAdapter;
 import org.opendaylight.mdsal.binding.dom.adapter.BindingDOMNotificationPublishServiceAdapter;
 import org.opendaylight.mdsal.binding.dom.adapter.BindingDOMNotificationServiceAdapter;
 import org.opendaylight.mdsal.binding.dom.adapter.ConstantAdapterContext;
-import org.opendaylight.mdsal.binding.dom.adapter.CurrentAdapterSerializer;
 import org.opendaylight.mdsal.binding.dom.codec.api.BindingNormalizedNodeSerializer;
-import org.opendaylight.mdsal.binding.dom.codec.impl.BindingCodecContext;
 import org.opendaylight.mdsal.common.api.LogicalDatastoreType;
 import org.opendaylight.mdsal.dom.api.DOMDataBroker;
 import org.opendaylight.mdsal.dom.api.DOMSchemaService;
@@ -103,7 +100,7 @@ public class DataStoreContextImpl implements DataStoreContext {
 
     @Override
     public BindingNormalizedNodeSerializer getBindingToNormalizedNodeCodec() {
-        return this.mockedSchemaContext.bindingStreamCodecs;
+        return this.mockedSchemaContext.adapterContext.currentSerializer();
     }
 
     @Override
@@ -151,19 +148,13 @@ public class DataStoreContextImpl implements DataStoreContext {
 
         private final EffectiveModelContext schemaContext;
         private final ListenerRegistry<EffectiveModelContextListener> listeners;
-        private final BindingNormalizedNodeSerializer bindingStreamCodecs;
-        private final CurrentAdapterSerializer bindingToNormalized;
         private final AdapterContext adapterContext;
 
         private SchemaContextHolder() {
             List<YangModuleInfo> moduleInfos = loadModuleInfos();
             this.schemaContext = BindingRuntimeHelpers.createEffectiveModel(moduleInfos);
             this.listeners = ListenerRegistry.create();
-            BindingRuntimeContext bindingContext =
-                    BindingRuntimeHelpers.createRuntimeContext();
-            this.bindingStreamCodecs = new BindingCodecContext(bindingContext);
-            this.bindingToNormalized = new CurrentAdapterSerializer(new BindingCodecContext(bindingContext));
-            adapterContext = new ConstantAdapterContext(this.bindingToNormalized);
+            this.adapterContext = new ConstantAdapterContext();
         }
 
         @Override