BUG 2412 - restconf @POST createConfigurationData method migration

[controller.git] / opendaylight / md-sal / sal-rest-connector / src / main / java / org / opendaylight / controller / sal / restconf / impl / RestconfImpl.java

diff --git a/opendaylight/md-sal/sal-rest-connector/src/main/java/org/opendaylight/controller/sal/restconf/impl/RestconfImpl.java b/opendaylight/md-sal/sal-rest-connector/src/main/java/org/opendaylight/controller/sal/restconf/impl/RestconfImpl.java
index 4023412640cb3eb6e547085c06b37b541e487f10..8fb2ea7ea72488d344a8a380544e9b6abbcf4c51 100644 (file)
--- a/opendaylight/md-sal/sal-rest-connector/src/main/java/org/opendaylight/controller/sal/restconf/impl/RestconfImpl.java
+++ b/opendaylight/md-sal/sal-rest-connector/src/main/java/org/opendaylight/controller/sal/restconf/impl/RestconfImpl.java
@@ -1015,65 +1015,30 @@ public class RestconfImpl implements RestconfService {
     }
 
     @Override
-    public Response createConfigurationData(final String identifier, final Node<?> payload, final UriInfo uriInfo) {
+    public Response createConfigurationData(final String identifier, final NormalizedNodeContext payload, final UriInfo uriInfo) {
         if (payload == null) {
             throw new RestconfDocumentedException("Input is required.", ErrorType.PROTOCOL, ErrorTag.MALFORMED_MESSAGE);
         }
 
-        final URI payloadNS = namespace(payload);
+        final URI payloadNS = payload.getData().getNodeType().getNamespace();
         if (payloadNS == null) {
             throw new RestconfDocumentedException(
                     "Data has bad format. Root element node must have namespace (XML format) or module name(JSON format)",
                     ErrorType.PROTOCOL, ErrorTag.UNKNOWN_NAMESPACE);
         }
 
-        InstanceIdentifierContext iiWithData = null;
-        CompositeNode value = null;
-        if (representsMountPointRootData(payload)) {
-            // payload represents mount point data and URI represents path to the mount point
-
-            if (endsWithMountPoint(identifier)) {
-                throw new RestconfDocumentedException("URI has bad format. URI should be without \""
-                        + ControllerContext.MOUNT + "\" for POST operation.", ErrorType.PROTOCOL,
-                        ErrorTag.INVALID_VALUE);
-            }
-
-            final String completeIdentifier = addMountPointIdentifier(identifier);
-            iiWithData = controllerContext.toInstanceIdentifier(completeIdentifier);
-
-            value = this.normalizeNode(payload, iiWithData.getSchemaNode(), iiWithData.getMountPoint());
-        } else {
-            final InstanceIdentifierContext incompleteInstIdWithData = controllerContext
-                    .toInstanceIdentifier(identifier);
-            final DataNodeContainer parentSchema = (DataNodeContainer) incompleteInstIdWithData.getSchemaNode();
-            final DOMMountPoint mountPoint = incompleteInstIdWithData.getMountPoint();
-            final Module module = findModule(mountPoint, payload);
-            if (module == null) {
-                throw new RestconfDocumentedException("Module was not found for \"" + payloadNS + "\"",
-                        ErrorType.PROTOCOL, ErrorTag.UNKNOWN_ELEMENT);
-            }
-
-            final String payloadName = getName(payload);
-            final DataSchemaNode schemaNode = ControllerContext.findInstanceDataChildByNameAndNamespace(
-                    parentSchema, payloadName, module.getNamespace());
-            value = this.normalizeNode(payload, schemaNode, mountPoint);
+        final DOMMountPoint mountPoint = payload.getInstanceIdentifierContext().getMountPoint();
 
-            iiWithData = addLastIdentifierFromData(incompleteInstIdWithData, value, schemaNode,incompleteInstIdWithData.getSchemaContext());
-        }
-
-        final NormalizedNode<?, ?> datastoreNormalizedData = compositeNodeToDatastoreNormalizedNode(value,
-                iiWithData.getSchemaNode());
-        final DOMMountPoint mountPoint = iiWithData.getMountPoint();
-        YangInstanceIdentifier normalizedII;
+        final InstanceIdentifierContext iiWithData = mountPoint != null
+                ? controllerContext.toMountPointIdentifier(identifier)
+                : controllerContext.toInstanceIdentifier(identifier);
+        final YangInstanceIdentifier normalizedII = iiWithData.getInstanceIdentifier();
 
         try {
             if (mountPoint != null) {
-                normalizedII = new DataNormalizer(mountPoint.getSchemaContext()).toNormalized(iiWithData
-                        .getInstanceIdentifier());
-                broker.commitConfigurationDataPost(mountPoint, normalizedII, datastoreNormalizedData);
+                broker.commitConfigurationDataPost(mountPoint, normalizedII, payload.getData());
             } else {
-                normalizedII = controllerContext.toNormalized(iiWithData.getInstanceIdentifier());
-                broker.commitConfigurationDataPost(normalizedII, datastoreNormalizedData);
+                broker.commitConfigurationDataPost(normalizedII, payload.getData());
             }
         } catch(final RestconfDocumentedException e) {
             throw e;