Index: Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Service/GrassCoverErosionInwardsCalculationService.cs =================================================================== diff -u -r0a51f20ac93373a43f79bb4c6327bce1d46545c6 -r49d90fb457184cd520ada77ee07774405985abd5 --- Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Service/GrassCoverErosionInwardsCalculationService.cs (.../GrassCoverErosionInwardsCalculationService.cs) (revision 0a51f20ac93373a43f79bb4c6327bce1d46545c6) +++ Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Service/GrassCoverErosionInwardsCalculationService.cs (.../GrassCoverErosionInwardsCalculationService.cs) (revision 49d90fb457184cd520ada77ee07774405985abd5) @@ -22,7 +22,6 @@ using System.Collections.Generic; using System.Linq; using Core.Common.Base.Properties; -using log4net; using Ringtoets.Common.Data.AssessmentSection; using Ringtoets.Common.Data.FailureMechanism; using Ringtoets.Common.Service; @@ -41,8 +40,6 @@ /// internal static class GrassCoverErosionInwardsCalculationService { - private static readonly ILog grassCoverErosionInwardsCalculationLogger = LogManager.GetLogger(typeof(GrassCoverErosionInwardsCalculationService)); - /// /// Performs validation over the values on the given . Error and status information is logged during /// the execution of the operation. @@ -52,19 +49,7 @@ /// False if contains validation errors; True otherwise. internal static bool Validate(GrassCoverErosionInwardsCalculation calculation, IAssessmentSection assessmentSection) { - grassCoverErosionInwardsCalculationLogger.Info(string.Format(RingtoetsCommonServiceResources.Validation_Subject_0_started_Time_1_, - calculation.Name, DateTimeService.CurrentTimeAsString)); - - var inputValidationResults = ValidateInput(calculation.InputParameters, assessmentSection); - - if (inputValidationResults.Count > 0) - { - LogMessagesAsError(RingtoetsCommonServiceResources.Error_in_validation_0, inputValidationResults.ToArray()); - } - - LogValidationEndTime(calculation); - - return inputValidationResults.Count == 0; + return CalculationServiceHelper.PerformValidation(calculation.Name, () => ValidateInput(calculation.InputParameters, assessmentSection)); } /// @@ -81,26 +66,11 @@ string hlcdDirectory, FailureMechanismSection failureMechanismSection, string ringId, GeneralGrassCoverErosionInwardsInput generalInput) { - grassCoverErosionInwardsCalculationLogger.Info(string.Format(RingtoetsCommonServiceResources.Calculation_Subject_0_started_Time_1_, - calculation.Name, DateTimeService.CurrentTimeAsString)); + var input = CreateInput(calculation, failureMechanismSection, generalInput); - try - { - var input = CreateInput(calculation, failureMechanismSection, generalInput); - var output = HydraRingCalculationService.PerformCalculation(hlcdDirectory, ringId, HydraRingTimeIntegrationSchemeType.FBC, HydraRingUncertaintiesType.All, input); - - if (output == null) - { - grassCoverErosionInwardsCalculationLogger.ErrorFormat(Resources.GrassCoverErosionInwardsCalculationService_Calculate_Error_in_grass_cover_erosion_inwards_0_calculation, calculation.Name); - } - - return output; - } - finally - { - grassCoverErosionInwardsCalculationLogger.Info(string.Format(RingtoetsCommonServiceResources.Calculation_Subject_0_ended_Time_1_, - calculation.Name, DateTimeService.CurrentTimeAsString)); - } + return CalculationServiceHelper.PerformCalculation(calculation.Name, + () => HydraRingCalculationService.PerformCalculation(hlcdDirectory, ringId, HydraRingTimeIntegrationSchemeType.FBC, HydraRingUncertaintiesType.All, input), + Resources.GrassCoverErosionInwardsCalculationService_Calculate_Error_in_grass_cover_erosion_inwards_0_calculation); } private static OvertoppingCalculationInput CreateInput(GrassCoverErosionInwardsCalculation calculation, FailureMechanismSection failureMechanismSection, GeneralGrassCoverErosionInwardsInput generalInput) @@ -176,19 +146,5 @@ return validationResult; } - - private static void LogMessagesAsError(string format, params string[] errorMessages) - { - foreach (var errorMessage in errorMessages) - { - grassCoverErosionInwardsCalculationLogger.ErrorFormat(format, errorMessage); - } - } - - private static void LogValidationEndTime(GrassCoverErosionInwardsCalculation calculation) - { - grassCoverErosionInwardsCalculationLogger.Info(string.Format(RingtoetsCommonServiceResources.Validation_Subject_0_ended_Time_1_, - calculation.Name, DateTimeService.CurrentTimeAsString)); - } } } \ No newline at end of file