Merge pull request #7242 from AvaloniaUI/feature/get-required-service

Added AvaloniaLocator.GetRequiredService.

src/Avalonia.Base/AvaloniaLocator.cs

@@ -125,6 +125,16 @@ namespace Avalonia
         {
             return (T?) resolver.GetService(typeof (T));
         }
+
+        public static object GetRequiredService(this IAvaloniaDependencyResolver resolver, Type t)
+        {
+            return resolver.GetService(t) ?? throw new InvalidOperationException($"Unable to locate '{t}'.");
+        }
+
+        public static T GetRequiredService<T>(this IAvaloniaDependencyResolver resolver)
+        {
+            return (T?)resolver.GetService(typeof(T)) ?? throw new InvalidOperationException($"Unable to locate '{typeof(T)}'.");
+        }
     }
 }
 

src/Avalonia.Base/Threading/Dispatcher.cs

@@ -56,11 +56,7 @@ namespace Avalonia.Threading
         /// </param>
         public void MainLoop(CancellationToken cancellationToken)
         {
-            var platform = AvaloniaLocator.Current.GetService<IPlatformThreadingInterface>();
+            var platform = AvaloniaLocator.Current.GetRequiredService<IPlatformThreadingInterface>();
-
-            if (platform is null)
-                throw new InvalidOperationException("Unable to locate IPlatformThreadingInterface");
-
             cancellationToken.Register(() => platform.Signal(DispatcherPriority.Send));
             platform.RunLoop(cancellationToken);
         }

src/Avalonia.Controls/SystemDialog.cs

@@ -66,8 +66,7 @@ namespace Avalonia.Controls
         {
             if(parent == null)
                 throw new ArgumentNullException(nameof(parent));
-            var service = AvaloniaLocator.Current.GetService<ISystemDialogImpl>() ??
+            var service = AvaloniaLocator.Current.GetRequiredService<ISystemDialogImpl>();
-                throw new InvalidOperationException("Unable to locate ISystemDialogImpl.");
             return (await service.ShowFileDialogAsync(this, parent) ??
              Array.Empty<string>()).FirstOrDefault();
         }
@@ -95,8 +94,7 @@ namespace Avalonia.Controls
         {
             if(parent == null)
                 throw new ArgumentNullException(nameof(parent));
-            var service = AvaloniaLocator.Current.GetService<ISystemDialogImpl>() ??
+            var service = AvaloniaLocator.Current.GetRequiredService<ISystemDialogImpl>();
-                throw new InvalidOperationException("Unable to locate ISystemDialogImpl.");
             return service.ShowFileDialogAsync(this, parent);
         }
     }
@@ -125,8 +123,7 @@ namespace Avalonia.Controls
         {
             if(parent == null)
                 throw new ArgumentNullException(nameof(parent));
-            var service = AvaloniaLocator.Current.GetService<ISystemDialogImpl>() ??
+            var service = AvaloniaLocator.Current.GetRequiredService<ISystemDialogImpl>();
-                throw new InvalidOperationException("Unable to locate ISystemDialogImpl.");
             return service.ShowFolderDialogAsync(this, parent);
         }
     }

src/Avalonia.Visuals/Animation/RenderLoopClock.cs

