migrate yangtools deprecated BindingNormalizedNodeSerializer

migrate yangtools deprecated BindingNormalizedNodeSerializer
to mdsal BindingNormalizedNodeSerializer

Change-Id: I32439a487a209a567b5436b204c11d979ac46cc8
Signed-off-by: Claudio D. Gasparini <claudio.gasparini@pantheon.tech>

diff --git a/bgp/config-loader-impl/pom.xml b/bgp/config-loader-impl/pom.xml
index 856dbd2961fcfe1d8ed93c1c9caf45d873f126f7..0fe3593c1383064641d92817991b2ff9acba5715 100644 (file)
--- a/bgp/config-loader-impl/pom.xml
+++ b/bgp/config-loader-impl/pom.xml
@@ -31,6 +31,10 @@
             <groupId>org.opendaylight.yangtools</groupId>
             <artifactId>yang-data-codec-xml</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.opendaylight.mdsal</groupId>
+            <artifactId>mdsal-dom-api</artifactId>
+        </dependency>
         <!-- test scope dependencies -->
         <dependency>
             <groupId>${project.groupId}</groupId>

diff --git a/bgp/config-loader-impl/src/main/java/org/opendaylight/protocol/bgp/config/loader/impl/ConfigLoaderImpl.java b/bgp/config-loader-impl/src/main/java/org/opendaylight/protocol/bgp/config/loader/impl/ConfigLoaderImpl.java
index fd2ef5e36e01aceb48f509b7402d8322ce77d79b..ddfd80e0aba38a349ed72e1930430d4ee2dd81b2 100644 (file)
--- a/bgp/config-loader-impl/src/main/java/org/opendaylight/protocol/bgp/config/loader/impl/ConfigLoaderImpl.java
+++ b/bgp/config-loader-impl/src/main/java/org/opendaylight/protocol/bgp/config/loader/impl/ConfigLoaderImpl.java
@@ -21,9 +21,9 @@ import java.util.regex.Pattern;
 import javax.annotation.concurrent.GuardedBy;
 import javax.xml.stream.XMLInputFactory;
 import javax.xml.stream.XMLStreamReader;
+import org.opendaylight.mdsal.binding.dom.codec.api.BindingNormalizedNodeSerializer;
 import org.opendaylight.protocol.bgp.config.loader.spi.ConfigFileProcessor;
 import org.opendaylight.protocol.bgp.config.loader.spi.ConfigLoader;
-import org.opendaylight.yangtools.binding.data.codec.api.BindingNormalizedNodeSerializer;
 import org.opendaylight.yangtools.concepts.AbstractRegistration;
 import org.opendaylight.yangtools.yang.data.api.schema.NormalizedNode;
 import org.opendaylight.yangtools.yang.data.api.schema.stream.NormalizedNodeStreamWriter;
