Merge "Remove explicit version declaration"
authorJakub Morvay <jmorvay@cisco.com>
Fri, 11 Aug 2017 07:08:49 +0000 (07:08 +0000)
committerGerrit Code Review <gerrit@opendaylight.org>
Fri, 11 Aug 2017 07:08:49 +0000 (07:08 +0000)
89 files changed:
features/netconf-connector/features-netconf-connector/pom.xml
features/netconf-connector/odl-message-bus/pom.xml
features/netconf-connector/odl-netconf-callhome-ssh/pom.xml
features/netconf-connector/odl-netconf-clustered-topology/pom.xml
features/netconf-connector/odl-netconf-connector-all/pom.xml
features/netconf-connector/odl-netconf-connector-ssh/pom.xml
features/netconf-connector/odl-netconf-connector/pom.xml
features/netconf-connector/odl-netconf-console/pom.xml
features/netconf-connector/odl-netconf-topology/pom.xml
features/netconf-connector/pom.xml
features/netconf/features-netconf/pom.xml
features/netconf/odl-aaa-netconf-plugin-no-cluster/pom.xml
features/netconf/odl-aaa-netconf-plugin/pom.xml
features/netconf/odl-config-netconf-connector/pom.xml
features/netconf/odl-netconf-all/pom.xml
features/netconf/odl-netconf-api/pom.xml
features/netconf/odl-netconf-client/pom.xml
features/netconf/odl-netconf-impl/pom.xml
features/netconf/odl-netconf-mapping-api/pom.xml
features/netconf/odl-netconf-mdsal/pom.xml
features/netconf/odl-netconf-monitoring/pom.xml
features/netconf/odl-netconf-netty-util/pom.xml
features/netconf/odl-netconf-notifications-api/pom.xml
features/netconf/odl-netconf-notifications-impl/pom.xml
features/netconf/odl-netconf-ssh/pom.xml
features/netconf/odl-netconf-tcp/pom.xml
features/netconf/odl-netconf-util/pom.xml
features/netconf/pom.xml
features/pom.xml
features/protocol-framework/features-protocol-framework/pom.xml
features/protocol-framework/odl-protocol-framework/pom.xml
features/protocol-framework/pom.xml
features/restconf/features-restconf/pom.xml
features/restconf/odl-mdsal-apidocs/pom.xml
features/restconf/odl-restconf-all/pom.xml
features/restconf/odl-restconf-noauth/pom.xml
features/restconf/odl-restconf/pom.xml
features/restconf/pom.xml
features/yanglib/features-yanglib/pom.xml
features/yanglib/odl-yanglib/pom.xml
features/yanglib/pom.xml
karaf/pom.xml
netconf/aaa-authn-odl-plugin/pom.xml
netconf/config-netconf-connector/pom.xml
netconf/mdsal-netconf-connector/pom.xml
netconf/mdsal-netconf-impl/pom.xml
netconf/mdsal-netconf-monitoring/pom.xml
netconf/mdsal-netconf-notification/pom.xml
netconf/mdsal-netconf-ssh/pom.xml
netconf/mdsal-netconf-tcp/pom.xml
netconf/mdsal-netconf-yang-library/pom.xml
netconf/messagebus-netconf/pom.xml
netconf/models/pom.xml
netconf/netconf-api/pom.xml
netconf/netconf-artifacts/pom.xml
netconf/netconf-auth/pom.xml
netconf/netconf-client/pom.xml
netconf/netconf-config/pom.xml
netconf/netconf-connector-config/pom.xml
netconf/netconf-console/pom.xml
netconf/netconf-impl/pom.xml
netconf/netconf-mapping-api/pom.xml
netconf/netconf-monitoring/pom.xml
netconf/netconf-netty-util/pom.xml
netconf/netconf-notifications-api/pom.xml
netconf/netconf-notifications-impl/pom.xml
netconf/netconf-ssh/pom.xml
netconf/netconf-tcp/pom.xml
netconf/netconf-topology-config/pom.xml
netconf/netconf-topology/pom.xml
netconf/netconf-util/pom.xml
netconf/pom.xml
netconf/tools/netconf-cli/pom.xml
netconf/tools/netconf-testtool/pom.xml
netconf/tools/pom.xml
pom.xml
protocol-framework/pom.xml
restconf/models/pom.xml
restconf/pom.xml
restconf/restconf-artifacts/pom.xml
restconf/sal-rest-connector-config/pom.xml
restconf/sal-rest-connector/src/main/java/org/opendaylight/netconf/sal/rest/impl/XmlNormalizedNodeBodyReader.java
restconf/sal-rest-connector/src/main/java/org/opendaylight/restconf/jersey/providers/XmlNormalizedNodeBodyReader.java
restconf/sal-rest-connector/src/test/java/org/opendaylight/controller/sal/rest/impl/test/providers/TestXmlBodyReader.java
restconf/sal-rest-connector/src/test/java/org/opendaylight/restconf/jersey/providers/XmlBodyReaderTest.java
restconf/sal-rest-connector/src/test/resources/foo-xml-test/foo.xml [new file with mode: 0644]
restconf/sal-rest-connector/src/test/resources/foo-xml-test/yang/foo.yang [new file with mode: 0644]
restconf/sal-rest-docgen-maven/pom.xml
restconf/sal-rest-docgen/pom.xml

index d742b00101b7c787dc0d73b43a988e9c66aa5cd2..4416482b656591f24d98d937acd1f029f78cc6a8 100644 (file)
@@ -14,7 +14,7 @@
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>feature-repo-parent</artifactId>
-    <version>2.0.2</version>
+    <version>2.0.4</version>
     <relativePath/>
   </parent>
 
