implement registrar data provider methods in svc locator. all current tests pass

Author: David Kline (ANALOG)

Assets/MixedRealityToolkit/Interfaces/Registrars/IMixedRealityServiceRegistrar.cs

@@ -49,7 +49,7 @@ bool RegisterService<T>(
         /// <typeparam name="T">The interface type of the service to be unregistered (ex: IMixedRealityBoundarySystem).
         /// <param name="service">The specific service instance to unregister.</param>
         /// <returns>True if the service was successfully unregistered, false otherwise.</returns>
-        bool UnregisterService<T>(IMixedRealityService serviceInstance) where T : IMixedRealityService;
+        bool UnregisterService<T>(T serviceInstance) where T : IMixedRealityService;
 
         /// <summary>
         /// Checks to see if a service of the specified type has been registered.
@@ -73,7 +73,7 @@ bool RegisterService<T>(
         /// </summary>
         /// <typeparam name="T">The interface type of the service (ex: IMixedRealityBoundarySystem).
         /// <param name="name">Friendly name of the service.</param>
-        /// <returns>Read-only collection of the service instances, as tye requested type.</returns>
+        /// <returns>Read-only collection of the service instances, as the requested type.</returns>
         IReadOnlyList<T> GetServices<T>(string name = null) where T : IMixedRealityService;
 
         #endregion IMixedRealityServce registration
@@ -85,7 +85,7 @@ bool RegisterService<T>(
         /// </summary>
         /// <typeparam name="T">The interface type of the data provider to be registered.</typeparam>
         /// <param name="dataProviderInstance">An instance of the data provider to be registered.</param>
-        bool RegisterDataProvider<T>(IMixedRealityDataProvider dataProviderInstance) where T : IMixedRealityDataProvider;
+        bool RegisterDataProvider<T>(T dataProviderInstance) where T : IMixedRealityDataProvider;
 
         /// <summary>
         /// Registers a data provider of the specified type.
@@ -112,7 +112,7 @@ bool RegisterDataProvider<T>(
         /// <typeparam name="T">The interface type of the data provider to be unregistered.
         /// <param name="service">The specific data provider instance to unregister.</param>
         /// <returns>True if the data provider was successfully unregistered, false otherwise.</returns>
-        bool UnregisterDataProvider<T>(IMixedRealityDataProvider dataProviderInstance) where T : IMixedRealityDataProvider;
+        bool UnregisterDataProvider<T>(T dataProviderInstance) where T : IMixedRealityDataProvider;
 
         /// <summary>
         /// Checks to see if a data provider of the specified type has been registered.
@@ -130,18 +130,13 @@ bool RegisterDataProvider<T>(
         /// <returns>The registered data provider instance as the requested type.</returns>
         T GetDataProvider<T>(string name = null) where T : IMixedRealityDataProvider;
 
-        /// <summary>
-        /// Gets the collection of the registered data provider instances matching the requested type.
-        /// </summary>
-        /// <returns>Read-only collection of the data provider instances, as IMixedRealitydata provider.</returns>
-        IReadOnlyList<IMixedRealityDataProvider> GetDataProviders();
-
         /// <summary>
         /// Gets the collection of the registered data provider instances matching the requested type.
         /// </summary>
         /// <typeparam name="T">The interface type of the data provider.
-        /// <returns>Read-only collection of the data provider instances, as tye requested type.</returns>
-        IReadOnlyList<T> GetDataProviders<T>() where T : IMixedRealityDataProvider;
+        /// <param name="name">The name of the data provider.</param>
+        /// <returns>Read-only collection of the data provider instances, as the requested type.</returns>
+        IReadOnlyList<T> GetDataProviders<T>(string name = null) where T : IMixedRealityDataProvider;
 
         #endregion IMixedRealityDataProvider registration
     }

Assets/MixedRealityToolkit/Services/MixedRealityToolkit.cs

@@ -191,15 +191,15 @@ public bool RegisterService<T>(
         /// <inheritdoc />
         public bool UnregisterService<T>(string name = null) where T : IMixedRealityService
         {
-            IMixedRealityService serviceInstance = GetServiceByName<T>(name);
+            T serviceInstance = GetServiceByName<T>(name);
 
             if (serviceInstance == null) { return false; }
 
             return UnregisterService<T>(serviceInstance);
         }
 
         /// <inheritdoc />
-        public bool UnregisterService<T>(IMixedRealityService serviceInstance) where T : IMixedRealityService
+        public bool UnregisterService<T>(T serviceInstance) where T : IMixedRealityService
         {
             Type interfaceType = typeof(T);
 
@@ -255,15 +255,9 @@ public IReadOnlyList<T> GetServices<T>(string name = null) where T : IMixedReali
         }
 
         /// <inheritdoc />
-        public IReadOnlyList<IMixedRealityService> GetServices()
-        {
-            return GetServices<IMixedRealityService>();
-        }
-
-        /// <inheritdoc />
-        public bool RegisterDataProvider<T>(IMixedRealityDataProvider dataProviderInstance) where T : IMixedRealityDataProvider
+        public bool RegisterDataProvider<T>(T dataProviderInstance) where T : IMixedRealityDataProvider
         {
-            throw new NotImplementedException();
+            return RegisterService<T>(dataProviderInstance);
         }
 
         /// <inheritdoc />
@@ -272,37 +266,37 @@ public bool RegisterDataProvider<T>(
             SupportedPlatforms supportedPlatforms = (SupportedPlatforms)(-1),
             params object[] args) where T : IMixedRealityDataProvider
         {
-            throw new NotImplementedException();
+            return RegisterService<T>(concreteType, supportedPlatforms, args);
         }
 
         /// <inheritdoc />
         public bool UnregisterDataProvider<T>(string name = null) where T : IMixedRealityDataProvider
         {
-            throw new NotImplementedException();
+            return UnregisterService<T>(name);
         }
 
         /// <inheritdoc />
-        public bool UnregisterDataProvider<T>(IMixedRealityDataProvider dataProviderInstance) where T : IMixedRealityDataProvider
+        public bool UnregisterDataProvider<T>(T dataProviderInstance) where T : IMixedRealityDataProvider
         {
-            throw new NotImplementedException();
+            return UnregisterService<T>(dataProviderInstance);
         }
 
         /// <inheritdoc />
         public bool IsDataProviderRegistered<T>(string name = null) where T : IMixedRealityDataProvider
         {
-            throw new NotImplementedException();
+            return IsServiceRegistered<T>(name);
         }
 
         /// <inheritdoc />
         public T GetDataProvider<T>(string name = null) where T : IMixedRealityDataProvider
         {
-            throw new NotImplementedException();
+            return GetService<T>(name);
         }
 
         /// <inheritdoc />
-        public IReadOnlyList<IMixedRealityDataProvider> GetDataProviders()
+        public IReadOnlyList<T> GetDataProviders<T>(string name = null) where T : IMixedRealityDataProvider
         {
-            throw new NotImplementedException();
+            return GetServices<T>(name);
         }
 
         /// <inheritdoc />
@@ -779,7 +773,7 @@ private bool RegisterServiceInternal(Type interfaceType, IMixedRealityService se
 
             IMixedRealityService preExistingService = GetServiceByNameInternal(interfaceType, serviceInstance.Name);
 
-            if (preExistingService == null)
+            if (preExistingService != null)
             {
                 Debug.LogError($"There's already a {interfaceType.Name}.{preExistingService.Name} registered!");
                 return false;