Bug 5679 - renamed package rest.services to base.services 57/48857/3
authorJakub Toth <jatoth@cisco.com>
Wed, 30 Nov 2016 15:14:31 +0000 (16:14 +0100)
committerJakub Toth <jatoth@cisco.com>
Tue, 20 Dec 2016 10:18:36 +0000 (11:18 +0100)
Change-Id: I8a8ca628d0667536ec7f6f2e217dd8cfb02d775f
Signed-off-by: Jakub Toth <jatoth@cisco.com>
28 files changed:
restconf/sal-rest-connector/src/main/java/org/opendaylight/netconf/md/sal/rest/schema/SchemaRetrievalService.java
restconf/sal-rest-connector/src/main/java/org/opendaylight/netconf/sal/rest/api/RestconfService.java
restconf/sal-rest-connector/src/main/java/org/opendaylight/netconf/sal/restconf/impl/FakeContainerSchemaNode.java [moved from restconf/sal-rest-connector/src/main/java/org/opendaylight/restconf/rest/services/impl/FakeContainerSchemaNode.java with 98% similarity]
restconf/sal-rest-connector/src/main/java/org/opendaylight/netconf/sal/restconf/impl/FakeImportedModule.java [moved from restconf/sal-rest-connector/src/main/java/org/opendaylight/restconf/rest/services/impl/FakeImportedModule.java with 98% similarity]
restconf/sal-rest-connector/src/main/java/org/opendaylight/netconf/sal/restconf/impl/FakeLeafSchemaNode.java [moved from restconf/sal-rest-connector/src/main/java/org/opendaylight/restconf/rest/services/impl/FakeLeafSchemaNode.java with 98% similarity]
restconf/sal-rest-connector/src/main/java/org/opendaylight/netconf/sal/restconf/impl/FakeModuleImport.java [moved from restconf/sal-rest-connector/src/main/java/org/opendaylight/restconf/rest/services/impl/FakeModuleImport.java with 95% similarity]
restconf/sal-rest-connector/src/main/java/org/opendaylight/netconf/sal/restconf/impl/FakeRestconfModule.java [moved from restconf/sal-rest-connector/src/main/java/org/opendaylight/restconf/rest/services/impl/FakeRestconfModule.java with 99% similarity]
restconf/sal-rest-connector/src/main/java/org/opendaylight/netconf/sal/restconf/impl/RestconfImpl.java
restconf/sal-rest-connector/src/main/java/org/opendaylight/restconf/base/services/api/BaseServicesWrapper.java [moved from restconf/sal-rest-connector/src/main/java/org/opendaylight/restconf/rest/services/api/BaseServicesWrapper.java with 92% similarity]
restconf/sal-rest-connector/src/main/java/org/opendaylight/restconf/base/services/api/RestconfModulesService.java [moved from restconf/sal-rest-connector/src/main/java/org/opendaylight/restconf/rest/services/api/RestconfModulesService.java with 98% similarity]
restconf/sal-rest-connector/src/main/java/org/opendaylight/restconf/base/services/api/RestconfOperationsService.java [moved from restconf/sal-rest-connector/src/main/java/org/opendaylight/restconf/rest/services/api/RestconfOperationsService.java with 97% similarity]
restconf/sal-rest-connector/src/main/java/org/opendaylight/restconf/base/services/api/RestconfSchemaService.java [moved from restconf/sal-rest-connector/src/main/java/org/opendaylight/restconf/rest/services/api/RestconfSchemaService.java with 95% similarity]
restconf/sal-rest-connector/src/main/java/org/opendaylight/restconf/base/services/api/RestconfStreamsService.java [moved from restconf/sal-rest-connector/src/main/java/org/opendaylight/restconf/rest/services/api/RestconfStreamsService.java with 96% similarity]
restconf/sal-rest-connector/src/main/java/org/opendaylight/restconf/base/services/impl/FakeContainerSchemaNode.java [moved from restconf/sal-rest-connector/src/main/java/org/opendaylight/netconf/sal/restconf/impl/ContainerSchemaNodeImpl.java with 77% similarity]
restconf/sal-rest-connector/src/main/java/org/opendaylight/restconf/base/services/impl/FakeImportedModule.java [new file with mode: 0644]
restconf/sal-rest-connector/src/main/java/org/opendaylight/restconf/base/services/impl/FakeLeafSchemaNode.java [moved from restconf/sal-rest-connector/src/main/java/org/opendaylight/netconf/sal/restconf/impl/LeafSchemaNodeImpl.java with 86% similarity]
restconf/sal-rest-connector/src/main/java/org/opendaylight/restconf/base/services/impl/FakeModuleImport.java [new file with mode: 0644]
restconf/sal-rest-connector/src/main/java/org/opendaylight/restconf/base/services/impl/FakeRestconfModule.java [moved from restconf/sal-rest-connector/src/main/java/org/opendaylight/netconf/sal/restconf/impl/ModuleImpl.java with 80% similarity]
restconf/sal-rest-connector/src/main/java/org/opendaylight/restconf/base/services/impl/RestconfModulesServiceImpl.java [moved from restconf/sal-rest-connector/src/main/java/org/opendaylight/restconf/rest/services/impl/RestconfModulesServiceImpl.java with 98% similarity]
restconf/sal-rest-connector/src/main/java/org/opendaylight/restconf/base/services/impl/RestconfOperationsServiceImpl.java [moved from restconf/sal-rest-connector/src/main/java/org/opendaylight/restconf/rest/services/impl/RestconfOperationsServiceImpl.java with 89% similarity]
restconf/sal-rest-connector/src/main/java/org/opendaylight/restconf/base/services/impl/RestconfSchemaServiceImpl.java [moved from restconf/sal-rest-connector/src/main/java/org/opendaylight/restconf/rest/services/impl/RestconfSchemaServiceImpl.java with 94% similarity]
restconf/sal-rest-connector/src/main/java/org/opendaylight/restconf/base/services/impl/RestconfStreamsServiceImpl.java [moved from restconf/sal-rest-connector/src/main/java/org/opendaylight/restconf/rest/services/impl/RestconfStreamsServiceImpl.java with 97% similarity]
restconf/sal-rest-connector/src/main/java/org/opendaylight/restconf/common/wrapper/services/ServicesWrapperImpl.java
restconf/sal-rest-connector/src/test/java/org/opendaylight/restconf/rest/services/impl/RestconfModulesServiceTest.java
restconf/sal-rest-connector/src/test/java/org/opendaylight/restconf/rest/services/impl/RestconfModulesServiceTestUtils.java
restconf/sal-rest-connector/src/test/java/org/opendaylight/restconf/rest/services/impl/RestconfOperationsServiceTest.java
restconf/sal-rest-connector/src/test/java/org/opendaylight/restconf/rest/services/impl/RestconfSchemaServiceTest.java
restconf/sal-rest-connector/src/test/java/org/opendaylight/restconf/rest/services/impl/RestconfStreamsServiceTest.java

index 2dc16e209b1ab6b632db052644d20d34de403859..caf3134e4ff07e72577941e640c2a68e1ad5fc67 100644 (file)
@@ -12,7 +12,7 @@ import javax.ws.rs.GET;
 import javax.ws.rs.Path;
 import javax.ws.rs.PathParam;
 import javax.ws.rs.Produces;