index 5941d6492b5e0a97bab7031993d1594a79bec27a..93bc3dc1feebb8337073cf690fc41c77e5482b78 100644 (file)
@@ -14,7 +14,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>2.0.2</version>
+        <version>2.0.4</version>
         <relativePath/>
     </parent>
 
index 56d5ee7332449675a0035654704c9f484a7c607a..b48cb47338aabbecfd0145fdd308c947cdbdd322 100644 (file)
@@ -14,7 +14,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>2.0.2</version>
+        <version>2.0.4</version>
         <relativePath/>
     </parent>
 
index c718b6fed42d9c5cf1a7abaedeecc36b3e4a0faf..f84cf493a023e0ff690c14c0a3d532c8275de235 100644 (file)
@@ -14,7 +14,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>2.0.2</version>
+        <version>2.0.4</version>
         <relativePath/>
     </parent>
 
index 0cadb4990cdd8bcc544a622ae716318fce0c617e..db24444e933dc4d8fdb22990fb8b13882fa63e7c 100644 (file)
@@ -14,7 +14,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>2.0.2</version>
+        <version>2.0.4</version>
         <relativePath/>
     </parent>
 
index 919bbba37e7a122a1028bb04f4280e083ee7aaac..f92347ea36e6267b09bee80dbed73b98adeccfe4 100644 (file)
@@ -14,7 +14,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>2.0.2</version>
+        <version>2.0.4</version>
         <relativePath/>
     </parent>
 
index 0ebcd45c00fa5982d1e6b2930f458bfc42624d70..674fb6b4faeb7a16cb96974b59f0e5c6029c7408 100644 (file)
@@ -14,7 +14,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>2.0.2</version>
+        <version>2.0.4</version>
         <relativePath/>
     </parent>
 
index 7c6ee7d24863aa1bc66ba459845c2b208c340bb3..773a0d0c9a080b28e52aa6b6da2fbe7b83a857d6 100644 (file)
@@ -14,7 +14,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>2.0.2</version>
+        <version>2.0.4</version>
         <relativePath/>
     </parent>
 
index 3ed7cb4209d680d3332bfc492d5817e1a63b2512..1cf2a4c3e871878d24c10a88acdd4b50e518738f 100644 (file)
@@ -14,7 +14,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>2.0.2</version>
+        <version>2.0.4</version>
         <relativePath/>
     </parent>
 
index d20a3ee6db399a700851b11002663f81b05e594e..ca70c0e019a953d18e2468432cf2c8f623676562 100644 (file)
@@ -12,7 +12,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent</artifactId>
-        <version>2.0.2</version>
+        <version>2.0.4</version>
         <relativePath/>
     </parent>
     <groupId>org.opendaylight.netconf</groupId>
index 75f4ee7cd4d4be5f341da21f130f19c05ce2fa16..73e0f1c52fcd6964a87e74c6b9ff989482429a47 100644 (file)
@@ -14,7 +14,7 @@
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>feature-repo-parent</artifactId>
-    <version>2.0.2</version>
+    <version>2.0.4</version>
     <relativePath/>
   </parent>
 
index 977d68d7fdddfec0f27259e1cd1d96cba18aeb37..9e22eb6829939619d492d25ba9440f510c7de585 100644 (file)
@@ -14,7 +14,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>2.0.2</version>
+        <version>2.0.4</version>
         <relativePath/>
     </parent>
 
index 287d3b242559232a8830904b2b44c65b2ff43c90..add4efdf84c9628e3bd1bc46473a2a3acbf901dc 100644 (file)
@@ -14,7 +14,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>2.0.2</version>
+        <version>2.0.4</version>
         <relativePath/>
     </parent>
 
index afac26734f5501678f9d162506c50b8d7392991f..2fe1998e8983c8decb76be1d92f2b8d403c1f7a0 100644 (file)
@@ -14,7 +14,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>2.0.2</version>
+        <version>2.0.4</version>
         <relativePath/>
     </parent>
 
index fc64af4f0763fcbf5f22e3a2f21b5feaa4cdbd30..1822b92e90c199516f4942dc065aba507159a3fb 100644 (file)
@@ -14,7 +14,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>2.0.2</version>
+        <version>2.0.4</version>
         <relativePath/>
     </parent>
 
index 89ccc4938963748bace2f3bb9b47be352262c78d..80c942d68096a5ba025acd815481188db1008803 100644 (file)
@@ -14,7 +14,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>2.0.2</version>
+        <version>2.0.4</version>
         <relativePath/>
     </parent>
 
index 810acef73eba6a63bd7fd61aceb2c52c9a566237..f681e0ab06b65069a0ad7110d59decd25061dbc1 100644 (file)
@@ -14,7 +14,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>2.0.2</version>
+        <version>2.0.4</version>
         <relativePath/>
     </parent>
 
index daccf536e0ec2c60030fa52da12f11dae41e583b..6844852ea016d4c961cb61191911e0396f3a2781 100644 (file)
@@ -14,7 +14,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>2.0.2</version>
+        <version>2.0.4</version>
         <relativePath/>
     </parent>
 
index cf437df0b0713e5d40325f6cb555d84532530f70..96deed1536a96241e771c312b8060f58a3bc37ab 100644 (file)
@@ -14,7 +14,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>2.0.2</version>
+        <version>2.0.4</version>
         <relativePath/>
     </parent>
 
