From: Tony Tkacik <ttkacik@cisco.com>
Date: Sun, 3 Aug 2014 18:14:14 +0000 (+0000)
Subject: Merge "BUG-1281: use SchemaContext lookups"
X-Git-Tag: release/helium~358
X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=controller.git;a=commitdiff_plain;h=48daeb11697dbb83f554b64fe8702e21de3e0a12

Merge "BUG-1281: use SchemaContext lookups"
---

48daeb11697dbb83f554b64fe8702e21de3e0a12
diff --cc opendaylight/md-sal/sal-rest-connector/src/main/java/org/opendaylight/controller/sal/restconf/impl/ControllerContext.java
index 39f4eef657,ce73132269..befc9f2c65
--- a/opendaylight/md-sal/sal-rest-connector/src/main/java/org/opendaylight/controller/sal/restconf/impl/ControllerContext.java
+++ b/opendaylight/md-sal/sal-rest-connector/src/main/java/org/opendaylight/controller/sal/restconf/impl/ControllerContext.java
@@@ -176,36 -178,10 +176,10 @@@ public class ControllerContext implemen
      public Module findModuleByName(final String moduleName) {
          this.checkPreconditions();
          Preconditions.checkArgument(moduleName != null && !moduleName.isEmpty());
-         return this.getLatestModule(globalSchema, moduleName);
+         return globalSchema.findModuleByName(moduleName, null);
      }
  
 -    public Module findModuleByName(final MountInstance mountPoint, final String moduleName) {
 +    public Module findModuleByName(final DOMMountPoint mountPoint, final String moduleName) {
          Preconditions.checkArgument(moduleName != null && mountPoint != null);
  
          final SchemaContext mountPointSchema = mountPoint.getSchemaContext();
@@@ -215,12 -195,10 +193,10 @@@
      public Module findModuleByNamespace(final URI namespace) {
          this.checkPreconditions();
          Preconditions.checkArgument(namespace != null);
- 
-         final Set<Module> moduleSchemas = globalSchema.findModuleByNamespace(namespace);
-         return moduleSchemas == null ? null : this.filterLatestModule(moduleSchemas);
+         return globalSchema.findModuleByNamespaceAndRevision(namespace, null);
      }
  
 -    public Module findModuleByNamespace(final MountInstance mountPoint, final URI namespace) {
 +    public Module findModuleByNamespace(final DOMMountPoint mountPoint, final URI namespace) {
          Preconditions.checkArgument(namespace != null && mountPoint != null);
  
          final SchemaContext mountPointSchema = mountPoint.getSchemaContext();