Apply performances recommendations

arnaudleclerc · arnaudleclerc · commit 90eddde17e53 · 2026-03-24T19:01:06.000+01:00
diff --git a/src/AzureMapsControl.Components/Animations/AnimationService.cs b/src/AzureMapsControl.Components/Animations/AnimationService.cs
diff --git a/src/AzureMapsControl.Components/Data/DataSourceEventArgs.cs b/src/AzureMapsControl.Components/Data/DataSourceEventArgs.cs
@@ -6,9 +6,9 @@
 
 namespace AzureMapsControl.Components.Data;
 [ExcludeFromCodeCoverage]
-internal class DataSourceEventArgs
+internal record DataSourceEventArgs
 {
-    public string Id { get; set; }
-    public IEnumerable<Shape<Geometry>> Shapes { get; set; }
-    public string Type { get; set; }
+    public string Id { get; init; }
+    public IEnumerable<Shape<Geometry>> Shapes { get; init; }
+    public string Type { get; init; }
 }
diff --git a/src/AzureMapsControl.Components/Data/DataSourceEventInvokeHelper.cs b/src/AzureMapsControl.Components/Data/DataSourceEventInvokeHelper.cs
@@ -5,9 +5,4 @@
 using AzureMapsControl.Components.Events;
 
 namespace AzureMapsControl.Components.Data;
-internal class DataSourceEventInvokeHelper : EventInvokeHelper<DataSourceEventArgs>
-{
-    public DataSourceEventInvokeHelper(Func<DataSourceEventArgs, ValueTask> callback) : base(callback)
-    {
-    }
-}
+internal sealed class DataSourceEventInvokeHelper(Func<DataSourceEventArgs, ValueTask> callback) : EventInvokeHelper<DataSourceEventArgs>(callback);
diff --git a/src/AzureMapsControl.Components/Drawing/DrawingToolbarEventInvokeHelper.cs b/src/AzureMapsControl.Components/Drawing/DrawingToolbarEventInvokeHelper.cs
@@ -7,7 +7,4 @@
 
 namespace AzureMapsControl.Components.Drawing;
 [ExcludeFromCodeCoverage]
-internal class DrawingToolbarEventInvokeHelper : EventInvokeHelper<DrawingToolbarJsEventArgs>
-{
-    public DrawingToolbarEventInvokeHelper(Func<DrawingToolbarJsEventArgs, ValueTask> callback) : base(callback) { }
-}
+internal sealed class DrawingToolbarEventInvokeHelper(Func<DrawingToolbarJsEventArgs, ValueTask> callback) : EventInvokeHelper<DrawingToolbarJsEventArgs>(callback);
diff --git a/src/AzureMapsControl.Components/Drawing/DrawingToolbarJsEventArgs.cs b/src/AzureMapsControl.Components/Drawing/DrawingToolbarJsEventArgs.cs
@@ -5,9 +5,9 @@
 
 namespace AzureMapsControl.Components.Drawing;
 [ExcludeFromCodeCoverage]
-internal class DrawingToolbarJsEventArgs
+internal record DrawingToolbarJsEventArgs
 {
-    public string Type { get; set; }
-    public string NewMode { get; set; }
-    public Feature<Geometry> Data { get; set; }
+    public string Type { get; init; }
+    public string NewMode { get; init; }
+    public Feature<Geometry> Data { get; init; }
 }
diff --git a/src/AzureMapsControl.Components/FullScreen/FullScreenEventInvokeHelper.cs b/src/AzureMapsControl.Components/FullScreen/FullScreenEventInvokeHelper.cs
@@ -5,9 +5,4 @@
 using AzureMapsControl.Components.Events;
 
 namespace AzureMapsControl.Components.FullScreen;
-internal class FullScreenEventInvokeHelper : EventInvokeHelper<bool>
-{
-    public FullScreenEventInvokeHelper(Func<bool, ValueTask> callback) : base(callback)
-    {
-    }
-}
+internal sealed class FullScreenEventInvokeHelper(Func<bool, ValueTask> callback) : EventInvokeHelper<bool>(callback);
diff --git a/src/AzureMapsControl.Components/FullScreen/FullScreenService.cs b/src/AzureMapsControl.Components/FullScreen/FullScreenService.cs
@@ -7,20 +7,11 @@
 using Microsoft.Extensions.Logging;
 
 namespace AzureMapsControl.Components.FullScreen;