index 01215b583f42d6d1be539b6aadee3943f6324e8b..961ce26fb01ccef1f1834621bea5a257c2e0c39d 100644 (file)
@@ -14,7 +14,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>2.0.2</version>
+        <version>2.0.4</version>
         <relativePath/>
     </parent>
 
index fdfd6dfcf73eb08b0210586d3738412bd0e6d155..042e004463e8b4946cd20ccec3b0aacdeb000629 100644 (file)
@@ -14,7 +14,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>2.0.2</version>
+        <version>2.0.4</version>
         <relativePath/>
     </parent>
 
index 9fdf10548f9d9147f0bd68ae1c7351b85065e23c..40322a3606836114465029c2555ad6005a491bb8 100644 (file)
@@ -14,7 +14,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>2.0.2</version>
+        <version>2.0.4</version>
         <relativePath/>
     </parent>
 
@@ -58,7 +58,7 @@
         <dependency>
             <groupId>org.opendaylight.odlparent</groupId>
             <artifactId>odl-netty-4</artifactId>
-            <version>2.0.2</version>
+            <version>2.0.4</version>
             <type>xml</type>
             <classifier>features</classifier>
         </dependency>
index 5320a3c77dce596591867628c9e3f4dfc0175edf..4800d9454e120f962888932bfa026f0c34d74eee 100644 (file)
@@ -14,7 +14,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>2.0.2</version>
+        <version>2.0.4</version>
         <relativePath/>
     </parent>
 
index 43df81aeed7c5f62739691b68bc0c3e3dde5fa1a..07acdfe46f161afd8a4cd88f77591d2bb7106e2f 100644 (file)
@@ -14,7 +14,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>2.0.2</version>
+        <version>2.0.4</version>
         <relativePath/>
     </parent>
 
index 7eb688a9a1ce7c1b7de6671038619c250baa9dd3..face5168b71d6d1bc67f493f3938fd7fbc7d7293 100644 (file)
@@ -14,7 +14,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>2.0.2</version>
+        <version>2.0.4</version>
         <relativePath/>
     </parent>
 
index 63b13139ef78e60b2f7b2a2508b9466aec180f30..8920c691a8a8effced277d0db09c9738f22309b0 100644 (file)
@@ -14,7 +14,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>2.0.2</version>
+        <version>2.0.4</version>
         <relativePath/>
     </parent>
 
index 6ec9dfc8709ff1825623fc4a6f4432efca116caf..ac20ff1216b0e412f5d98e348151230e9a8c2eee 100644 (file)
@@ -14,7 +14,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>2.0.2</version>
+        <version>2.0.4</version>
         <relativePath/>
     </parent>
 
index 49b9c5518504a3236e2ace7b5e6cdab3bd9fde0f..ea1f30a18c467aed8accd886cee6d6a638b24210 100644 (file)
@@ -11,7 +11,7 @@
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>odlparent-lite</artifactId>
-    <version>2.0.2</version>
+    <version>2.0.4</version>
     <relativePath/>
   </parent>
 
index 2372f0dfe0dbd41f304578f0d79b9aa06aec8c03..ecd59a43f6a645b348147fd51ca8503fdfd00334 100644 (file)
@@ -11,7 +11,7 @@
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>odlparent-lite</artifactId>
-    <version>2.0.2</version>
+    <version>2.0.4</version>
     <relativePath/>
   </parent>
 
index 0c829e52d078431d1cba851a56cc79dea6ac973c..18c56b94d0080c9117ec184544d05d817999864b 100644 (file)
@@ -14,7 +14,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>feature-repo-parent</artifactId>
-        <version>2.0.2</version>
+        <version>2.0.4</version>
         <relativePath/>
     </parent>
 
index d11a8b18509f35e7862669f5c8d15975101089b4..00144484a4e352a3279eaf63d8a9a5d196327ec1 100644 (file)
@@ -14,7 +14,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>2.0.2</version>
+        <version>2.0.4</version>
         <relativePath/>
     </parent>
 
index cac7eb20aa8193623363da037e744f6e07486604..b3c6979458c5489bf6a2d87edd7656e82e140644 100644 (file)
@@ -12,7 +12,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>2.0.2</version>
+        <version>2.0.4</version>
         <relativePath/>
     </parent>
 
index 6713d6097bc1c1fcfc26d799281f77e66167c6f8..7fed7a7bfcf115c9355e9cba2af5aee59028b562 100644 (file)
@@ -14,7 +14,7 @@
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>feature-repo-parent</artifactId>
-    <version>2.0.2</version>
+    <version>2.0.4</version>
     <relativePath/>
   </parent>
 
index aa616f9be4c0f2ca410fa953264f170b611744a0..987a634d7d0029662f16c462b4df6b683df0aed4 100644 (file)
@@ -14,7 +14,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>2.0.2</version>
+        <version>2.0.4</version>
         <relativePath/>
     </parent>
 
index a27347498b0974d3294c74bf7b78f2a0e6200b91..2b9d4290aefde29066b6cbe4b582cc0d64905c56 100644 (file)
@@ -14,7 +14,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>2.0.2</version>
+        <version>2.0.4</version>
         <relativePath/>
     </parent>
 
index 77cafa4ce4213468053fa0d1db4d7eb1791220b2..5386df222f807953ccf8f0117b98a9ebe27797b2 100644 (file)
@@ -14,7 +14,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>2.0.2</version>
+        <version>2.0.4</version>
         <relativePath/>
     </parent>
 
@@ -30,7 +30,7 @@
             <dependency>
                 <groupId>org.opendaylight.odlparent</groupId>
                 <artifactId>odlparent-artifacts</artifactId>
