[API] Wire in ObjectAPI appropriately

src/MCT.js

@@ -60,7 +60,7 @@ define([
         this.legacyBundle = { extensions: {
             services: [
                 {
-                    key: "mct",
+                    key: "openmct",
                     implementation: function () {
                         return this;
                     }.bind(this)

src/adapter/bundle.js

@@ -43,7 +43,7 @@ define([
                     implementation: MCTView,
                     depends: [
                         "newViews[]",
-                        "mct"
+                        "openmct"
                     ]
                 }
             ],
@@ -72,14 +72,14 @@ define([
                     type: "decorator",
                     provides: "actionService",
                     implementation: ActionDialogDecorator,
-                    depends: [ "mct", "newViews[]" ]
+                    depends: [ "openmct", "newViews[]" ]
                 }
             ],
             policies: [
                 {
                     category: "composition",
                     implementation: AdapterCompositionPolicy,
-                    depends: [ "mct" ]
+                    depends: [ "openmct" ]
                 }
             ],
             licenses: [

src/api/objects/LegacyObjectAPIInterceptor.js

@@ -22,11 +22,9 @@
 
 define([
     './object-utils',
-    './ObjectAPI',
     './objectEventEmitter'
 ], function (
     utils,
-    ObjectAPI,
     objectEventEmitter
 ) {
     function ObjectServiceProvider(objectService, instantiate, topic) {
@@ -98,12 +96,12 @@ define([
 
     // Injects new object API as a decorator so that it hijacks all requests.
     // Object providers implemented on new API should just work, old API should just work, many things may break.
-    function LegacyObjectAPIInterceptor(ROOTS, instantiate, topic, objectService) {
+    function LegacyObjectAPIInterceptor(openmct, ROOTS, instantiate, topic, objectService) {
         this.getObjects = function (keys) {
             var results = {},
                 promises = keys.map(function (keyString) {
                     var key = utils.parseKeyString(keyString);
-                    return ObjectAPI.get(key)
+                    return openmct.objects.get(key)
                         .then(function (object) {
                             object = utils.toOldFormat(object)
                             results[keyString] = instantiate(object, keyString);
@@ -116,12 +114,12 @@ define([
                 });
         };
 
-        ObjectAPI._supersecretSetFallbackProvider(
+        openmct.objects._supersecretSetFallbackProvider(
             new ObjectServiceProvider(objectService, instantiate, topic)
         );
 
         ROOTS.forEach(function (r) {
-            ObjectAPI.addRoot(utils.parseKeyString(r.id));
+            openmct.objects.addRoot(utils.parseKeyString(r.id));
         });
 
         return this;

src/api/objects/ObjectAPI.js

@@ -37,33 +37,33 @@ define([
      * @memberof module:openmct
      * @implements {module:openmct.ObjectProvider}
      */
-    var Objects = {},
-        ROOT_REGISTRY = [],
-        PROVIDER_REGISTRY = {},
-        FALLBACK_PROVIDER;
 
-    Objects._supersecretSetFallbackProvider = function (p) {
+    function ObjectAPI() {
-        FALLBACK_PROVIDER = p;
+        this.providers = {};
-    };
+        this.rootRegistry = [];
+        this.rootProvider = {
+            'get': function () {
+                return Promise.resolve({
+                    name: 'The root object',
+                    type: 'root',
+                    composition: this.rootRegistry
+                });
+            }.bind(this)
+        };
+    }
 
-    // Root provider is hardcoded in; can't be skipped.
+    ObjectAPI.prototype._supersecretSetFallbackProvider = function (p) {
-    var RootProvider = {
+        this.fallbackProvider = p;
-        'get': function () {
-            return Promise.resolve({
-                name: 'The root object',
-                type: 'root',
-                composition: ROOT_REGISTRY
-            });
-        }
     };
 
     // Retrieve the provider for a given key.
-    function getProvider(key) {
+    ObjectAPI.prototype.getProvider = function (key) {
         if (key.identifier === 'ROOT') {
-            return RootProvider;
+            return this.rootProvider;
         }
-        return PROVIDER_REGISTRY[key.namespace] || FALLBACK_PROVIDER;
+        return this.providers[key.namespace] || this.fallbackProvider;
-    }
+    };
+
 
     /**
      * Register a new object provider for a particular namespace.
@@ -74,8 +74,8 @@ define([
      * @memberof {module:openmct.ObjectAPI#}
      * @name addProvider
      */
-    Objects.addProvider = function (namespace, provider) {
+    ObjectAPI.prototype.addProvider = function (namespace, provider) {
-        PROVIDER_REGISTRY[namespace] = provider;
+        this.providers[namespace] = provider;
     };
 
     /**
@@ -125,9 +125,9 @@ define([
         'delete',
         'get'
     ].forEach(function (method) {
-        Objects[method] = function () {
+        ObjectAPI.prototype[method] = function () {
             var key = arguments[0],
-                provider = getProvider(key);
+                provider = this.getProvider(key);
 
             if (!provider) {
                 throw new Error('No Provider Matched');
@@ -148,8 +148,8 @@ define([
      * @method addRoot
      * @memberof module:openmct.ObjectAPI#
      */
-    Objects.addRoot = function (key) {
+    ObjectAPI.prototype.addRoot = function (key) {
-        ROOT_REGISTRY.unshift(key);
+        this.rootRegistry.unshift(key);
     };
 
     /**
@@ -159,8 +159,8 @@ define([
      * @method removeRoot
      * @memberof module:openmct.ObjectAPI#
      */
-    Objects.removeRoot = function (key) {
+    ObjectAPI.prototype.removeRoot = function (key) {
-        ROOT_REGISTRY = ROOT_REGISTRY.filter(function (k) {
+        this.rootRegistry = this.rootRegistry.filter(function (k) {
             return (
                 k.identifier !== key.identifier ||
                 k.namespace !== key.namespace
@@ -176,7 +176,7 @@ define([
      * @method mutate
      * @memberof module:openmct.ObjectAPI#
      */
-    Objects.mutate = function (domainObject, path, value) {
+    ObjectAPI.prototype.mutate = function (domainObject, path, value) {
         return new MutableObject(domainObject).set(path, value);
     };
 
@@ -189,7 +189,7 @@ define([
      * @method observe
      * @memberof module:openmct.ObjectAPI#
      */
-    Objects.observe = function (domainObject, path, callback) {
+    ObjectAPI.prototype.observe = function (domainObject, path, callback) {
         return new MutableObject(domainObject).on(path, callback);
     };
 
@@ -228,5 +228,5 @@ define([
      * @memberof module:openmct
      */
 
-    return Objects;
+    return ObjectAPI;
 });

src/api/objects/bundle.js

@@ -39,6 +39,7 @@ define([
                     priority: "mandatory",
                     implementation: LegacyObjectAPIInterceptor,
                     depends: [
+                        "openmct",
                         "roots[]",
                         "instantiate",
                         "topic"