Bug 7906: Fixed json parsing on patch request

Currently lists with simple objects (string, int, etc.) are not
supported in the patch request. This commit adds support for that.

Change-Id: I4310a683aa42271b914c5dd8c3349bb2bac9e971
Signed-off-by: David Goldberg <gdavid@hpe.com>

diff --git a/restconf/sal-rest-connector/src/main/java/org/opendaylight/netconf/sal/rest/impl/JsonToPATCHBodyReader.java b/restconf/sal-rest-connector/src/main/java/org/opendaylight/netconf/sal/rest/impl/JsonToPATCHBodyReader.java
index 806cd0ea8deb17e503996c88ba7ab30ee31bb792..208ccad1a604ce4484c5d1b956dc5c0bb4fd449f 100644 (file)
--- a/restconf/sal-rest-connector/src/main/java/org/opendaylight/netconf/sal/rest/impl/JsonToPATCHBodyReader.java
+++ b/restconf/sal-rest-connector/src/main/java/org/opendaylight/netconf/sal/rest/impl/JsonToPATCHBodyReader.java
@@ -273,7 +273,11 @@ public class JsonToPATCHBodyReader extends AbstractIdentifierAwareJaxRsProvider
             value.append("[");
 
             while (in.hasNext()) {
-                readValueObject(value, in);
+                if (in.peek() == JsonToken.STRING) {
+                    value.append("\"" + in.nextString() + "\"");
+                } else {
+                    readValueObject(value, in);
+                }
                 if (in.peek() != JsonToken.END_ARRAY) {
                     value.append(",");
                 }
@@ -317,7 +321,11 @@ public class JsonToPATCHBodyReader extends AbstractIdentifierAwareJaxRsProvider
                     value.append("[");
 
                     while (in.hasNext()) {
-                        readValueObject(value, in);
+                        if (in.peek() == JsonToken.STRING) {
+                            value.append("\"" + in.nextString() + "\"");
+                        } else {
+                            readValueObject(value, in);
+                        }
                         if (in.peek() != JsonToken.END_ARRAY) {
                             value.append(",");
                         }

diff --git a/restconf/sal-rest-connector/src/main/java/org/opendaylight/restconf/jersey/providers/JsonToPATCHBodyReader.java b/restconf/sal-rest-connector/src/main/java/org/opendaylight/restconf/jersey/providers/JsonToPATCHBodyReader.java
index 2d4c860abb75336d012c43f16de8341bc669a712..a7dd12bacd491d24ef9673ff021b4622f4d7afac 100644 (file)
--- a/restconf/sal-rest-connector/src/main/java/org/opendaylight/restconf/jersey/providers/JsonToPATCHBodyReader.java
+++ b/restconf/sal-rest-connector/src/main/java/org/opendaylight/restconf/jersey/providers/JsonToPATCHBodyReader.java
@@ -268,7 +268,11 @@ public class JsonToPATCHBodyReader extends AbstractIdentifierAwareJaxRsProvider
             value.append("[");
 
             while (in.hasNext()) {
-                readValueObject(value, in);
+                if (in.peek() == JsonToken.STRING) {
+                    value.append("\"" + in.nextString() + "\"");
+                } else {
+                    readValueObject(value, in);
+                }
                 if (in.peek() != JsonToken.END_ARRAY) {
                     value.append(",");
                 }
@@ -312,7 +316,11 @@ public class JsonToPATCHBodyReader extends AbstractIdentifierAwareJaxRsProvider
                     value.append("[");
 
                     while (in.hasNext()) {
-                        readValueObject(value, in);
+                        if (in.peek() == JsonToken.STRING) {
+                            value.append("\"" + in.nextString() + "\"");
+                        } else {
+                            readValueObject(value, in);
+                        }
                         if (in.peek() != JsonToken.END_ARRAY) {
                             value.append(",");
                         }
@@ -355,7 +363,7 @@ public class JsonToPATCHBodyReader extends AbstractIdentifierAwareJaxRsProvider
      */
     private PATCHEntity prepareEditOperation(@Nonnull final PatchEdit edit) {
         if (edit.getOperation() != null && edit.getTargetSchemaNode() != null
-                && checkDataPresence(edit.getOperation(), (edit.getData() != null))) {
+                && checkDataPresence(edit.getOperation(), edit.getData() != null)) {
             if (isPatchOperationWithValue(edit.getOperation())) {
                 // for lists allow to manipulate with list items through their parent
                 final YangInstanceIdentifier targetNode;

diff --git a/restconf/sal-rest-connector/src/test/resources/instanceidentifier/json/jsonPATCHdata.json b/restconf/sal-rest-connector/src/test/resources/instanceidentifier/json/jsonPATCHdata.json
index e254502ff8e73831bc56f5e2cc811221f794a5ca..e027a7667283685ff9f4d020c38da0ccbb326179 100644 (file)
--- a/restconf/sal-rest-connector/src/test/resources/instanceidentifier/json/jsonPATCHdata.json
+++ b/restconf/sal-rest-connector/src/test/resources/instanceidentifier/json/jsonPATCHdata.json
@@ -25,10 +25,11 @@
           "my-list2": {
             "name": "my-leaf20",
             "my-leaf21": "I am leaf21-1",
-            "my-leaf22": "I am leaf22-1"
+            "my-leaf22": "I am leaf22-1",
+            "my-leaf-list": ["listelement"]
           }
         }
       }
     ]
   }
-}
\ No newline at end of file
+}

diff --git a/restconf/sal-rest-connector/src/test/resources/instanceidentifier/yang/instance-identifier-patch-module.yang b/restconf/sal-rest-connector/src/test/resources/instanceidentifier/yang/instance-identifier-patch-module.yang
index 11b4684da1ef68bcfb7ae0e8c73a8526d36e9f9f..02c1c2eaaaa3f282b39437ba652f904c1ecfeb25 100644 (file)
--- a/restconf/sal-rest-connector/src/test/resources/instanceidentifier/yang/instance-identifier-patch-module.yang
+++ b/restconf/sal-rest-connector/src/test/resources/instanceidentifier/yang/instance-identifier-patch-module.yang
@@ -38,7 +38,10 @@ module instance-identifier-patch-module {
             leaf my-leaf22 {
                 type string;
             }
+            leaf-list my-leaf-list {
+                type string;
+            }
         }
     }
   }
-}
\ No newline at end of file
+}