-                <version>2.0.2</version>
+                <version>2.0.4</version>
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
index 75918176adf5613d6017653a12468d5b23b2313b..cbf5b7b660d20fe4b54f172f0e22e071eedfc73f 100644 (file)
@@ -14,7 +14,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>2.0.2</version>
+        <version>2.0.4</version>
         <relativePath/>
     </parent>
 
index bbfe50adcc1455e537aa75db30dd8110db28d987..489d0fc63b4eae36db0ef30490075c312d503c2c 100644 (file)
@@ -12,7 +12,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>2.0.2</version>
+        <version>2.0.4</version>
         <relativePath/>
     </parent>
     <artifactId>features-restconf-aggregator</artifactId>
index a1ad5d16bd6fe2f681b10385be62ccf81f33a30b..3c65d3404de2918ae1adc53c3d8e10b63261ba97 100644 (file)
@@ -15,7 +15,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>feature-repo-parent</artifactId>
-        <version>2.0.2</version>
+        <version>2.0.4</version>
         <relativePath/>
     </parent>
 
index 8827e6879f112efb14169e2ff36970dd707cf089..beedb5b2e4822b75d5a6d5703132288f67fd4a14 100644 (file)
@@ -14,7 +14,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>2.0.2</version>
+        <version>2.0.4</version>
         <relativePath/>
     </parent>
 
index 05c6f0e4b93ee77ed267947edbcc520cfacf39c5..0432211d8380bc1f73d86e001a252fac912528ea 100644 (file)
@@ -11,7 +11,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>2.0.2</version>
+        <version>2.0.4</version>
         <relativePath/>
     </parent>
 
index fc61081e12544ed433705caa6bbbaba2e2dc386d..131ee7207b7a533031d5b639616f479f838bb121 100644 (file)
@@ -11,7 +11,7 @@
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>karaf4-parent</artifactId>
-    <version>2.0.2</version>
+    <version>2.0.4</version>
     <relativePath/>
   </parent>
   <groupId>org.opendaylight.netconf</groupId>
index e918c03e936aceb83f250602abb580c833676448..1805ae6db0485fa1ef4e3a0e74bc52f3bb3c707e 100644 (file)
@@ -12,7 +12,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>bundle-parent</artifactId>
-        <version>2.0.2</version>
+        <version>2.0.4</version>
         <relativePath/>
     </parent>
 
index 6a2eb71fa85eb06c9f7e198ac785fb5f4d228cea..13631d7e326199c702edabdf31fd7a7e3e0d40a3 100644 (file)
@@ -12,7 +12,7 @@
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>bundle-parent</artifactId>
-    <version>2.0.2</version>
+    <version>2.0.4</version>
     <relativePath/>
   </parent>
 
index e0c6983205298122fc4929b37a98ee85138ebd3c..9d3d1e60973821291ca3297f5304b877b49522a3 100644 (file)
@@ -12,7 +12,7 @@
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>bundle-parent</artifactId>
-    <version>2.0.2</version>
+    <version>2.0.4</version>
     <relativePath/>
   </parent>
 
index d4dc7373db19226a5f5727461e484cbe39131bd0..90fe82bd7acf2f193a0831a18add01200902b282 100644 (file)
@@ -12,7 +12,7 @@
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>bundle-parent</artifactId>
-    <version>2.0.2</version>
+    <version>2.0.4</version>
     <relativePath/>
   </parent>
 
index 506b8bf43c633d2ca592d23124920352c832363d..93e0dc9322903f93f220082e533856f327eb4409 100644 (file)
@@ -11,7 +11,7 @@
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>bundle-parent</artifactId>
-    <version>2.0.2</version>
+    <version>2.0.4</version>
     <relativePath/>
   </parent>
 
index 3aeba6412c451e4fdd01da656d7a171d79bab64d..09f9462cafae7119f78cf829c2c4699b79189328 100644 (file)
@@ -11,7 +11,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>bundle-parent</artifactId>
-        <version>2.0.2</version>
+        <version>2.0.4</version>
         <relativePath/>
     </parent>
 
index fa5f0f788bb021241d30ee36cfde5e3f7c227115..57f225d2a85f9df60e3e66e2e6c83e62550e8091 100644 (file)
@@ -12,7 +12,7 @@
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>bundle-parent</artifactId>
-    <version>2.0.2</version>
+    <version>2.0.4</version>
     <relativePath/>
   </parent>
 
index 27f11b40de48ee05829e332efc4423d11c9b85df..3b29c7dbb68c94783bebd1d97dec8e6eb6a278a5 100644 (file)
@@ -12,7 +12,7 @@
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>bundle-parent</artifactId>
-    <version>2.0.2</version>
+    <version>2.0.4</version>
     <relativePath/>
   </parent>
 
index ea96b7dd26d7bb8171aae20ebb5cecc58cc29f39..c8fdedacb7d7f4837eddda9fbdef54c440467afd 100644 (file)
@@ -12,7 +12,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>bundle-parent</artifactId>
-        <version>2.0.2</version>
+        <version>2.0.4</version>
         <relativePath/>
     </parent>
 
index 6750a90d5240d1a0c4e42d62eb65a6ec5dd07998..6668d3b37bfbd993f73d90dd6b7fa07481a671e9 100644 (file)
@@ -14,7 +14,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>bundle-parent</artifactId>
-        <version>2.0.2</version>
+        <version>2.0.4</version>
         <relativePath/>
     </parent>
 
