Adapt TransportPCE code to Sulfur

[transportpce.git] / test-common / src / main / java / org / opendaylight / transportpce / test / DataStoreContextImpl.java

diff --git a/test-common/src/main/java/org/opendaylight/transportpce/test/DataStoreContextImpl.java b/test-common/src/main/java/org/opendaylight/transportpce/test/DataStoreContextImpl.java
index 42719c8b30c1d0cc01998298d4ad193f1e3d15f1..6b429fd09edb8e841ea3c1ab39bceaf38d160f23 100644 (file)
--- a/test-common/src/main/java/org/opendaylight/transportpce/test/DataStoreContextImpl.java
+++ b/test-common/src/main/java/org/opendaylight/transportpce/test/DataStoreContextImpl.java
@@ -9,20 +9,20 @@ package org.opendaylight.transportpce.test;
 
 import com.google.common.collect.ImmutableMap;
 import com.google.common.util.concurrent.MoreExecutors;
-import java.util.LinkedList;
-import java.util.List;
+import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
+import java.util.HashSet;
 import java.util.Map;
 import java.util.ServiceLoader;
+import java.util.Set;
 import java.util.concurrent.Executors;
-import org.opendaylight.binding.runtime.spi.BindingRuntimeHelpers;
 import org.opendaylight.mdsal.binding.api.DataBroker;
 import org.opendaylight.mdsal.binding.api.NotificationPublishService;
 import org.opendaylight.mdsal.binding.api.NotificationService;
 import org.opendaylight.mdsal.binding.dom.adapter.BindingAdapterFactory;
 import org.opendaylight.mdsal.binding.dom.adapter.ConstantAdapterContext;
-import org.opendaylight.mdsal.binding.dom.codec.api.BindingNormalizedNodeSerializer;
 import org.opendaylight.mdsal.binding.dom.codec.impl.BindingCodecContext;
 import org.opendaylight.mdsal.binding.dom.codec.spi.BindingDOMCodecServices;
+import org.opendaylight.mdsal.binding.runtime.spi.BindingRuntimeHelpers;
 import org.opendaylight.mdsal.common.api.LogicalDatastoreType;
 import org.opendaylight.mdsal.dom.api.DOMDataBroker;
 import org.opendaylight.mdsal.dom.broker.DOMNotificationRouter;
@@ -46,9 +46,9 @@ public class DataStoreContextImpl implements DataStoreContext {
     private BindingDOMCodecServices bindingDOMCodecServices;
     private BindingAdapterFactory adapterFactory ;
 
-
+    @SuppressFBWarnings(value = "MC_OVERRIDABLE_METHOD_CALL_IN_CONSTRUCTOR")
     public DataStoreContextImpl() {
-        List<YangModuleInfo> moduleInfos = new LinkedList<>();
+        Set<YangModuleInfo> moduleInfos = new HashSet<>();
         ServiceLoader<YangModelBindingProvider> yangProviderLoader = ServiceLoader.load(YangModelBindingProvider.class);
         for (YangModelBindingProvider yangModelBindingProvider : yangProviderLoader) {
             moduleInfos.add(yangModelBindingProvider.getModuleInfo());
@@ -56,7 +56,7 @@ public class DataStoreContextImpl implements DataStoreContext {
         schemaCtx = BindingRuntimeHelpers.createEffectiveModel(moduleInfos);
         bindingDOMCodecServices = new BindingCodecContext(BindingRuntimeHelpers.createRuntimeContext());
         adapterFactory = new BindingAdapterFactory(new ConstantAdapterContext(bindingDOMCodecServices));
-        domNotificationRouter = DOMNotificationRouter.create(16);
+        domNotificationRouter = new DOMNotificationRouter(16);
         datastores = createDatastores();
         domDataBroker = createDOMDataBroker();
         dataBroker = createDataBroker();
@@ -75,12 +75,12 @@ public class DataStoreContextImpl implements DataStoreContext {
     }
 
     @Override
-    public NotificationService createNotificationService() {
+    public final NotificationService createNotificationService() {
         return adapterFactory.createNotificationService(domNotificationRouter);
     }
 
     @Override
-    public NotificationPublishService createNotificationPublishService() {
+    public final NotificationPublishService createNotificationPublishService() {
         return adapterFactory.createNotificationPublishService(domNotificationRouter);
     }
 
@@ -89,11 +89,6 @@ public class DataStoreContextImpl implements DataStoreContext {
         return schemaCtx;
     }
 
-    @Override
-    public BindingNormalizedNodeSerializer getBindingToNormalizedNodeCodec() {
-        return bindingDOMCodecServices;
-    }
-
     @Override
     public NotificationService getNotificationService() {
         return notificationService;
@@ -129,5 +124,10 @@ public class DataStoreContextImpl implements DataStoreContext {
                 FixedDOMSchemaService.of(bindingDOMCodecServices.getRuntimeContext()));
     }
 
+    @Override
+    public BindingDOMCodecServices getBindingDOMCodecServices() {
+        return bindingDOMCodecServices;
+    }
+
 
 }