Bump upstreams

[bgpcep.git] / config-loader / config-loader-impl / src / main / java / org / opendaylight / bgpcep / config / loader / impl / SimpleConfigLoader.java

diff --git a/config-loader/config-loader-impl/src/main/java/org/opendaylight/bgpcep/config/loader/impl/SimpleConfigLoader.java b/config-loader/config-loader-impl/src/main/java/org/opendaylight/bgpcep/config/loader/impl/SimpleConfigLoader.java
index 1756d9b285a49963aac485ac9fd8ece5e86c218f..f2247033e41f0c709f17c9f4f66b6c7076e4fccd 100644 (file)
--- a/config-loader/config-loader-impl/src/main/java/org/opendaylight/bgpcep/config/loader/impl/SimpleConfigLoader.java
+++ b/config-loader/config-loader-impl/src/main/java/org/opendaylight/bgpcep/config/loader/impl/SimpleConfigLoader.java
@@ -7,8 +7,6 @@
  */
 package org.opendaylight.bgpcep.config.loader.impl;
 
-import static java.util.Objects.requireNonNull;
-
 import com.google.common.annotations.Beta;
 import java.io.File;
 import java.nio.file.WatchKey;
@@ -18,29 +16,19 @@ import javax.annotation.PreDestroy;
 import javax.inject.Inject;
 import javax.inject.Singleton;
 import org.eclipse.jdt.annotation.NonNull;
-import org.opendaylight.mdsal.binding.dom.codec.api.BindingNormalizedNodeSerializer;
-import org.opendaylight.mdsal.binding.dom.codec.spi.BindingDOMCodecServices;
-import org.opendaylight.yangtools.yang.model.api.EffectiveModelContext;
+import org.opendaylight.mdsal.binding.runtime.api.BindingRuntimeContext;
 
 @Beta
 @Singleton
 public final class SimpleConfigLoader extends AbstractWatchingConfigLoader implements AutoCloseable {
-    private final @NonNull BindingNormalizedNodeSerializer serializer;
-    private final @NonNull EffectiveModelContext modelContext;
     private final @NonNull WatchService watchService;
     private final @NonNull File directory;
 
     @Inject
-    public SimpleConfigLoader(final FileWatcher fileWatcher, final BindingDOMCodecServices codec) {
-        this.serializer = requireNonNull(codec);
-        this.modelContext = codec.getRuntimeContext().getEffectiveModelContext();
-        this.watchService = fileWatcher.getWatchService();
-        this.directory = new File(fileWatcher.getPathFile());
-    }
-
-    @Override
-    public BindingNormalizedNodeSerializer getBindingNormalizedNodeSerializer() {
-        return serializer;
+    public SimpleConfigLoader(final FileWatcher fileWatcher, final BindingRuntimeContext runtimeContext) {
+        updateModelContext(runtimeContext.modelContext());
+        watchService = fileWatcher.getWatchService();
+        directory = new File(fileWatcher.getPathFile());
     }
 
     @PostConstruct
@@ -54,11 +42,6 @@ public final class SimpleConfigLoader extends AbstractWatchingConfigLoader imple
         stop();
     }
 
-    @Override
-    EffectiveModelContext modelContext() {
-        return modelContext;
-    }
-
     @Override
     File directory() {
         return directory;