index e301fb82d6d451a6eeba08c422573cf939eb2c3a..ec88c59c40331dc1ce4df1cd1be726eb756fca0e 100644 (file)
@@ -12,7 +12,7 @@
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>odlparent-lite</artifactId>
-    <version>2.0.2</version>
+    <version>2.0.4</version>
     <relativePath/>
   </parent>
 
index 74bbe3508d5a5c9d51f00495798bd2d343099b0b..2e98849368f84a96ce51096a9e5615cfce1e50ce 100644 (file)
@@ -12,7 +12,7 @@
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>bundle-parent</artifactId>
-    <version>2.0.2</version>
+    <version>2.0.4</version>
     <relativePath/>
   </parent>
 
index 02d9ae135098bd83cff9a46cfbc27c1d1e9adf9a..5495311a05b88ad5b2f1831f49fafba9f092632a 100644 (file)
@@ -14,7 +14,7 @@
     <parent>
       <groupId>org.opendaylight.odlparent</groupId>
       <artifactId>odlparent-lite</artifactId>
-      <version>2.0.2</version>
+      <version>2.0.4</version>
       <relativePath/>
     </parent>
 
index bbc5d0360e79bbe2af37a7c6ce487936c660feb9..e53bf3c2a0cbf94ed1f4e8f3ed40208f39c950b0 100644 (file)
@@ -12,7 +12,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>bundle-parent</artifactId>
-        <version>2.0.2</version>
+        <version>2.0.4</version>
         <relativePath/>
     </parent>
 
index 976097907be93727e9f01e33721fb3d1e1219624..4ec8002f96e2a8ea4c0f2387d375b63169dc21c1 100644 (file)
@@ -12,7 +12,7 @@
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>bundle-parent</artifactId>
-    <version>2.0.2</version>
+    <version>2.0.4</version>
     <relativePath/>
   </parent>
 
index ad15de2a2793294f5e6d27e401f19841c3fa0b4f..16538c6944f4e354ed71ee6b9e8a8a08db30f95a 100644 (file)
@@ -12,7 +12,7 @@
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>bundle-parent</artifactId>
-    <version>2.0.2</version>
+    <version>2.0.4</version>
     <relativePath/>
   </parent>
 
index d3be6f58912a94682c80c0ebe3fcbf4788608a9c..1e3f4c402b7e2cf077b5d31c8869c302c31347e9 100644 (file)
@@ -13,7 +13,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>bundle-parent</artifactId>
-        <version>2.0.2</version>
+        <version>2.0.4</version>
         <relativePath/>
     </parent>
 
index 4a5595c4cb666b72435ef984ca0c09bac450472e..17082aed1edac6611023dbd579966fb78a4cbd8d 100644 (file)
@@ -11,7 +11,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>bundle-parent</artifactId>
-    <version>2.0.2</version>
+    <version>2.0.4</version>
     <relativePath/>
   </parent>
 
index 35241b6bf40897053722be4509004e87d798df94..ba51631daab82bcf1a38e9c8dd176270d6e3cc5d 100644 (file)
@@ -12,7 +12,7 @@
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>bundle-parent</artifactId>
-    <version>2.0.2</version>
+    <version>2.0.4</version>
     <relativePath/>
   </parent>
 
index cbe00f7148b90e7a9c08fc16abb12e250c006ca4..7fae23ff719dd6c73c6ded2b90221e386e3d2a5a 100644 (file)
@@ -12,7 +12,7 @@
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>bundle-parent</artifactId>
-    <version>2.0.2</version>
+    <version>2.0.4</version>
     <relativePath/>
   </parent>
 
index c4ba5a0c7b00dce5a44f2b9d603b09e69fc30d5f..6c1b794633e2fc0172ded7026a2caccd61d8fa83 100644 (file)
@@ -12,7 +12,7 @@
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>bundle-parent</artifactId>
-    <version>2.0.2</version>
+    <version>2.0.4</version>
     <relativePath/>
   </parent>
 
index 44fa3c6fa6b8eadd8fc1b5478435c5989118103d..fd9a074d6426596f09f4d3a992b5f98c8d14b510 100644 (file)
@@ -12,7 +12,7 @@
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>bundle-parent</artifactId>
-    <version>2.0.2</version>
+    <version>2.0.4</version>
     <relativePath/>
   </parent>
 
index aef8fde9b211cb34c01a2cb3911c2fd4969ed4a5..76e231e11cc904f3c22cb0b4fcb5d49ed4ec11d1 100644 (file)
@@ -15,7 +15,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>bundle-parent</artifactId>
-        <version>2.0.2</version>
+        <version>2.0.4</version>
         <relativePath/>
     </parent>
 
index 50f8c40f607b8460cd13c000ebeac9230d413f2f..7b8fd99b59524109ebf2796d79e0a10eec602903 100644 (file)
@@ -14,7 +14,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>bundle-parent</artifactId>
-        <version>2.0.2</version>
+        <version>2.0.4</version>
         <relativePath/>
     </parent>
 
index 10cb64b162c1825c822f83c1551c341bfb96174d..51df925600dd6596dcff74ba256bb29363ac5917 100644 (file)
@@ -11,7 +11,7 @@
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>bundle-parent</artifactId>
-    <version>2.0.2</version>
+    <version>2.0.4</version>
     <relativePath/>
   </parent>
 
index b802e1c42f432c3f117b375ae6e6ef666c878ea8..fff2272295a1aa581e7c2aacfd69af0955528f74 100644 (file)
@@ -12,7 +12,7 @@
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>bundle-parent</artifactId>
-    <version>2.0.2</version>
+    <version>2.0.4</version>
     <relativePath/>
   </parent>
 
