From: manuedelf <emmanuelle.delfour@orange.com>
Date: Fri, 11 Dec 2020 15:04:34 +0000 (+0100)
Subject: Test-common module update
X-Git-Tag: 3.0.0~57
X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=commitdiff_plain;ds=inline;h=6fede53990d78fad5c5a52d184245aa5db43fe5f;p=transportpce.git

Test-common module update

Update test-common module to be able to deserialize json for yang object
that are not data object (notification, rpcdata).
- change parent to mdsal bing parent to be able to generate classes from
yang files : today converter can only parse json for data object not
notification or rpcdata. A temporary workaroud is to add stub model yang
data object.
- replace getBindingToNormalizedNodeCodec by getBindingDOMCodecServices
to have all the methods of BindingDOMCodecServices.
TODO: clean converter to use methods from BindingDOMCodecServices
and focus converter on parsing/writing json or xml file for data
object, notification or rpcdata.

JIRA: TRNSPRTPCE-230
Signed-off-by: manuedelf <emmanuelle.delfour@orange.com>
Change-Id: I201060182ffe6434ffe837198d84e44c35d237c5
---

diff --git a/test-common/pom.xml b/test-common/pom.xml
index 7850990ce..cf840c619 100644
--- a/test-common/pom.xml
+++ b/test-common/pom.xml
@@ -10,9 +10,9 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <groupId>org.opendaylight.odlparent</groupId>
-        <artifactId>bundle-parent</artifactId>
-        <version>8.0.3</version>
+        <groupId>org.opendaylight.mdsal</groupId>
+        <artifactId>binding-parent</artifactId>
+        <version>7.0.4</version>
         <relativePath />
     </parent>
 
@@ -29,13 +29,6 @@
                 <scope>import</scope>
                 <type>pom</type>
             </dependency>
-            <dependency>
-                <groupId>org.opendaylight.mdsal</groupId>
-                <artifactId>mdsal-artifacts</artifactId>
-                <version>7.0.4</version>
-                <scope>import</scope>
-                <type>pom</type>
-            </dependency>
         </dependencies>
     </dependencyManagement>
     <dependencies>
diff --git a/test-common/src/main/java/org/opendaylight/transportpce/test/DataStoreContext.java b/test-common/src/main/java/org/opendaylight/transportpce/test/DataStoreContext.java
index b5b396ab2..9b630b901 100644
--- a/test-common/src/main/java/org/opendaylight/transportpce/test/DataStoreContext.java
+++ b/test-common/src/main/java/org/opendaylight/transportpce/test/DataStoreContext.java
@@ -10,7 +10,7 @@ package org.opendaylight.transportpce.test;
 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.codec.api.BindingNormalizedNodeSerializer;
+import org.opendaylight.mdsal.binding.dom.codec.spi.BindingDOMCodecServices;
 import org.opendaylight.mdsal.dom.api.DOMDataBroker;
 import org.opendaylight.yangtools.yang.model.api.EffectiveModelContext;
 
@@ -26,10 +26,10 @@ public interface DataStoreContext {
 
     EffectiveModelContext getSchemaContext();
 
-    BindingNormalizedNodeSerializer getBindingToNormalizedNodeCodec();
-
     NotificationService getNotificationService();
 
     NotificationPublishService getNotificationPublishService();
 
+    BindingDOMCodecServices getBindingDOMCodecServices();
+
 }
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 0829a4ac3..9fea5cb4a 100644
--- a/test-common/src/main/java/org/opendaylight/transportpce/test/DataStoreContextImpl.java
+++ b/test-common/src/main/java/org/opendaylight/transportpce/test/DataStoreContextImpl.java
@@ -19,7 +19,6 @@ 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;
@@ -89,11 +88,6 @@ public class DataStoreContextImpl implements DataStoreContext {
         return schemaCtx;
     }
 
-    @Override
-    public BindingNormalizedNodeSerializer getBindingToNormalizedNodeCodec() {
-        return bindingDOMCodecServices;
-    }
-
     @Override
     public NotificationService getNotificationService() {
         return notificationService;
@@ -129,5 +123,10 @@ public class DataStoreContextImpl implements DataStoreContext {
                 FixedDOMSchemaService.of(bindingDOMCodecServices.getRuntimeContext()));
     }
 
+    @Override
+    public BindingDOMCodecServices getBindingDOMCodecServices() {
+        return bindingDOMCodecServices;
+    }
+
 
 }
diff --git a/test-common/src/main/java/org/opendaylight/transportpce/test/converter/JSONDataObjectConverter.java b/test-common/src/main/java/org/opendaylight/transportpce/test/converter/JSONDataObjectConverter.java
index 62b442284..7693c8ff9 100644
--- a/test-common/src/main/java/org/opendaylight/transportpce/test/converter/JSONDataObjectConverter.java
+++ b/test-common/src/main/java/org/opendaylight/transportpce/test/converter/JSONDataObjectConverter.java
@@ -54,7 +54,7 @@ public final class JSONDataObjectConverter extends AbstractDataObjectConverter {
      */
     public static DataObjectConverter createWithDataStoreUtil(@Nonnull DataStoreContext dataStoreContextUtil) {
         return new JSONDataObjectConverter(dataStoreContextUtil.getSchemaContext(),
-                dataStoreContextUtil.getBindingToNormalizedNodeCodec());
+                dataStoreContextUtil.getBindingDOMCodecServices());
     }
 
     /**
@@ -132,7 +132,7 @@ public final class JSONDataObjectConverter extends AbstractDataObjectConverter {
         NormalizedNodeResult result = new NormalizedNodeResult();
         try (NormalizedNodeStreamWriter streamWriter = ImmutableNormalizedNodeStreamWriter.from(result);
             JsonParserStream jsonParser = JsonParserStream.create(streamWriter,
-                JSONCodecFactorySupplier.DRAFT_LHOTKA_NETMOD_YANG_JSON_02.getShared(getSchemaContext()),
+                JSONCodecFactorySupplier.RFC7951.getShared(getSchemaContext()),
                 getSchemaContext())) {
             jsonParser.parse(reader);
         } catch (IOException e) {
diff --git a/test-common/src/main/java/org/opendaylight/transportpce/test/converter/XMLDataObjectConverter.java b/test-common/src/main/java/org/opendaylight/transportpce/test/converter/XMLDataObjectConverter.java
index 10e402a86..fefafd181 100644
--- a/test-common/src/main/java/org/opendaylight/transportpce/test/converter/XMLDataObjectConverter.java
+++ b/test-common/src/main/java/org/opendaylight/transportpce/test/converter/XMLDataObjectConverter.java
@@ -72,7 +72,7 @@ public final class XMLDataObjectConverter extends AbstractDataObjectConverter {
      */
     public static XMLDataObjectConverter createWithDataStoreUtil(@Nonnull DataStoreContext dataStoreContextUtil) {
         BindingNormalizedNodeSerializer bindingToNormalizedNodeCodec =
-                dataStoreContextUtil.getBindingToNormalizedNodeCodec();
+                dataStoreContextUtil.getBindingDOMCodecServices();
         return new XMLDataObjectConverter(dataStoreContextUtil.getSchemaContext(), bindingToNormalizedNodeCodec);
     }