Index: Ringtoets/Piping/src/Ringtoets.Piping.Service/PipingCalculationService.cs =================================================================== diff -u -re568165b751acf8d72cdf0d128f76d7792dadb56 -r49d90fb457184cd520ada77ee07774405985abd5 --- Ringtoets/Piping/src/Ringtoets.Piping.Service/PipingCalculationService.cs (.../PipingCalculationService.cs) (revision e568165b751acf8d72cdf0d128f76d7792dadb56) +++ Ringtoets/Piping/src/Ringtoets.Piping.Service/PipingCalculationService.cs (.../PipingCalculationService.cs) (revision 49d90fb457184cd520ada77ee07774405985abd5) @@ -19,9 +19,7 @@ // Stichting Deltares and remain full property of Stichting Deltares at all times. // All rights reserved. -using System; using System.Collections.Generic; -using log4net; using Ringtoets.Common.Service; using Ringtoets.Piping.Data; using Ringtoets.Piping.KernelWrapper; @@ -39,8 +37,6 @@ /// public static class PipingCalculationService { - private static readonly ILog pipingCalculationLogger = LogManager.GetLogger(typeof(PipingCalculation)); - /// /// Performs validation over the values on the given . Error and status information is logged during /// the execution of the operation. @@ -49,22 +45,21 @@ /// False if contains validation errors; True otherwise. public static bool Validate(PipingCalculation calculation) { - pipingCalculationLogger.Info(String.Format(RingtoetsCommonServiceResources.Validation_Subject_0_started_Time_1_, - calculation.Name, DateTimeService.CurrentTimeAsString)); + CalculationServiceHelper.LogValidationBeginTime(calculation.Name); var inputValidationResults = ValidateInput(calculation.InputParameters); if (inputValidationResults.Count > 0) { - LogMessagesAsError(Resources.Error_in_piping_validation_0, inputValidationResults.ToArray()); - LogValidationEndTime(calculation); + CalculationServiceHelper.LogMessagesAsError(Resources.Error_in_piping_validation_0, inputValidationResults.ToArray()); + CalculationServiceHelper.LogValidationEndTime(calculation.Name); return false; } var validationResults = new PipingCalculator(CreateInputFromData(calculation.InputParameters), PipingSubCalculatorFactory.Instance).Validate(); - LogMessagesAsError(Resources.Error_in_piping_validation_0, validationResults.ToArray()); + CalculationServiceHelper.LogMessagesAsError(Resources.Error_in_piping_validation_0, validationResults.ToArray()); - LogValidationEndTime(calculation); + CalculationServiceHelper.LogValidationEndTime(calculation.Name); return validationResults.Count == 0; } @@ -78,8 +73,7 @@ /// Consider calling first to see if calculation is possible. public static void Calculate(PipingCalculation calculation) { - pipingCalculationLogger.Info(String.Format(RingtoetsCommonServiceResources.Calculation_Subject_0_started_Time_1_, - calculation.Name, DateTimeService.CurrentTimeAsString)); + CalculationServiceHelper.LogCalculationBeginTime(calculation.Name); try { @@ -94,21 +88,14 @@ } catch (PipingCalculatorException e) { - LogMessagesAsError(Resources.Error_in_piping_calculation_0, e.Message); + CalculationServiceHelper.LogMessagesAsError(Resources.Error_in_piping_calculation_0, e.Message); } finally { - pipingCalculationLogger.Info(String.Format(RingtoetsCommonServiceResources.Calculation_Subject_0_ended_Time_1_, - calculation.Name, DateTimeService.CurrentTimeAsString)); + CalculationServiceHelper.LogCalculationEndTime(calculation.Name); } } - private static void LogValidationEndTime(PipingCalculation calculation) - { - pipingCalculationLogger.Info(String.Format(RingtoetsCommonServiceResources.Validation_Subject_0_ended_Time_1_, - calculation.Name, DateTimeService.CurrentTimeAsString)); - } - private static List ValidateInput(PipingInput inputParameters) { List validationResult = new List(); @@ -126,14 +113,6 @@ return validationResult; } - private static void LogMessagesAsError(string format, params string[] errorMessages) - { - foreach (var errorMessage in errorMessages) - { - pipingCalculationLogger.ErrorFormat(format, errorMessage); - } - } - private static PipingCalculatorInput CreateInputFromData(PipingInput inputParameters) { return new PipingCalculatorInput(