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;
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;
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.InstanceIdentifier;
-import org.opendaylight.yangtools.yang.data.api.InstanceIdentifier.InstanceIdentifierBuilder;
-import org.opendaylight.yangtools.yang.data.api.InstanceIdentifier.NodeIdentifier;
-import org.opendaylight.yangtools.yang.data.api.InstanceIdentifier.NodeIdentifierWithPredicates;
-import org.opendaylight.yangtools.yang.data.api.InstanceIdentifier.PathArgument;
+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;
private static final Splitter SLASH_SPLITTER = Splitter.on('/');
- private final BiMap<URI, String> uriToModuleName = HashBiMap.<URI, String> create();
-
- private final Map<String, URI> moduleNameToUri = uriToModuleName.inverse();
+ private static final YangInstanceIdentifier ROOT = YangInstanceIdentifier.builder().build();
private final AtomicReference<Map<QName, RpcDefinition>> qnameToRpc =
new AtomicReference<>(Collections.<QName, RpcDefinition>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;
}
}
public void setSchemas(final SchemaContext schemas) {
- this.onGlobalContextUpdated(schemas);
+ onGlobalContextUpdated(schemas);
+ }
+
+ public InstanceIdentifierContext toInstanceIdentifier(final String restconfInstance) {
+ return toIdentifier(restconfInstance, false);
}
- public InstanceIdWithSchemaNode toInstanceIdentifier(final String restconfInstance) {
- return this.toIdentifier(restconfInstance, false);
+ public SchemaContext getGlobalSchema() {
+ return globalSchema;
}
- public InstanceIdWithSchemaNode toMountPointIdentifier(final String restconfInstance) {
- return this.toIdentifier(restconfInstance, true);
+ public InstanceIdentifierContext toMountPointIdentifier(final String restconfInstance) {
+ return toIdentifier(restconfInstance, true);
}
- private InstanceIdWithSchemaNode toIdentifier(final String restconfInstance, final boolean toMountPointIdentifier) {
- this.checkPreconditions();
+ private InstanceIdentifierContext toIdentifier(final String restconfInstance, final boolean toMountPointIdentifier) {
+ checkPreconditions();
+
+ if(restconfInstance == null) {
+ return new InstanceIdentifierContext<>(ROOT, globalSchema, null, globalSchema);
+ }
final List<String> pathArgs = urlPathArgsDecode(SLASH_SPLITTER.split(restconfInstance));
omitFirstAndLastEmptyString(pathArgs);
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 = InstanceIdentifier.builder();
- Module latestModule = this.getLatestModule(globalSchema, startModule);
- 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) {
return list;
}
- String head = list.iterator().next();
+ final String head = list.iterator().next();
if (head.isEmpty()) {
list.remove(0);
}
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);
}
return list;
}
-
- private Module getLatestModule(final SchemaContext schema, final String moduleName) {
- Preconditions.checkArgument(schema != null);
- Preconditions.checkArgument(moduleName != null && !moduleName.isEmpty());
-
- Predicate<Module> filter = new Predicate<Module>() {
- @Override
- public boolean apply(final Module m) {
- return Objects.equal(m.getName(), moduleName);
- }
- };
-
- Iterable<Module> modules = Iterables.filter(schema.getModules(), filter);
- return this.filterLatestModule(modules);
- }
-
- private Module filterLatestModule(final Iterable<Module> modules) {
- Module latestModule = modules.iterator().hasNext() ? modules.iterator().next() : null;
- for (final Module module : modules) {
- if (module.getRevision().after(latestModule.getRevision())) {
- latestModule = module;
- }
- }
- return latestModule;
- }
-
public Module findModuleByName(final String moduleName) {
- this.checkPreconditions();
+ checkPreconditions();
Preconditions.checkArgument(moduleName != null && !moduleName.isEmpty());
- return this.getLatestModule(globalSchema, moduleName);
+ 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();
- return mountPointSchema == null ? null : this.getLatestModule(mountPointSchema, moduleName);
+ if (mountPointSchema == null) {
+ return null;
+ }
+
+ return mountPointSchema.findModuleByName(moduleName, null);
}
public Module findModuleByNamespace(final URI namespace) {
- this.checkPreconditions();
+ checkPreconditions();
Preconditions.checkArgument(namespace != null);
-
- final Set<Module> moduleSchemas = globalSchema.findModuleByNamespace(namespace);
- return moduleSchemas == null ? null : this.filterLatestModule(moduleSchemas);
+ 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();
- Set<Module> moduleSchemas = mountPointSchema == null ? null : mountPointSchema.findModuleByNamespace(namespace);
- return moduleSchemas == null ? null : this.filterLatestModule(moduleSchemas);
+ if (mountPointSchema == null) {
+ return null;
+ }
+
+ return mountPointSchema.findModuleByNamespaceAndRevision(namespace, null);
}
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 InstanceIdentifier path) {
- this.checkPreconditions();
+ public DataNodeContainer getDataNodeContainerFor(final YangInstanceIdentifier path) {
+ checkPreconditions();
final Iterable<PathArgument> 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;
return node;
}
- public String toFullRestconfIdentifier(final InstanceIdentifier path) {
- this.checkPreconditions();
+ public String toFullRestconfIdentifier(final YangInstanceIdentifier path, final DOMMountPoint mount) {
+ checkPreconditions();
final Iterable<PathArgument> 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<Module> getAllModules(final MountInstance mountPoint) {
- this.checkPreconditions();
+ public Set<Module> 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<Module> 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() {
return findModuleByNameAndRevision(Draft02.RestConfModule.IETF_RESTCONF_QNAME);
}
+ private static final Predicate<GroupingDefinition> ERRORS_GROUPING_FILTER = new Predicate<GroupingDefinition>() {
+ @Override
+ public boolean apply(final GroupingDefinition g) {
+ return Draft02.RestConfModule.ERRORS_GROUPING_SCHEMA_NODE.equals(g.getQName().getLocalName());
+ }
+ };
+
public DataSchemaNode getRestconfModuleErrorsSchemaNode() {
- Module restconfModule = getRestconfModule();
+ final Module restconfModule = getRestconfModule();
if (restconfModule == null) {
return null;
}
- Set<GroupingDefinition> groupings = restconfModule.getGroupings();
+ final Set<GroupingDefinition> groupings = restconfModule.getGroupings();
- final Predicate<GroupingDefinition> filter = new Predicate<GroupingDefinition>() {
- @Override
- public boolean apply(final GroupingDefinition g) {
- return Objects.equal(g.getQName().getLocalName(), Draft02.RestConfModule.ERRORS_GROUPING_SCHEMA_NODE);
- }
- };
-
- Iterable<GroupingDefinition> filteredGroups = Iterables.filter(groupings, filter);
+ final Iterable<GroupingDefinition> filteredGroups = Iterables.filter(groupings, ERRORS_GROUPING_FILTER);
final GroupingDefinition restconfGrouping = Iterables.getFirst(filteredGroups, null);
- List<DataSchemaNode> instanceDataChildrenByName = this.findInstanceDataChildrenByName(restconfGrouping,
+ final List<DataSchemaNode> instanceDataChildrenByName = findInstanceDataChildrenByName(restconfGrouping,
Draft02.RestConfModule.ERRORS_CONTAINER_SCHEMA_NODE);
return Iterables.getFirst(instanceDataChildrenByName, null);
}
+ private static final Predicate<GroupingDefinition> GROUPING_FILTER = new Predicate<GroupingDefinition>() {
+ @Override
+ public boolean apply(final GroupingDefinition g) {
+ return Draft02.RestConfModule.RESTCONF_GROUPING_SCHEMA_NODE.equals(g.getQName().getLocalName());
+ }
+ };
+
public DataSchemaNode getRestconfModuleRestConfSchemaNode(final Module inRestconfModule, final String schemaNodeName) {
Module restconfModule = inRestconfModule;
if (restconfModule == null) {
return null;
}
- Set<GroupingDefinition> groupings = restconfModule.getGroupings();
-
- final Predicate<GroupingDefinition> filter = new Predicate<GroupingDefinition>() {
- @Override
- public boolean apply(final GroupingDefinition g) {
- return Objects.equal(g.getQName().getLocalName(), Draft02.RestConfModule.RESTCONF_GROUPING_SCHEMA_NODE);
- }
- };
-
- Iterable<GroupingDefinition> filteredGroups = Iterables.filter(groupings, filter);
-
+ final Set<GroupingDefinition> groupings = restconfModule.getGroupings();
+ final Iterable<GroupingDefinition> filteredGroups = Iterables.filter(groupings, GROUPING_FILTER);
final GroupingDefinition restconfGrouping = Iterables.getFirst(filteredGroups, null);
- List<DataSchemaNode> instanceDataChildrenByName = this.findInstanceDataChildrenByName(restconfGrouping,
+ final List<DataSchemaNode> 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<DataSchemaNode> instances = this.findInstanceDataChildrenByName(
+ final List<DataSchemaNode> 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<DataSchemaNode> instances = this.findInstanceDataChildrenByName(
+ final List<DataSchemaNode> 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<DataSchemaNode> instances = this.findInstanceDataChildrenByName(
+ List<DataSchemaNode> 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<DataSchemaNode> instances = this.findInstanceDataChildrenByName(
+ final List<DataSchemaNode> 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<DataSchemaNode> instances = this.findInstanceDataChildrenByName(
+ List<DataSchemaNode> 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<DataSchemaNode> instances = this.findInstanceDataChildrenByName(
+ final List<DataSchemaNode> instances = findInstanceDataChildrenByName(
((DataNodeContainer) restconfContainer), Draft02.RestConfModule.STREAMS_CONTAINER_SCHEMA_NODE);
return Iterables.getFirst(instances, null);
}
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) {
}
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 ChoiceCaseNode)) {
- final ChoiceCaseNode caseNode = ((ChoiceCaseNode) node);
- DataSchemaNode childByQName = ControllerContext.childByQName(caseNode, name);
+ if ((node instanceof ChoiceSchemaNode)) {
+ final ChoiceSchemaNode choiceNode = ((ChoiceSchemaNode) node);
+ final DataSchemaNode childByQName = ControllerContext.childByQName(choiceNode, name);
if (childByQName != null) {
return childByQName;
}
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<Object, Object> 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<String> strings, final DataNodeContainer parentNode, final MountInstance mountPoint,
+ private InstanceIdentifierContext collectPathArguments(final InstanceIdentifierBuilder builder,
+ final List<String> strings, final DataNodeContainer parentNode, final DOMMountPoint mountPoint,
final boolean returnJustMountPoint) {
Preconditions.<List<String>> checkNotNull(strings);
}
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);
ErrorType.APPLICATION, ErrorTag.OPERATION_NOT_SUPPORTED);
}
- final InstanceIdentifier partialPath = builder.toInstance();
- final MountInstance mount = mountService.getMountPoint(partialPath);
- if (mount == null) {
+ final YangInstanceIdentifier partialPath = dataNormalizer.toNormalized(builder.build());
+ final Optional<DOMMountPoint> 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) {
ErrorType.APPLICATION, ErrorTag.UNKNOWN_ELEMENT);
}
- if (returnJustMountPoint) {
- InstanceIdentifier instance = InstanceIdentifier.builder().toInstance();
- return new InstanceIdWithSchemaNode(instance, mountPointSchema, mount);
- }
-
- if (strings.size() == 1) {
- InstanceIdentifier instance = InstanceIdentifier.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));
ErrorType.PROTOCOL, ErrorTag.INVALID_VALUE);
}
- final Module moduleBehindMountPoint = this
- .getLatestModule(mountPointSchema, moduleNameBehindMountPoint);
+ final Module moduleBehindMountPoint = mountPointSchema.findModuleByName(moduleNameBehindMountPoint, null);
if (moduleBehindMountPoint == null) {
throw new RestconfDocumentedException("\"" + moduleName
+ "\" module does not exist in mount point.", ErrorType.PROTOCOL, ErrorTag.UNKNOWN_ELEMENT);
}
- List<String> subList = strings.subList(1, strings.size());
- return this.collectPathArguments(InstanceIdentifier.builder(), subList, moduleBehindMountPoint, mount,
+ final List<String> subList = strings.subList(1, strings.size());
+ return collectPathArguments(YangInstanceIdentifier.builder(), subList, moduleBehindMountPoint, mount,
returnJustMountPoint);
}
Module module = null;
if (mountPoint == null) {
- module = this.getLatestModule(globalSchema, moduleName);
+ 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();
- module = schemaContext == null ? null : this.getLatestModule(schemaContext, moduleName);
+ final SchemaContext schemaContext = mountPoint.getSchemaContext();
+ if (schemaContext != null) {
+ module = schemaContext.findModuleByName(moduleName, null);
+ } else {
+ module = null;
+ }
if (module == null) {
throw new RestconfDocumentedException("\"" + moduleName
+ "\" module does not exist in mount point.", ErrorType.PROTOCOL, ErrorTag.UNKNOWN_ELEMENT);
}
}
- 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<RpcDefinition>(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
ErrorType.PROTOCOL, ErrorTag.INVALID_VALUE);
}
} else {
- final List<DataSchemaNode> potentialSchemaNodes = this.findInstanceDataChildrenByName(parentNode, nodeName);
+ final List<DataSchemaNode> potentialSchemaNodes = findInstanceDataChildrenByName(parentNode, nodeName);
if (potentialSchemaNodes.size() > 1) {
final StringBuilder strBuilder = new StringBuilder();
for (final DataSchemaNode potentialNodeSchema : potentialSchemaNodes) {
ErrorType.PROTOCOL, ErrorTag.INVALID_VALUE);
}
- this.addKeyValue(keyValues, listNode.getDataChildByName(key), uriKeyValue, mountPoint);
+ addKeyValue(keyValues, listNode.getDataChildByName(key), uriKeyValue, mountPoint);
i++;
}
}
if ((targetNode instanceof DataNodeContainer)) {
final List<String> 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.<URI> checkNotNull(namespace);
- final List<DataSchemaNode> potentialSchemaNodes = this.findInstanceDataChildrenByName(container, name);
+ final List<DataSchemaNode> potentialSchemaNodes = findInstanceDataChildrenByName(container, name);
- Predicate<DataSchemaNode> filter = new Predicate<DataSchemaNode>() {
+ final Predicate<DataSchemaNode> filter = new Predicate<DataSchemaNode>() {
@Override
public boolean apply(final DataSchemaNode node) {
return Objects.equal(node.getQName().getNamespace(), namespace);
}
};
- Iterable<DataSchemaNode> result = Iterables.filter(potentialSchemaNodes, filter);
+ final Iterable<DataSchemaNode> result = Iterables.filter(potentialSchemaNodes, filter);
return Iterables.getFirst(result, null);
}
- public List<DataSchemaNode> findInstanceDataChildrenByName(final DataNodeContainer container, final String name) {
+ public static List<DataSchemaNode> findInstanceDataChildrenByName(final DataNodeContainer container, final String name) {
Preconditions.<DataNodeContainer> checkNotNull(container);
Preconditions.<String> checkNotNull(name);
- List<DataSchemaNode> instantiatedDataNodeContainers = new ArrayList<DataSchemaNode>();
- this.collectInstanceDataNodeContainers(instantiatedDataNodeContainers, container, name);
+ final List<DataSchemaNode> instantiatedDataNodeContainers = new ArrayList<DataSchemaNode>();
+ collectInstanceDataNodeContainers(instantiatedDataNodeContainers, container, name);
return instantiatedDataNodeContainers;
}
- private void collectInstanceDataNodeContainers(final List<DataSchemaNode> potentialSchemaNodes,
+ private static final Function<ChoiceSchemaNode, Set<ChoiceCaseNode>> CHOICE_FUNCTION = new Function<ChoiceSchemaNode, Set<ChoiceCaseNode>>() {
+ @Override
+ public Set<ChoiceCaseNode> apply(final ChoiceSchemaNode node) {
+ return node.getCases();
+ }
+ };
+
+ private static void collectInstanceDataNodeContainers(final List<DataSchemaNode> potentialSchemaNodes,
final DataNodeContainer container, final String name) {
- Predicate<DataSchemaNode> filter = new Predicate<DataSchemaNode>() {
+ final Predicate<DataSchemaNode> filter = new Predicate<DataSchemaNode>() {
@Override
public boolean apply(final DataSchemaNode node) {
return Objects.equal(node.getQName().getLocalName(), name);
}
};
- Iterable<DataSchemaNode> nodes = Iterables.filter(container.getChildNodes(), filter);
+ final Iterable<DataSchemaNode> 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<ChoiceNode> choiceNodes = Iterables.<ChoiceNode> filter(container.getChildNodes(), ChoiceNode.class);
-
- final Function<ChoiceNode, Set<ChoiceCaseNode>> choiceFunction = new Function<ChoiceNode, Set<ChoiceCaseNode>>() {
- @Override
- public Set<ChoiceCaseNode> apply(final ChoiceNode node) {
- return node.getCases();
- }
- };
-
- Iterable<Set<ChoiceCaseNode>> map = Iterables.<ChoiceNode, Set<ChoiceCaseNode>> transform(choiceNodes,
- choiceFunction);
+ final Iterable<ChoiceSchemaNode> choiceNodes = Iterables.filter(container.getChildNodes(), ChoiceSchemaNode.class);
+ final Iterable<Set<ChoiceCaseNode>> map = Iterables.transform(choiceNodes, CHOICE_FUNCTION);
final Iterable<ChoiceCaseNode> allCases = Iterables.<ChoiceCaseNode> 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<QName, Object> map, final DataSchemaNode node, final String uriValue,
- final MountInstance mountPoint) {
+ final DOMMountPoint mountPoint) {
Preconditions.<String> checkNotNull(uriValue);
Preconditions.checkArgument((node instanceof LeafSchemaNode));
final String urlDecoded = urlPathArgDecode(uriValue);
final TypeDefinition<? extends Object> typedef = ((LeafSchemaNode) node).getType();
- Codec<Object, Object> codec = RestCodec.from(typedef, mountPoint);
+ final Codec<Object, Object> codec = RestCodec.from(typedef, mountPoint);
Object decoded = codec == null ? null : codec.deserialize(urlDecoded);
String additionalInfo = "";
if (decoded == null) {
- TypeDefinition<? extends Object> baseType = RestUtil.resolveBaseTypeFrom(typedef);
+ final TypeDefinition<? extends Object> 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.";
}
}
}
private QName toQName(final String name) {
+ checkPreconditions();
final String module = toModuleName(name);
final String node = toNodeName(name);
final Module m = globalSchema.findModuleByName(module, null);
}
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
}
// FIXME: still not completely atomic
- this.qnameToRpc.set(ImmutableMap.copyOf(newMap));
- this.setGlobalSchema(context);
+ qnameToRpc.set(ImmutableMap.copyOf(newMap));
+ setGlobalSchema(context);
}
}
public static List<String> urlPathArgsDecode(final Iterable<String> strings) {
try {
- List<String> decodedPathArgs = new ArrayList<String>();
+ final List<String> decodedPathArgs = new ArrayList<String>();
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);
}
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);
}
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 {
}
}
- 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<QName, Object> keyValues = argument.getKeyValues();
- StringBuilder builder = new StringBuilder();
- builder.append("/");
+ final StringBuilder builder = new StringBuilder();
+ builder.append('/');
builder.append(nodeIdentifier);
- builder.append("/");
+ builder.append('/');
- List<QName> keyDefinition = node.getKeyDefinition();
+ final List<QName> 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;
+ }
}
}
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) {
+ Arrays.<Object> 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();
+ }
+
}
Code Review / controller.git / blobdiff