even more cleanup

nilsauf · nilsauf · commit 5500543c38cb · 2026-04-10T20:20:33.000+02:00
diff --git a/FTMS.NET.Contracts/Control/ControlRequest.cs b/FTMS.NET.Contracts/Control/ControlRequest.cs
@@ -1,4 +1,5 @@
 ﻿namespace FTMS.NET.Control;
-public record ControlRequest(EControlOpCode OpCode, byte[] Parameter)
-{
-}
+
+public sealed record ControlRequest(
+	EControlOpCode OpCode,
+	byte[] Parameter);
diff --git a/FTMS.NET.Contracts/Control/ControlResponse.cs b/FTMS.NET.Contracts/Control/ControlResponse.cs
@@ -1,4 +1,6 @@
 ﻿namespace FTMS.NET.Control;
-public record ControlResponse(EControlOpCode RequestedOpCode, EControlResultCode ResultCode, byte[] ResponseParameter)
-{
-}
+
+public sealed record ControlResponse(
+	EControlOpCode RequestedOpCode,
+	EControlResultCode ResultCode,
+	byte[] ResponseParameter);
diff --git a/FTMS.NET.Contracts/Control/IFitnessMachineControl.cs b/FTMS.NET.Contracts/Control/IFitnessMachineControl.cs
@@ -1,4 +1,5 @@
 ﻿namespace FTMS.NET.Control;
+
 using System.Threading.Tasks;
 
 public interface IFitnessMachineControl : IDisposable
diff --git a/FTMS.NET.Contracts/Data/IFitnessMachineValue.cs b/FTMS.NET.Contracts/Data/IFitnessMachineValue.cs
@@ -1,4 +1,5 @@
 ﻿namespace FTMS.NET.Data;
+
 using System;
 
 public interface IFitnessMachineValue
diff --git a/FTMS.NET.Contracts/Exceptions/ControlRequestException.cs b/FTMS.NET.Contracts/Exceptions/ControlRequestException.cs
@@ -3,7 +3,9 @@
 using FTMS.NET.Control;
 using System;
 