index 2f6d55f38d33e1df171659db37013dcf82512242..89823a005b344f208ad408c9d7dc99ddbeea6699 100644 (file)
@@ -14,7 +14,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>bundle-parent</artifactId>
-        <version>2.0.2</version>
+        <version>2.0.4</version>
         <relativePath/>
     </parent>
 
index 34dfc2d843254fa9d0b80f412bf2eda592aaec7d..86d6b5107d785f9463fa0bbcf159afc2ba55c0ac 100644 (file)
@@ -6,7 +6,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>bundle-parent</artifactId>
-        <version>2.0.2</version>
+        <version>2.0.4</version>
         <relativePath/>
     </parent>
 
index 85b6bb1fc5291744a02db9daf2cec1181cd69b18..eefdcfd45ce8e1808d973ab248193ec2a664c003 100644 (file)
@@ -12,7 +12,7 @@
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>bundle-parent</artifactId>
-    <version>2.0.2</version>
+    <version>2.0.4</version>
     <relativePath/>
   </parent>
 
index fe028cff3d64f567157a1fe8419f81f6910017e9..1a0e170259ae01acc8847b49e5214cd68804aaac 100644 (file)
@@ -13,7 +13,7 @@
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>odlparent-lite</artifactId>
-    <version>2.0.2</version>
+    <version>2.0.4</version>
     <relativePath/>
   </parent>
 
index e7ed9b517d9cd457d8e178eef358b622b13e8a9f..aa78aa28bdc0377c7381e35a06ec195d349fdcdb 100644 (file)
@@ -12,7 +12,7 @@
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>odlparent</artifactId>
-    <version>2.0.2</version>
+    <version>2.0.4</version>
     <relativePath/>
   </parent>
 
index 090b03cb8a6526ad77c5cd2f2d762053be95c078..fcff8d2b7a3988c039bd2d661d141334c5e6b927 100644 (file)
@@ -14,7 +14,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent</artifactId>
-        <version>2.0.2</version>
+        <version>2.0.4</version>
         <relativePath/>
     </parent>
 
index 2cc0aae07cf4ac464de4d33e2853874d19b2c35d..dc69529058989565e671a6f8421418403538e96d 100644 (file)
@@ -12,7 +12,7 @@
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>odlparent-lite</artifactId>
-    <version>2.0.2</version>
+    <version>2.0.4</version>
     <relativePath/>
   </parent>
 
diff --git a/pom.xml b/pom.xml
index 5bdade4d620cc363846920eecd4df04bff46b169..03c4e3ecb1f8ad914642f9637184ef325a87cb04 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -12,7 +12,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>2.0.2</version>
+        <version>2.0.4</version>
         <relativePath/>
     </parent>
 
index 5b2b68658b3adb3ab63487beb06d193bb3224e36..088cc6b075c442a824b3785812f2c278415ae90d 100644 (file)
@@ -7,7 +7,7 @@
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>bundle-parent</artifactId>
-    <version>2.0.2</version>
+    <version>2.0.4</version>
     <relativePath/>
   </parent>
 
index 6582e0d5c09b14c24ea985dbf250d0f39e04307d..1498d2c9634ab12994321116ada9bb84498ff884 100644 (file)
@@ -12,7 +12,7 @@
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>odlparent-lite</artifactId>
-    <version>2.0.2</version>
+    <version>2.0.4</version>
     <relativePath/>
   </parent>
 
index c32e2c870378a4dd16135bd253272e17d035fe19..d7edde7b4b073293af031d68a943e4588be94649 100644 (file)
@@ -12,7 +12,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>2.0.2</version>
+        <version>2.0.4</version>
         <relativePath/>
     </parent>
 
index d64b24c51af3ec3bc4039b1e92ec7ce8abd610f0..ae25ea029f376d7a16a706f7731ba95999f59acc 100644 (file)
@@ -15,7 +15,7 @@
     <parent>
       <groupId>org.opendaylight.odlparent</groupId>
       <artifactId>odlparent-lite</artifactId>
-      <version>2.0.2</version>
+      <version>2.0.4</version>
       <relativePath/>
     </parent>
 
index 4acba8b7491ce22e49402f81a7bb170a1ffaa970..a8a2db727e76b625f6771c3c050686f46aa7eadb 100644 (file)
@@ -12,7 +12,7 @@
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>odlparent-lite</artifactId>
-    <version>2.0.2</version>
+    <version>2.0.4</version>
     <relativePath/>
   </parent>
 
index 1aa79bce51f6c8187fb9de54dadd0c748b226ad4..21bc6d301d5d94a29e2dc4b378ab3098c83ae7b7 100644 (file)
@@ -39,6 +39,7 @@ import org.opendaylight.restconf.utils.RestconfConstants;
 import org.opendaylight.yangtools.util.xml.UntrustedXML;
 import org.opendaylight.yangtools.yang.common.QName;
 import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier;
+import org.opendaylight.yangtools.yang.data.api.schema.MapNode;
 import org.opendaylight.yangtools.yang.data.api.schema.NormalizedNode;
 import org.opendaylight.yangtools.yang.data.api.schema.stream.NormalizedNodeStreamWriter;
 import org.opendaylight.yangtools.yang.data.codec.xml.XmlParserStream;
@@ -157,7 +158,7 @@ public class XmlNormalizedNodeBodyReader extends AbstractIdentifierAwareJaxRsPro
                             docRootElm, scQName));
         }
 
-        final NormalizedNode<?, ?> parsed;
+        NormalizedNode<?, ?> parsed;
         final NormalizedNodeResult resultHolder = new NormalizedNodeResult();
         final NormalizedNodeStreamWriter writer = ImmutableNormalizedNodeStreamWriter.from(resultHolder);
 
