From 3f50bdb334bf67a9e1ae264725747dce8924591b Mon Sep 17 00:00:00 2001
From: Victor Woeltjen <victor.woeltjen@nasa.gov>
Date: Wed, 19 Oct 2016 16:47:11 -0700
Subject: [PATCH] [Roots] Distinguish objects.get

...which needs to accept full identifiers from namespace-specific
object providers, which only need to accept keys.
---
 src/api/objects/ObjectAPI.js | 26 ++++++++++++++++++++------
 1 file changed, 20 insertions(+), 6 deletions(-)

diff --git a/src/api/objects/ObjectAPI.js b/src/api/objects/ObjectAPI.js
index 9dfe31b589..05b5caf657 100644
--- a/src/api/objects/ObjectAPI.js
+++ b/src/api/objects/ObjectAPI.js
@@ -39,7 +39,6 @@ define([
      * Utilities for loading, saving, and manipulating domain objects.
      * @interface ObjectAPI
      * @memberof module:openmct
-     * @implements {module:openmct.ObjectProvider}
      */
 
     function ObjectAPI() {
@@ -53,11 +52,11 @@ define([
     };
 
     // Retrieve the provider for a given key.
-    ObjectAPI.prototype.getProvider = function (key) {
-        if (key.identifier === 'ROOT') {
+    ObjectAPI.prototype.getProvider = function (identifier) {
+        if (identifier.key === 'ROOT') {
             return this.rootProvider;
         }
-        return this.providers[key.namespace] || this.fallbackProvider;
+        return this.providers[identifier.namespace] || this.fallbackProvider;
     };
 
     /**
@@ -123,14 +122,25 @@ define([
      *          has been saved, or be rejected if it cannot be saved
      */
 
+    /**
+     * Get a domain object.
+     *
+     * @method get
+     * @memberof module:openmct.ObjectAPI#
+     * @param {module:openmct.ObjectAPI~Identifier} identifier
+     *        the identifier for the domain object to load
+     * @returns {Promise} a promise which will resolve when the domain object
+     *          has been saved, or be rejected if it cannot be saved
+     */
+
     [
         'save',
         'delete',
         'get'
     ].forEach(function (method) {
         ObjectAPI.prototype[method] = function () {
-            var key = arguments[0],
-                provider = this.getProvider(key);
+            var identifier = arguments[0],
+                provider = this.getProvider(identifier);
 
             if (!provider) {
                 throw new Error('No Provider Matched');
@@ -140,6 +150,10 @@ define([
                 throw new Error('Provider does not support [' + method + '].');
             }
 
+            if (method === 'get') {
+                return provider.get(identifier.key);
+            }
+
             return provider[method].apply(provider, arguments);
         };
     });