@@ -9,9 +9,7 @@ namespace Avalonia.Animation
     {
         protected override void Stop()
         {
-            var loop = AvaloniaLocator.Current.GetService<IRenderLoop>() ??
+            AvaloniaLocator.Current.GetRequiredService<IRenderLoop>().Remove(this);
-                throw new InvalidOperationException("Unable to locate IRenderLoop.");
-            loop.Remove(this);
         }
 
         bool IRenderLoopTask.NeedsUpdate => HasSubscriptions;

src/Avalonia.Visuals/Media/CombinedGeometry.cs

@@ -154,8 +154,7 @@ namespace Avalonia.Media
 
             if (g1 is object && g2 is object)
             {
-                var factory = AvaloniaLocator.Current.GetService<IPlatformRenderInterface>() ??
+                var factory = AvaloniaLocator.Current.GetRequiredService<IPlatformRenderInterface>();
-                    throw new InvalidOperationException("Unable to locate IPlatformRenderInterface.");
                 return factory.CreateCombinedGeometry(GeometryCombineMode, g1, g2);
             }
             else if (GeometryCombineMode == GeometryCombineMode.Intersect)

src/Avalonia.Visuals/Media/EllipseGeometry.cs

@@ -98,8 +98,7 @@ namespace Avalonia.Media
         /// <inheritdoc/>
         protected override IGeometryImpl? CreateDefiningGeometry()
         {
-            var factory = AvaloniaLocator.Current.GetService<IPlatformRenderInterface>() ??
+            var factory = AvaloniaLocator.Current.GetRequiredService<IPlatformRenderInterface>();
-                throw new InvalidOperationException("Unable to locate IPlatformRenderInterface.");
 
             if (Rect != default) return factory.CreateEllipseGeometry(Rect);
             

src/Avalonia.Visuals/Media/Fonts/FontFamilyLoader.cs

@@ -32,9 +32,7 @@ namespace Avalonia.Media.Fonts
         /// <returns></returns>
         private static IEnumerable<Uri> GetFontAssetsBySource(FontFamilyKey fontFamilyKey)
         {
-            var assetLoader = AvaloniaLocator.Current.GetService<IAssetLoader>() ??
+            var assetLoader = AvaloniaLocator.Current.GetRequiredService<IAssetLoader>();
-                throw new InvalidOperationException("Unable to locate IAssetLoader.");
-
             var availableAssets = assetLoader.GetAssets(fontFamilyKey.Source, fontFamilyKey.BaseUri);
 
             var matchingAssets =
@@ -51,8 +49,7 @@ namespace Avalonia.Media.Fonts
         /// <returns></returns>
         private static IEnumerable<Uri> GetFontAssetsByExpression(FontFamilyKey fontFamilyKey)
         {
-            var assetLoader = AvaloniaLocator.Current.GetService<IAssetLoader>() ??
+            var assetLoader = AvaloniaLocator.Current.GetRequiredService<IAssetLoader>();
-                throw new InvalidOperationException("Unable to locate IAssetLoader.");
 
             var fileName = GetFileName(fontFamilyKey, out var fileExtension, out var location);
 

src/Avalonia.Visuals/Media/FormattedText.cs

@@ -24,8 +24,7 @@ namespace Avalonia.Media
         /// </summary>
         public FormattedText()
         {
-            _platform = AvaloniaLocator.Current.GetService<IPlatformRenderInterface>() ??
+            _platform = AvaloniaLocator.Current.GetRequiredService<IPlatformRenderInterface>();
-                throw new InvalidOperationException("Unable to locate IPlatformRenderInterface.");
         }
 
         /// <summary>

src/Avalonia.Visuals/Media/GeometryGroup.cs

@@ -61,8 +61,7 @@ namespace Avalonia.Media
         {
             if (_children?.Count > 0)
             {
-                var factory = AvaloniaLocator.Current.GetService<IPlatformRenderInterface>() ??
+                var factory = AvaloniaLocator.Current.GetRequiredService<IPlatformRenderInterface>();
-                    throw new InvalidOperationException("Unable to locate IPlatformRenderInterface.");
                 return factory.CreateGeometryGroup(FillRule, _children);
             }
 

src/Avalonia.Visuals/Media/GlyphRun.cs

@@ -627,8 +627,7 @@ namespace Avalonia.Media
                 throw new InvalidOperationException();
             }
 
-            var platformRenderInterface = AvaloniaLocator.Current.GetService<IPlatformRenderInterface>() ??
+            var platformRenderInterface = AvaloniaLocator.Current.GetRequiredService<IPlatformRenderInterface>();
-                throw new InvalidOperationException("Unable to locate IPlatformRenderInterface");
 
             _glyphRunImpl = platformRenderInterface.CreateGlyphRun(this);
         }

src/Avalonia.Visuals/Media/Imaging/Bitmap.cs

@@ -169,8 +169,7 @@ namespace Avalonia.Media.Imaging
 
         private static IPlatformRenderInterface GetFactory()
         {
-            return AvaloniaLocator.Current.GetService<IPlatformRenderInterface>() ??
+            return AvaloniaLocator.Current.GetRequiredService<IPlatformRenderInterface>();
-                throw new InvalidOperationException("Unable to locate IPlatformRenderInterface.");
         }
     }
 }

src/Avalonia.Visuals/Media/Imaging/RenderTargetBitmap.cs

@@ -54,8 +54,7 @@ namespace Avalonia.Media.Imaging
         /// <returns>The platform-specific implementation.</returns>
         private static IRenderTargetBitmapImpl CreateImpl(PixelSize size, Vector dpi)
         {
-            IPlatformRenderInterface factory = AvaloniaLocator.Current.GetService<IPlatformRenderInterface>() ??
+            IPlatformRenderInterface factory = AvaloniaLocator.Current.GetRequiredService<IPlatformRenderInterface>();
-                throw new InvalidOperationException("Unable to locate IPlatformRenderInterface.");
             return factory.CreateRenderTargetBitmap(size, dpi);
         }
 

src/Avalonia.Visuals/Media/Imaging/WriteableBitmap.cs

@@ -93,8 +93,7 @@ namespace Avalonia.Media.Imaging
 
         private static IPlatformRenderInterface GetFactory()
         {
-            return AvaloniaLocator.Current.GetService<IPlatformRenderInterface>() ??
+            return AvaloniaLocator.Current.GetRequiredService<IPlatformRenderInterface>();
-                throw new InvalidOperationException("Unable to locate IPlatformRenderInterface.");
         }
     }
 }