-internal class FullScreenService : IFullScreenService
+internal sealed class FullScreenService(IMapJsRuntime jsRuntime, ILogger<FullScreenService> logger) : IFullScreenService
 {
-    private readonly IMapJsRuntime _jsRuntime;
-    private readonly ILogger<FullScreenService> _logger;
-
-    public FullScreenService(IMapJsRuntime jsRuntime, ILogger<FullScreenService> logger)
-    {
-        _jsRuntime = jsRuntime;
-        _logger = logger;
-    }
-
     public async ValueTask<bool> IsSupportedAsync()
     {
-        _logger?.LogAzureMapsControlInfo(AzureMapLogEvent.FullScreenService_IsFullScreenSupportedAsync, "FullScreenService - IsSupportedAsync");
-        return await _jsRuntime.InvokeAsync<bool>(Constants.JsConstants.Methods.FullScreenControl.IsFullScreenSupported.ToFullScreenControlNamespace()).ConfigureAwait(false);
+        logger?.LogAzureMapsControlInfo(AzureMapLogEvent.FullScreenService_IsFullScreenSupportedAsync, "FullScreenService - IsSupportedAsync");
+        return await jsRuntime.InvokeAsync<bool>(Constants.JsConstants.Methods.FullScreenControl.IsFullScreenSupported.ToFullScreenControlNamespace()).ConfigureAwait(false);
     }
 }
diff --git a/src/AzureMapsControl.Components/Geolocation/GeolocationEventInvokeHelper.cs b/src/AzureMapsControl.Components/Geolocation/GeolocationEventInvokeHelper.cs
@@ -5,9 +5,4 @@
 using AzureMapsControl.Components.Events;
 
 namespace AzureMapsControl.Components.Geolocation;
-internal class GeolocationEventInvokeHelper : EventInvokeHelper<GeolocationJsEventArgs>
-{
-    public GeolocationEventInvokeHelper(Func<GeolocationJsEventArgs, ValueTask> callback) : base(callback)
-    {
-    }
-}
+internal sealed class GeolocationEventInvokeHelper(Func<GeolocationJsEventArgs, ValueTask> callback) : EventInvokeHelper<GeolocationJsEventArgs>(callback);
diff --git a/src/AzureMapsControl.Components/Geolocation/GeolocationJsEventArgs.cs b/src/AzureMapsControl.Components/Geolocation/GeolocationJsEventArgs.cs
@@ -5,10 +5,10 @@
 
 namespace AzureMapsControl.Components.Geolocation;
 [ExcludeFromCodeCoverage]
-internal class GeolocationJsEventArgs
+internal record GeolocationJsEventArgs
 {
-    public int? Code { get; set; }
-    public string Message { get; set; }
-    public Feature<Point> Feature { get; set; }
-    public string Type { get; set; }
+    public int? Code { get; init; }
+    public string Message { get; init; }
+    public Feature<Point> Feature { get; init; }
+    public string Type { get; init; }
 }
diff --git a/src/AzureMapsControl.Components/Geolocation/GeolocationService.cs b/src/AzureMapsControl.Components/Geolocation/GeolocationService.cs
@@ -7,24 +7,15 @@
 using Microsoft.Extensions.Logging;
 
 namespace AzureMapsControl.Components.Geolocation;
-internal class GeolocationService : IGeolocationService
+internal sealed class GeolocationService(IMapJsRuntime mapJsRuntime, ILogger<GeolocationService> logger) : IGeolocationService
 {
-    private readonly IMapJsRuntime _mapJsRuntime;
-    private readonly ILogger<GeolocationService> _logger;
-
-    public GeolocationService(IMapJsRuntime mapJsRuntime, ILogger<GeolocationService> logger)
-    {
-        _mapJsRuntime = mapJsRuntime;
-        _logger = logger;
-    }
-
     /// <summary>
     /// Checks to see if the geolocation API is supported in the browser.
     /// </summary>
     /// <returns>True if the geolocation API is supported in the browser, otherwise false</returns>
     public async ValueTask<bool> IsGeolocationSupportedAsync()
     {
-        _logger?.LogAzureMapsControlInfo(AzureMapLogEvent.GeolocationService_IsGeolocationSupportedAsync, "GeolocationService - IsGeolocationSupportedAsync");
-        return await _mapJsRuntime.InvokeAsync<bool>(Constants.JsConstants.Methods.GeolocationControl.IsGeolocationSupported.ToGeolocationControlNamespace()).ConfigureAwait(false);
+        logger?.LogAzureMapsControlInfo(AzureMapLogEvent.GeolocationService_IsGeolocationSupportedAsync, "GeolocationService - IsGeolocationSupportedAsync");
+        return await mapJsRuntime.InvokeAsync<bool>(Constants.JsConstants.Methods.GeolocationControl.IsGeolocationSupported.ToGeolocationControlNamespace()).ConfigureAwait(false);
     }
 }
