Fix XmlPatchBodyReader revision handling

There is a nullness bug around the conversions through string and
calling Revision.of(). Our current interfaces allow us to do better,
with fewer objects.

Change-Id: I68163b7b8766e6063a27d280bae9c049a675ac76
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
(cherry picked from commit c75fc716f8c60dfdf267d078df66346c95dae7a4)

diff --git a/restconf/restconf-nb-rfc8040/src/main/java/org/opendaylight/restconf/nb/rfc8040/jersey/providers/patch/XmlToPatchBodyReader.java b/restconf/restconf-nb-rfc8040/src/main/java/org/opendaylight/restconf/nb/rfc8040/jersey/providers/patch/XmlToPatchBodyReader.java
index 4b3a60440d6830f58dfb1755c9613e364657e98f..95a78badb8d30e802be09379c55d7d9e0afb11bc 100644 (file)
--- a/restconf/restconf-nb-rfc8040/src/main/java/org/opendaylight/restconf/nb/rfc8040/jersey/providers/patch/XmlToPatchBodyReader.java
+++ b/restconf/restconf-nb-rfc8040/src/main/java/org/opendaylight/restconf/nb/rfc8040/jersey/providers/patch/XmlToPatchBodyReader.java
@@ -24,6 +24,7 @@ import javax.xml.parsers.ParserConfigurationException;
 import javax.xml.stream.XMLStreamException;
 import javax.xml.transform.dom.DOMSource;
 import org.eclipse.jdt.annotation.NonNull;
+import org.eclipse.jdt.annotation.Nullable;
 import org.opendaylight.restconf.common.context.InstanceIdentifierContext;
 import org.opendaylight.restconf.common.errors.RestconfDocumentedException;
 import org.opendaylight.restconf.common.errors.RestconfError.ErrorTag;
@@ -117,12 +118,11 @@ public class XmlToPatchBodyReader extends AbstractToPatchBodyReader {
                 targetNode = pathContext.getSchemaContext();
             } else {
                 // get namespace according to schema node from path context or value
-                final String namespace = firstValueElement == null
-                        ? schemaNode.getQName().getNamespace().toString() : firstValueElement.getNamespaceURI();
+                final URI namespace = firstValueElement == null ? schemaNode.getQName().getNamespace()
+                    : URI.create(firstValueElement.getNamespaceURI());
 
                 // find module according to namespace
-                final Module module = pathContext.getSchemaContext().findModules(URI.create(namespace)).iterator()
-                    .next();
+                final Module module = pathContext.getSchemaContext().findModules(namespace).iterator().next();
 
                 // initialize codec + set default prefix derived from module name
                 final StringModuleInstanceIdentifierCodec codec = new StringModuleInstanceIdentifierCodec(
@@ -130,8 +130,7 @@ public class XmlToPatchBodyReader extends AbstractToPatchBodyReader {
 
                 targetII = codec.deserialize(codec.serialize(pathContext.getInstanceIdentifier())
                         .concat(prepareNonCondXpath(schemaNode, target.replaceFirst("/", ""), firstValueElement,
-                                namespace,
-                                module.getQNameModule().getRevision().map(Revision::toString).orElse(null))));
+                                namespace, module.getQNameModule().getRevision().orElse(null))));
 
                 targetNode = SchemaContextUtil.findDataSchemaNode(pathContext.getSchemaContext(),
                         codec.getDataContextTree().findChild(targetII).orElseThrow().getDataSchemaNode()
@@ -222,7 +221,7 @@ public class XmlToPatchBodyReader extends AbstractToPatchBodyReader {
      * @return Non-conditional XPath
      */
     private static String prepareNonCondXpath(final @NonNull DataSchemaNode schemaNode, final @NonNull String target,
-            final @NonNull Element value, final @NonNull String namespace, final @NonNull String revision) {
+            final @NonNull Element value, final @NonNull URI namespace, final @Nullable Revision revision) {
         final Iterator<String> args = SLASH_SPLITTER.split(target.substring(target.indexOf(':') + 1)).iterator();
 
         final StringBuilder nonCondXpath = new StringBuilder();