src/Avalonia.Visuals/Media/LineGeometry.cs

@@ -70,8 +70,7 @@ namespace Avalonia.Media
         /// <inheritdoc/>
         protected override IGeometryImpl? CreateDefiningGeometry()
         {
-            var factory = AvaloniaLocator.Current.GetService<IPlatformRenderInterface>() ??
+            var factory = AvaloniaLocator.Current.GetRequiredService<IPlatformRenderInterface>();
-                throw new InvalidOperationException("Unable to locate IPlatformRenderInterface.");
 
             return factory.CreateLineGeometry(StartPoint, EndPoint);
         }

src/Avalonia.Visuals/Media/PathGeometry.cs

@@ -88,8 +88,7 @@ namespace Avalonia.Media
             if (figures is null)
                 return null;
 
-            var factory = AvaloniaLocator.Current.GetService<IPlatformRenderInterface>() ??
+            var factory = AvaloniaLocator.Current.GetRequiredService<IPlatformRenderInterface>();
-                throw new InvalidOperationException("Unable to locate IPlatformRenderInterface.");
             var geometry = factory.CreateStreamGeometry();
 
             using (var ctx = new StreamGeometryContext(geometry.Open()))

src/Avalonia.Visuals/Media/PolylineGeometry.cs

@@ -76,8 +76,7 @@ namespace Avalonia.Media
 
         protected override IGeometryImpl? CreateDefiningGeometry()
         {
-            var factory = AvaloniaLocator.Current.GetService<IPlatformRenderInterface>() ??
+            var factory = AvaloniaLocator.Current.GetRequiredService<IPlatformRenderInterface>();
-                throw new InvalidOperationException("Unable to locate IPlatformRenderInterface.");
             var geometry = factory.CreateStreamGeometry();
 
             using (var context = geometry.Open())

src/Avalonia.Visuals/Media/RectangleGeometry.cs

@@ -49,8 +49,7 @@ namespace Avalonia.Media
 
         protected override IGeometryImpl? CreateDefiningGeometry()
         {
-            var factory = AvaloniaLocator.Current.GetService<IPlatformRenderInterface>() ??
+            var factory = AvaloniaLocator.Current.GetRequiredService<IPlatformRenderInterface>();
-                throw new InvalidOperationException("Unable to locate IPlatformRenderInterface.");
 
             return factory.CreateRectangleGeometry(Rect);
         }

src/Avalonia.Visuals/Media/StreamGeometry.cs

@@ -66,8 +66,7 @@ namespace Avalonia.Media
         {
             if (_impl == null)
             {
-                var factory = AvaloniaLocator.Current.GetService<IPlatformRenderInterface>() ??
+                var factory = AvaloniaLocator.Current.GetRequiredService<IPlatformRenderInterface>();
-                    throw new InvalidOperationException("Unable to locate IPlatformRenderInterface.");
                 _impl = factory.CreateStreamGeometry();
             }
 

src/Avalonia.Visuals/Rendering/DefaultRenderTimer.cs

@@ -77,8 +77,7 @@ namespace Avalonia.Rendering
         /// </remarks>
         protected virtual IDisposable StartCore(Action<TimeSpan> tick)
         {
-            _runtime ??= AvaloniaLocator.Current.GetService<IRuntimePlatform>() ??
+            _runtime ??= AvaloniaLocator.Current.GetRequiredService<IRuntimePlatform>();
-                throw new InvalidOperationException("Unable to locate IRuntimePlatform.");
 
             return _runtime.StartSystemTimer(
                 TimeSpan.FromSeconds(1.0 / FramesPerSecond),

src/Avalonia.X11/X11CursorFactory.cs

@@ -94,10 +94,8 @@ namespace Avalonia.X11
             {
                 var size = Marshal.SizeOf<XcursorImage>() +
                     (bitmap.PixelSize.Width * bitmap.PixelSize.Height * 4);
-                var runtimePlatform = AvaloniaLocator.Current.GetService<IRuntimePlatform>() ??
+                var runtimePlatform = AvaloniaLocator.Current.GetRequiredService<IRuntimePlatform>();
-                    throw new InvalidOperationException("Unable to locate IRuntimePlatform");
+                var platformRenderInterface = AvaloniaLocator.Current.GetRequiredService<IPlatformRenderInterface>();
-                var platformRenderInterface = AvaloniaLocator.Current.GetService<IPlatformRenderInterface>() ??
-                    throw new InvalidOperationException("Unable to locate IPlatformRenderInterface");
 
                 _pixelSize = bitmap.PixelSize;
                 _blob = runtimePlatform.AllocBlob(size);

src/Web/Avalonia.Web.Blazor/RazorViewTopLevelImpl.cs

@@ -106,8 +106,7 @@ namespace Avalonia.Web.Blazor
 
         public IRenderer CreateRenderer(IRenderRoot root)
         {
-            var loop = AvaloniaLocator.Current.GetService<IRenderLoop>() ??
+            var loop = AvaloniaLocator.Current.GetRequiredService<IRenderLoop>();
-                throw new InvalidOperationException("Unable to locate IRenderLoop.");
             return new DeferredRenderer(root, loop);
         }
 

src/Web/Avalonia.Web.Blazor/WindowingPlatform.cs

@@ -98,8 +98,7 @@ namespace Avalonia.Web.Blazor
 
         private static IRuntimePlatform GetRuntimePlatform()
         {
-            return AvaloniaLocator.Current.GetService<IRuntimePlatform>() ??
+            return AvaloniaLocator.Current.GetRequiredService<IRuntimePlatform>();
-                throw new InvalidOperationException("Unable to locate IRuntimePlatform.");
         }
     }
 }

src/Windows/Avalonia.Win32/FramebufferManager.cs

@@ -107,8 +107,7 @@ namespace Avalonia.Win32
 
         private static FramebufferData AllocateFramebufferData(int width, int height)
         {
-            var service = AvaloniaLocator.Current.GetService<IRuntimePlatform>() ??
+            var service = AvaloniaLocator.Current.GetRequiredService<IRuntimePlatform>();
-                throw new InvalidOperationException("Unable to locate IRuntimePlatform.");
             var bitmapBlob = service.AllocBlob(width * height * _bytesPerPixel);
 
             return new FramebufferData(bitmapBlob, width, height);