diff --git a/src/AzureMapsControl.Components/Indoor/IndoorManagerJsEventArgs.cs b/src/AzureMapsControl.Components/Indoor/IndoorManagerJsEventArgs.cs
@@ -3,11 +3,11 @@
 
 namespace AzureMapsControl.Components.Indoor;
 [ExcludeFromCodeCoverage]
-internal class IndoorManagerJsEventArgs
+internal record IndoorManagerJsEventArgs
 {
-    public string Type { get; set; }
-    public string FacilityId { get; set; }
-    public int LevelNumber { get; set; }
-    public string PrevFacilityId { get; set; }
-    public int PrevLevelNumber { get; set; }
+    public string Type { get; init; }
+    public string FacilityId { get; init; }
+    public int LevelNumber { get; init; }
+    public string PrevFacilityId { get; init; }
+    public int PrevLevelNumber { get; init; }
 }
diff --git a/src/AzureMapsControl.Components/Indoor/IndoorService.cs b/src/AzureMapsControl.Components/Indoor/IndoorService.cs
@@ -8,27 +8,18 @@
 using Microsoft.JSInterop;
 
 namespace AzureMapsControl.Components.Indoor;
-internal class IndoorService : IIndoorService
+internal sealed class IndoorService(IMapJsRuntime jsRuntime, ILogger<IndoorService> logger) : IIndoorService
 {
-    private readonly IMapJsRuntime _jsRuntime;
-    private readonly ILogger<IndoorService> _logger;
-
-    public IndoorService(IMapJsRuntime jsRuntime, ILogger<IndoorService> logger)
-    {
-        _jsRuntime = jsRuntime;
-        _logger = logger;
-    }
-
     public async ValueTask<IndoorManager> CreateIndoorManagerAsync(IndoorManagerOptions options) => await CreateIndoorManagerAsync(options, null).ConfigureAwait(false);
 
     public async ValueTask<IndoorManager> CreateIndoorManagerAsync(IndoorManagerOptions options, IndoorManagerEventActivationFlags eventFlags)
     {
-        _logger.LogAzureMapsControlInfo(AzureMapLogEvent.IndoorService_CreateIndoorManagerAsync, "IndoorService - CreateIndoorManagerAsync");
-        _logger.LogAzureMapsControlDebug(AzureMapLogEvent.IndoorService_CreateIndoorManagerAsync, "Options", options);
-        _logger.LogAzureMapsControlDebug(AzureMapLogEvent.IndoorService_CreateIndoorManagerAsync, "EventFlags", eventFlags);
+        logger.LogAzureMapsControlInfo(AzureMapLogEvent.IndoorService_CreateIndoorManagerAsync, "IndoorService - CreateIndoorManagerAsync");
+        logger.LogAzureMapsControlDebug(AzureMapLogEvent.IndoorService_CreateIndoorManagerAsync, "Options", options);
+        logger.LogAzureMapsControlDebug(AzureMapLogEvent.IndoorService_CreateIndoorManagerAsync, "EventFlags", eventFlags);
 
-        var indoorManager = new IndoorManager(_jsRuntime, _logger);
-        await _jsRuntime.InvokeVoidAsync(Constants.JsConstants.Methods.Indoor.CreateIndoorManager.ToIndoorNamespace(), indoorManager.Id, options, eventFlags?.EnabledEvents, DotNetObjectReference.Create(indoorManager.EventHelper)).ConfigureAwait(false);
+        var indoorManager = new IndoorManager(jsRuntime, logger);
+        await jsRuntime.InvokeVoidAsync(Constants.JsConstants.Methods.Indoor.CreateIndoorManager.ToIndoorNamespace(), indoorManager.Id, options, eventFlags?.EnabledEvents, DotNetObjectReference.Create(indoorManager.EventHelper)).ConfigureAwait(false);
         return indoorManager;
     }
 }