@@ -35,7 +35,6 @@ import org.opendaylight.yangtools.yang.model.api.SchemaNode;
 import org.opendaylight.yangtools.yang.model.util.SchemaContextUtil;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-
 public final class ConfigLoaderImpl implements ConfigLoader, AutoCloseable {
     private static final Logger LOG = LoggerFactory.getLogger(ConfigLoaderImpl.class);
     private static final String INTERRUPTED = "InterruptedException";

diff --git a/bgp/config-loader-impl/src/main/resources/org/opendaylight/blueprint/bgp-config-loader.xml b/bgp/config-loader-impl/src/main/resources/org/opendaylight/blueprint/bgp-config-loader.xml
index 1c818c8e70ce9438c3c216e47c97143eb48d0d9c..6febae33d3a2b5a0ef6f5e3877534cc7c3e065dc 100644 (file)
--- a/bgp/config-loader-impl/src/main/resources/org/opendaylight/blueprint/bgp-config-loader.xml
+++ b/bgp/config-loader-impl/src/main/resources/org/opendaylight/blueprint/bgp-config-loader.xml
@@ -8,16 +8,16 @@
   -->
 
 <blueprint xmlns="http://www.osgi.org/xmlns/blueprint/v1.0.0" xmlns:odl="http://opendaylight.org/xmlns/blueprint/v1.0.0">
-    <odl:static-reference id="schemaService" interface="org.opendaylight.controller.sal.core.api.model.SchemaService" />
-    <odl:static-reference id="binding-codec" interface="org.opendaylight.yangtools.binding.data.codec.api.BindingNormalizedNodeSerializer" />
+    <odl:static-reference id="domSchemaService" interface="org.opendaylight.mdsal.dom.api.DOMSchemaService"/>
+    <odl:static-reference id="mappingCodec" interface="org.opendaylight.mdsal.binding.dom.codec.api.BindingNormalizedNodeSerializer"/>
 
     <bean id="bgpFileWatcher" class="org.opendaylight.protocol.bgp.config.loader.impl.BGPFileWatcher"  destroy-method="close" />
 
     <bean id="bgpConfigLoader" class="org.opendaylight.protocol.bgp.config.loader.impl.ConfigLoaderImpl"  destroy-method="close">
         <argument>
-            <bean factory-ref="schemaService" factory-method="getGlobalContext"/>
+            <bean factory-ref="domSchemaService" factory-method="getGlobalContext"/>
         </argument>
-        <argument ref="binding-codec"/>
+        <argument ref="mappingCodec"/>
         <argument>
             <bean factory-ref="bgpFileWatcher" factory-method="getPathFile"/>
         </argument>

diff --git a/bgp/config-loader-spi/src/main/java/org/opendaylight/protocol/bgp/config/loader/spi/ConfigLoader.java b/bgp/config-loader-spi/src/main/java/org/opendaylight/protocol/bgp/config/loader/spi/ConfigLoader.java
index b13d9f1fa7dcd2e30183cd79051269143603c10f..644f9e6d5f408b3fe7086fdce065f118fe41f4e2 100644 (file)
--- a/bgp/config-loader-spi/src/main/java/org/opendaylight/protocol/bgp/config/loader/spi/ConfigLoader.java
+++ b/bgp/config-loader-spi/src/main/java/org/opendaylight/protocol/bgp/config/loader/spi/ConfigLoader.java
@@ -9,19 +9,21 @@
 package org.opendaylight.protocol.bgp.config.loader.spi;
 
 import javax.annotation.Nonnull;
-import org.opendaylight.yangtools.binding.data.codec.api.BindingNormalizedNodeSerializer;
+import org.opendaylight.mdsal.binding.dom.codec.api.BindingNormalizedNodeSerializer;
 import org.opendaylight.yangtools.concepts.AbstractRegistration;
 
 public interface ConfigLoader {
     /**
      * Register object model handler
+     *
      * @param config Config File Processor
      */
-    @Nonnull AbstractRegistration registerConfigFile(@Nonnull ConfigFileProcessor config);
+    @Nonnull
+    AbstractRegistration registerConfigFile(@Nonnull ConfigFileProcessor config);
 
     /**
-     *
      * @return Binding Normalized node serializer
      */
-    @Nonnull BindingNormalizedNodeSerializer getBindingNormalizedNodeSerializer();
+    @Nonnull
+    BindingNormalizedNodeSerializer getBindingNormalizedNodeSerializer();
 }

diff --git a/features/bgp/features-bgp/src/main/features/features.xml b/features/bgp/features-bgp/src/main/features/features.xml
index d24f3aee5ccce3924b2a9a94a9039e0a210052d5..e4c03f53f00df99d98e223e8659464e2ff293226 100644 (file)
--- a/features/bgp/features-bgp/src/main/features/features.xml
+++ b/features/bgp/features-bgp/src/main/features/features.xml
@@ -177,6 +177,7 @@
     <feature name="odl-bgpcep-bgp-config-loader" version='${project.version}'>
         <feature version='${project.version}'>odl-bgpcep-config-files</feature>
         <feature version='${mdsal.common.version}'>odl-mdsal-binding-runtime</feature>
+        <feature version='${mdsal.common.version}'>odl-mdsal-dom-api</feature>
         <bundle>mvn:org.opendaylight.bgpcep/bgp-config-loader-spi/{{VERSION}}</bundle>
         <bundle>mvn:org.opendaylight.bgpcep/bgp-config-loader-impl/{{VERSION}}</bundle>
    </feature>

diff --git a/features/bgp/odl-bgpcep-bgp-config-loader/pom.xml b/features/bgp/odl-bgpcep-bgp-config-loader/pom.xml
index cf8d7275bb16eabb6c5f9fe3879e313904ba2f1d..ba97abc1847e326055cf3b7daa9e5479f806eeeb 100644 (file)
--- a/features/bgp/odl-bgpcep-bgp-config-loader/pom.xml
+++ b/features/bgp/odl-bgpcep-bgp-config-loader/pom.xml
@@ -56,6 +56,12 @@
             <type>xml</type>
             <classifier>features</classifier>
         </dependency>
+        <dependency>
+            <groupId>org.opendaylight.mdsal</groupId>
+            <artifactId>odl-mdsal-dom-api</artifactId>
+            <type>xml</type>
+            <classifier>features</classifier>
+        </dependency>
         <dependency>
             <groupId>org.opendaylight.mdsal</groupId>
             <artifactId>odl-mdsal-binding-runtime</artifactId>