-import org.opendaylight.restconf.rest.services.api.RestconfSchemaService;
+import org.opendaylight.restconf.base.services.api.RestconfSchemaService;
 
 /**
  * @deprecated do not use this api. It is replaced by
index 4419105d1de537f7b1ae06f395c26bb69bcb9d13..f82e5767df0c1499f2f6a2b7dcbf68c622fd3191 100644 (file)
@@ -26,9 +26,9 @@ import org.opendaylight.netconf.sal.rest.impl.PATCH;
 import org.opendaylight.netconf.sal.restconf.impl.NormalizedNodeContext;
 import org.opendaylight.netconf.sal.restconf.impl.PATCHContext;
 import org.opendaylight.netconf.sal.restconf.impl.PATCHStatusContext;
-import org.opendaylight.restconf.rest.services.api.RestconfModulesService;
-import org.opendaylight.restconf.rest.services.api.RestconfOperationsService;
-import org.opendaylight.restconf.rest.services.api.RestconfStreamsService;
+import org.opendaylight.restconf.base.services.api.RestconfModulesService;
+import org.opendaylight.restconf.base.services.api.RestconfOperationsService;
+import org.opendaylight.restconf.base.services.api.RestconfStreamsService;
 import org.opendaylight.restconf.restful.services.api.RestconfDataService;
 import org.opendaylight.restconf.restful.services.api.RestconfInvokeOperationsService;
 
@@ -5,7 +5,7 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
-package org.opendaylight.restconf.rest.services.impl;
+package org.opendaylight.netconf.sal.restconf.impl;
 
 import com.google.common.collect.ImmutableList;
 import java.util.Collection;
similarity index 98%
rename from restconf/sal-rest-connector/src/main/java/org/opendaylight/restconf/rest/services/impl/FakeImportedModule.java
rename to restconf/sal-rest-connector/src/main/java/org/opendaylight/netconf/sal/restconf/impl/FakeImportedModule.java
index 6fc3d2bfb0625add1400bd96a969648f02fe3380..10002206608093ff1cf8e9800a6cb01dd0303e8c 100644 (file)
@@ -5,7 +5,7 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
-package org.opendaylight.restconf.rest.services.impl;
+package org.opendaylight.netconf.sal.restconf.impl;
 
 import com.google.common.base.Preconditions;
 import com.google.common.collect.ForwardingObject;
similarity index 98%
rename from restconf/sal-rest-connector/src/main/java/org/opendaylight/restconf/rest/services/impl/FakeLeafSchemaNode.java
rename to restconf/sal-rest-connector/src/main/java/org/opendaylight/netconf/sal/restconf/impl/FakeLeafSchemaNode.java
index 81bbc47d8adeb8e4b853ee37a05d807a8286ce91..3c6818f0b41d8644a88f21be7e348b09e9958751 100644 (file)
@@ -5,7 +5,7 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
-package org.opendaylight.restconf.rest.services.impl;
+package org.opendaylight.netconf.sal.restconf.impl;
 
 import java.util.List;
 import org.opendaylight.yangtools.yang.common.QName;
similarity index 95%
rename from restconf/sal-rest-connector/src/main/java/org/opendaylight/restconf/rest/services/impl/FakeModuleImport.java
rename to restconf/sal-rest-connector/src/main/java/org/opendaylight/netconf/sal/restconf/impl/FakeModuleImport.java
index 4ada5a7bb030f6ceb2488a6658fa8cf619afc6c3..8d781e88c537541577e1b85a08d974ddccc7b5a7 100644 (file)
@@ -5,7 +5,7 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
-package org.opendaylight.restconf.rest.services.impl;
+package org.opendaylight.netconf.sal.restconf.impl;
 
 import com.google.common.base.Preconditions;
 import java.util.Date;
similarity index 99%
rename from restconf/sal-rest-connector/src/main/java/org/opendaylight/restconf/rest/services/impl/FakeRestconfModule.java
rename to restconf/sal-rest-connector/src/main/java/org/opendaylight/netconf/sal/restconf/impl/FakeRestconfModule.java
index a30b45463f5b34a2541a7775287b3997c97d5faf..9bac961c2f0d27ac4cc10f393ce82d26306dda82 100644 (file)
@@ -5,7 +5,7 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
-package org.opendaylight.restconf.rest.services.impl;
+package org.opendaylight.netconf.sal.restconf.impl;
 
 import com.google.common.collect.Collections2;
 import com.google.common.collect.ImmutableList;
index edb32d48c6a863f44724de664ff2ba968dd911c4..928abe0eaf61c13431975d96de2a9bbea6d68073 100644 (file)
@@ -13,6 +13,7 @@ import com.google.common.base.Optional;
 import com.google.common.base.Preconditions;
 import com.google.common.base.Splitter;
 import com.google.common.base.Strings;
+import com.google.common.collect.ImmutableSet;
 import com.google.common.collect.Iterables;
 import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
@@ -30,7 +31,6 @@ import java.util.Collection;
 import java.util.Collections;
 import java.util.Date;
 import java.util.HashMap;
-import java.util.HashSet;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
@@ -158,20 +158,18 @@ public class RestconfImpl implements RestconfService {
     static {
         try {
             final Date eventSubscriptionAugRevision = new SimpleDateFormat("yyyy-MM-dd").parse("2014-07-08");
-            NETCONF_BASE_QNAME = QName.create(QNameModule.create(new URI(NETCONF_BASE), null),
-                    NETCONF_BASE_PAYLOAD_NAME);
-            SAL_REMOTE_AUGMENT = QNameModule.create(NAMESPACE_EVENT_SUBSCRIPTION_AUGMENT,
-                    eventSubscriptionAugRevision);
+            NETCONF_BASE_QNAME =
+                    QName.create(QNameModule.create(new URI(NETCONF_BASE), null), NETCONF_BASE_PAYLOAD_NAME);
+            SAL_REMOTE_AUGMENT = QNameModule.create(NAMESPACE_EVENT_SUBSCRIPTION_AUGMENT, eventSubscriptionAugRevision);
             SAL_REMOTE_AUG_IDENTIFIER = new YangInstanceIdentifier.AugmentationIdentifier(Sets.newHashSet(
-                    QName.create(SAL_REMOTE_AUGMENT, "scope"),
-                    QName.create(SAL_REMOTE_AUGMENT, "datastore"),
+                    QName.create(SAL_REMOTE_AUGMENT, "scope"), QName.create(SAL_REMOTE_AUGMENT, "datastore"),
                     QName.create(SAL_REMOTE_AUGMENT, "notification-output-type")));
         } catch (final ParseException e) {
             final String errMsg = "It wasn't possible to convert revision date of sal-remote-augment to date";
             LOG.debug(errMsg);
             throw new RestconfDocumentedException(errMsg, ErrorType.APPLICATION, ErrorTag.OPERATION_FAILED);
         } catch (final URISyntaxException e) {
-            final String errMsg = "It wasn't possible to create instance of URI class with "+NETCONF_BASE+" URI";
+            final String errMsg = "It wasn't possible to create instance of URI class with " + NETCONF_BASE + " URI";
             throw new RestconfDocumentedException(errMsg, ErrorType.APPLICATION, ErrorTag.OPERATION_FAILED);
         }
     }
@@ -207,9 +205,8 @@ public class RestconfImpl implements RestconfService {
                 Builders.containerBuilder((ContainerSchemaNode) modulesSchemaNode);
         moduleContainerBuilder.withChild(allModuleMap);
 
-        return new NormalizedNodeContext(new InstanceIdentifierContext<>(null, modulesSchemaNode,
-                null, schemaContext), moduleContainerBuilder.build(),
-                QueryParametersParser.parseWriterParameters(uriInfo));
+        return new NormalizedNodeContext(new InstanceIdentifierContext<>(null, modulesSchemaNode, null, schemaContext),
+                moduleContainerBuilder.build(), QueryParametersParser.parseWriterParameters(uriInfo));
     }
 
     /**
@@ -218,15 +215,15 @@ public class RestconfImpl implements RestconfService {
     @Override
     public NormalizedNodeContext getModules(final String identifier, final UriInfo uriInfo) {
         Preconditions.checkNotNull(identifier);
-        if ( ! identifier.contains(ControllerContext.MOUNT)) {
+        if (!identifier.contains(ControllerContext.MOUNT)) {
             final String errMsg = "URI has bad format. If modules behind mount point should be showed,"
                     + " URI has to end with " + ControllerContext.MOUNT;
             LOG.debug(errMsg + " for " + identifier);
             throw new RestconfDocumentedException(errMsg, ErrorType.PROTOCOL, ErrorTag.INVALID_VALUE);
         }
 
-        final InstanceIdentifierContext<?> mountPointIdentifier = this.controllerContext
-                .toMountPointIdentifier(identifier);
+        final InstanceIdentifierContext<?> mountPointIdentifier =
+                this.controllerContext.toMountPointIdentifier(identifier);
         final DOMMountPoint mountPoint = mountPointIdentifier.getMountPoint();
         final Set<Module> modules = this.controllerContext.getAllModules(mountPoint);
         final MapNode mountPointModulesMap = makeModuleMapNode(modules);
@@ -240,9 +237,10 @@ public class RestconfImpl implements RestconfService {
                 Builders.containerBuilder((ContainerSchemaNode) modulesSchemaNode);
         moduleContainerBuilder.withChild(mountPointModulesMap);
 
-        return new NormalizedNodeContext(new InstanceIdentifierContext<>(null, modulesSchemaNode,
-                mountPoint, this.controllerContext.getGlobalSchema()), moduleContainerBuilder.build(),
-                QueryParametersParser.parseWriterParameters(uriInfo));
+        return new NormalizedNodeContext(
+                new InstanceIdentifierContext<>(null, modulesSchemaNode, mountPoint,
+                        this.controllerContext.getGlobalSchema()),
+                moduleContainerBuilder.build(), QueryParametersParser.parseWriterParameters(uriInfo));
     }
 
     @Override
@@ -253,8 +251,8 @@ public class RestconfImpl implements RestconfService {
         DOMMountPoint mountPoint = null;
         final SchemaContext schemaContext;
         if (identifier.contains(ControllerContext.MOUNT)) {
-            final InstanceIdentifierContext<?> mountPointIdentifier = this.controllerContext
-                    .toMountPointIdentifier(identifier);
+            final InstanceIdentifierContext<?> mountPointIdentifier =
+                    this.controllerContext.toMountPointIdentifier(identifier);
             mountPoint = mountPointIdentifier.getMountPoint();
             module = this.controllerContext.findModuleByNameAndRevision(mountPoint, moduleNameAndRevision);
             schemaContext = mountPoint.getSchemaContext();
@@ -264,8 +262,8 @@ public class RestconfImpl implements RestconfService {
         }
 
         if (module == null) {
-            final String errMsg = "Module with name '" + moduleNameAndRevision.getLocalName()
-                    + "' and revision '" + moduleNameAndRevision.getRevision() + "' was not found.";
+            final String errMsg = "Module with name '" + moduleNameAndRevision.getLocalName() + "' and revision '"
+                    + moduleNameAndRevision.getRevision() + "' was not found.";
             LOG.debug(errMsg);
             throw new RestconfDocumentedException(errMsg, ErrorType.PROTOCOL, ErrorTag.UNKNOWN_ELEMENT);
         }
@@ -274,12 +272,13 @@ public class RestconfImpl implements RestconfService {
         final Set<Module> modules = Collections.singleton(module);
         final MapNode moduleMap = makeModuleMapNode(modules);
 
-        final DataSchemaNode moduleSchemaNode = this.controllerContext.getRestconfModuleRestConfSchemaNode(
-                restconfModule, Draft02.RestConfModule.MODULE_LIST_SCHEMA_NODE);
+        final DataSchemaNode moduleSchemaNode = this.controllerContext
+                .getRestconfModuleRestConfSchemaNode(restconfModule, Draft02.RestConfModule.MODULE_LIST_SCHEMA_NODE);
         Preconditions.checkState(moduleSchemaNode instanceof ListSchemaNode);
 
-        return new NormalizedNodeContext(new InstanceIdentifierContext<>(null, moduleSchemaNode, mountPoint,
-                schemaContext), moduleMap, QueryParametersParser.parseWriterParameters(uriInfo));
+        return new NormalizedNodeContext(
+                new InstanceIdentifierContext<>(null, moduleSchemaNode, mountPoint, schemaContext), moduleMap,
+                QueryParametersParser.parseWriterParameters(uriInfo));
     }
 
     @Override
@@ -291,8 +290,8 @@ public class RestconfImpl implements RestconfService {
                 .getRestconfModuleRestConfSchemaNode(restconfModule, Draft02.RestConfModule.STREAM_LIST_SCHEMA_NODE);
         Preconditions.checkState(streamSchemaNode instanceof ListSchemaNode);
 
-        final CollectionNodeBuilder<MapEntryNode, MapNode> listStreamsBuilder = Builders
-                .mapBuilder((ListSchemaNode) streamSchemaNode);
+        final CollectionNodeBuilder<MapEntryNode, MapNode> listStreamsBuilder =
+                Builders.mapBuilder((ListSchemaNode) streamSchemaNode);
 
         for (final String streamName : availableStreams) {
             listStreamsBuilder.withChild(toStreamEntryNode(streamName, streamSchemaNode));
@@ -306,9 +305,9 @@ public class RestconfImpl implements RestconfService {
                 Builders.containerBuilder((ContainerSchemaNode) streamsContainerSchemaNode);
         streamsContainerBuilder.withChild(listStreamsBuilder.build());
 
-
-        return new NormalizedNodeContext(new InstanceIdentifierContext<>(null, streamsContainerSchemaNode, null,
-                schemaContext), streamsContainerBuilder.build(), QueryParametersParser.parseWriterParameters(uriInfo));
+        return new NormalizedNodeContext(
+                new InstanceIdentifierContext<>(null, streamsContainerSchemaNode, null, schemaContext),
+                streamsContainerBuilder.build(), QueryParametersParser.parseWriterParameters(uriInfo));
     }
 
     @Override
@@ -322,14 +321,14 @@ public class RestconfImpl implements RestconfService {
         Set<Module> modules = null;
         DOMMountPoint mountPoint = null;
         if (identifier.contains(ControllerContext.MOUNT)) {
-            final InstanceIdentifierContext<?> mountPointIdentifier = this.controllerContext
-                    .toMountPointIdentifier(identifier);
+            final InstanceIdentifierContext<?> mountPointIdentifier =
+                    this.controllerContext.toMountPointIdentifier(identifier);
             mountPoint = mountPointIdentifier.getMountPoint();
             modules = this.controllerContext.getAllModules(mountPoint);
 
         } else {
-            final String errMsg = "URI has bad format. If operations behind mount point should be showed, URI has to "
-                    + "end with ";
+            final String errMsg =
+                    "URI has bad format. If operations behind mount point should be showed, URI has to " + "end with ";
             LOG.debug(errMsg + ControllerContext.MOUNT + " for " + identifier);
             throw new RestconfDocumentedException(errMsg + ControllerContext.MOUNT, ErrorType.PROTOCOL,
                     ErrorTag.INVALID_VALUE);
@@ -339,10 +338,10 @@ public class RestconfImpl implements RestconfService {
     }
 
     /**
-     * Special case only for GET restconf/operations use (since moment of pre-Beryllium
-     * Yang parser and Yang model API removal). The method is creating fake
-     * schema context with fake module and fake data by use own implementations
-     * of schema nodes and module.
+     * Special case only for GET restconf/operations use (since moment of
+     * pre-Beryllium Yang parser and Yang model API removal). The method is
+     * creating fake schema context with fake module and fake data by use own
+     * implementations of schema nodes and module.
      *
      * @param modules
      *            - set of modules for get RPCs from every module
@@ -353,32 +352,35 @@ public class RestconfImpl implements RestconfService {
     private NormalizedNodeContext operationsFromModulesToNormalizedContext(final Set<Module> modules,
             final DOMMountPoint mountPoint) {
 
-        final ContainerSchemaNodeImpl fakeCont = new ContainerSchemaNodeImpl();
-        final List<LeafNode<Object>> listRpcNodes = new ArrayList<>();
+        final Collection<Module> neededModules = new ArrayList<>(modules.size());
+        final ArrayList<LeafSchemaNode> fakeRpcSchema = new ArrayList<>();
+
         for (final Module m : modules) {
-            for (final RpcDefinition rpc : m.getRpcs()) {
+            final Set<RpcDefinition> rpcs = m.getRpcs();
+            if (!rpcs.isEmpty()) {
+                neededModules.add(m);
 
-                final LeafSchemaNode fakeLeaf = new LeafSchemaNodeImpl(fakeCont.getPath(),
-                        QName.create(ModuleImpl.moduleQName, m.getName() + ":" + rpc.getQName().getLocalName()));
-                fakeCont.addNodeChild(fakeLeaf);
-                listRpcNodes.add(Builders.leafBuilder(fakeLeaf).build());
+                fakeRpcSchema.ensureCapacity(fakeRpcSchema.size() + rpcs.size());
+                rpcs.forEach(rpc -> fakeRpcSchema.add(new FakeLeafSchemaNode(rpc.getQName())));
             }
         }
-        final ContainerSchemaNode fakeContSchNode = fakeCont;
-        final DataContainerNodeAttrBuilder<NodeIdentifier, ContainerNode> containerBuilder = Builders
-                .containerBuilder(fakeContSchNode);
 
-        for (final LeafNode<Object> rpcNode : listRpcNodes) {
-            containerBuilder.withChild(rpcNode);
+        final ContainerSchemaNode fakeCont = new FakeContainerSchemaNode(fakeRpcSchema);
+        final DataContainerNodeAttrBuilder<NodeIdentifier, ContainerNode> containerBuilder =
+                Builders.containerBuilder(fakeCont);
+
+        for (final LeafSchemaNode leaf : fakeRpcSchema) {
+            containerBuilder.withChild(Builders.leafBuilder(leaf).build());
         }
 
-        final Module fakeModule = new ModuleImpl(fakeContSchNode);
+        final Collection<Module> fakeModules = new ArrayList<>(neededModules.size() + 1);
+        neededModules.forEach(imp -> fakeModules.add(new FakeImportedModule(imp)));
+        fakeModules.add(new FakeRestconfModule(neededModules, fakeCont));
 
-        final Set<Module> fakeModules = new HashSet<>();
-        fakeModules.add(fakeModule);
-        final SchemaContext fakeSchemaCtx = EffectiveSchemaContext.resolveSchemaContext(fakeModules);
+        final SchemaContext fakeSchemaCtx =
+                EffectiveSchemaContext.resolveSchemaContext(ImmutableSet.copyOf(fakeModules));
         final InstanceIdentifierContext<ContainerSchemaNode> instanceIdentifierContext =
-                new InstanceIdentifierContext<>(null, fakeContSchNode, mountPoint, fakeSchemaCtx);
+                new InstanceIdentifierContext<>(null, fakeCont, mountPoint, fakeSchemaCtx);
         return new NormalizedNodeContext(instanceIdentifierContext, containerBuilder.build());
     }
 
@@ -440,7 +442,7 @@ public class RestconfImpl implements RestconfService {
 
         if (mountPoint != null) {
             final Optional<DOMRpcService> mountRpcServices = mountPoint.getService(DOMRpcService.class);
-            if ( ! mountRpcServices.isPresent()) {
+            if (!mountRpcServices.isPresent()) {
                 LOG.debug("Error: Rpc service is missing.");
                 throw new RestconfDocumentedException("Rpc service is missing.");
             }
@@ -471,9 +473,9 @@ public class RestconfImpl implements RestconfService {
             resultNodeSchema = (RpcDefinition) payload.getInstanceIdentifierContext().getSchemaNode();
         }
 
-        return new NormalizedNodeContext(new InstanceIdentifierContext<RpcDefinition>(null,
-                resultNodeSchema, mountPoint, schemaContext), resultData,
-                QueryParametersParser.parseWriterParameters(uriInfo));
+        return new NormalizedNodeContext(
+                new InstanceIdentifierContext<RpcDefinition>(null, resultNodeSchema, mountPoint, schemaContext),
+                resultData, QueryParametersParser.parseWriterParameters(uriInfo));
     }
 
     private static DOMRpcResult checkRpcResponse(final CheckedFuture<DOMRpcResult, DOMRpcException> response) {
@@ -547,8 +549,8 @@ public class RestconfImpl implements RestconfService {
         String streamName = (String) CREATE_DATA_SUBSCR;
         NotificationOutputType outputType = null;
         if (!pathIdentifier.isEmpty()) {
-            final String fullRestconfIdentifier = DATA_SUBSCR
-                    + this.controllerContext.toFullRestconfIdentifier(pathIdentifier, null);
+            final String fullRestconfIdentifier =
+                    DATA_SUBSCR + this.controllerContext.toFullRestconfIdentifier(pathIdentifier, null);
 
             LogicalDatastoreType datastore =
                     parseEnumTypeParameter(value, LogicalDatastoreType.class, DATASTORE_PARAM_NAME);
@@ -557,12 +559,11 @@ public class RestconfImpl implements RestconfService {
             DataChangeScope scope = parseEnumTypeParameter(value, DataChangeScope.class, SCOPE_PARAM_NAME);
             scope = scope == null ? DEFAULT_SCOPE : scope;
 
-            outputType = parseEnumTypeParameter(value, NotificationOutputType.class,
-                    OUTPUT_TYPE_PARAM_NAME);
+            outputType = parseEnumTypeParameter(value, NotificationOutputType.class, OUTPUT_TYPE_PARAM_NAME);
             outputType = outputType == null ? NotificationOutputType.XML : outputType;
 
-            streamName = Notificator.createStreamNameFromUri(fullRestconfIdentifier + "/datastore=" + datastore
-                    + "/scope=" + scope);
+            streamName = Notificator
+                    .createStreamNameFromUri(fullRestconfIdentifier + "/datastore=" + datastore + "/scope=" + scope);
         }
 
         if (Strings.isNullOrEmpty(streamName)) {
@@ -601,14 +602,16 @@ public class RestconfImpl implements RestconfService {
             final InstanceIdentifierContext<?> mountPointId = this.controllerContext.toMountPointIdentifier(identifier);
             mountPoint = mountPointId.getMountPoint();
             schemaContext = mountPoint.getSchemaContext();
-            final int startOfRemoteRpcName = identifier.lastIndexOf(ControllerContext.MOUNT)
-                    + ControllerContext.MOUNT.length() + 1;
+            final int startOfRemoteRpcName =
+                    identifier.lastIndexOf(ControllerContext.MOUNT) + ControllerContext.MOUNT.length() + 1;
             final String remoteRpcName = identifier.substring(startOfRemoteRpcName);
             identifierEncoded = remoteRpcName;
 
         } else if (identifier.indexOf("/") != CHAR_NOT_FOUND) {
-            final String slashErrorMsg = String.format("Identifier %n%s%ncan\'t contain slash "
-                    + "character (/).%nIf slash is part of identifier name then use %%2F placeholder.", identifier);
+            final String slashErrorMsg = String.format(
+                    "Identifier %n%s%ncan\'t contain slash "
+                            + "character (/).%nIf slash is part of identifier name then use %%2F placeholder.",
+                    identifier);
             LOG.debug(slashErrorMsg);
             throw new RestconfDocumentedException(slashErrorMsg, ErrorType.PROTOCOL, ErrorTag.INVALID_VALUE);
         } else {
@@ -639,7 +642,7 @@ public class RestconfImpl implements RestconfService {
         final CheckedFuture<DOMRpcResult, DOMRpcException> response;
         if (mountPoint != null) {
             final Optional<DOMRpcService> mountRpcServices = mountPoint.getService(DOMRpcService.class);
-            if ( ! mountRpcServices.isPresent()) {
+            if (!mountRpcServices.isPresent()) {
                 throw new RestconfDocumentedException("Rpc service is missing.");
             }
             response = mountRpcServices.get().invokeRpc(rpc.getPath(), null);
@@ -709,8 +712,9 @@ public class RestconfImpl implements RestconfService {
         } else {
             data = this.broker.readConfigurationData(normalizedII, withDefa);
         }
-        if(data == null) {
-            final String errMsg = "Request could not be completed because the relevant data model content does not exist ";
+        if (data == null) {
+            final String errMsg =
+                    "Request could not be completed because the relevant data model content does not exist ";
             LOG.debug(errMsg + identifier);
             throw new RestconfDocumentedException(errMsg, ErrorType.APPLICATION, ErrorTag.DATA_MISSING);
         }
@@ -729,10 +733,11 @@ public class RestconfImpl implements RestconfService {
         } else {
             data = this.broker.readOperationalData(normalizedII);
         }
-        if(data == null) {
-            final String errMsg = "Request could not be completed because the relevant data model content does not exist ";
+        if (data == null) {
+            final String errMsg =
+                    "Request could not be completed because the relevant data model content does not exist ";
             LOG.debug(errMsg + identifier);
-            throw new RestconfDocumentedException(errMsg , ErrorType.APPLICATION, ErrorTag.DATA_MISSING);
+            throw new RestconfDocumentedException(errMsg, ErrorType.APPLICATION, ErrorTag.DATA_MISSING);
         }
         return new NormalizedNodeContext(iiWithData, data, QueryParametersParser.parseWriterParameters(uriInfo));
     }
@@ -766,7 +771,7 @@ public class RestconfImpl implements RestconfService {
                 default:
                     throw new RestconfDocumentedException("Bad parameter for post: " + entry.getKey());
             }
-            }
+        }
 
         if (point_used && !insert_used) {
             throw new RestconfDocumentedException("Point parameter can't be used without Insert parameter.");
@@ -788,21 +793,24 @@ public class RestconfImpl implements RestconfService {
         final YangInstanceIdentifier normalizedII = iiWithData.getInstanceIdentifier();
 
         /*
-         * There is a small window where another write transaction could be updating the same data
-         * simultaneously and we get an OptimisticLockFailedException. This error is likely
-         * transient and The WriteTransaction#submit API docs state that a retry will likely
-         * succeed. So we'll try again if that scenario occurs. If it fails a third time then it
-         * probably will never succeed so we'll fail in that case.
+         * There is a small window where another write transaction could be
+         * updating the same data simultaneously and we get an
+         * OptimisticLockFailedException. This error is likely transient and The
+         * WriteTransaction#submit API docs state that a retry will likely
+         * succeed. So we'll try again if that scenario occurs. If it fails a
+         * third time then it probably will never succeed so we'll fail in that
+         * case.
          *
-         * By retrying we're attempting to hide the internal implementation of the data store and
-         * how it handles concurrent updates from the restconf client. The client has instructed us
-         * to put the data and we should make every effort to do so without pushing optimistic lock
-         * failures back to the client and forcing them to handle it via retry (and having to
-         * document the behavior).
+         * By retrying we're attempting to hide the internal implementation of
+         * the data store and how it handles concurrent updates from the
+         * restconf client. The client has instructed us to put the data and we
+         * should make every effort to do so without pushing optimistic lock
+         * failures back to the client and forcing them to handle it via retry
+         * (and having to document the behavior).
          */
         PutResult result = null;
         final TryOfPutData tryPutData = new TryOfPutData();