diff --git a/src/AzureMapsControl.Components/Layers/LayerEventInvokeHelper.cs b/src/AzureMapsControl.Components/Layers/LayerEventInvokeHelper.cs
@@ -6,9 +6,4 @@
 using AzureMapsControl.Components.Map;
 
 namespace AzureMapsControl.Components.Layers;
-internal sealed class LayerEventInvokeHelper : EventInvokeHelper<MapJsEventArgs>
-{
-    public LayerEventInvokeHelper(Func<MapJsEventArgs, ValueTask> callback) : base(callback)
-    {
-    }
-}
+internal sealed class LayerEventInvokeHelper(Func<MapJsEventArgs, ValueTask> callback) : EventInvokeHelper<MapJsEventArgs>(callback);
diff --git a/src/AzureMapsControl.Components/Map/MapEventInvokeHelper.cs b/src/AzureMapsControl.Components/Map/MapEventInvokeHelper.cs
@@ -5,9 +5,4 @@
 using AzureMapsControl.Components.Events;
 
 namespace AzureMapsControl.Components.Map;
-internal sealed class MapEventInvokeHelper : EventInvokeHelper<MapJsEventArgs>
-{
-    public MapEventInvokeHelper(Func<MapJsEventArgs, ValueTask> callback) : base(callback)
-    {
-    }
-}
+internal sealed class MapEventInvokeHelper(Func<MapJsEventArgs, ValueTask> callback) : EventInvokeHelper<MapJsEventArgs>(callback);
diff --git a/src/AzureMapsControl.Components/Map/MapJsEventArgs.cs b/src/AzureMapsControl.Components/Map/MapJsEventArgs.cs
@@ -6,29 +6,23 @@
 
 namespace AzureMapsControl.Components.Map;
 [ExcludeFromCodeCoverage]
-internal class MapJsEventArgs
+internal record MapJsEventArgs
 {
-    public string Error { get; set; }
-
-    public string Type { get; set; }
-
-    public string LayerId { get; set; }
-    public IEnumerable<Feature<Geometry>> Features { get; set; }
-    public IEnumerable<Shape<Geometry>> Shapes { get; set; }
-    public Pixel Pixel { get; set; }
-    public Position Position { get; set; }
-
-    public string DataType { get; set; }
-    public bool? IsSourceLoaded { get; set; }
-    public Source Source { get; set; }
-    public string SourceDataType { get; set; }
-    public string Style { get; set; }
-    public Tile Tile { get; set; }
-
-    public string Message { get; set; }
-
-    public IEnumerable<Pixel> Pixels { get; set; }
-    public IEnumerable<Position> Positions { get; set; }
-
-    public string Id { get; set; }
+    public string Error { get; init; }
+    public string Type { get; init; }
+    public string LayerId { get; init; }
+    public IEnumerable<Feature<Geometry>> Features { get; init; }
+    public IEnumerable<Shape<Geometry>> Shapes { get; init; }
+    public Pixel Pixel { get; init; }
+    public Position Position { get; init; }
+    public string DataType { get; init; }
+    public bool? IsSourceLoaded { get; init; }
+    public Source Source { get; init; }
+    public string SourceDataType { get; init; }
+    public string Style { get; init; }
+    public Tile Tile { get; init; }
+    public string Message { get; init; }
+    public IEnumerable<Pixel> Pixels { get; init; }
+    public IEnumerable<Position> Positions { get; init; }
+    public string Id { get; init; }
 }
diff --git a/src/AzureMapsControl.Components/Map/MapService.cs b/src/AzureMapsControl.Components/Map/MapService.cs
@@ -8,28 +8,24 @@
 namespace AzureMapsControl.Components.Map;
 public delegate ValueTask MapReadyEvent();
 