@@ -167,6 +168,17 @@ public class XmlNormalizedNodeBodyReader extends AbstractIdentifierAwareJaxRsPro
                     schemaNode);
             xmlParser.traverse(new DOMSource(doc.getDocumentElement()));
             parsed = resultHolder.getResult();
+
+            // When parsing an XML source with a list root node
+            // the new XML parser always returns a MapNode with one MapEntryNode inside.
+            // However, the old XML parser returned a MapEntryNode directly in this place.
+            // Therefore we now have to extract the MapEntryNode from the parsed MapNode.
+            if (parsed instanceof MapNode) {
+                final MapNode mapNode = (MapNode) parsed;
+                // extracting the MapEntryNode
+                parsed = mapNode.getValue().iterator().next();
+            }
+
             if (schemaNode instanceof  ListSchemaNode && isPost()) {
                 iiToDataList.add(parsed.getIdentifier());
             }
index e5978bedd263f062a0d153d47531307a37fc04c8..ced6918fa9a7767e03737b5e3b41f57d9015696b 100644 (file)
@@ -34,6 +34,7 @@ import org.opendaylight.restconf.utils.RestconfConstants;
 import org.opendaylight.yangtools.util.xml.UntrustedXML;
 import org.opendaylight.yangtools.yang.common.QName;
 import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier;
+import org.opendaylight.yangtools.yang.data.api.schema.MapNode;
 import org.opendaylight.yangtools.yang.data.api.schema.NormalizedNode;
 import org.opendaylight.yangtools.yang.data.api.schema.stream.NormalizedNodeStreamWriter;
 import org.opendaylight.yangtools.yang.data.codec.xml.XmlParserStream;
@@ -122,7 +123,7 @@ public class XmlNormalizedNodeBodyReader extends AbstractNormalizedNodeBodyReade
                             docRootElm, scQName));
         }
 
-        final NormalizedNode<?, ?> parsed;
+        NormalizedNode<?, ?> parsed;
         final NormalizedNodeResult resultHolder = new NormalizedNodeResult();
         final NormalizedNodeStreamWriter writer = ImmutableNormalizedNodeStreamWriter.from(resultHolder);
 
@@ -132,6 +133,17 @@ public class XmlNormalizedNodeBodyReader extends AbstractNormalizedNodeBodyReade
                     schemaNode);
             xmlParser.traverse(new DOMSource(doc.getDocumentElement()));
             parsed = resultHolder.getResult();
+
+            // When parsing an XML source with a list root node
+            // the new XML parser always returns a MapNode with one MapEntryNode inside.
+            // However, the old XML parser returned a MapEntryNode directly in this place.
+            // Therefore we now have to extract the MapEntryNode from the parsed MapNode.
+            if (parsed instanceof MapNode) {
+                final MapNode mapNode = (MapNode) parsed;
+                // extracting the MapEntryNode
+                parsed = mapNode.getValue().iterator().next();
+            }
+
             if (schemaNode instanceof  ListSchemaNode && isPost()) {
                 iiToDataList.add(parsed.getIdentifier());
             }
index c1a9c567ca02711a4f8466bef0773c292162ff77..da4b89ecf0faa752186f43d139cdfa964778afab 100644 (file)
@@ -11,6 +11,7 @@ package org.opendaylight.controller.sal.rest.impl.test.providers;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
 
 import com.google.common.base.Optional;
 import com.google.common.collect.Sets;
@@ -35,6 +36,7 @@ import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier;
 import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.PathArgument;
 import org.opendaylight.yangtools.yang.data.api.schema.ContainerNode;
 import org.opendaylight.yangtools.yang.data.api.schema.DataContainerChild;
+import org.opendaylight.yangtools.yang.data.api.schema.MapEntryNode;
 import org.opendaylight.yangtools.yang.data.api.schema.NormalizedNodes;
 import org.opendaylight.yangtools.yang.model.api.DataNodeContainer;
 import org.opendaylight.yangtools.yang.model.api.DataSchemaNode;