-public class ControlRequestException(EControlOpCode opCode, Exception? innerException = null)
+public sealed class ControlRequestException(
+		EControlOpCode opCode, 
+		Exception? innerException = null)
 	: Exception("Control Request could not be executed.", innerException)
 {
 	public EControlOpCode OpCode { get; } = opCode;
diff --git a/FTMS.NET.Contracts/Exceptions/FitnessMachineNotAvailableException.cs b/FTMS.NET.Contracts/Exceptions/FitnessMachineNotAvailableException.cs
@@ -1,7 +1,5 @@
 ﻿namespace FTMS.NET.Exceptions;
 using System;
 
-public class FitnessMachineNotAvailableException()
-	: Exception("The service data indicate, that the fitness machine service is not available.")
-{
-}
+public sealed class FitnessMachineNotAvailableException()
+	: Exception("The service data indicate, that the fitness machine service is not available.");
diff --git a/FTMS.NET.Contracts/Exceptions/FitnessMachineTypeNotDefinedException.cs b/FTMS.NET.Contracts/Exceptions/FitnessMachineTypeNotDefinedException.cs
@@ -2,7 +2,7 @@
 
 using System;
 
-public class FitnessMachineTypeNotDefinedException(EFitnessMachineType machineType)
+public sealed class FitnessMachineTypeNotDefinedException(EFitnessMachineType machineType)
 	: Exception("The fitness machine type sent from the server is not defined.")
 {
 	public EFitnessMachineType MachineType { get; } = machineType;
diff --git a/FTMS.NET.Contracts/Exceptions/NeededCharacteristicNotAvailableException.cs b/FTMS.NET.Contracts/Exceptions/NeededCharacteristicNotAvailableException.cs
@@ -3,7 +3,7 @@
 using System;
 
 public sealed class NeededCharacteristicNotAvailableException(
-	Guid characteristicUuid)
+		Guid characteristicUuid)
 	: Exception("The needed characteristic is not available.")
 {
 	public string CharacteristicName { get; } = FtmsUuids.GetName(characteristicUuid);
diff --git a/FTMS.NET.Contracts/Features/ISupportedRangeExtensions.cs b/FTMS.NET.Contracts/Features/ISupportedRangeExtensions.cs
@@ -8,6 +8,7 @@ public static class ISupportedRangeExtensions
 	public static bool IsInRange<TValue>(this ISupportedRange range, TValue value)
 		where TValue : struct, INumber<TValue>
 		=> GenericMath.IsInRange(value, range.MinimumValue, range.MaximumValue);
+
 	public static TValue Clamp<TValue>(this ISupportedRange range, TValue value)
 		where TValue : struct, INumber<TValue>
 		=> GenericMath.Clamp(value, range.MinimumValue, range.MaximumValue);
diff --git a/FTMS.NET.Contracts/IFitnessMachineCharacteristic.cs b/FTMS.NET.Contracts/IFitnessMachineCharacteristic.cs
@@ -1,11 +1,11 @@
 ﻿namespace FTMS.NET;
+
 using System;
 using System.Threading.Tasks;
 
 public interface IFitnessMachineCharacteristic
 {
 	public Guid Id { get; }
-
 	Task<byte[]> ReadValueAsync();
 	Task WriteValueAsync(byte[] value);
 	IObservable<byte[]> ObserveValue();
diff --git a/FTMS.NET.Contracts/IFitnessMachineService.cs b/FTMS.NET.Contracts/IFitnessMachineService.cs
@@ -5,15 +5,12 @@
 using FTMS.NET.Features;
 using FTMS.NET.State;
 
-public interface IFitnessMachineService : IFitnessMachineControl, IFitnessMachineStateProvider, IFitnessMachineData, IDisposable
+public interface IFitnessMachineService
+	: IFitnessMachineControl, IFitnessMachineStateProvider, IFitnessMachineData, IDisposable
 {
 	EFitnessMachineType Type { get; }
-
 	IFitnessMachineData Data { get; }
-
 	IFitnessMachineStateProvider State { get; }
-
 	IFitnessMachineControl Control { get; }
-
 	IFitnessMachineFeatures Features { get; }
 }
diff --git a/FTMS.NET.Contracts/IFitnessMachineServiceConnection.cs b/FTMS.NET.Contracts/IFitnessMachineServiceConnection.cs
@@ -1,10 +1,10 @@
 ﻿namespace FTMS.NET;
+
 using System;
 using System.Threading.Tasks;
 
 public interface IFitnessMachineServiceConnection
 {
 	byte[] ServiceData { get; }
-
 	Task<IFitnessMachineCharacteristic?> GetCharacteristicAsync(Guid id);
 }
diff --git a/FTMS.NET.Contracts/State/FitnessMachineStateParameter.cs b/FTMS.NET.Contracts/State/FitnessMachineStateParameter.cs
@@ -1,4 +1,6 @@
 ﻿namespace FTMS.NET.State;
-public record FitnessMachineStateParameter(string Name, FitnessMachineUnit Unit, double Value)
-{
-}
+
+public sealed record FitnessMachineStateParameter(
+	string Name,
+	FitnessMachineUnit Unit,
+	double Value);
diff --git a/FTMS.NET.Contracts/State/IFitnessMachineStateProvider.cs b/FTMS.NET.Contracts/State/IFitnessMachineStateProvider.cs
@@ -1,4 +1,5 @@
 ﻿namespace FTMS.NET.State;
+
 using System;
 
 public interface IFitnessMachineStateProvider : IDisposable
diff --git a/FTMS.NET.Contracts/Utils/GenericMath.cs b/FTMS.NET.Contracts/Utils/GenericMath.cs
@@ -1,4 +1,5 @@
 ﻿namespace FTMS.NET.Utils;
+
 using System.Numerics;
 
 internal static class GenericMath
diff --git a/FTMS.NET.Contracts/Utils/UInt24.cs b/FTMS.NET.Contracts/Utils/UInt24.cs
@@ -1,8 +1,8 @@
 ﻿namespace FTMS.NET.Utils;
+
 using System.Diagnostics.CodeAnalysis;
 using System.Runtime.InteropServices;
 
-
 /// Based on https://stackoverflow.com/a/12549260
 [StructLayout(LayoutKind.Sequential)]
 public readonly struct UInt24 : IEquatable<UInt24>, IComparable<UInt24>/*, INumber<UInt24>*/
diff --git a/FTMS.NET.Tests/FtmsUuids.Tests.cs b/FTMS.NET.Tests/FtmsUuids.Tests.cs
@@ -2,7 +2,7 @@
 
 using System;
 
-public class FtmsUuids_Tests
+public sealed class FtmsUuids_Tests
 {
 	public static readonly TheoryData<Guid, string> UuidTestData = new()
 	{
diff --git a/FTMS.NET.Tests/Utils/ByteExtensionsTests.cs b/FTMS.NET.Tests/Utils/ByteExtensionsTests.cs
@@ -2,7 +2,7 @@
 
 using FTMS.NET.Utils;
 
-public class ByteExtensionsTests
+public sealed class ByteExtensionsTests
 {
     /// <summary>
     /// Tests that IsBitSet correctly identifies set and unset bits for all positions 0-7
diff --git a/FTMS.NET.Tests/Utils/GenericMathTests.cs b/FTMS.NET.Tests/Utils/GenericMathTests.cs
@@ -5,7 +5,7 @@
 /// <summary>
 /// Unit tests for the <see cref="GenericMath"/> class.
 /// </summary>
-public class GenericMathTests
+public sealed class GenericMathTests
 {
     /// <summary>
     /// Tests that Clamp returns the minimum value when the input value is below the minimum.
diff --git a/FTMS.NET.Tests/Utils/ValueCalculationTests.cs b/FTMS.NET.Tests/Utils/ValueCalculationTests.cs
@@ -1,10 +1,11 @@
-﻿
-namespace FTMS.NET.Utils.UnitTests;
+﻿namespace FTMS.NET.Tests.Utils;
+
+using FTMS.NET.Utils;
 
 /// <summary>
 /// Unit tests for the <see cref="ValueCalculation"/> record's Calculate method.
 /// </summary>
-public partial class ValueCalculationTests
+public sealed partial class ValueCalculationTests
 {
     /// <summary>
     /// Tests that Calculate returns the correct result with default parameters (multiplier=1, exponents=0).
diff --git a/FTMS.NET/Control/FitnessMachineControl.cs b/FTMS.NET/Control/FitnessMachineControl.cs
@@ -1,6 +1,6 @@
 ﻿namespace FTMS.NET.Control;
+
 using FTMS.NET.Exceptions;
-using FTMS.NET.Utils;
 using System;
 using System.Linq;
 using System.Reactive.Concurrency;
@@ -15,7 +15,10 @@ internal sealed class FitnessMachineControl : IFitnessMachineControl
 	private readonly CancellationDisposable cancellationDisposable = new();
 	private readonly IObservable<ControlResponse> responseObservable;
 
-	internal FitnessMachineControl(IObservable<byte[]> observeControlPoint, Func<byte[], Task> writeControlPoint, IScheduler? scheduler = null)
+	internal FitnessMachineControl(
+		IObservable<byte[]> observeControlPoint,
+		Func<byte[], Task> writeControlPoint,
+		IScheduler? scheduler = null)
 	{
 		this.writeControlPoint = writeControlPoint;
 		this.responseObservable = observeControlPoint
diff --git a/FTMS.NET/Data/FitnessMachineData.cs b/FTMS.NET/Data/FitnessMachineData.cs
@@ -1,4 +1,5 @@
 ﻿namespace FTMS.NET.Data;
+
 using DynamicData;
 using System;
 using System.Reactive.Linq;
diff --git a/FTMS.NET/Data/FitnessMachineDataReader.cs b/FTMS.NET/Data/FitnessMachineDataReader.cs
@@ -1,11 +1,12 @@
 ﻿namespace FTMS.NET.Data;
+
 using System.Collections.Generic;
 
 internal sealed class FitnessMachineDataReader(SingleFrameStrategy singleFrameStrategy)
 {
 	public IEnumerable<IFitnessMachineValue> Read(byte[] dataFrame)
 	{
-		if (dataFrame.Length == 0)
+		if (dataFrame.Length is 0)
 			return [];
 
 		using var singleFrameReader = new SingleFrameReader(dataFrame, singleFrameStrategy);
diff --git a/FTMS.NET/Data/FitnessMachineValue.cs b/FTMS.NET/Data/FitnessMachineValue.cs
@@ -1,4 +1,4 @@
 ﻿namespace FTMS.NET.Data;
 using System;
 
-public record FitnessMachineValue(Guid Uuid, double Value, string Name) : IFitnessMachineValue;
+public sealed record FitnessMachineValue(Guid Uuid, double Value, string Name) : IFitnessMachineValue;
diff --git a/FTMS.NET/Data/SingleFrameStrategies.cs b/FTMS.NET/Data/SingleFrameStrategies.cs
@@ -1,24 +1,20 @@
 ﻿namespace FTMS.NET.Data;
 
-using FTMS.NET.Utils;
 using System;
 
 internal static class SingleFrameStrategies
 {
-	private readonly static Dictionary<EFitnessMachineType, Lazy<SingleFrameStrategy>> strategies = new()
+	public static SingleFrameStrategy GetFor(EFitnessMachineType type) => type switch
 	{
-		{ EFitnessMachineType.Threadmill, new(CreateThreadmillStrategy) },
-		{ EFitnessMachineType.CrossTrainer, new(CreateCrossTrainerStrategy) },
-		{ EFitnessMachineType.StepClimber, new(CreateStepClimberStrategy) },
-		{ EFitnessMachineType.StairClimber, new(CreateStairClimberStrategy) },
-		{ EFitnessMachineType.Rower, new(CreateRowerStrategy) },
-		{ EFitnessMachineType.IndoorBike, new(CreateIndoorBikeStrategy) }
+		EFitnessMachineType.Threadmill => CreateThreadmillStrategy(),
+		EFitnessMachineType.CrossTrainer => CreateCrossTrainerStrategy(),
+		EFitnessMachineType.StepClimber => CreateStepClimberStrategy(),
+		EFitnessMachineType.StairClimber => CreateStairClimberStrategy(),
+		EFitnessMachineType.Rower => CreateRowerStrategy(),
+		EFitnessMachineType.IndoorBike => CreateIndoorBikeStrategy(),
+		_ => throw new ArgumentException($"Unsupported fitness machine type: {type}")
 	};
 
-	public static SingleFrameStrategy GetFor(EFitnessMachineType type)
-		=> strategies.GetValueOrDefault(type)?.Value
-			?? throw new NotSupportedException($"No SingleFrameStrategy defined for Fitness Machine Type: {type}");
-
 	private static SingleFrameStrategy CreateThreadmillStrategy() => new()
 	{
 		FlagFieldLength = 2,
diff --git a/FTMS.NET/Features/FitnessMachineFeatures.cs b/FTMS.NET/Features/FitnessMachineFeatures.cs
@@ -3,9 +3,10 @@
 using FTMS.NET.Utils;
 using System;
 
-internal class FitnessMachineFeatures(
-	ReadOnlySpan<byte> featuresField,
-	ReadOnlySpan<byte> targetSettingsField) : IFitnessMachineFeatures
+internal sealed class FitnessMachineFeatures(
+		ReadOnlySpan<byte> featuresField,
+		ReadOnlySpan<byte> targetSettingsField) 
+	: IFitnessMachineFeatures
 {
 	public bool AverageSpeedSupported { get; } = featuresField.IsBitSet(0);
 	public bool CadenceSupported { get; } = featuresField.IsBitSet(1);
diff --git a/FTMS.NET/Features/SupportedRange.cs b/FTMS.NET/Features/SupportedRange.cs
@@ -3,11 +3,11 @@
 using FTMS.NET;
 using FTMS.NET.Utils;
 
-internal record SupportedRange(
-	double MinimumValue,
-	double MaximumValue,
-	double MinimumIncrement,
-	FitnessMachineUnit Unit)
+internal sealed record SupportedRange(
+		double MinimumValue,
+		double MaximumValue,
+		double MinimumIncrement,
+		FitnessMachineUnit Unit)
 	: ISupportedRange
 {
 	public static ISupportedRange ReadSpeed(byte[] data) =>
diff --git a/FTMS.NET/FitnessMachineServiceFactory.cs b/FTMS.NET/FitnessMachineServiceFactory.cs
@@ -1,4 +1,5 @@
 ﻿namespace FTMS.NET;
+
 using FTMS.NET.Control;
 using FTMS.NET.Data;
 using FTMS.NET.Exceptions;
diff --git a/FTMS.NET/State/FitnessMachineState.cs b/FTMS.NET/State/FitnessMachineState.cs
@@ -2,11 +2,13 @@
 
 using System.Collections.Immutable;
 
-internal record FitnessMachineState(EStateOpCode OpCode, byte[] RawData) : IFitnessMachineState
+internal sealed record FitnessMachineState(
+		EStateOpCode OpCode, 
+		byte[] RawData) 
+	: IFitnessMachineState
 {
-	private readonly Lazy<IImmutableList<object>> parameters = new(
-		() => FitnessMachineStateParameterFactory.ReadParameters(OpCode, RawData).ToImmutableList());
+	private IImmutableList<object>? parameters;
 
 	public IImmutableList<object> ReadParameters()
-		=> this.parameters.Value;
+		=> this.parameters ??= FitnessMachineStateParameterFactory.ReadParameters(OpCode, RawData).ToImmutableList();
 }
diff --git a/FTMS.NET/State/FitnessMachineStateProvider.cs b/FTMS.NET/State/FitnessMachineStateProvider.cs
@@ -1,4 +1,5 @@
 ﻿namespace FTMS.NET.State;
+
 using FTMS.NET.Utils;
 using System;
 using System.Linq;
diff --git a/FTMS.NET/State/TrainingState.cs b/FTMS.NET/State/TrainingState.cs
@@ -1,4 +1,3 @@
 ﻿namespace FTMS.NET.State;
-internal record TrainingState(ETrainingState State, string? Details) : ITrainingState
-{
-}
+
+internal sealed record TrainingState(ETrainingState State, string? Details) : ITrainingState;
diff --git a/FTMS.NET/Utils/ValueCalculation.cs b/FTMS.NET/Utils/ValueCalculation.cs
@@ -1,7 +1,7 @@
 ﻿namespace FTMS.NET.Utils;
 using System;
 
-internal record ValueCalculation(int Multiplier = 1, int DecimalExponent = 0, int BinaryExponent = 0)
+internal sealed record ValueCalculation(int Multiplier = 1, int DecimalExponent = 0, int BinaryExponent = 0)
 {
 	private readonly double constantMultiplier = Multiplier * Math.Pow(10, DecimalExponent) * Math.Pow(2, BinaryExponent);
 

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,5 @@`
`1`	`1`	`namespace FTMS.NET.Control;`
	`2`	`+`
`2`	`3`	`using System.Threading.Tasks;`
`3`	`4`
`4`	`5`	`public interface IFitnessMachineControl : IDisposable`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,5 @@`
`1`	`1`	`namespace FTMS.NET.Data;`
	`2`	`+`
`2`	`3`	`using System;`
`3`	`4`
`4`	`5`	`public interface IFitnessMachineValue`
Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@`
`2`	`2`
`3`	`3`	`using System;`
`4`	`4`
`5`		`-public class FitnessMachineTypeNotDefinedException(EFitnessMachineType machineType)`
	`5`	`+public sealed class FitnessMachineTypeNotDefinedException(EFitnessMachineType machineType)`
`6`	`6`	`: Exception("The fitness machine type sent from the server is not defined.")`
`7`	`7`	`{`
`8`	`8`	`public EFitnessMachineType MachineType { get; } = machineType;`
Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@`
`3`	`3`	`using System;`
`4`	`4`
`5`	`5`	`public sealed class NeededCharacteristicNotAvailableException(`
`6`		`- Guid characteristicUuid)`
	`6`	`+ Guid characteristicUuid)`
`7`	`7`	`: Exception("The needed characteristic is not available.")`
`8`	`8`	`{`
`9`	`9`	`public string CharacteristicName { get; } = FtmsUuids.GetName(characteristicUuid);`