-internal sealed class MapService : IMapAdderService
+internal sealed class MapService(ILogger<MapService> logger) : IMapAdderService
 {
-    private readonly ILogger<MapService> _logger;
-
     public Map Map
     {
         get;
         private set;
     }
 
-    public MapService(ILogger<MapService> logger) => _logger = logger;
-
     public event MapReadyEvent OnMapReadyAsync;
 
     public async ValueTask AddMapAsync(Map map)
     {
-        _logger?.LogAzureMapsControlInfo(AzureMapLogEvent.MapService_AddMapAsync, "Adding instance of map");
+        logger?.LogAzureMapsControlInfo(AzureMapLogEvent.MapService_AddMapAsync, "Adding instance of map");
         Map = map;
 
         if (OnMapReadyAsync is not null)
         {
-            _logger?.LogAzureMapsControlInfo(AzureMapLogEvent.MapService_AddMapAsync, "Emitting OnMapReadyAsync");
+            logger?.LogAzureMapsControlInfo(AzureMapLogEvent.MapService_AddMapAsync, "Emitting OnMapReadyAsync");
             await OnMapReadyAsync.Invoke().ConfigureAwait(false);
         }
     }
diff --git a/src/AzureMapsControl.Components/Markers/HtmlMarkerInvokeHelper.cs b/src/AzureMapsControl.Components/Markers/HtmlMarkerInvokeHelper.cs
@@ -5,9 +5,4 @@
 using AzureMapsControl.Components.Events;
 
 namespace AzureMapsControl.Components.Markers;
-internal class HtmlMarkerInvokeHelper : EventInvokeHelper<HtmlMarkerJsEventArgs>
-{
-    public HtmlMarkerInvokeHelper(Func<HtmlMarkerJsEventArgs, ValueTask> callback) : base(callback)
-    {
-    }
-}
+internal sealed class HtmlMarkerInvokeHelper(Func<HtmlMarkerJsEventArgs, ValueTask> callback) : EventInvokeHelper<HtmlMarkerJsEventArgs>(callback);
diff --git a/src/AzureMapsControl.Components/Markers/HtmlMarkerJsEventArgs.cs b/src/AzureMapsControl.Components/Markers/HtmlMarkerJsEventArgs.cs
@@ -3,9 +3,9 @@
 
 namespace AzureMapsControl.Components.Markers;
 [ExcludeFromCodeCoverage]
-internal class HtmlMarkerJsEventArgs
+internal record HtmlMarkerJsEventArgs
 {
-    public string MarkerId { get; set; }
-    public string Type { get; set; }
-    public HtmlMarkerOptions Options { get; set; }
+    public string MarkerId { get; init; }
+    public string Type { get; init; }
+    public HtmlMarkerOptions Options { get; init; }
 }
diff --git a/src/AzureMapsControl.Components/Popups/PopupInvokeHelper.cs b/src/AzureMapsControl.Components/Popups/PopupInvokeHelper.cs
@@ -5,7 +5,4 @@
 using AzureMapsControl.Components.Events;
 
 namespace AzureMapsControl.Components.Popups;
-internal sealed class PopupInvokeHelper : EventInvokeHelper<PopupEventArgs>
-{
-    public PopupInvokeHelper(Func<PopupEventArgs, ValueTask> callback) : base(callback) { }
-}
+internal sealed class PopupInvokeHelper(Func<PopupEventArgs, ValueTask> callback) : EventInvokeHelper<PopupEventArgs>(callback);
diff --git a/src/AzureMapsControl.Components/Runtime/MapJsRuntime.cs b/src/AzureMapsControl.Components/Runtime/MapJsRuntime.cs
@@ -5,26 +5,17 @@
 using Microsoft.JSInterop;
 
 namespace AzureMapsControl.Components.Runtime;
-internal sealed class MapJsRuntime : IMapJsRuntime
+internal sealed class MapJsRuntime(IJSRuntime jsRuntime, ILogger<MapJsRuntime> logger) : IMapJsRuntime
 {
-    private readonly IJSRuntime _jsRuntime;
-    private readonly ILogger<MapJsRuntime> _logger;
-
-    public MapJsRuntime(IJSRuntime jsRuntime, ILogger<MapJsRuntime> logger)
-    {
-        _jsRuntime = jsRuntime;
-        _logger = logger;
-    }
-
     public async ValueTask InvokeVoidAsync(string identifier, params object[] args)
     {
-        _logger?.LogDebug($"MapJsRuntime - InvokeVoidAsync - {identifier}");
-        await _jsRuntime.InvokeVoidAsync(identifier, args).ConfigureAwait(false);
+        logger?.LogDebug($"MapJsRuntime - InvokeVoidAsync - {identifier}");
+        await jsRuntime.InvokeVoidAsync(identifier, args).ConfigureAwait(false);
     }
 
     public async ValueTask<TValue> InvokeAsync<TValue>(string identifier, params object[] args)
     {
-        _logger?.LogDebug($"MapJsRuntime - InvokeAsync - {identifier}");
-        return await _jsRuntime.InvokeAsync<TValue>(identifier, args).ConfigureAwait(false);
+        logger?.LogDebug($"MapJsRuntime - InvokeAsync - {identifier}");
+        return await jsRuntime.InvokeAsync<TValue>(identifier, args).ConfigureAwait(false);
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -6,9 +6,9 @@`
`6`	`6`
`7`	`7`	`namespace AzureMapsControl.Components.Data;`
`8`	`8`	`[ExcludeFromCodeCoverage]`
`9`		`-internal class DataSourceEventArgs`
	`9`	`+internal record DataSourceEventArgs`
`10`	`10`	`{`
`11`		`- public string Id { get; set; }`
`12`		`- public IEnumerable<Shape<Geometry>> Shapes { get; set; }`
`13`		`- public string Type { get; set; }`
	`11`	`+ public string Id { get; init; }`
	`12`	`+ public IEnumerable<Shape<Geometry>> Shapes { get; init; }`
	`13`	`+ public string Type { get; init; }`
`14`	`14`	`}`
Original file line number	Diff line number	Diff line change
`@@ -5,9 +5,9 @@`
`5`	`5`
`6`	`6`	`namespace AzureMapsControl.Components.Drawing;`
`7`	`7`	`[ExcludeFromCodeCoverage]`
`8`		`-internal class DrawingToolbarJsEventArgs`
	`8`	`+internal record DrawingToolbarJsEventArgs`
`9`	`9`	`{`
`10`		`- public string Type { get; set; }`
`11`		`- public string NewMode { get; set; }`
`12`		`- public Feature<Geometry> Data { get; set; }`
	`10`	`+ public string Type { get; init; }`
	`11`	`+ public string NewMode { get; init; }`
	`12`	`+ public Feature<Geometry> Data { get; init; }`
`13`	`13`	`}`
Original file line number	Diff line number	Diff line change
`@@ -7,20 +7,11 @@`
`7`	`7`	`using Microsoft.Extensions.Logging;`
`8`	`8`
`9`	`9`	`namespace AzureMapsControl.Components.FullScreen;`
`10`		`-internal class FullScreenService : IFullScreenService`
	`10`	`+internal sealed class FullScreenService(IMapJsRuntime jsRuntime, ILogger<FullScreenService> logger) : IFullScreenService`
`11`	`11`	`{`
`12`		`- private readonly IMapJsRuntime _jsRuntime;`
`13`		`- private readonly ILogger<FullScreenService> _logger;`
`14`		`-`
`15`		`- public FullScreenService(IMapJsRuntime jsRuntime, ILogger<FullScreenService> logger)`
`16`		`- {`
`17`		`- _jsRuntime = jsRuntime;`
`18`		`- _logger = logger;`
`19`		`- }`
`20`		`-`
`21`	`12`	`public async ValueTask<bool> IsSupportedAsync()`
`22`	`13`	`{`
`23`		`- _logger?.LogAzureMapsControlInfo(AzureMapLogEvent.FullScreenService_IsFullScreenSupportedAsync, "FullScreenService - IsSupportedAsync");`
`24`		`- return await _jsRuntime.InvokeAsync<bool>(Constants.JsConstants.Methods.FullScreenControl.IsFullScreenSupported.ToFullScreenControlNamespace()).ConfigureAwait(false);`
	`14`	`+ logger?.LogAzureMapsControlInfo(AzureMapLogEvent.FullScreenService_IsFullScreenSupportedAsync, "FullScreenService - IsSupportedAsync");`
	`15`	`+ return await jsRuntime.InvokeAsync<bool>(Constants.JsConstants.Methods.FullScreenControl.IsFullScreenSupported.ToFullScreenControlNamespace()).ConfigureAwait(false);`
`25`	`16`	`}`
`26`	`17`	`}`