-        while(true) {
+        while (true) {
             if (mountPoint != null) {
 
                 result = this.broker.commitMountPointDataPut(mountPoint, normalizedII, payload.getData(), insert,
@@ -835,7 +843,7 @@ public class RestconfImpl implements RestconfService {
                 throw new RestconfDocumentedException(msg, e);
             }
 
-            if(tryPutData.isDone()){
+            if (tryPutData.isDone()) {
                 break;
             } else {
                 throw new RestconfDocumentedException("Problem while PUT operations");
@@ -869,26 +877,27 @@ public class RestconfImpl implements RestconfService {
 
         final String payloadName = node.getData().getNodeType().getLocalName();
 
-        //no arguments
+        // no arguments
         if (identifier.isEmpty()) {
-            //no "data" payload
+            // no "data" payload
             if (!node.getData().getNodeType().equals(NETCONF_BASE_QNAME)) {
                 throw new RestconfDocumentedException("Instance identifier has to contain at least one path argument",
                         ErrorType.PROTOCOL, ErrorTag.MALFORMED_MESSAGE);
             }
-        //any arguments
+            // any arguments
         } else {
             final String identifierName = identifier.getLastPathArgument().getNodeType().getLocalName();
             if (!payloadName.equals(identifierName)) {
-                throw new RestconfDocumentedException("Payload name (" + payloadName
-                        + ") is different from identifier name (" + identifierName + ")", ErrorType.PROTOCOL,
-                        ErrorTag.MALFORMED_MESSAGE);
+                throw new RestconfDocumentedException(
+                        "Payload name (" + payloadName + ") is different from identifier name (" + identifierName + ")",
+                        ErrorType.PROTOCOL, ErrorTag.MALFORMED_MESSAGE);
             }
         }
     }
 
     /**
-     * Validates whether keys in {@code payload} are equal to values of keys in {@code iiWithData} for list schema node
+     * Validates whether keys in {@code payload} are equal to values of keys in
+     * {@code iiWithData} for list schema node
      *
      * @throws RestconfDocumentedException
      *             if key values or key count in payload and URI isn't equal
@@ -903,14 +912,15 @@ public class RestconfImpl implements RestconfService {
         if (schemaNode instanceof ListSchemaNode) {
             final List<QName> keyDefinitions = ((ListSchemaNode) schemaNode).getKeyDefinition();
             if ((lastPathArgument instanceof NodeIdentifierWithPredicates) && (data instanceof MapEntryNode)) {
-                final Map<QName, Object> uriKeyValues = ((NodeIdentifierWithPredicates) lastPathArgument).getKeyValues();
+                final Map<QName, Object> uriKeyValues =
+                        ((NodeIdentifierWithPredicates) lastPathArgument).getKeyValues();
                 isEqualUriAndPayloadKeyValues(uriKeyValues, (MapEntryNode) data, keyDefinitions);
             }
         }
     }
 
-    private static void isEqualUriAndPayloadKeyValues(final Map<QName, Object> uriKeyValues,
-            final MapEntryNode payload, final List<QName> keyDefinitions) {
+    private static void isEqualUriAndPayloadKeyValues(final Map<QName, Object> uriKeyValues, final MapEntryNode payload,
+            final List<QName> keyDefinitions) {
 
         final Map<QName, Object> mutableCopyUriKeyValues = Maps.newHashMap(uriKeyValues);
         for (final QName keyDefinition : keyDefinitions) {
@@ -921,9 +931,9 @@ public class RestconfImpl implements RestconfService {
 
             final Object dataKeyValue = payload.getIdentifier().getKeyValues().get(keyDefinition);
 
-            if ( ! uriKeyValue.equals(dataKeyValue)) {
-                final String errMsg = "The value '" + uriKeyValue + "' for key '" + keyDefinition.getLocalName() +
-                        "' specified in the URI doesn't match the value '" + dataKeyValue
+            if (!uriKeyValue.equals(dataKeyValue)) {
+                final String errMsg = "The value '" + uriKeyValue + "' for key '" + keyDefinition.getLocalName()
+                        "' specified in the URI doesn't match the value '" + dataKeyValue
                         + "' specified in the message body. ";
                 throw new RestconfDocumentedException(errMsg, ErrorType.PROTOCOL, ErrorTag.INVALID_VALUE);
             }
@@ -933,7 +943,7 @@ public class RestconfImpl implements RestconfService {
     @Override
     public Response createConfigurationData(final String identifier, final NormalizedNodeContext payload,
             final UriInfo uriInfo) {
-       return createConfigurationData(payload, uriInfo);
+        return createConfigurationData(payload, uriInfo);
     }
 
     // FIXME create RestconfIdetifierHelper and move this method there
@@ -951,7 +961,7 @@ public class RestconfImpl implements RestconfService {
         }
         final InstanceIdentifierContext<?> parentContext = payload.getInstanceIdentifierContext();
         final SchemaNode parentSchemaNode = parentContext.getSchemaNode();
-        if(parentSchemaNode instanceof DataNodeContainer) {
+        if (parentSchemaNode instanceof DataNodeContainer) {
             final DataNodeContainer cast = (DataNodeContainer) parentSchemaNode;
             for (final DataSchemaNode child : cast.getChildNodes()) {
                 if (payloadNodeQname.compareTo(child.getQName()) == 0) {
@@ -1066,7 +1076,7 @@ public class RestconfImpl implements RestconfService {
 
     private URI resolveLocation(final UriInfo uriInfo, final String uriBehindBase, final DOMMountPoint mountPoint,
             final YangInstanceIdentifier normalizedII) {
-        if(uriInfo == null) {
+        if (uriInfo == null) {
             // This is null if invoked internally
             return null;
         }
@@ -1143,11 +1153,14 @@ public class RestconfImpl implements RestconfService {
     }
 
     /**
-     * Subscribes to some path in schema context (stream) to listen on changes on this stream.
+     * Subscribes to some path in schema context (stream) to listen on changes
+     * on this stream.
      *
-     * Additional parameters for subscribing to stream are loaded via rpc input parameters:
+     * Additional parameters for subscribing to stream are loaded via rpc input
+     * parameters:
      * <ul>
-     * <li>datastore - default CONFIGURATION (other values of {@link LogicalDatastoreType} enum type)</li>
+     * <li>datastore - default CONFIGURATION (other values of
+     * {@link LogicalDatastoreType} enum type)</li>
      * <li>scope - default BASE (other values of {@link DataChangeScope})</li>
      * </ul>
      */
@@ -1190,7 +1203,7 @@ public class RestconfImpl implements RestconfService {
                     throw new RestconfDocumentedException("Bad parameter used with notifications: " + entry.getKey());
             }
         }
-        if(!startTime_used && stopTime_used){
+        if (!startTime_used && stopTime_used) {
             throw new RestconfDocumentedException("Stop-time parameter has to be used with start-time parameter.");
         }
         URI response = null;
@@ -1200,11 +1213,11 @@ public class RestconfImpl implements RestconfService {
             response = notifStream(identifier, uriInfo, start, stop, filter);
         }
 
-        if(response != null){
+        if (response != null) {
             // prepare node with value of location
             final InstanceIdentifierContext<?> iid = prepareIIDSubsStreamOutput();
-            final NormalizedNodeAttrBuilder<NodeIdentifier, Object, LeafNode<Object>> builder = ImmutableLeafNodeBuilder
-                    .create().withValue(response.toString());
+            final NormalizedNodeAttrBuilder<NodeIdentifier, Object, LeafNode<Object>> builder =
+                    ImmutableLeafNodeBuilder.create().withValue(response.toString());
             builder.withNodeIdentifier(
                     NodeIdentifier.create(QName.create("subscribe:to:notification", "2016-10-28", "location")));
 
@@ -1334,18 +1347,20 @@ public class RestconfImpl implements RestconfService {
 
         final ListenerAdapter listener = Notificator.getListenerFor(streamName);
         if (listener == null) {
-            throw new RestconfDocumentedException("Stream was not found.", ErrorType.PROTOCOL, ErrorTag.UNKNOWN_ELEMENT);
+            throw new RestconfDocumentedException("Stream was not found.", ErrorType.PROTOCOL,
+                    ErrorTag.UNKNOWN_ELEMENT);
         }
         listener.setQueryParams(start, stop, filter);
 
         final Map<String, String> paramToValues = resolveValuesFromUri(identifier);
-        final LogicalDatastoreType datastore = parserURIEnumParameter(LogicalDatastoreType.class,
-                paramToValues.get(DATASTORE_PARAM_NAME));
+        final LogicalDatastoreType datastore =
+                parserURIEnumParameter(LogicalDatastoreType.class, paramToValues.get(DATASTORE_PARAM_NAME));
         if (datastore == null) {
             throw new RestconfDocumentedException("Stream name doesn't contains datastore value (pattern /datastore=)",
                     ErrorType.APPLICATION, ErrorTag.MISSING_ATTRIBUTE);
         }
-        final DataChangeScope scope = parserURIEnumParameter(DataChangeScope.class, paramToValues.get(SCOPE_PARAM_NAME));
+        final DataChangeScope scope =
+                parserURIEnumParameter(DataChangeScope.class, paramToValues.get(SCOPE_PARAM_NAME));
         if (scope == null) {
             throw new RestconfDocumentedException("Stream name doesn't contains datastore value (pattern /scope=)",
                     ErrorType.APPLICATION, ErrorTag.MISSING_ATTRIBUTE);
@@ -1401,17 +1416,18 @@ public class RestconfImpl implements RestconfService {
      *
      * @param value
      *            contains value
-     * @return enum object if its string value is equal to {@code paramName}. In other cases null.
+     * @return enum object if its string value is equal to {@code paramName}. In
+     *         other cases null.
      */
     private static <T> T parseEnumTypeParameter(final ContainerNode value, final Class<T> classDescriptor,
             final String paramName) {
-        final Optional<DataContainerChild<? extends PathArgument, ?>> augNode = value.getChild(SAL_REMOTE_AUG_IDENTIFIER);
+        final Optional<DataContainerChild<? extends PathArgument, ?>> augNode =
+                value.getChild(SAL_REMOTE_AUG_IDENTIFIER);
         if (!augNode.isPresent() && !(augNode instanceof AugmentationNode)) {
             return null;
         }
-        final Optional<DataContainerChild<? extends PathArgument, ?>> enumNode =
-                ((AugmentationNode) augNode.get())
-                        .getChild(new NodeIdentifier(QName.create(SAL_REMOTE_AUGMENT, paramName)));
+        final Optional<DataContainerChild<? extends PathArgument, ?>> enumNode = ((AugmentationNode) augNode.get())
+                .getChild(new NodeIdentifier(QName.create(SAL_REMOTE_AUGMENT, paramName)));
         if (!enumNode.isPresent()) {
             return null;
         }
@@ -1424,10 +1440,11 @@ public class RestconfImpl implements RestconfService {
     }
 
     /**
-     * Checks whether {@code value} is one of the string representation of enumeration {@code classDescriptor}
+     * Checks whether {@code value} is one of the string representation of
+     * enumeration {@code classDescriptor}
      *
-     * @return enum object if string value of {@code classDescriptor} enumeration is equal to {@code value}. Other cases
-     *         null.
+     * @return enum object if string value of {@code classDescriptor}
+     *         enumeration is equal to {@code value}. Other cases null.
      */
     private static <T> T parserURIEnumParameter(final Class<T> classDescriptor, final String value) {
         if (Strings.isNullOrEmpty(value)) {
@@ -1463,12 +1480,12 @@ public class RestconfImpl implements RestconfService {
     private MapNode makeModuleMapNode(final Set<Module> modules) {
         Preconditions.checkNotNull(modules);
         final Module restconfModule = getRestconfModule();
-        final DataSchemaNode moduleSchemaNode = this.controllerContext.getRestconfModuleRestConfSchemaNode(
-                restconfModule, Draft02.RestConfModule.MODULE_LIST_SCHEMA_NODE);
+        final DataSchemaNode moduleSchemaNode = this.controllerContext
+                .getRestconfModuleRestConfSchemaNode(restconfModule, Draft02.RestConfModule.MODULE_LIST_SCHEMA_NODE);
         Preconditions.checkState(moduleSchemaNode instanceof ListSchemaNode);
 
-        final CollectionNodeBuilder<MapEntryNode, MapNode> listModuleBuilder = Builders
-                .mapBuilder((ListSchemaNode) moduleSchemaNode);
+        final CollectionNodeBuilder<MapEntryNode, MapNode> listModuleBuilder =
+                Builders.mapBuilder((ListSchemaNode) moduleSchemaNode);
 
         for (final Module module : modules) {
             listModuleBuilder.withChild(toModuleEntryNode(module, moduleSchemaNode));
@@ -1480,37 +1497,37 @@ public class RestconfImpl implements RestconfService {
         Preconditions.checkArgument(moduleSchemaNode instanceof ListSchemaNode,
                 "moduleSchemaNode has to be of type ListSchemaNode");
         final ListSchemaNode listModuleSchemaNode = (ListSchemaNode) moduleSchemaNode;
-        final DataContainerNodeAttrBuilder<NodeIdentifierWithPredicates, MapEntryNode> moduleNodeValues = Builders
-                .mapEntryBuilder(listModuleSchemaNode);
+        final DataContainerNodeAttrBuilder<NodeIdentifierWithPredicates, MapEntryNode> moduleNodeValues =
+                Builders.mapEntryBuilder(listModuleSchemaNode);
 
-        List<DataSchemaNode> instanceDataChildrenByName = ControllerContext.findInstanceDataChildrenByName(
-                (listModuleSchemaNode), "name");
+        List<DataSchemaNode> instanceDataChildrenByName =
+                ControllerContext.findInstanceDataChildrenByName((listModuleSchemaNode), "name");
         final DataSchemaNode nameSchemaNode = Iterables.getFirst(instanceDataChildrenByName, null);
         Preconditions.checkState(nameSchemaNode instanceof LeafSchemaNode);
-        moduleNodeValues.withChild(Builders.leafBuilder((LeafSchemaNode) nameSchemaNode).withValue(module.getName())
-                .build());
+        moduleNodeValues
+                .withChild(Builders.leafBuilder((LeafSchemaNode) nameSchemaNode).withValue(module.getName()).build());
 
-        instanceDataChildrenByName = ControllerContext.findInstanceDataChildrenByName(
-                (listModuleSchemaNode), "revision");
+        instanceDataChildrenByName =
+                ControllerContext.findInstanceDataChildrenByName((listModuleSchemaNode), "revision");
         final DataSchemaNode revisionSchemaNode = Iterables.getFirst(instanceDataChildrenByName, null);
         Preconditions.checkState(revisionSchemaNode instanceof LeafSchemaNode);
         final String revision = REVISION_FORMAT.format(module.getRevision());
-        moduleNodeValues.withChild(Builders.leafBuilder((LeafSchemaNode) revisionSchemaNode).withValue(revision)
-                .build());
+        moduleNodeValues
+                .withChild(Builders.leafBuilder((LeafSchemaNode) revisionSchemaNode).withValue(revision).build());
 
-        instanceDataChildrenByName = ControllerContext.findInstanceDataChildrenByName(
-                (listModuleSchemaNode), "namespace");
+        instanceDataChildrenByName =
+                ControllerContext.findInstanceDataChildrenByName((listModuleSchemaNode), "namespace");
         final DataSchemaNode namespaceSchemaNode = Iterables.getFirst(instanceDataChildrenByName, null);
         Preconditions.checkState(namespaceSchemaNode instanceof LeafSchemaNode);
         moduleNodeValues.withChild(Builders.leafBuilder((LeafSchemaNode) namespaceSchemaNode)
                 .withValue(module.getNamespace().toString()).build());
 
-        instanceDataChildrenByName = ControllerContext.findInstanceDataChildrenByName(
-                (listModuleSchemaNode), "feature");
+        instanceDataChildrenByName =
+                ControllerContext.findInstanceDataChildrenByName((listModuleSchemaNode), "feature");
         final DataSchemaNode featureSchemaNode = Iterables.getFirst(instanceDataChildrenByName, null);
         Preconditions.checkState(featureSchemaNode instanceof LeafListSchemaNode);
-        final ListNodeBuilder<Object, LeafSetEntryNode<Object>> featuresBuilder = Builders
-                .leafSetBuilder((LeafListSchemaNode) featureSchemaNode);
+        final ListNodeBuilder<Object, LeafSetEntryNode<Object>> featuresBuilder =
+                Builders.leafSetBuilder((LeafListSchemaNode) featureSchemaNode);
         for (final FeatureDefinition feature : module.getFeatures()) {
             featuresBuilder.withChild(Builders.leafSetEntryBuilder(((LeafListSchemaNode) featureSchemaNode))
                     .withValue(feature.getQName().getLocalName()).build());
@@ -1524,43 +1541,40 @@ public class RestconfImpl implements RestconfService {
         Preconditions.checkArgument(streamSchemaNode instanceof ListSchemaNode,
                 "streamSchemaNode has to be of type ListSchemaNode");
         final ListSchemaNode listStreamSchemaNode = (ListSchemaNode) streamSchemaNode;
-        final DataContainerNodeAttrBuilder<NodeIdentifierWithPredicates, MapEntryNode> streamNodeValues = Builders
-                .mapEntryBuilder(listStreamSchemaNode);
+        final DataContainerNodeAttrBuilder<NodeIdentifierWithPredicates, MapEntryNode> streamNodeValues =
+                Builders.mapEntryBuilder(listStreamSchemaNode);
 
-        List<DataSchemaNode> instanceDataChildrenByName = ControllerContext.findInstanceDataChildrenByName(
-                (listStreamSchemaNode), "name");
+        List<DataSchemaNode> instanceDataChildrenByName =
+                ControllerContext.findInstanceDataChildrenByName((listStreamSchemaNode), "name");
         final DataSchemaNode nameSchemaNode = Iterables.getFirst(instanceDataChildrenByName, null);
         Preconditions.checkState(nameSchemaNode instanceof LeafSchemaNode);
-        streamNodeValues.withChild(Builders.leafBuilder((LeafSchemaNode) nameSchemaNode).withValue(streamName)
-                .build());
+        streamNodeValues.withChild(Builders.leafBuilder((LeafSchemaNode) nameSchemaNode).withValue(streamName).build());
 
-        instanceDataChildrenByName = ControllerContext.findInstanceDataChildrenByName(
-                (listStreamSchemaNode), "description");
+        instanceDataChildrenByName =
+                ControllerContext.findInstanceDataChildrenByName((listStreamSchemaNode), "description");
         final DataSchemaNode descriptionSchemaNode = Iterables.getFirst(instanceDataChildrenByName, null);
         Preconditions.checkState(descriptionSchemaNode instanceof LeafSchemaNode);
-        streamNodeValues.withChild(Builders.leafBuilder((LeafSchemaNode) nameSchemaNode)
-                .withValue("DESCRIPTION_PLACEHOLDER").build());
+        streamNodeValues.withChild(
+                Builders.leafBuilder((LeafSchemaNode) nameSchemaNode).withValue("DESCRIPTION_PLACEHOLDER").build());
 
-        instanceDataChildrenByName = ControllerContext.findInstanceDataChildrenByName(
-                (listStreamSchemaNode), "replay-support");
+        instanceDataChildrenByName =
+                ControllerContext.findInstanceDataChildrenByName((listStreamSchemaNode), "replay-support");
         final DataSchemaNode replaySupportSchemaNode = Iterables.getFirst(instanceDataChildrenByName, null);
         Preconditions.checkState(replaySupportSchemaNode instanceof LeafSchemaNode);
         streamNodeValues.withChild(Builders.leafBuilder((LeafSchemaNode) replaySupportSchemaNode)
                 .withValue(Boolean.valueOf(true)).build());
 
-        instanceDataChildrenByName = ControllerContext.findInstanceDataChildrenByName(
-                (listStreamSchemaNode), "replay-log-creation-time");
+        instanceDataChildrenByName =
+                ControllerContext.findInstanceDataChildrenByName((listStreamSchemaNode), "replay-log-creation-time");
         final DataSchemaNode replayLogCreationTimeSchemaNode = Iterables.getFirst(instanceDataChildrenByName, null);
         Preconditions.checkState(replayLogCreationTimeSchemaNode instanceof LeafSchemaNode);
-        streamNodeValues.withChild(Builders.leafBuilder((LeafSchemaNode) replayLogCreationTimeSchemaNode)
-                .withValue("").build());
+        streamNodeValues.withChild(
+                Builders.leafBuilder((LeafSchemaNode) replayLogCreationTimeSchemaNode).withValue("").build());
 
-        instanceDataChildrenByName = ControllerContext.findInstanceDataChildrenByName(
-                (listStreamSchemaNode), "events");
+        instanceDataChildrenByName = ControllerContext.findInstanceDataChildrenByName((listStreamSchemaNode), "events");
         final DataSchemaNode eventsSchemaNode = Iterables.getFirst(instanceDataChildrenByName, null);
         Preconditions.checkState(eventsSchemaNode instanceof LeafSchemaNode);
-        streamNodeValues.withChild(Builders.leafBuilder((LeafSchemaNode) eventsSchemaNode)
-                .withValue("").build());
+        streamNodeValues.withChild(Builders.leafBuilder((LeafSchemaNode) eventsSchemaNode).withValue("").build());
 
         return streamNodeValues.build();
     }
@@ -1572,8 +1586,8 @@ public class RestconfImpl implements RestconfService {
      *            - contains list of qnames of notifications
      * @return - checked future object
      */
-    private CheckedFuture<DOMRpcResult, DOMRpcException> invokeSalRemoteRpcNotifiStrRPC(
-            final NormalizedNodeContext payload) {
+    private CheckedFuture<DOMRpcResult, DOMRpcException>
+            invokeSalRemoteRpcNotifiStrRPC(final NormalizedNodeContext payload) {
         final ContainerNode data = (ContainerNode) payload.getData();
         LeafSetNode leafSet = null;
         String outputType = "XML";
@@ -1592,10 +1606,10 @@ public class RestconfImpl implements RestconfService {
         final Iterator<LeafSetEntryNode> iterator = entryNodes.iterator();
         while (iterator.hasNext()) {
             final QName valueQName = QName.create((String) iterator.next().getValue());
-            final Module module = ControllerContext.getInstance()
-                    .findModuleByNamespace(valueQName.getModule().getNamespace());
-            Preconditions.checkNotNull(module, "Module for namespace " + valueQName.getModule().getNamespace()
-                    + " does not exist");
+            final Module module =
+                    ControllerContext.getInstance().findModuleByNamespace(valueQName.getModule().getNamespace());
+            Preconditions.checkNotNull(module,
+                    "Module for namespace " + valueQName.getModule().getNamespace() + " does not exist");
             NotificationDefinition notifiDef = null;
             for (final NotificationDefinition notification : module.getNotifications()) {
                 if (notification.getQName().equals(valueQName)) {
@@ -1617,9 +1631,9 @@ public class RestconfImpl implements RestconfService {
         final QName outputQname = QName.create(rpcQName, "output");
         final QName streamNameQname = QName.create(rpcQName, "notification-stream-identifier");
 
-        final ContainerNode output = ImmutableContainerNodeBuilder.create()
-                .withNodeIdentifier(new NodeIdentifier(outputQname))
-                .withChild(ImmutableNodes.leafNode(streamNameQname, streamName)).build();
+        final ContainerNode output =
+                ImmutableContainerNodeBuilder.create().withNodeIdentifier(new NodeIdentifier(outputQname))
+                        .withChild(ImmutableNodes.leafNode(streamNameQname, streamName)).build();
 
         if (!Notificator.existNotificationListenerFor(streamName)) {
             Notificator.createNotificationListener(paths, streamName, outputType);
@@ -1645,6 +1659,7 @@ public class RestconfImpl implements RestconfService {
         boolean isDone() {
             return this.done;
         }
+
         int countGet() {
             return this.tries;
         }
similarity index 92%
rename from restconf/sal-rest-connector/src/main/java/org/opendaylight/restconf/rest/services/api/BaseServicesWrapper.java
rename to restconf/sal-rest-connector/src/main/java/org/opendaylight/restconf/base/services/api/BaseServicesWrapper.java
index c63b2913f2bccb32d4a81c6643fdca34bd622fed..be0382952feebf887130683cc914b586dd23008a 100644 (file)
@@ -5,7 +5,7 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
-package org.opendaylight.restconf.rest.services.api;
+package org.opendaylight.restconf.base.services.api;
 
 /**
  * Wrapper for all base services:
@@ -5,7 +5,7 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
-package org.opendaylight.restconf.rest.services.api;
+package org.opendaylight.restconf.base.services.api;
 
 import javax.ws.rs.GET;
 import javax.ws.rs.Path;
@@ -5,7 +5,7 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
-package org.opendaylight.restconf.rest.services.api;
+package org.opendaylight.restconf.base.services.api;
 
 import javax.ws.rs.GET;
 import javax.ws.rs.Path;
@@ -5,7 +5,7 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
-package org.opendaylight.restconf.rest.services.api;
+package org.opendaylight.restconf.base.services.api;
 
 import javax.ws.rs.GET;
 import javax.ws.rs.Path;
@@ -5,7 +5,7 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
-package org.opendaylight.restconf.rest.services.api;
+package org.opendaylight.restconf.base.services.api;
 
 import javax.ws.rs.GET;
 import javax.ws.rs.Path;
@@ -5,19 +5,21 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
-package org.opendaylight.netconf.sal.restconf.impl;
+package org.opendaylight.restconf.base.services.impl;
 
-import java.util.ArrayList;
+import com.google.common.collect.ImmutableList;
 import java.util.Collection;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
+import org.opendaylight.netconf.sal.restconf.impl.RestconfDocumentedException;
 import org.opendaylight.yangtools.yang.common.QName;
 import org.opendaylight.yangtools.yang.model.api.AugmentationSchema;
 import org.opendaylight.yangtools.yang.model.api.ConstraintDefinition;
 import org.opendaylight.yangtools.yang.model.api.ContainerSchemaNode;
 import org.opendaylight.yangtools.yang.model.api.DataSchemaNode;
 import org.opendaylight.yangtools.yang.model.api.GroupingDefinition;
+import org.opendaylight.yangtools.yang.model.api.LeafSchemaNode;
 import org.opendaylight.yangtools.yang.model.api.SchemaPath;
 import org.opendaylight.yangtools.yang.model.api.Status;
 import org.opendaylight.yangtools.yang.model.api.TypeDefinition;
@@ -25,14 +27,18 @@ import org.opendaylight.yangtools.yang.model.api.UnknownSchemaNode;
 import org.opendaylight.yangtools.yang.model.api.UsesNode;
 
 /**
- * Special case only use by GET restconf/operations (since moment of pre-Beryllium Yang
- * parser and yang model API removal) to build and use fake container for module
+ * Special case only use by GET restconf/operations (since moment of old Yang
+ * parser and old yang model API removal) to build and use fake container for
+ * module.
  */
-class ContainerSchemaNodeImpl implements ContainerSchemaNode {
+class FakeContainerSchemaNode implements ContainerSchemaNode {
+    static final SchemaPath PATH = SchemaPath.create(true, QName.create(FakeRestconfModule.QNAME, "operations").intern());
 
-    List<DataSchemaNode> child = new ArrayList<>();
-    private final QName qname = QName.create(ModuleImpl.moduleQName, "operations");
-    private final SchemaPath path = SchemaPath.create(true, this.qname);
+    private final Collection<DataSchemaNode> children;
+
+    FakeContainerSchemaNode(final Collection<LeafSchemaNode> children) {
+        this.children = ImmutableList.copyOf(children);
+    }
 
     @Override
     public Set<TypeDefinition<?>> getTypeDefinitions() {
@@ -41,7 +47,7 @@ class ContainerSchemaNodeImpl implements ContainerSchemaNode {
 
     @Override
     public Collection<DataSchemaNode> getChildNodes() {
-        return this.child;
+        return this.children;
     }
 
     @Override
@@ -51,12 +57,12 @@ class ContainerSchemaNodeImpl implements ContainerSchemaNode {
 
     @Override
     public DataSchemaNode getDataChildByName(final QName name) {
-        for (final DataSchemaNode node : this.child) {
+        for (final DataSchemaNode node : this.children) {
             if (node.getQName().equals(name)) {
                 return node;
             }
         }
-        throw new RestconfDocumentedException(name + " is not in child of " + this.qname);
+        throw new RestconfDocumentedException(name + " is not in child of " + PATH.getLastComponent());
     }
 
     @Override
@@ -91,12 +97,12 @@ class ContainerSchemaNodeImpl implements ContainerSchemaNode {
 
     @Override
     public QName getQName() {
-        return this.qname;
+        return PATH.getLastComponent();
     }
 
     @Override
     public SchemaPath getPath() {
-        return this.path;
+        return PATH;
     }
 
     @Override
@@ -123,14 +129,4 @@ class ContainerSchemaNodeImpl implements ContainerSchemaNode {
     public boolean isPresenceContainer() {
         throw new UnsupportedOperationException("Not supported.");
     }
-
-    /**
-     * Adding new schema node to this container
-     *
-     * @param fakeLeaf
-     *            - fake schema leaf node
-     */
-    public void addNodeChild(final DataSchemaNode fakeLeaf) {
-        this.child.add(fakeLeaf);
-    }
 }
diff --git a/restconf/sal-rest-connector/src/main/java/org/opendaylight/restconf/base/services/impl/FakeImportedModule.java b/restconf/sal-rest-connector/src/main/java/org/opendaylight/restconf/base/services/impl/FakeImportedModule.java
new file mode 100644 (file)
index 0000000..85f6abb
--- /dev/null
@@ -0,0 +1,177 @@
+/*
+ * Copyright (c) 2016 Cisco Systems, Inc. and others.  All rights reserved.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v1.0 which accompanies this distribution,
+ * and is available at http://www.eclipse.org/legal/epl-v10.html
+ */
+package org.opendaylight.restconf.base.services.impl;
+
+import com.google.common.base.Preconditions;
+import com.google.common.collect.ForwardingObject;
+import com.google.common.collect.ImmutableList;
+import com.google.common.collect.ImmutableSet;
+import java.net.URI;
+import java.util.Collection;
+import java.util.Date;
+import java.util.List;
+import java.util.Set;
+import org.opendaylight.yangtools.yang.common.QName;
+import org.opendaylight.yangtools.yang.common.QNameModule;
+import org.opendaylight.yangtools.yang.model.api.AugmentationSchema;
+import org.opendaylight.yangtools.yang.model.api.DataSchemaNode;
+import org.opendaylight.yangtools.yang.model.api.Deviation;
+import org.opendaylight.yangtools.yang.model.api.ExtensionDefinition;
+import org.opendaylight.yangtools.yang.model.api.FeatureDefinition;
+import org.opendaylight.yangtools.yang.model.api.GroupingDefinition;
+import org.opendaylight.yangtools.yang.model.api.IdentitySchemaNode;
+import org.opendaylight.yangtools.yang.model.api.Module;
+import org.opendaylight.yangtools.yang.model.api.ModuleImport;
+import org.opendaylight.yangtools.yang.model.api.RpcDefinition;
+import org.opendaylight.yangtools.yang.model.api.TypeDefinition;
+import org.opendaylight.yangtools.yang.model.api.UnknownSchemaNode;
+import org.opendaylight.yangtools.yang.model.api.UsesNode;
+
+final class FakeImportedModule extends ForwardingObject implements Module {
+
+    private final Module delegate;
+
+    FakeImportedModule(final Module delegate) {
+        this.delegate = Preconditions.checkNotNull(delegate);
+    }
+
+    @Override
+    protected Module delegate() {
+        return delegate;
+    }
+
+    @Override
+    public Set<TypeDefinition<?>> getTypeDefinitions() {
+        return ImmutableSet.of();
+    }
+
+    @Override
+    public Collection<DataSchemaNode> getChildNodes() {
+        return ImmutableList.of();
+    }
+
+    @Override
+    public Set<GroupingDefinition> getGroupings() {
+        return ImmutableSet.of();
+    }
+
+    @Override
+    public DataSchemaNode getDataChildByName(final QName name) {
+        return null;
+    }
+
+    @Override
+    public Set<UsesNode> getUses() {
+        return ImmutableSet.of();
+    }
+
+    @Override
+    public String getModuleSourcePath() {
+        return null;
+    }
+
+    @Override
+    public QNameModule getQNameModule() {
+        return delegate.getQNameModule();
+    }
+
+    @Override
+    public String getName() {
+        return delegate.getName();
+    }
+
+    @Override
+    public URI getNamespace() {
+        return delegate.getNamespace();
+    }
+
+    @Override
+    public Date getRevision() {
+        return delegate.getRevision();
+    }
+
+    @Override
+    public String getPrefix() {
+        return delegate.getPrefix();
+    }
+
+    @Override
+    public String getYangVersion() {
+        return delegate.getYangVersion();
+    }
+
+    @Override
+    public String getDescription() {
+        return delegate.getDescription();
+    }
+
+    @Override
+    public String getReference() {
+        return delegate.getReference();
+    }
+
+    @Override
+    public String getOrganization() {
+        return delegate.getOrganization();
+    }
+
+    @Override
+    public String getContact() {
+        return delegate.getContact();
+    }
+
+    @Override
+    public Set<ModuleImport> getImports() {
+        return ImmutableSet.of();
+    }
+
+    @Override
+    public Set<Module> getSubmodules() {
+        return ImmutableSet.of();
+    }
+
+    @Override
+    public Set<FeatureDefinition> getFeatures() {
+        return ImmutableSet.of();
+    }
+
+    @Override
+    public Set<AugmentationSchema> getAugmentations() {
+        return ImmutableSet.of();
+    }
+
+    @Override
+    public Set<RpcDefinition> getRpcs() {
+        return ImmutableSet.of();
+    }
+
+    @Override
+    public Set<Deviation> getDeviations() {
+        return ImmutableSet.of();
+    }
+
+    @Override
+    public Set<IdentitySchemaNode> getIdentities() {
+        return ImmutableSet.of();
+    }
+
+    @Override
+    public List<ExtensionDefinition> getExtensionSchemaNodes() {
+        return ImmutableList.of();
+    }
+
+    @Override
+    public List<UnknownSchemaNode> getUnknownSchemaNodes() {
+        return ImmutableList.of();
+    }
+
+    @Override
+    public String getSource() {
+        return null;
+    }
+}
similarity index 86%
rename from restconf/sal-rest-connector/src/main/java/org/opendaylight/netconf/sal/restconf/impl/LeafSchemaNodeImpl.java
rename to restconf/sal-rest-connector/src/main/java/org/opendaylight/restconf/base/services/impl/FakeLeafSchemaNode.java
index f36b5fc565597d07f64992e26c3dd859633cb311..c57feaef8e8ad6225db4d3776751fec8efd4af98 100644 (file)
@@ -5,7 +5,7 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
-package org.opendaylight.netconf.sal.restconf.impl;
+package org.opendaylight.restconf.base.services.impl;
 
 import java.util.List;
 import org.opendaylight.yangtools.yang.common.QName;
@@ -21,24 +21,19 @@ import org.opendaylight.yangtools.yang.model.util.type.BaseTypes;
  * Special case only use by GET restconf/operations (since moment of old Yang
  * parser and old yang model API removal) to build and use fake leaf like child
  * in container
- *
  */
-class LeafSchemaNodeImpl implements LeafSchemaNode {
+final class FakeLeafSchemaNode implements LeafSchemaNode {
 
     private final SchemaPath path;
-    private final QName qname;
 
     /**
      * Base values for fake leaf schema node
      *
-     * @param basePath
-     *            - schema path
      * @param qname
      *            - qname
      */
-    LeafSchemaNodeImpl(final SchemaPath basePath, final QName qname) {
-        this.path = basePath.createChild(qname);
-        this.qname = qname;
+    FakeLeafSchemaNode(final QName qname) {
+        this.path = FakeContainerSchemaNode.PATH.createChild(qname);
     }
 
     @Override
@@ -63,12 +58,12 @@ class LeafSchemaNodeImpl implements LeafSchemaNode {
 
     @Override
     public QName getQName() {
-        return this.qname;
+        return path.getLastComponent();
     }
 
     @Override
     public SchemaPath getPath() {
-        return this.path;
+        return path;
     }
 
     @Override
@@ -107,4 +102,3 @@ class LeafSchemaNodeImpl implements LeafSchemaNode {
     }
 
 }
-
diff --git a/restconf/sal-rest-connector/src/main/java/org/opendaylight/restconf/base/services/impl/FakeModuleImport.java b/restconf/sal-rest-connector/src/main/java/org/opendaylight/restconf/base/services/impl/FakeModuleImport.java
new file mode 100644 (file)
index 0000000..8f10f71
--- /dev/null
@@ -0,0 +1,41 @@
+/*
+ * Copyright (c) 2016 Cisco Systems, Inc. and others.  All rights reserved.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v1.0 which accompanies this distribution,
+ * and is available at http://www.eclipse.org/legal/epl-v10.html
+ */
+package org.opendaylight.restconf.base.services.impl;
+
+import com.google.common.base.Preconditions;
+import java.util.Date;
+import org.opendaylight.yangtools.yang.model.api.Module;
+import org.opendaylight.yangtools.yang.model.api.ModuleImport;
+
+/**
+ * Fake {@link ModuleImport} implementation used to attach corrent prefix mapping to fake RPCs.
+ *
+ * @author Robert Varga
+ */
+final class FakeModuleImport implements ModuleImport {
+    private final Module module;
+
+    FakeModuleImport(final Module module) {
+        this.module = Preconditions.checkNotNull(module);
+    }
+
+    @Override
+    public String getModuleName() {
+        return module.getName();
+    }
+
+    @Override
+    public Date getRevision() {
+        return module.getRevision();
+    }
+
+    @Override
+    public String getPrefix() {
+        return module.getName();
+    }
+}
similarity index 80%
rename from restconf/sal-rest-connector/src/main/java/org/opendaylight/netconf/sal/restconf/impl/ModuleImpl.java
rename to restconf/sal-rest-connector/src/main/java/org/opendaylight/restconf/base/services/impl/FakeRestconfModule.java
index 4f7fa52f29c38d1d95af22b6bf2ff67b229199b7..4551acc2ee6691264c799dcba116a12e66b11ca2 100644 (file)
@@ -5,17 +5,18 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
-package org.opendaylight.netconf.sal.restconf.impl;
+package org.opendaylight.restconf.base.services.impl;
 
+import com.google.common.collect.Collections2;
+import com.google.common.collect.ImmutableList;
+import com.google.common.collect.ImmutableSet;
 import java.net.URI;
-import java.net.URISyntaxException;
 import java.text.ParseException;
-import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Date;
-import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
+import org.opendaylight.netconf.sal.restconf.impl.RestconfDocumentedException;
 import org.opendaylight.yangtools.yang.common.QName;
 import org.opendaylight.yangtools.yang.common.QNameModule;
 import org.opendaylight.yangtools.yang.common.SimpleDateFormatUtil;
@@ -39,35 +40,32 @@ import org.opendaylight.yangtools.yang.model.api.UsesNode;
  * Special case only use by GET restconf/operations (since moment of old Yang
  * parser and old yang model API removal) to build and use fake module to create
  * new schema context
- *
  */
-class ModuleImpl implements Module {
+final class FakeRestconfModule implements Module {
 
-    private final List<DataSchemaNode> listChild = new ArrayList<>();
-    static QNameModule moduleQName;
+    static final QNameModule QNAME;
     static {
-        Date date = null;
+        Date date;
         try {
             date = SimpleDateFormatUtil.getRevisionFormat().parse("2016-06-28");
         } catch (final ParseException e) {
-            throw new RestconfDocumentedException("Problem while parsing revision.", e);
-        }
-        try {
-            moduleQName = QNameModule.create(new URI("urn:ietf:params:xml:ns:yang:ietf-restconf"), date);
-        } catch (final URISyntaxException e) {
-            throw new RestconfDocumentedException("Problem while creating URI.", e);
+            throw new ExceptionInInitializerError(e);
         }
+        QNAME = QNameModule.create(URI.create("urn:ietf:params:xml:ns:yang:ietf-restconf"), date).intern();
     }
 
+    private final Collection<DataSchemaNode> children;
+    private final ImmutableSet<ModuleImport> imports;
+
     /**
-     * Set container for this module
-     *
-     * @param fakeContSchNode
-     *            - fake container schema node
+     * Instantiate a new fake module
      *
+     * @param neededModules needed import statements
+     * @param child fake child container
      */
-    public ModuleImpl(final ContainerSchemaNode fakeContSchNode) {
-        this.listChild.add(fakeContSchNode);
+    public FakeRestconfModule(final Collection<Module> neededModules, final ContainerSchemaNode child) {
+        this.children = ImmutableList.of(child);
+        this.imports = ImmutableSet.copyOf(Collections2.transform(neededModules, FakeModuleImport::new));
     }
 
     @Override
@@ -77,7 +75,7 @@ class ModuleImpl implements Module {
 
     @Override
     public Collection<DataSchemaNode> getChildNodes() {
-        return this.listChild;
+        return this.children;
     }
 
     @Override
@@ -87,12 +85,12 @@ class ModuleImpl implements Module {
 
     @Override
     public DataSchemaNode getDataChildByName(final QName name) {
-        for (final DataSchemaNode node : this.listChild) {
+        for (final DataSchemaNode node : this.children) {
             if (node.getQName().equals(name)) {
                 return node;
             }
         }
-        throw new RestconfDocumentedException(name + " is not in child of " + ModuleImpl.moduleQName);
+        throw new RestconfDocumentedException(name + " is not in child of " + FakeRestconfModule.QNAME);
     }
 
     @Override
@@ -107,7 +105,7 @@ class ModuleImpl implements Module {
 
     @Override
     public QNameModule getQNameModule() {
-        return moduleQName;
+        return QNAME;
     }
 
     @Override
@@ -117,12 +115,12 @@ class ModuleImpl implements Module {
 
     @Override
     public URI getNamespace() {
-        return moduleQName.getNamespace();
+        return QNAME.getNamespace();
     }
 
     @Override
     public Date getRevision() {
-        return moduleQName.getRevision();
+        return QNAME.getRevision();
     }
 
     @Override
@@ -157,12 +155,12 @@ class ModuleImpl implements Module {
 
     @Override
     public Set<ModuleImport> getImports() {
-        return new HashSet<>();
+        return imports;
     }
 
     @Override
     public Set<Module> getSubmodules() {
-        throw new UnsupportedOperationException("Not supported operations.");
+        return ImmutableSet.of();
     }
 
     @Override
@@ -5,7 +5,7 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
-package org.opendaylight.restconf.rest.services.impl;
+package org.opendaylight.restconf.base.services.impl;
 
 import com.google.common.base.Optional;
 import com.google.common.base.Preconditions;
@@ -19,10 +19,10 @@ import org.opendaylight.netconf.sal.restconf.impl.RestconfDocumentedException;
 import org.opendaylight.netconf.sal.restconf.impl.RestconfError.ErrorTag;
 import org.opendaylight.netconf.sal.restconf.impl.RestconfError.ErrorType;
 import org.opendaylight.restconf.Draft18;
+import org.opendaylight.restconf.base.services.api.RestconfModulesService;
 import org.opendaylight.restconf.common.references.SchemaContextRef;
 import org.opendaylight.restconf.handlers.DOMMountPointServiceHandler;
 import org.opendaylight.restconf.handlers.SchemaContextHandler;
-import org.opendaylight.restconf.rest.services.api.RestconfModulesService;
 import org.opendaylight.restconf.utils.RestconfConstants;
 import org.opendaylight.restconf.utils.mapping.RestconfMappingNodeUtil;
 import org.opendaylight.restconf.utils.parser.ParserIdentifier;
@@ -5,7 +5,7 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
-package org.opendaylight.restconf.rest.services.impl;
+package org.opendaylight.restconf.base.services.impl;
 
 import com.google.common.base.Optional;
 import com.google.common.collect.ImmutableSet;
@@ -20,10 +20,10 @@ import org.opendaylight.netconf.sal.restconf.impl.NormalizedNodeContext;
 import org.opendaylight.netconf.sal.restconf.impl.RestconfDocumentedException;
 import org.opendaylight.netconf.sal.restconf.impl.RestconfError.ErrorTag;
 import org.opendaylight.netconf.sal.restconf.impl.RestconfError.ErrorType;
+import org.opendaylight.restconf.base.services.api.RestconfOperationsService;
 import org.opendaylight.restconf.common.references.SchemaContextRef;
 import org.opendaylight.restconf.handlers.DOMMountPointServiceHandler;
 import org.opendaylight.restconf.handlers.SchemaContextHandler;
-import org.opendaylight.restconf.rest.services.api.RestconfOperationsService;
 import org.opendaylight.restconf.utils.RestconfConstants;
 import org.opendaylight.restconf.utils.parser.ParserIdentifier;
 import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.NodeIdentifier;
@@ -76,13 +76,14 @@ public class RestconfOperationsServiceImpl implements RestconfOperationsService
         final DOMMountPoint mountPoint;
         final SchemaContextRef ref = new SchemaContextRef(this.schemaContextHandler.get());
         if (identifier.contains(RestconfConstants.MOUNT)) {
-            final InstanceIdentifierContext<?> mountPointIdentifier = ParserIdentifier.toInstanceIdentifier(
-                    identifier, ref.get(), Optional.of(this.domMountPointServiceHandler.get()));
+            final InstanceIdentifierContext<?> mountPointIdentifier = ParserIdentifier.toInstanceIdentifier(identifier,
+                    ref.get(), Optional.of(this.domMountPointServiceHandler.get()));
             mountPoint = mountPointIdentifier.getMountPoint();
             modules = ref.getModules(mountPoint);
 
         } else {
-            final String errMsg = "URI has bad format. If operations behind mount point should be showed, URI has to end with ";
+            final String errMsg =
+                    "URI has bad format. If operations behind mount point should be showed, URI has to end with ";
             LOG.debug(errMsg + ControllerContext.MOUNT + " for " + identifier);
             throw new RestconfDocumentedException(errMsg + ControllerContext.MOUNT, ErrorType.PROTOCOL,
                     ErrorTag.INVALID_VALUE);
@@ -118,8 +119,8 @@ public class RestconfOperationsServiceImpl implements RestconfOperationsService
         }
 
         final ContainerSchemaNode fakeCont = new FakeContainerSchemaNode(fakeRpcSchema);
-        final DataContainerNodeAttrBuilder<NodeIdentifier, ContainerNode> containerBuilder = Builders
-                .containerBuilder(fakeCont);
+        final DataContainerNodeAttrBuilder<NodeIdentifier, ContainerNode> containerBuilder =
+                Builders.containerBuilder(fakeCont);
 
         for (final LeafSchemaNode leaf : fakeRpcSchema) {
             containerBuilder.withChild(Builders.leafBuilder(leaf).build());
@@ -129,10 +130,10 @@ public class RestconfOperationsServiceImpl implements RestconfOperationsService
         neededModules.forEach(imp -> fakeModules.add(new FakeImportedModule(imp)));
         fakeModules.add(new FakeRestconfModule(neededModules, fakeCont));
 
-        final SchemaContext fakeSchemaCtx = EffectiveSchemaContext.resolveSchemaContext(
-            ImmutableSet.copyOf(fakeModules));
-        final InstanceIdentifierContext<ContainerSchemaNode> instanceIdentifierContext = new InstanceIdentifierContext<>(
-                null, fakeCont, mountPoint, fakeSchemaCtx);
+        final SchemaContext fakeSchemaCtx =
+                EffectiveSchemaContext.resolveSchemaContext(ImmutableSet.copyOf(fakeModules));
+        final InstanceIdentifierContext<ContainerSchemaNode> instanceIdentifierContext =
+                new InstanceIdentifierContext<>(null, fakeCont, mountPoint, fakeSchemaCtx);
         return new NormalizedNodeContext(instanceIdentifierContext, containerBuilder.build());
     }
 
@@ -5,13 +5,13 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
-package org.opendaylight.restconf.rest.services.impl;
+package org.opendaylight.restconf.base.services.impl;
 
 import org.opendaylight.netconf.md.sal.rest.schema.SchemaExportContext;
+import org.opendaylight.restconf.base.services.api.RestconfSchemaService;
 import org.opendaylight.restconf.common.references.SchemaContextRef;
 import org.opendaylight.restconf.handlers.DOMMountPointServiceHandler;
 import org.opendaylight.restconf.handlers.SchemaContextHandler;
-import org.opendaylight.restconf.rest.services.api.RestconfSchemaService;
 import org.opendaylight.restconf.utils.parser.ParserIdentifier;
 import org.opendaylight.yangtools.yang.model.api.SchemaContext;
 
@@ -5,7 +5,7 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
-package org.opendaylight.restconf.rest.services.impl;
+package org.opendaylight.restconf.base.services.impl;
 
 import com.google.common.base.Preconditions;
 import java.util.Set;
@@ -14,9 +14,9 @@ import org.opendaylight.netconf.sal.restconf.impl.InstanceIdentifierContext;
 import org.opendaylight.netconf.sal.restconf.impl.NormalizedNodeContext;
 import org.opendaylight.netconf.sal.streams.listeners.Notificator;
 import org.opendaylight.restconf.Draft18;
+import org.opendaylight.restconf.base.services.api.RestconfStreamsService;
 import org.opendaylight.restconf.common.references.SchemaContextRef;
 import org.opendaylight.restconf.handlers.SchemaContextHandler;
-import org.opendaylight.restconf.rest.services.api.RestconfStreamsService;
 import org.opendaylight.restconf.utils.mapping.RestconfMappingNodeUtil;
 import org.opendaylight.restconf.utils.schema.context.RestconfSchemaUtil;
 import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.NodeIdentifier;
index 54fb06881765be27873f03b5380f30fcabd3b584..f2602d02bb72d66764fc27bb6ce39797900e2286 100644 (file)
@@ -14,21 +14,21 @@ import org.opendaylight.netconf.md.sal.rest.schema.SchemaExportContext;
 import org.opendaylight.netconf.sal.restconf.impl.NormalizedNodeContext;
 import org.opendaylight.netconf.sal.restconf.impl.PATCHContext;
 import org.opendaylight.netconf.sal.restconf.impl.PATCHStatusContext;
+import org.opendaylight.restconf.base.services.api.BaseServicesWrapper;
+import org.opendaylight.restconf.base.services.api.RestconfModulesService;
+import org.opendaylight.restconf.base.services.api.RestconfOperationsService;
+import org.opendaylight.restconf.base.services.api.RestconfSchemaService;
+import org.opendaylight.restconf.base.services.api.RestconfStreamsService;
+import org.opendaylight.restconf.base.services.impl.RestconfModulesServiceImpl;
+import org.opendaylight.restconf.base.services.impl.RestconfOperationsServiceImpl;
+import org.opendaylight.restconf.base.services.impl.RestconfSchemaServiceImpl;
+import org.opendaylight.restconf.base.services.impl.RestconfStreamsServiceImpl;
 import org.opendaylight.restconf.handlers.DOMDataBrokerHandler;
 import org.opendaylight.restconf.handlers.DOMMountPointServiceHandler;
 import org.opendaylight.restconf.handlers.NotificationServiceHandler;
 import org.opendaylight.restconf.handlers.RpcServiceHandler;
 import org.opendaylight.restconf.handlers.SchemaContextHandler;
 import org.opendaylight.restconf.handlers.TransactionChainHandler;
-import org.opendaylight.restconf.rest.services.api.BaseServicesWrapper;
-import org.opendaylight.restconf.rest.services.api.RestconfModulesService;
-import org.opendaylight.restconf.rest.services.api.RestconfOperationsService;
-import org.opendaylight.restconf.rest.services.api.RestconfSchemaService;
-import org.opendaylight.restconf.rest.services.api.RestconfStreamsService;
-import org.opendaylight.restconf.rest.services.impl.RestconfModulesServiceImpl;
-import org.opendaylight.restconf.rest.services.impl.RestconfOperationsServiceImpl;
-import org.opendaylight.restconf.rest.services.impl.RestconfSchemaServiceImpl;
-import org.opendaylight.restconf.rest.services.impl.RestconfStreamsServiceImpl;
 import org.opendaylight.restconf.restful.services.api.RestconfDataService;
 import org.opendaylight.restconf.restful.services.api.RestconfInvokeOperationsService;
 import org.opendaylight.restconf.restful.services.api.RestconfStreamsSubscriptionService;
index ed959d3ae1ae8046eba28a817739aefa936d9ddd..c5e9057848e18add8eced1214683f2ff0ebabdac 100644 (file)
@@ -48,9 +48,10 @@ import org.opendaylight.netconf.sal.restconf.impl.RestconfDocumentedException;
 import org.opendaylight.netconf.sal.restconf.impl.RestconfError.ErrorTag;
 import org.opendaylight.netconf.sal.restconf.impl.RestconfError.ErrorType;
 import org.opendaylight.restconf.Draft18.RestconfModule;
+import org.opendaylight.restconf.base.services.api.RestconfModulesService;
+import org.opendaylight.restconf.base.services.impl.RestconfModulesServiceImpl;
 import org.opendaylight.restconf.handlers.DOMMountPointServiceHandler;
 import org.opendaylight.restconf.handlers.SchemaContextHandler;
-import org.opendaylight.restconf.rest.services.api.RestconfModulesService;
 import org.opendaylight.restconf.rest.services.impl.RestconfModulesServiceTestUtils.TestModule;
 import org.opendaylight.restconf.utils.RestconfConstants;
 import org.opendaylight.restconf.utils.mapping.RestconfMappingNodeConstants;
index 8ec10ceacf03b3275aacfa652f9f000208e12f65..45260aa3b5eacb0ac45f87463d331551230ef212 100644 (file)
@@ -30,6 +30,7 @@ import org.opendaylight.controller.md.sal.dom.broker.impl.mount.DOMMountPointSer
 import org.opendaylight.controller.md.sal.dom.broker.spi.mount.SimpleDOMMountPoint;
 import org.opendaylight.controller.md.sal.rest.common.TestRestconfUtils;
 import org.opendaylight.restconf.Draft18;
+import org.opendaylight.restconf.base.services.impl.RestconfModulesServiceImpl;
 import org.opendaylight.restconf.handlers.DOMMountPointServiceHandler;
 import org.opendaylight.restconf.handlers.SchemaContextHandler;
 import org.opendaylight.restconf.utils.RestconfConstants;
index 6578d5114967320950f347f7f6b1f6d29b79f92e..690cb3fa08e232e42c228c568995482ecd17a2e2 100644 (file)
@@ -22,6 +22,7 @@ import org.mockito.MockitoAnnotations;
 import org.opendaylight.controller.md.sal.dom.api.DOMMountPointService;
 import org.opendaylight.controller.md.sal.rest.common.TestRestconfUtils;
 import org.opendaylight.netconf.sal.restconf.impl.NormalizedNodeContext;
+import org.opendaylight.restconf.base.services.impl.RestconfOperationsServiceImpl;
 import org.opendaylight.restconf.handlers.DOMMountPointServiceHandler;
 import org.opendaylight.restconf.handlers.SchemaContextHandler;
 import org.opendaylight.yangtools.yang.common.QName;
index b65f28a5b35eb3812f0fa3ac35bd712988de015c..4480c0e25cd9409374ca923c66706f5367d1d52e 100644 (file)
@@ -29,10 +29,10 @@ import org.opendaylight.controller.md.sal.rest.common.TestRestconfUtils;
 import org.opendaylight.netconf.md.sal.rest.schema.SchemaExportContext;
 import org.opendaylight.netconf.sal.restconf.impl.RestconfDocumentedException;
 import org.opendaylight.netconf.sal.restconf.impl.RestconfError;
+import org.opendaylight.restconf.base.services.api.RestconfSchemaService;
+import org.opendaylight.restconf.base.services.impl.RestconfSchemaServiceImpl;
 import org.opendaylight.restconf.handlers.DOMMountPointServiceHandler;
 import org.opendaylight.restconf.handlers.SchemaContextHandler;
-import org.opendaylight.restconf.rest.services.api.RestconfSchemaService;
-import org.opendaylight.restconf.rest.services.impl.RestconfSchemaServiceImpl;
 import org.opendaylight.restconf.utils.RestconfConstants;
 import org.opendaylight.yangtools.yang.common.QName;
 import org.opendaylight.yangtools.yang.common.SimpleDateFormatUtil;
index 8cc5d3b8dfd0196f92929621730783e705ded2a5..8755c4e645ffab03ef52ea632957f1a5571f01f1 100644 (file)
@@ -38,8 +38,9 @@ import org.opendaylight.netconf.sal.restconf.impl.RestconfDocumentedException;
 import org.opendaylight.netconf.sal.restconf.impl.RestconfError;
 import org.opendaylight.netconf.sal.streams.listeners.Notificator;
 import org.opendaylight.restconf.Draft18;
+import org.opendaylight.restconf.base.services.api.RestconfStreamsService;
+import org.opendaylight.restconf.base.services.impl.RestconfStreamsServiceImpl;
 import org.opendaylight.restconf.handlers.SchemaContextHandler;
-import org.opendaylight.restconf.rest.services.api.RestconfStreamsService;
 import org.opendaylight.restconf.utils.mapping.RestconfMappingNodeConstants;
 import org.opendaylight.restconf.utils.mapping.RestconfMappingStreamConstants;
 import org.opendaylight.yang.gen.v1.urn.sal.restconf.event.subscription.rev140708.NotificationOutputTypeGrouping.NotificationOutputType;