From fe6e13e8c45460f2ba005f5bf12e19a9ab12f625 Mon Sep 17 00:00:00 2001 From: Dave Walker Date: Fri, 22 Sep 2023 12:08:47 +0100 Subject: [PATCH 1/2] Reduce simulator log size --- src/BaseStationReader.Data/BaseStationReader.Data.csproj | 4 ++-- .../BaseStationReader.Entities.csproj | 4 ++-- src/BaseStationReader.Logic/BaseStationReader.Logic.csproj | 4 ++-- .../Simulator/MsgMessageGeneratorBase.cs | 2 +- src/BaseStationReader.Logic/Simulator/ReceiverSimulator.cs | 2 +- .../BaseStationReader.Simulator.csproj | 6 +++--- .../BaseStationReader.Terminal.csproj | 6 +++--- src/BaseStationReader.UI/BaseStationReader.UI.csproj | 6 +++--- 8 files changed, 17 insertions(+), 17 deletions(-) diff --git a/src/BaseStationReader.Data/BaseStationReader.Data.csproj b/src/BaseStationReader.Data/BaseStationReader.Data.csproj index 3370159..f20fe36 100644 --- a/src/BaseStationReader.Data/BaseStationReader.Data.csproj +++ b/src/BaseStationReader.Data/BaseStationReader.Data.csproj @@ -5,7 +5,7 @@ enable enable BaseStationReader.Data - 1.23.0.0 + 1.24.0.0 Dave Walker Copyright (c) Dave Walker 2023 Dave Walker @@ -17,7 +17,7 @@ https://github.com/davewalker5/ADS-B-BaseStationReader MIT false - 1.23.0.0 + 1.24.0.0 diff --git a/src/BaseStationReader.Entities/BaseStationReader.Entities.csproj b/src/BaseStationReader.Entities/BaseStationReader.Entities.csproj index 4c8f483..3740243 100644 --- a/src/BaseStationReader.Entities/BaseStationReader.Entities.csproj +++ b/src/BaseStationReader.Entities/BaseStationReader.Entities.csproj @@ -5,7 +5,7 @@ enable enable BaseStationReader.Entities - 1.23.0.0 + 1.24.0.0 Dave Walker Copyright (c) Dave Walker 2023 Dave Walker @@ -17,7 +17,7 @@ https://github.com/davewalker5/ADS-B-BaseStationReader MIT false - 1.23.0.0 + 1.24.0.0 diff --git a/src/BaseStationReader.Logic/BaseStationReader.Logic.csproj b/src/BaseStationReader.Logic/BaseStationReader.Logic.csproj index ecba8bf..e36899c 100644 --- a/src/BaseStationReader.Logic/BaseStationReader.Logic.csproj +++ b/src/BaseStationReader.Logic/BaseStationReader.Logic.csproj @@ -5,7 +5,7 @@ enable enable BaseStationReader.Logic - 1.23.0.0 + 1.24.0.0 Dave Walker Copyright (c) Dave Walker 2023 Dave Walker @@ -17,7 +17,7 @@ https://github.com/davewalker5/ADS-B-BaseStationReader MIT false - 1.23.0.0 + 1.24.0.0 diff --git a/src/BaseStationReader.Logic/Simulator/MsgMessageGeneratorBase.cs b/src/BaseStationReader.Logic/Simulator/MsgMessageGeneratorBase.cs index 595b0b5..02b7bfe 100644 --- a/src/BaseStationReader.Logic/Simulator/MsgMessageGeneratorBase.cs +++ b/src/BaseStationReader.Logic/Simulator/MsgMessageGeneratorBase.cs @@ -54,7 +54,7 @@ protected Message ConstructMessage(TransmissionType type, string address) protected void LogGeneratedMessage(Message message) { _logger.LogMessage( - Severity.Info, + Severity.Debug, $"Generated MSG {(int)message.TransmissionType} ({message.TransmissionType.ToString()}) message"); } } diff --git a/src/BaseStationReader.Logic/Simulator/ReceiverSimulator.cs b/src/BaseStationReader.Logic/Simulator/ReceiverSimulator.cs index bee244e..9326457 100644 --- a/src/BaseStationReader.Logic/Simulator/ReceiverSimulator.cs +++ b/src/BaseStationReader.Logic/Simulator/ReceiverSimulator.cs @@ -188,7 +188,7 @@ private byte[] GenerateMessage() // Log it in Base Station format var basestation = message.ToBaseStation(); - _logger.LogMessage(Severity.Info, basestation); + _logger.LogMessage(Severity.Debug, basestation); // Generate a byte array representing the message in BaseStation format var messageBytes = Encoding.UTF8.GetBytes($"{basestation}\r\n"); diff --git a/src/BaseStationReader.Simulator/BaseStationReader.Simulator.csproj b/src/BaseStationReader.Simulator/BaseStationReader.Simulator.csproj index 0b41000..588cdad 100644 --- a/src/BaseStationReader.Simulator/BaseStationReader.Simulator.csproj +++ b/src/BaseStationReader.Simulator/BaseStationReader.Simulator.csproj @@ -3,9 +3,9 @@ Exe net7.0 - 1.23.0.0 - 1.23.0.0 - 1.23.0 + 1.24.0.0 + 1.24.0.0 + 1.24.0 enable enable diff --git a/src/BaseStationReader.Terminal/BaseStationReader.Terminal.csproj b/src/BaseStationReader.Terminal/BaseStationReader.Terminal.csproj index a2c778c..71573f6 100644 --- a/src/BaseStationReader.Terminal/BaseStationReader.Terminal.csproj +++ b/src/BaseStationReader.Terminal/BaseStationReader.Terminal.csproj @@ -3,9 +3,9 @@ Exe net7.0 - 1.23.0.0 - 1.23.0.0 - 1.23.0 + 1.24.0.0 + 1.24.0.0 + 1.24.0 enable enable diff --git a/src/BaseStationReader.UI/BaseStationReader.UI.csproj b/src/BaseStationReader.UI/BaseStationReader.UI.csproj index c71845f..81c5009 100644 --- a/src/BaseStationReader.UI/BaseStationReader.UI.csproj +++ b/src/BaseStationReader.UI/BaseStationReader.UI.csproj @@ -2,9 +2,9 @@ WinExe net7.0 - 1.23.0.0 - 1.23.0.0 - 1.23.0 + 1.24.0.0 + 1.24.0.0 + 1.24.0 enable true app.manifest From fb4252cfe3d07c34468f2683520ea282a0319ea1 Mon Sep 17 00:00:00 2001 From: Dave Walker Date: Fri, 22 Sep 2023 15:07:33 +0100 Subject: [PATCH 2/2] SonarCloud comment resolution --- .../Simulator/IdentificationMessageGenerator.cs | 2 +- .../Simulator/MsgMessageGeneratorBase.cs | 4 ++-- src/BaseStationReader.Logic/Simulator/ReceiverSimulator.cs | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/BaseStationReader.Logic/Simulator/IdentificationMessageGenerator.cs b/src/BaseStationReader.Logic/Simulator/IdentificationMessageGenerator.cs index b98ca6b..6344532 100644 --- a/src/BaseStationReader.Logic/Simulator/IdentificationMessageGenerator.cs +++ b/src/BaseStationReader.Logic/Simulator/IdentificationMessageGenerator.cs @@ -20,7 +20,7 @@ public IdentificationMessageGenerator(ITrackerLogger logger) : base(logger) public Message Generate(string address, string? callsign, string? squawk) { // Generate the base message and populate the type-specific members - var message = base.ConstructMessage(TransmissionType.Identification, address); + var message = ConstructMessage(TransmissionType.Identification, address); message.Callsign = callsign; // Log and return the message diff --git a/src/BaseStationReader.Logic/Simulator/MsgMessageGeneratorBase.cs b/src/BaseStationReader.Logic/Simulator/MsgMessageGeneratorBase.cs index 02b7bfe..6642ccc 100644 --- a/src/BaseStationReader.Logic/Simulator/MsgMessageGeneratorBase.cs +++ b/src/BaseStationReader.Logic/Simulator/MsgMessageGeneratorBase.cs @@ -9,7 +9,7 @@ public abstract class MsgMessageGeneratorBase protected readonly Random _random = new(); private readonly ITrackerLogger _logger; - public MsgMessageGeneratorBase(ITrackerLogger logger) + protected MsgMessageGeneratorBase(ITrackerLogger logger) { _logger = logger; } @@ -30,7 +30,7 @@ protected int RandomInt(int minValue, int maxValue) /// /// /// - protected Message ConstructMessage(TransmissionType type, string address) + protected static Message ConstructMessage(TransmissionType type, string address) { Message message = new() { diff --git a/src/BaseStationReader.Logic/Simulator/ReceiverSimulator.cs b/src/BaseStationReader.Logic/Simulator/ReceiverSimulator.cs index 9326457..214f4e5 100644 --- a/src/BaseStationReader.Logic/Simulator/ReceiverSimulator.cs +++ b/src/BaseStationReader.Logic/Simulator/ReceiverSimulator.cs @@ -137,7 +137,7 @@ private void RemoveExpiredAircraft() // Compile a list of aircraft to be removed var expired = _aircraft.Where(x => x.FirstSeen < cutoff).Select(x => x.Address); - if (expired.Count() > 0) + if (expired.Any()) { // Log the removal and remove them var addresses = string.Join(',', expired);