X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=controller.git;a=blobdiff_plain;f=opendaylight%2Fmd-sal%2Fsal-rest-connector%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Fcontroller%2Fsal%2Frestconf%2Fimpl%2FControllerContext.java;h=e3beaa2287d01f5734b50a467b4e5cdd47cfcf6f;hp=91e24541994487089be96a7ce3586d09320c4a32;hb=e631dc96f0461b2270377dc072b9f969a875667a;hpb=b268243d7b907ea36f15e2baf6b50e44789797d8 diff --git a/opendaylight/md-sal/sal-rest-connector/src/main/java/org/opendaylight/controller/sal/restconf/impl/ControllerContext.java b/opendaylight/md-sal/sal-rest-connector/src/main/java/org/opendaylight/controller/sal/restconf/impl/ControllerContext.java index 91e2454199..e3beaa2287 100644 --- a/opendaylight/md-sal/sal-rest-connector/src/main/java/org/opendaylight/controller/sal/restconf/impl/ControllerContext.java +++ b/opendaylight/md-sal/sal-rest-connector/src/main/java/org/opendaylight/controller/sal/restconf/impl/ControllerContext.java @@ -9,15 +9,13 @@ package org.opendaylight.controller.sal.restconf.impl; import com.google.common.base.Function; import com.google.common.base.Objects; +import com.google.common.base.Optional; import com.google.common.base.Preconditions; import com.google.common.base.Predicate; import com.google.common.base.Splitter; import com.google.common.base.Strings; -import com.google.common.collect.BiMap; -import com.google.common.collect.HashBiMap; import com.google.common.collect.ImmutableMap; import com.google.common.collect.Iterables; - import java.io.UnsupportedEncodingException; import java.net.URI; import java.net.URLDecoder; @@ -31,11 +29,12 @@ import java.util.List; import java.util.Map; import java.util.Set; import java.util.concurrent.atomic.AtomicReference; - import javax.ws.rs.core.Response.Status; - -import org.opendaylight.controller.sal.core.api.mount.MountInstance; -import org.opendaylight.controller.sal.core.api.mount.MountService; +import org.opendaylight.controller.md.sal.common.impl.util.compat.DataNormalizationException; +import org.opendaylight.controller.md.sal.common.impl.util.compat.DataNormalizationOperation; +import org.opendaylight.controller.md.sal.common.impl.util.compat.DataNormalizer; +import org.opendaylight.controller.md.sal.dom.api.DOMMountPoint; +import org.opendaylight.controller.md.sal.dom.api.DOMMountPointService; import org.opendaylight.controller.sal.rest.api.Draft02; import org.opendaylight.controller.sal.rest.impl.RestUtil; import org.opendaylight.controller.sal.restconf.impl.RestconfError.ErrorTag; @@ -43,13 +42,14 @@ import org.opendaylight.controller.sal.restconf.impl.RestconfError.ErrorType; import org.opendaylight.yangtools.concepts.Codec; import org.opendaylight.yangtools.yang.common.QName; import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier; +import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.AugmentationIdentifier; import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.InstanceIdentifierBuilder; import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.NodeIdentifier; import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.NodeIdentifierWithPredicates; import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.PathArgument; import org.opendaylight.yangtools.yang.model.api.AnyXmlSchemaNode; import org.opendaylight.yangtools.yang.model.api.ChoiceCaseNode; -import org.opendaylight.yangtools.yang.model.api.ChoiceNode; +import org.opendaylight.yangtools.yang.model.api.ChoiceSchemaNode; import org.opendaylight.yangtools.yang.model.api.ContainerSchemaNode; import org.opendaylight.yangtools.yang.model.api.DataNodeContainer; import org.opendaylight.yangtools.yang.model.api.DataSchemaNode; @@ -83,21 +83,22 @@ public class ControllerContext implements SchemaContextListener { private static final Splitter SLASH_SPLITTER = Splitter.on('/'); - private final BiMap uriToModuleName = HashBiMap. create(); - - private final Map moduleNameToUri = uriToModuleName.inverse(); + private static final YangInstanceIdentifier ROOT = YangInstanceIdentifier.builder().build(); private final AtomicReference> qnameToRpc = new AtomicReference<>(Collections.emptyMap()); private volatile SchemaContext globalSchema; - private volatile MountService mountService; + private volatile DOMMountPointService mountService; + + private DataNormalizer dataNormalizer; public void setGlobalSchema(final SchemaContext globalSchema) { this.globalSchema = globalSchema; + dataNormalizer = new DataNormalizer(globalSchema); } - public void setMountService(final MountService mountService) { + public void setMountService(final DOMMountPointService mountService) { this.mountService = mountService; } @@ -115,19 +116,27 @@ public class ControllerContext implements SchemaContextListener { } public void setSchemas(final SchemaContext schemas) { - this.onGlobalContextUpdated(schemas); + onGlobalContextUpdated(schemas); } - public InstanceIdWithSchemaNode toInstanceIdentifier(final String restconfInstance) { - return this.toIdentifier(restconfInstance, false); + public InstanceIdentifierContext toInstanceIdentifier(final String restconfInstance) { + return toIdentifier(restconfInstance, false); } - public InstanceIdWithSchemaNode toMountPointIdentifier(final String restconfInstance) { - return this.toIdentifier(restconfInstance, true); + public SchemaContext getGlobalSchema() { + return globalSchema; } - private InstanceIdWithSchemaNode toIdentifier(final String restconfInstance, final boolean toMountPointIdentifier) { - this.checkPreconditions(); + public InstanceIdentifierContext toMountPointIdentifier(final String restconfInstance) { + return toIdentifier(restconfInstance, true); + } + + private InstanceIdentifierContext toIdentifier(final String restconfInstance, final boolean toMountPointIdentifier) { + checkPreconditions(); + + if(restconfInstance == null) { + return new InstanceIdentifierContext<>(ROOT, globalSchema, null, globalSchema); + } final List pathArgs = urlPathArgsDecode(SLASH_SPLITTER.split(restconfInstance)); omitFirstAndLastEmptyString(pathArgs); @@ -135,16 +144,16 @@ public class ControllerContext implements SchemaContextListener { return null; } - String first = pathArgs.iterator().next(); + final String first = pathArgs.iterator().next(); final String startModule = ControllerContext.toModuleName(first); if (startModule == null) { throw new RestconfDocumentedException("First node in URI has to be in format \"moduleName:nodeName\"", ErrorType.PROTOCOL, ErrorTag.INVALID_VALUE); } - InstanceIdentifierBuilder builder = YangInstanceIdentifier.builder(); - Module latestModule = globalSchema.findModuleByName(startModule, null); - InstanceIdWithSchemaNode iiWithSchemaNode = this.collectPathArguments(builder, pathArgs, latestModule, null, + final InstanceIdentifierBuilder builder = YangInstanceIdentifier.builder(); + final Module latestModule = globalSchema.findModuleByName(startModule, null); + final InstanceIdentifierContext iiWithSchemaNode = collectPathArguments(builder, pathArgs, latestModule, null, toMountPointIdentifier); if (iiWithSchemaNode == null) { @@ -159,7 +168,7 @@ public class ControllerContext implements SchemaContextListener { return list; } - String head = list.iterator().next(); + final String head = list.iterator().next(); if (head.isEmpty()) { list.remove(0); } @@ -168,7 +177,7 @@ public class ControllerContext implements SchemaContextListener { return list; } - String last = list.get(list.size() - 1); + final String last = list.get(list.size() - 1); if (last.isEmpty()) { list.remove(list.size() - 1); } @@ -176,12 +185,12 @@ public class ControllerContext implements SchemaContextListener { return list; } public Module findModuleByName(final String moduleName) { - this.checkPreconditions(); + checkPreconditions(); Preconditions.checkArgument(moduleName != null && !moduleName.isEmpty()); return globalSchema.findModuleByName(moduleName, null); } - public Module findModuleByName(final MountInstance mountPoint, final String moduleName) { + public Module findModuleByName(final DOMMountPoint mountPoint, final String moduleName) { Preconditions.checkArgument(moduleName != null && mountPoint != null); final SchemaContext mountPointSchema = mountPoint.getSchemaContext(); @@ -193,12 +202,12 @@ public class ControllerContext implements SchemaContextListener { } public Module findModuleByNamespace(final URI namespace) { - this.checkPreconditions(); + checkPreconditions(); Preconditions.checkArgument(namespace != null); return globalSchema.findModuleByNamespaceAndRevision(namespace, null); } - public Module findModuleByNamespace(final MountInstance mountPoint, final URI namespace) { + public Module findModuleByNamespace(final DOMMountPoint mountPoint, final URI namespace) { Preconditions.checkArgument(namespace != null && mountPoint != null); final SchemaContext mountPointSchema = mountPoint.getSchemaContext(); @@ -210,33 +219,33 @@ public class ControllerContext implements SchemaContextListener { } public Module findModuleByNameAndRevision(final QName module) { - this.checkPreconditions(); + checkPreconditions(); Preconditions.checkArgument(module != null && module.getLocalName() != null && module.getRevision() != null); return globalSchema.findModuleByName(module.getLocalName(), module.getRevision()); } - public Module findModuleByNameAndRevision(final MountInstance mountPoint, final QName module) { - this.checkPreconditions(); + public Module findModuleByNameAndRevision(final DOMMountPoint mountPoint, final QName module) { + checkPreconditions(); Preconditions.checkArgument(module != null && module.getLocalName() != null && module.getRevision() != null && mountPoint != null); - SchemaContext schemaContext = mountPoint.getSchemaContext(); + final SchemaContext schemaContext = mountPoint.getSchemaContext(); return schemaContext == null ? null : schemaContext.findModuleByName(module.getLocalName(), module.getRevision()); } public DataNodeContainer getDataNodeContainerFor(final YangInstanceIdentifier path) { - this.checkPreconditions(); + checkPreconditions(); final Iterable elements = path.getPathArguments(); - PathArgument head = elements.iterator().next(); + final PathArgument head = elements.iterator().next(); final QName startQName = head.getNodeType(); final Module initialModule = globalSchema.findModuleByNamespaceAndRevision(startQName.getNamespace(), startQName.getRevision()); DataNodeContainer node = initialModule; for (final PathArgument element : elements) { - QName _nodeType = element.getNodeType(); + final QName _nodeType = element.getNodeType(); final DataSchemaNode potentialNode = ControllerContext.childByQName(node, _nodeType); if (potentialNode == null || !ControllerContext.isListOrContainer(potentialNode)) { return null; @@ -247,119 +256,102 @@ public class ControllerContext implements SchemaContextListener { return node; } - public String toFullRestconfIdentifier(final YangInstanceIdentifier path) { - this.checkPreconditions(); + public String toFullRestconfIdentifier(final YangInstanceIdentifier path, final DOMMountPoint mount) { + checkPreconditions(); final Iterable elements = path.getPathArguments(); final StringBuilder builder = new StringBuilder(); - PathArgument head = elements.iterator().next(); + final PathArgument head = elements.iterator().next(); final QName startQName = head.getNodeType(); - final Module initialModule = globalSchema.findModuleByNamespaceAndRevision(startQName.getNamespace(), + final SchemaContext schemaContext; + if (mount != null) { + schemaContext = mount.getSchemaContext(); + } else { + schemaContext = globalSchema; + } + final Module initialModule = schemaContext.findModuleByNamespaceAndRevision(startQName.getNamespace(), startQName.getRevision()); DataNodeContainer node = initialModule; for (final PathArgument element : elements) { - QName _nodeType = element.getNodeType(); - final DataSchemaNode potentialNode = ControllerContext.childByQName(node, _nodeType); - if (!ControllerContext.isListOrContainer(potentialNode)) { - return null; + if (!(element instanceof AugmentationIdentifier)) { + final QName _nodeType = element.getNodeType(); + final DataSchemaNode potentialNode = ControllerContext.childByQName(node, _nodeType); + if (!(element instanceof NodeIdentifier && potentialNode instanceof ListSchemaNode)) { + if (!ControllerContext.isListOrContainer(potentialNode)) { + return null; + } + builder.append(convertToRestconfIdentifier(element, (DataNodeContainer) potentialNode, mount)); + node = (DataNodeContainer) potentialNode; + } } - node = ((DataNodeContainer) potentialNode); - builder.append(this.convertToRestconfIdentifier(element, node)); } return builder.toString(); } public String findModuleNameByNamespace(final URI namespace) { - this.checkPreconditions(); - - String moduleName = this.uriToModuleName.get(namespace); - if (moduleName == null) { - final Module module = this.findModuleByNamespace(namespace); - if (module != null) { - moduleName = module.getName(); - this.uriToModuleName.put(namespace, moduleName); - } - } + checkPreconditions(); - return moduleName; + final Module module = this.findModuleByNamespace(namespace); + return module == null ? null : module.getName(); } - public String findModuleNameByNamespace(final MountInstance mountPoint, final URI namespace) { + public String findModuleNameByNamespace(final DOMMountPoint mountPoint, final URI namespace) { final Module module = this.findModuleByNamespace(mountPoint, namespace); return module == null ? null : module.getName(); } public URI findNamespaceByModuleName(final String moduleName) { - URI namespace = this.moduleNameToUri.get(moduleName); - if (namespace == null) { - Module module = this.findModuleByName(moduleName); - if (module != null) { - URI _namespace = module.getNamespace(); - namespace = _namespace; - this.uriToModuleName.put(namespace, moduleName); - } - } - return namespace; + final Module module = this.findModuleByName(moduleName); + return module == null ? null : module.getNamespace(); } - public URI findNamespaceByModuleName(final MountInstance mountPoint, final String moduleName) { + public URI findNamespaceByModuleName(final DOMMountPoint mountPoint, final String moduleName) { final Module module = this.findModuleByName(mountPoint, moduleName); return module == null ? null : module.getNamespace(); } - public Set getAllModules(final MountInstance mountPoint) { - this.checkPreconditions(); + public Set getAllModules(final DOMMountPoint mountPoint) { + checkPreconditions(); - SchemaContext schemaContext = mountPoint == null ? null : mountPoint.getSchemaContext(); + final SchemaContext schemaContext = mountPoint == null ? null : mountPoint.getSchemaContext(); return schemaContext == null ? null : schemaContext.getModules(); } public Set getAllModules() { - this.checkPreconditions(); + checkPreconditions(); return globalSchema.getModules(); } - public CharSequence toRestconfIdentifier(final QName qname) { - this.checkPreconditions(); - - String module = this.uriToModuleName.get(qname.getNamespace()); - if (module == null) { - final Module moduleSchema = globalSchema.findModuleByNamespaceAndRevision(qname.getNamespace(), - qname.getRevision()); - if (moduleSchema == null) { - return null; - } + private static final CharSequence toRestconfIdentifier(final SchemaContext context, final QName qname) { + final Module schema = context.findModuleByNamespaceAndRevision(qname.getNamespace(), qname.getRevision()); + return schema == null ? null : schema.getName() + ':' + qname.getLocalName(); + } - this.uriToModuleName.put(qname.getNamespace(), moduleSchema.getName()); - module = moduleSchema.getName(); + public CharSequence toRestconfIdentifier(final QName qname, final DOMMountPoint mount) { + final SchemaContext schema; + if (mount != null) { + schema = mount.getSchemaContext(); + } else { + checkPreconditions(); + schema = globalSchema; } - StringBuilder builder = new StringBuilder(); - builder.append(module); - builder.append(":"); - builder.append(qname.getLocalName()); - return builder.toString(); + return toRestconfIdentifier(schema, qname); } - public CharSequence toRestconfIdentifier(final MountInstance mountPoint, final QName qname) { - if (mountPoint == null) { - return null; - } + public CharSequence toRestconfIdentifier(final QName qname) { + checkPreconditions(); - SchemaContext schemaContext = mountPoint.getSchemaContext(); + return toRestconfIdentifier(globalSchema, qname); + } - final Module moduleSchema = schemaContext.findModuleByNamespaceAndRevision(qname.getNamespace(), - qname.getRevision()); - if (moduleSchema == null) { + public CharSequence toRestconfIdentifier(final DOMMountPoint mountPoint, final QName qname) { + if (mountPoint == null) { return null; } - StringBuilder builder = new StringBuilder(); - builder.append(moduleSchema.getName()); - builder.append(":"); - builder.append(qname.getLocalName()); - return builder.toString(); + return toRestconfIdentifier(mountPoint.getSchemaContext(), qname); } public Module getRestconfModule() { @@ -374,18 +366,18 @@ public class ControllerContext implements SchemaContextListener { }; public DataSchemaNode getRestconfModuleErrorsSchemaNode() { - Module restconfModule = getRestconfModule(); + final Module restconfModule = getRestconfModule(); if (restconfModule == null) { return null; } - Set groupings = restconfModule.getGroupings(); + final Set groupings = restconfModule.getGroupings(); - Iterable filteredGroups = Iterables.filter(groupings, ERRORS_GROUPING_FILTER); + final Iterable filteredGroups = Iterables.filter(groupings, ERRORS_GROUPING_FILTER); final GroupingDefinition restconfGrouping = Iterables.getFirst(filteredGroups, null); - List instanceDataChildrenByName = this.findInstanceDataChildrenByName(restconfGrouping, + final List instanceDataChildrenByName = findInstanceDataChildrenByName(restconfGrouping, Draft02.RestConfModule.ERRORS_CONTAINER_SCHEMA_NODE); return Iterables.getFirst(instanceDataChildrenByName, null); } @@ -407,42 +399,42 @@ public class ControllerContext implements SchemaContextListener { return null; } - Set groupings = restconfModule.getGroupings(); - Iterable filteredGroups = Iterables.filter(groupings, GROUPING_FILTER); + final Set groupings = restconfModule.getGroupings(); + final Iterable filteredGroups = Iterables.filter(groupings, GROUPING_FILTER); final GroupingDefinition restconfGrouping = Iterables.getFirst(filteredGroups, null); - List instanceDataChildrenByName = this.findInstanceDataChildrenByName(restconfGrouping, + final List instanceDataChildrenByName = findInstanceDataChildrenByName(restconfGrouping, Draft02.RestConfModule.RESTCONF_CONTAINER_SCHEMA_NODE); final DataSchemaNode restconfContainer = Iterables.getFirst(instanceDataChildrenByName, null); if (Objects.equal(schemaNodeName, Draft02.RestConfModule.OPERATIONS_CONTAINER_SCHEMA_NODE)) { - List instances = this.findInstanceDataChildrenByName( + final List instances = findInstanceDataChildrenByName( ((DataNodeContainer) restconfContainer), Draft02.RestConfModule.OPERATIONS_CONTAINER_SCHEMA_NODE); return Iterables.getFirst(instances, null); } else if (Objects.equal(schemaNodeName, Draft02.RestConfModule.STREAMS_CONTAINER_SCHEMA_NODE)) { - List instances = this.findInstanceDataChildrenByName( + final List instances = findInstanceDataChildrenByName( ((DataNodeContainer) restconfContainer), Draft02.RestConfModule.STREAMS_CONTAINER_SCHEMA_NODE); return Iterables.getFirst(instances, null); } else if (Objects.equal(schemaNodeName, Draft02.RestConfModule.STREAM_LIST_SCHEMA_NODE)) { - List instances = this.findInstanceDataChildrenByName( + List instances = findInstanceDataChildrenByName( ((DataNodeContainer) restconfContainer), Draft02.RestConfModule.STREAMS_CONTAINER_SCHEMA_NODE); final DataSchemaNode modules = Iterables.getFirst(instances, null); - instances = this.findInstanceDataChildrenByName(((DataNodeContainer) modules), + instances = findInstanceDataChildrenByName(((DataNodeContainer) modules), Draft02.RestConfModule.STREAM_LIST_SCHEMA_NODE); return Iterables.getFirst(instances, null); } else if (Objects.equal(schemaNodeName, Draft02.RestConfModule.MODULES_CONTAINER_SCHEMA_NODE)) { - List instances = this.findInstanceDataChildrenByName( + final List instances = findInstanceDataChildrenByName( ((DataNodeContainer) restconfContainer), Draft02.RestConfModule.MODULES_CONTAINER_SCHEMA_NODE); return Iterables.getFirst(instances, null); } else if (Objects.equal(schemaNodeName, Draft02.RestConfModule.MODULE_LIST_SCHEMA_NODE)) { - List instances = this.findInstanceDataChildrenByName( + List instances = findInstanceDataChildrenByName( ((DataNodeContainer) restconfContainer), Draft02.RestConfModule.MODULES_CONTAINER_SCHEMA_NODE); final DataSchemaNode modules = Iterables.getFirst(instances, null); - instances = this.findInstanceDataChildrenByName(((DataNodeContainer) modules), + instances = findInstanceDataChildrenByName(((DataNodeContainer) modules), Draft02.RestConfModule.MODULE_LIST_SCHEMA_NODE); return Iterables.getFirst(instances, null); } else if (Objects.equal(schemaNodeName, Draft02.RestConfModule.STREAMS_CONTAINER_SCHEMA_NODE)) { - List instances = this.findInstanceDataChildrenByName( + final List instances = findInstanceDataChildrenByName( ((DataNodeContainer) restconfContainer), Draft02.RestConfModule.STREAMS_CONTAINER_SCHEMA_NODE); return Iterables.getFirst(instances, null); } @@ -450,7 +442,7 @@ public class ControllerContext implements SchemaContextListener { return null; } - private static DataSchemaNode childByQName(final ChoiceNode container, final QName name) { + private static DataSchemaNode childByQName(final ChoiceSchemaNode container, final QName name) { for (final ChoiceCaseNode caze : container.getCases()) { final DataSchemaNode ret = ControllerContext.childByQName(caze, name); if (ret != null) { @@ -482,12 +474,12 @@ public class ControllerContext implements SchemaContextListener { } private static DataSchemaNode dataNodeChildByQName(final DataNodeContainer container, final QName name) { - DataSchemaNode ret = container.getDataChildByName(name); + final DataSchemaNode ret = container.getDataChildByName(name); if (ret == null) { for (final DataSchemaNode node : container.getChildNodes()) { - if ((node instanceof ChoiceNode)) { - final ChoiceNode choiceNode = ((ChoiceNode) node); - DataSchemaNode childByQName = ControllerContext.childByQName(choiceNode, name); + if ((node instanceof ChoiceSchemaNode)) { + final ChoiceSchemaNode choiceNode = ((ChoiceSchemaNode) node); + final DataSchemaNode childByQName = ControllerContext.childByQName(choiceNode, name); if (childByQName != null) { return childByQName; } @@ -497,12 +489,13 @@ public class ControllerContext implements SchemaContextListener { return ret; } - private String toUriString(final Object object) throws UnsupportedEncodingException { - return object == null ? "" : URLEncoder.encode(object.toString(), ControllerContext.URI_ENCODING_CHAR_SET); + private String toUriString(final Object object, final LeafSchemaNode leafNode, final DOMMountPoint mount) throws UnsupportedEncodingException { + final Codec codec = RestCodec.from(leafNode.getType(), mount); + return object == null ? "" : URLEncoder.encode(codec.serialize(object).toString(), ControllerContext.URI_ENCODING_CHAR_SET); } - private InstanceIdWithSchemaNode collectPathArguments(final InstanceIdentifierBuilder builder, - final List strings, final DataNodeContainer parentNode, final MountInstance mountPoint, + private InstanceIdentifierContext collectPathArguments(final InstanceIdentifierBuilder builder, + final List strings, final DataNodeContainer parentNode, final DOMMountPoint mountPoint, final boolean returnJustMountPoint) { Preconditions.> checkNotNull(strings); @@ -511,10 +504,10 @@ public class ControllerContext implements SchemaContextListener { } if (strings.isEmpty()) { - return new InstanceIdWithSchemaNode(builder.toInstance(), ((DataSchemaNode) parentNode), mountPoint); + return createContext(builder.toInstance(), ((DataSchemaNode) parentNode), mountPoint,mountPoint != null ? mountPoint.getSchemaContext() : globalSchema); } - String head = strings.iterator().next(); + final String head = strings.iterator().next(); final String nodeName = toNodeName(head); final String moduleName = ControllerContext.toModuleName(head); @@ -533,13 +526,14 @@ public class ControllerContext implements SchemaContextListener { ErrorType.APPLICATION, ErrorTag.OPERATION_NOT_SUPPORTED); } - final YangInstanceIdentifier partialPath = builder.toInstance(); - final MountInstance mount = mountService.getMountPoint(partialPath); - if (mount == null) { + final YangInstanceIdentifier partialPath = dataNormalizer.toNormalized(builder.build()); + final Optional mountOpt = mountService.getMountPoint(partialPath); + if (!mountOpt.isPresent()) { LOG.debug("Instance identifier to missing mount point: {}", partialPath); throw new RestconfDocumentedException("Mount point does not exist.", ErrorType.PROTOCOL, ErrorTag.UNKNOWN_ELEMENT); } + final DOMMountPoint mount = mountOpt.get(); final SchemaContext mountPointSchema = mount.getSchemaContext(); if (mountPointSchema == null) { @@ -547,14 +541,9 @@ public class ControllerContext implements SchemaContextListener { ErrorType.APPLICATION, ErrorTag.UNKNOWN_ELEMENT); } - if (returnJustMountPoint) { - YangInstanceIdentifier instance = YangInstanceIdentifier.builder().toInstance(); - return new InstanceIdWithSchemaNode(instance, mountPointSchema, mount); - } - - if (strings.size() == 1) { - YangInstanceIdentifier instance = YangInstanceIdentifier.builder().toInstance(); - return new InstanceIdWithSchemaNode(instance, mountPointSchema, mount); + if (returnJustMountPoint || strings.size() == 1) { + final YangInstanceIdentifier instance = YangInstanceIdentifier.builder().toInstance(); + return new InstanceIdentifierContext(instance, mountPointSchema, mount,mountPointSchema); } final String moduleNameBehindMountPoint = toModuleName(strings.get(1)); @@ -570,20 +559,21 @@ public class ControllerContext implements SchemaContextListener { + "\" module does not exist in mount point.", ErrorType.PROTOCOL, ErrorTag.UNKNOWN_ELEMENT); } - List subList = strings.subList(1, strings.size()); - return this.collectPathArguments(YangInstanceIdentifier.builder(), subList, moduleBehindMountPoint, mount, + final List subList = strings.subList(1, strings.size()); + return collectPathArguments(YangInstanceIdentifier.builder(), subList, moduleBehindMountPoint, mount, returnJustMountPoint); } Module module = null; if (mountPoint == null) { + checkPreconditions(); module = globalSchema.findModuleByName(moduleName, null); if (module == null) { throw new RestconfDocumentedException("\"" + moduleName + "\" module does not exist.", ErrorType.PROTOCOL, ErrorTag.UNKNOWN_ELEMENT); } } else { - SchemaContext schemaContext = mountPoint.getSchemaContext(); + final SchemaContext schemaContext = mountPoint.getSchemaContext(); if (schemaContext != null) { module = schemaContext.findModuleByName(moduleName, null); } else { @@ -595,7 +585,16 @@ public class ControllerContext implements SchemaContextListener { } } - targetNode = this.findInstanceDataChildByNameAndNamespace(parentNode, nodeName, module.getNamespace()); + targetNode = findInstanceDataChildByNameAndNamespace(parentNode, nodeName, module.getNamespace()); + + if (targetNode == null && parentNode instanceof Module) { + final RpcDefinition rpc = ControllerContext.getInstance().getRpcDefinition(head); + if (rpc != null) { + return new InstanceIdentifierContext(builder.build(), rpc, mountPoint, + mountPoint != null ? mountPoint.getSchemaContext() : globalSchema); + } + } + if (targetNode == null) { throw new RestconfDocumentedException("URI has bad format. Possible reasons:\n" + " 1. \"" + head + "\" was not found in parent data node.\n" + " 2. \"" + head @@ -603,7 +602,7 @@ public class ControllerContext implements SchemaContextListener { ErrorType.PROTOCOL, ErrorTag.INVALID_VALUE); } } else { - final List potentialSchemaNodes = this.findInstanceDataChildrenByName(parentNode, nodeName); + final List potentialSchemaNodes = findInstanceDataChildrenByName(parentNode, nodeName); if (potentialSchemaNodes.size() > 1) { final StringBuilder strBuilder = new StringBuilder(); for (final DataSchemaNode potentialNodeSchema : potentialSchemaNodes) { @@ -653,7 +652,7 @@ public class ControllerContext implements SchemaContextListener { ErrorType.PROTOCOL, ErrorTag.INVALID_VALUE); } - this.addKeyValue(keyValues, listNode.getDataChildByName(key), uriKeyValue, mountPoint); + addKeyValue(keyValues, listNode.getDataChildByName(key), uriKeyValue, mountPoint); i++; } } @@ -666,96 +665,103 @@ public class ControllerContext implements SchemaContextListener { if ((targetNode instanceof DataNodeContainer)) { final List remaining = strings.subList(consumed, strings.size()); - return this.collectPathArguments(builder, remaining, ((DataNodeContainer) targetNode), mountPoint, + return collectPathArguments(builder, remaining, ((DataNodeContainer) targetNode), mountPoint, returnJustMountPoint); } - return new InstanceIdWithSchemaNode(builder.toInstance(), targetNode, mountPoint); + return createContext(builder.build(), targetNode, mountPoint,mountPoint != null ? mountPoint.getSchemaContext() : globalSchema); } - public DataSchemaNode findInstanceDataChildByNameAndNamespace(final DataNodeContainer container, final String name, + private InstanceIdentifierContext createContext(final YangInstanceIdentifier instance, final DataSchemaNode dataSchemaNode, + final DOMMountPoint mountPoint, final SchemaContext schemaContext) { + + final YangInstanceIdentifier instanceIdentifier = new DataNormalizer(schemaContext).toNormalized(instance); + return new InstanceIdentifierContext(instanceIdentifier, dataSchemaNode, mountPoint,schemaContext); + } + + public static DataSchemaNode findInstanceDataChildByNameAndNamespace(final DataNodeContainer container, final String name, final URI namespace) { Preconditions. checkNotNull(namespace); - final List potentialSchemaNodes = this.findInstanceDataChildrenByName(container, name); + final List potentialSchemaNodes = findInstanceDataChildrenByName(container, name); - Predicate filter = new Predicate() { + final Predicate filter = new Predicate() { @Override public boolean apply(final DataSchemaNode node) { return Objects.equal(node.getQName().getNamespace(), namespace); } }; - Iterable result = Iterables.filter(potentialSchemaNodes, filter); + final Iterable result = Iterables.filter(potentialSchemaNodes, filter); return Iterables.getFirst(result, null); } - public List findInstanceDataChildrenByName(final DataNodeContainer container, final String name) { + public static List findInstanceDataChildrenByName(final DataNodeContainer container, final String name) { Preconditions. checkNotNull(container); Preconditions. checkNotNull(name); - List instantiatedDataNodeContainers = new ArrayList(); - this.collectInstanceDataNodeContainers(instantiatedDataNodeContainers, container, name); + final List instantiatedDataNodeContainers = new ArrayList(); + collectInstanceDataNodeContainers(instantiatedDataNodeContainers, container, name); return instantiatedDataNodeContainers; } - private static final Function> CHOICE_FUNCTION = new Function>() { + private static final Function> CHOICE_FUNCTION = new Function>() { @Override - public Set apply(final ChoiceNode node) { + public Set apply(final ChoiceSchemaNode node) { return node.getCases(); } }; - private void collectInstanceDataNodeContainers(final List potentialSchemaNodes, + private static void collectInstanceDataNodeContainers(final List potentialSchemaNodes, final DataNodeContainer container, final String name) { - Predicate filter = new Predicate() { + final Predicate filter = new Predicate() { @Override public boolean apply(final DataSchemaNode node) { return Objects.equal(node.getQName().getLocalName(), name); } }; - Iterable nodes = Iterables.filter(container.getChildNodes(), filter); + final Iterable nodes = Iterables.filter(container.getChildNodes(), filter); // Can't combine this loop with the filter above because the filter is // lazily-applied by Iterables.filter. for (final DataSchemaNode potentialNode : nodes) { - if (this.isInstantiatedDataSchema(potentialNode)) { + if (isInstantiatedDataSchema(potentialNode)) { potentialSchemaNodes.add(potentialNode); } } - Iterable choiceNodes = Iterables.filter(container.getChildNodes(), ChoiceNode.class); - Iterable> map = Iterables.transform(choiceNodes, CHOICE_FUNCTION); + final Iterable choiceNodes = Iterables.filter(container.getChildNodes(), ChoiceSchemaNode.class); + final Iterable> map = Iterables.transform(choiceNodes, CHOICE_FUNCTION); final Iterable allCases = Iterables. concat(map); for (final ChoiceCaseNode caze : allCases) { - this.collectInstanceDataNodeContainers(potentialSchemaNodes, caze, name); + collectInstanceDataNodeContainers(potentialSchemaNodes, caze, name); } } - public boolean isInstantiatedDataSchema(final DataSchemaNode node) { + public static boolean isInstantiatedDataSchema(final DataSchemaNode node) { return node instanceof LeafSchemaNode || node instanceof LeafListSchemaNode || node instanceof ContainerSchemaNode || node instanceof ListSchemaNode || node instanceof AnyXmlSchemaNode; } private void addKeyValue(final HashMap map, final DataSchemaNode node, final String uriValue, - final MountInstance mountPoint) { + final DOMMountPoint mountPoint) { Preconditions. checkNotNull(uriValue); Preconditions.checkArgument((node instanceof LeafSchemaNode)); final String urlDecoded = urlPathArgDecode(uriValue); final TypeDefinition typedef = ((LeafSchemaNode) node).getType(); - Codec codec = RestCodec.from(typedef, mountPoint); + final Codec codec = RestCodec.from(typedef, mountPoint); Object decoded = codec == null ? null : codec.deserialize(urlDecoded); String additionalInfo = ""; if (decoded == null) { - TypeDefinition baseType = RestUtil.resolveBaseTypeFrom(typedef); + final TypeDefinition baseType = RestUtil.resolveBaseTypeFrom(typedef); if ((baseType instanceof IdentityrefTypeDefinition)) { - decoded = this.toQName(urlDecoded); + decoded = toQName(urlDecoded); additionalInfo = "For key which is of type identityref it should be in format module_name:identity_name."; } } @@ -797,6 +803,7 @@ public class ControllerContext implements SchemaContextListener { } private QName toQName(final String name) { + checkPreconditions(); final String module = toModuleName(name); final String node = toNodeName(name); final Module m = globalSchema.findModuleByName(module, null); @@ -808,8 +815,8 @@ public class ControllerContext implements SchemaContextListener { } public RpcDefinition getRpcDefinition(final String name) { - final QName validName = this.toQName(name); - return validName == null ? null : this.qnameToRpc.get().get(validName); + final QName validName = toQName(name); + return validName == null ? null : qnameToRpc.get().get(validName); } @Override @@ -823,20 +830,20 @@ public class ControllerContext implements SchemaContextListener { } // FIXME: still not completely atomic - this.qnameToRpc.set(ImmutableMap.copyOf(newMap)); - this.setGlobalSchema(context); + qnameToRpc.set(ImmutableMap.copyOf(newMap)); + setGlobalSchema(context); } } public static List urlPathArgsDecode(final Iterable strings) { try { - List decodedPathArgs = new ArrayList(); + final List decodedPathArgs = new ArrayList(); for (final String pathArg : strings) { - String _decode = URLDecoder.decode(pathArg, URI_ENCODING_CHAR_SET); + final String _decode = URLDecoder.decode(pathArg, URI_ENCODING_CHAR_SET); decodedPathArgs.add(_decode); } return decodedPathArgs; - } catch (UnsupportedEncodingException e) { + } catch (final UnsupportedEncodingException e) { throw new RestconfDocumentedException("Invalid URL path '" + strings + "': " + e.getMessage(), ErrorType.PROTOCOL, ErrorTag.INVALID_VALUE); } @@ -846,7 +853,7 @@ public class ControllerContext implements SchemaContextListener { if (pathArg != null) { try { return URLDecoder.decode(pathArg, URI_ENCODING_CHAR_SET); - } catch (UnsupportedEncodingException e) { + } catch (final UnsupportedEncodingException e) { throw new RestconfDocumentedException("Invalid URL path arg '" + pathArg + "': " + e.getMessage(), ErrorType.PROTOCOL, ErrorTag.INVALID_VALUE); } @@ -855,11 +862,11 @@ public class ControllerContext implements SchemaContextListener { return null; } - private CharSequence convertToRestconfIdentifier(final PathArgument argument, final DataNodeContainer node) { + private CharSequence convertToRestconfIdentifier(final PathArgument argument, final DataNodeContainer node, final DOMMountPoint mount) { if (argument instanceof NodeIdentifier && node instanceof ContainerSchemaNode) { - return convertToRestconfIdentifier((NodeIdentifier) argument, (ContainerSchemaNode) node); + return convertToRestconfIdentifier((NodeIdentifier) argument, mount); } else if (argument instanceof NodeIdentifierWithPredicates && node instanceof ListSchemaNode) { - return convertToRestconfIdentifier((NodeIdentifierWithPredicates) argument, (ListSchemaNode) node); + return convertToRestconfIdentifierWithPredicates((NodeIdentifierWithPredicates) argument, (ListSchemaNode) node, mount); } else if (argument != null && node != null) { throw new IllegalArgumentException("Conversion of generic path argument is not supported"); } else { @@ -868,39 +875,41 @@ public class ControllerContext implements SchemaContextListener { } } - private CharSequence convertToRestconfIdentifier(final NodeIdentifier argument, final ContainerSchemaNode node) { - StringBuilder builder = new StringBuilder(); - builder.append("/"); - QName nodeType = argument.getNodeType(); - builder.append(this.toRestconfIdentifier(nodeType)); - return builder.toString(); + private CharSequence convertToRestconfIdentifier(final NodeIdentifier argument, final DOMMountPoint node) { + return "/" + this.toRestconfIdentifier(argument.getNodeType(),node); } - private CharSequence convertToRestconfIdentifier(final NodeIdentifierWithPredicates argument, - final ListSchemaNode node) { - QName nodeType = argument.getNodeType(); - final CharSequence nodeIdentifier = this.toRestconfIdentifier(nodeType); + private CharSequence convertToRestconfIdentifierWithPredicates(final NodeIdentifierWithPredicates argument, + final ListSchemaNode node, final DOMMountPoint mount) { + final QName nodeType = argument.getNodeType(); + final CharSequence nodeIdentifier = this.toRestconfIdentifier(nodeType, mount); final Map keyValues = argument.getKeyValues(); - StringBuilder builder = new StringBuilder(); - builder.append("/"); + final StringBuilder builder = new StringBuilder(); + builder.append('/'); builder.append(nodeIdentifier); - builder.append("/"); + builder.append('/'); - List keyDefinition = node.getKeyDefinition(); + final List keyDefinition = node.getKeyDefinition(); boolean hasElements = false; for (final QName key : keyDefinition) { - if (!hasElements) { - hasElements = true; - } else { - builder.append("/"); - } + for (final DataSchemaNode listChild : node.getChildNodes()) { + if (listChild.getQName().equals(key)) { + if (!hasElements) { + hasElements = true; + } else { + builder.append('/'); + } - try { - builder.append(this.toUriString(keyValues.get(key))); - } catch (UnsupportedEncodingException e) { - LOG.error("Error parsing URI: {}", keyValues.get(key), e); - return null; + try { + Preconditions.checkState(listChild instanceof LeafSchemaNode, "List key has to consist of leaves"); + builder.append(toUriString(keyValues.get(key), (LeafSchemaNode)listChild, mount)); + } catch (final UnsupportedEncodingException e) { + LOG.error("Error parsing URI: {}", keyValues.get(key), e); + return null; + } + break; + } } } @@ -910,8 +919,8 @@ public class ControllerContext implements SchemaContextListener { private static DataSchemaNode childByQName(final Object container, final QName name) { if (container instanceof ChoiceCaseNode) { return childByQName((ChoiceCaseNode) container, name); - } else if (container instanceof ChoiceNode) { - return childByQName((ChoiceNode) container, name); + } else if (container instanceof ChoiceSchemaNode) { + return childByQName((ChoiceSchemaNode) container, name); } else if (container instanceof ContainerSchemaNode) { return childByQName((ContainerSchemaNode) container, name); } else if (container instanceof ListSchemaNode) { @@ -925,4 +934,37 @@ public class ControllerContext implements SchemaContextListener { + Arrays. asList(container, name).toString()); } } + + public YangInstanceIdentifier toNormalized(final YangInstanceIdentifier legacy) { + try { + return dataNormalizer.toNormalized(legacy); + } catch (final NullPointerException e) { + throw new RestconfDocumentedException("Data normalizer isn't set. Normalization isn't possible", e); + } + } + + public YangInstanceIdentifier toXpathRepresentation(final YangInstanceIdentifier instanceIdentifier) { + try { + return dataNormalizer.toLegacy(instanceIdentifier); + } catch (final NullPointerException e) { + throw new RestconfDocumentedException("Data normalizer isn't set. Normalization isn't possible", e); + } catch (final DataNormalizationException e) { + throw new RestconfDocumentedException("Data normalizer failed. Normalization isn't possible", e); + } + } + + public boolean isNodeMixin(final YangInstanceIdentifier path) { + final DataNormalizationOperation operation; + try { + operation = dataNormalizer.getOperation(path); + } catch (final DataNormalizationException e) { + throw new RestconfDocumentedException("Data normalizer failed. Normalization isn't possible", e); + } + return operation.isMixin(); + } + + public DataNormalizationOperation getRootOperation() { + return dataNormalizer.getRootOperation(); + } + }