@@ -71,10 +73,45 @@ public class TestXmlBodyReader extends AbstractBodyReaderTest {
     public static void initialization() throws Exception {
         final Collection<File> testFiles = TestRestconfUtils.loadFiles("/instanceidentifier/yang");
         testFiles.addAll(TestRestconfUtils.loadFiles("/invoke-rpc"));
+        testFiles.addAll(TestRestconfUtils.loadFiles("/foo-xml-test/yang"));
         schemaContext = YangParserTestUtils.parseYangSources(testFiles);
         CONTROLLER_CONTEXT.setSchemas(schemaContext);
     }
 
+    @Test
+    public void putXmlTest() throws Exception {
+        runXmlTest(false, "foo:top-level-list/key-value");
+    }
+
+    @Test
+    public void postXmlTest() throws Exception {
+        runXmlTest(true, "");
+    }
+
+    private void runXmlTest(final boolean isPost, final String path) throws Exception {
+        mockBodyReader(path, xmlBodyReader, isPost);
+        final InputStream inputStream = TestXmlBodyReader.class.getResourceAsStream("/foo-xml-test/foo.xml");
+        final NormalizedNodeContext nnc = xmlBodyReader.readFrom(null, null, null, mediaType, null, inputStream);
+        assertNotNull(nnc);
+
+        assertTrue(nnc.getData() instanceof MapEntryNode);
+        final MapEntryNode data = (MapEntryNode) nnc.getData();
+        assertTrue(data.getValue().size() == 2);
+        for (final DataContainerChild<? extends PathArgument, ?> child : data.getValue()) {
+            switch (child.getNodeType().getLocalName()) {
+                case "key-leaf":
+                    assertEquals("key-value", child.getValue());
+                    break;
+
+                case "ordinary-leaf":
+                    assertEquals("leaf-value", child.getValue());
+                    break;
+                default:
+                    fail();
+            }
+        }
+    }
+
     @Test
     public void moduleDataTest() throws Exception {
         final DataSchemaNode dataSchemaNode =
index d35c17e861bfc1aa980df5857a95aade48d05622..0f9c4dca0ee9ebad258e54a0a8a2c2916df0663d 100644 (file)
@@ -10,6 +10,8 @@ package org.opendaylight.restconf.jersey.providers;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 
@@ -33,6 +35,9 @@ import org.opendaylight.yangtools.yang.common.QName;
 import org.opendaylight.yangtools.yang.common.QNameModule;
 import org.opendaylight.yangtools.yang.common.SimpleDateFormatUtil;
 import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier;
+import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.PathArgument;
+import org.opendaylight.yangtools.yang.data.api.schema.DataContainerChild;
+import org.opendaylight.yangtools.yang.data.api.schema.MapEntryNode;
 import org.opendaylight.yangtools.yang.data.api.schema.NormalizedNodes;
 import org.opendaylight.yangtools.yang.model.api.DataNodeContainer;
 import org.opendaylight.yangtools.yang.model.api.DataSchemaNode;
@@ -69,11 +74,46 @@ public class XmlBodyReaderTest extends AbstractBodyReaderTest {
     public static void initialization() throws Exception {
         final Collection<File> testFiles = TestRestconfUtils.loadFiles("/instanceidentifier/yang");
         testFiles.addAll(TestRestconfUtils.loadFiles("/modules"));
+        testFiles.addAll(TestRestconfUtils.loadFiles("/foo-xml-test/yang"));
         schemaContext = YangParserTestUtils.parseYangSources(testFiles);
         CONTROLLER_CONTEXT.setSchemas(schemaContext);
         when(MOUNT_POINT_SERVICE_HANDLER.get()).thenReturn(mock(DOMMountPointService.class));
     }
 
+    @Test
+    public void putXmlTest() throws Exception {
+        runXmlTest(false, "foo:top-level-list=key-value");
+    }
+
+    @Test
+    public void postXmlTest() throws Exception {
+        runXmlTest(true, "");
+    }
+
+    private void runXmlTest(final boolean isPost, final String path) throws Exception {
+        mockBodyReader(path, xmlBodyReader, isPost);
+        final InputStream inputStream = TestXmlBodyReader.class.getResourceAsStream("/foo-xml-test/foo.xml");
+        final NormalizedNodeContext nnc = xmlBodyReader.readFrom(null, null, null, mediaType, null, inputStream);
+        assertNotNull(nnc);
+
+        assertTrue(nnc.getData() instanceof MapEntryNode);
+        final MapEntryNode data = (MapEntryNode) nnc.getData();
+        assertTrue(data.getValue().size() == 2);
+        for (final DataContainerChild<? extends PathArgument, ?> child : data.getValue()) {
+            switch (child.getNodeType().getLocalName()) {
+                case "key-leaf":
+                    assertEquals("key-value", child.getValue());
+                    break;
+
+                case "ordinary-leaf":
+                    assertEquals("leaf-value", child.getValue());
+                    break;
+                default:
+                    fail();
+            }
+        }
+    }
+
     @Test
     public void moduleDataTest() throws Exception {
         final DataSchemaNode dataSchemaNode = schemaContext
diff --git a/restconf/sal-rest-connector/src/test/resources/foo-xml-test/foo.xml b/restconf/sal-rest-connector/src/test/resources/foo-xml-test/foo.xml
new file mode 100644 (file)
index 0000000..96b69c4
--- /dev/null
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>\r
+<top-level-list xmlns="foo">\r
+    <key-leaf>key-value</key-leaf>\r
+    <ordinary-leaf>leaf-value</ordinary-leaf>\r
+</top-level-list>
\ No newline at end of file
diff --git a/restconf/sal-rest-connector/src/test/resources/foo-xml-test/yang/foo.yang b/restconf/sal-rest-connector/src/test/resources/foo-xml-test/yang/foo.yang
new file mode 100644 (file)
index 0000000..ceed3d9
--- /dev/null
@@ -0,0 +1,18 @@
+module foo {\r
+    namespace foo;\r
+    prefix foo;\r
+\r
+    revision 2017-08-09;\r
+\r
+    list top-level-list {\r
+        key key-leaf;\r
+\r
+        leaf key-leaf {\r
+            type string;\r
+        }\r
+\r
+        leaf ordinary-leaf {\r
+            type string;\r
+        }\r
+    }\r
+}
\ No newline at end of file
index 0bd0fdd73fa313bf7c5aa43591887232131c483e..3d77b0ec97cbf4bb667c179fe388df6bbf6dfb5b 100644 (file)
@@ -12,7 +12,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent</artifactId>
-        <version>2.0.2</version>
+        <version>2.0.4</version>
         <relativePath/>
     </parent>
 
index 74734fe652a15d9890230b429439cf00a85a8dad..717dbdc0ec2456af942dc69462659e68c004e7eb 100644 (file)
@@ -11,7 +11,7 @@
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>bundle-parent</artifactId>
-    <version>2.0.2</version>
+    <version>2.0.4</version>
     <relativePath/>
   </parent>