6245535001

Committed 20 Sep 2023 07:44AM UTC coverage: 57.013%. First build

Build # 6245535001

Build Type

push

github

Committed by

web-flow

Commit Message

8.1.0 Release (#1628)

* Bump Newtonsoft.Json from 13.0.1 to 13.0.2

Bumps [Newtonsoft.Json](https://github.com/JamesNK/Newtonsoft.Json) from 13.0.1 to 13.0.2.
- [Release notes](https://github.com/JamesNK/Newtonsoft.Json/releases)
- [Commits](https://github.com/JamesNK/Newtonsoft.Json/compare/13.0.1...13.0.2)

---
updated-dependencies:
- dependency-name: Newtonsoft.Json
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

* Bump NLog from 5.0.5 to 5.1.0

Bumps [NLog](https://github.com/NLog/NLog) from 5.0.5 to 5.1.0.
- [Release notes](https://github.com/NLog/NLog/releases)
- [Changelog](https://github.com/NLog/NLog/blob/dev/CHANGELOG.md)
- [Commits](https://github.com/NLog/NLog/compare/v5.0.5...v5.1.0)

---
updated-dependencies:
- dependency-name: NLog
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

* Bump NLog from 5.0.5 to 5.1.0

* Fix -r flag - should have been --results-directory all along

* Bump Newtonsoft.Json from 13.0.1 to 13.0.2

* Bump YamlDotNet from 12.0.2 to 12.1.0

Bumps [YamlDotNet](https://github.com/aaubry/YamlDotNet) from 12.0.2 to 12.1.0.
- [Release notes](https://github.com/aaubry/YamlDotNet/releases)
- [Commits](https://github.com/aaubry/YamlDotNet/compare/v12.0.2...v12.1.0)

---
updated-dependencies:
- dependency-name: YamlDotNet
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

* Bump Moq from 4.18.2 to 4.18.3

Bumps [Moq](https://github.com/moq/moq4) from 4.18.2 to 4.18.3.
- [Release notes](https://github.com/moq/moq4/releases)
- [Changelog](https://github.com/moq/moq4/blob/main/CHANGELOG.md)
- [Commits](https://github.com/moq/moq4/compare/v4.18.2...v4.18.3)

---
updated-dependencies:
- dependency-name: Moq
... (continued)

Run Details

10732 of 20257 branches covered (0.0%)

Branch coverage included in aggregate %.

48141 of 48141 new or added lines in 1086 files covered. (100.0%)

30685 of 52388 relevant lines covered (58.57%)

7387.88 hits per line

Source File
Press 'n' to go to next uncovered line, 'b' for previous

94.44

/Rdmp.Core/DataLoad/Engine/LoadProcess/DataLoadProcess.cs

// Copyright (c) The University of Dundee 2018-2019
// This file is part of the Research Data Management Platform (RDMP).
// RDMP is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.
// RDMP is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
// You should have received a copy of the GNU General Public License along with RDMP. If not, see <https://www.gnu.org/licenses/>.

using System;
using Rdmp.Core.Curation.Data.DataLoad;
using Rdmp.Core.DataFlowPipeline;
using Rdmp.Core.DataLoad.Engine.DatabaseManagement.EntityNaming;
using Rdmp.Core.DataLoad.Engine.Job;
using Rdmp.Core.DataLoad.Engine.LoadExecution;
using Rdmp.Core.Logging;
using Rdmp.Core.Repositories;
using Rdmp.Core.ReusableLibraryCode.Checks;
using Rdmp.Core.ReusableLibraryCode.Progress;

namespace Rdmp.Core.DataLoad.Engine.LoadProcess;

/// <summary>
/// Container class for an IDataLoadExecution.  This class records the ILoadMetadata that is being executed and the current state (whether it has crashed etc).
/// When you call run then an IDataLoadJob will be generated by the JobProvider will be executed by the LoadExecution (See IDataLoadExecution).
/// </summary>
public class DataLoadProcess : IDataLoadProcess, IDataLoadOperation
{
    /// <summary>
    /// Provides jobs for the data load process, allows different strategies for what jobs will be loaded e.g. single job, scheduled
    /// </summary>
    public IJobFactory JobProvider { get; set; }

    /// <summary>
    /// The load execution that will be used to load the jobs provided by the JobProvider
    /// </summary>
    public IDataLoadExecution LoadExecution { get; private set; }

    public ExitCodeType? ExitCode { get; private set; }
    public Exception Exception { get; private set; }

    private readonly IRDMPPlatformRepositoryServiceLocator _repositoryLocator;
    protected readonly ILoadMetadata LoadMetadata;
    protected readonly IDataLoadEventListener DataLoadEventListener;
    private readonly HICDatabaseConfiguration _configuration;
    protected readonly ILogManager LogManager;

    private readonly ICheckable _preExecutionChecker;

    public DataLoadProcess(IRDMPPlatformRepositoryServiceLocator repositoryLocator, ILoadMetadata loadMetadata,
        ICheckable preExecutionChecker, ILogManager logManager, IDataLoadEventListener dataLoadEventListener,
        IDataLoadExecution loadExecution, HICDatabaseConfiguration configuration)
    {
        _repositoryLocator = repositoryLocator;
        LoadMetadata = loadMetadata;
        DataLoadEventListener = dataLoadEventListener;
        _configuration = configuration;
        LoadExecution = loadExecution;
        _preExecutionChecker = preExecutionChecker;
        LogManager = logManager;
        ExitCode = ExitCodeType.Success;

        JobProvider = new JobFactory(loadMetadata, logManager);
    }

    public virtual ExitCodeType Run(GracefulCancellationToken loadCancellationToken, object payload = null)
    {
        PerformPreExecutionChecks();

        // create job
        var job = JobProvider.Create(_repositoryLocator, DataLoadEventListener, _configuration);

        // if job is null, there are no more jobs to submit
        if (job == null)
            return ExitCodeType.OperationNotRequired;

        job.Payload = payload;
        job.PersistentRaw = Rdmp.Core.Curation.Data.DataLoad.LoadMetadata.UsesPersistentRaw(LoadMetadata);

        return LoadExecution.Run(job, loadCancellationToken);
    }

    private void PerformPreExecutionChecks()
    {
        try
        {
            DataLoadEventListener.OnNotify(this,
                new NotifyEventArgs(ProgressEventType.Information, "Performing pre-execution checks"));
            var thrower = ThrowImmediatelyCheckNotifier.Quiet;
            _preExecutionChecker.Check(thrower);
        }
        catch (Exception e)
        {
            Exception = e;
            ExitCode = ExitCodeType.Error;
        }
    }
}

1	// Copyright (c) The University of Dundee 2018-2019
2	// This file is part of the Research Data Management Platform (RDMP).
3	// RDMP is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.
4	// RDMP is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
5	// You should have received a copy of the GNU General Public License along with RDMP. If not, see <https://www.gnu.org/licenses/>.
6
7	using System;
8	using Rdmp.Core.Curation.Data.DataLoad;
9	using Rdmp.Core.DataFlowPipeline;
10	using Rdmp.Core.DataLoad.Engine.DatabaseManagement.EntityNaming;
11	using Rdmp.Core.DataLoad.Engine.Job;
12	using Rdmp.Core.DataLoad.Engine.LoadExecution;
13	using Rdmp.Core.Logging;
14	using Rdmp.Core.Repositories;
15	using Rdmp.Core.ReusableLibraryCode.Checks;
16	using Rdmp.Core.ReusableLibraryCode.Progress;
17
18	namespace Rdmp.Core.DataLoad.Engine.LoadProcess;
19
20	/// <summary>
21	/// Container class for an IDataLoadExecution. This class records the ILoadMetadata that is being executed and the current state (whether it has crashed etc).
22	/// When you call run then an IDataLoadJob will be generated by the JobProvider will be executed by the LoadExecution (See IDataLoadExecution).
23	/// </summary>
24	public class DataLoadProcess : IDataLoadProcess, IDataLoadOperation
25	{
26	/// <summary>
27	/// Provides jobs for the data load process, allows different strategies for what jobs will be loaded e.g. single job, scheduled
28	/// </summary>
29	public IJobFactory JobProvider { get; set; }	34✔
30
31	/// <summary>
32	/// The load execution that will be used to load the jobs provided by the JobProvider
33	/// </summary>
34	public IDataLoadExecution LoadExecution { get; private set; }	32✔
35
36	public ExitCodeType? ExitCode { get; private set; }	22✔
37	public Exception Exception { get; private set; }	6✔
38
39	private readonly IRDMPPlatformRepositoryServiceLocator _repositoryLocator;
40	protected readonly ILoadMetadata LoadMetadata;
41	protected readonly IDataLoadEventListener DataLoadEventListener;
42	private readonly HICDatabaseConfiguration _configuration;
43	protected readonly ILogManager LogManager;
44
45	private readonly ICheckable _preExecutionChecker;
46
47	public DataLoadProcess(IRDMPPlatformRepositoryServiceLocator repositoryLocator, ILoadMetadata loadMetadata,	16✔
48	ICheckable preExecutionChecker, ILogManager logManager, IDataLoadEventListener dataLoadEventListener,	16✔
49	IDataLoadExecution loadExecution, HICDatabaseConfiguration configuration)	16✔
50	{
51	_repositoryLocator = repositoryLocator;	16✔
52	LoadMetadata = loadMetadata;	16✔
53	DataLoadEventListener = dataLoadEventListener;	16✔
54	_configuration = configuration;	16✔
55	LoadExecution = loadExecution;	16✔
56	_preExecutionChecker = preExecutionChecker;	16✔
57	LogManager = logManager;	16✔
58	ExitCode = ExitCodeType.Success;	16✔
59
60	JobProvider = new JobFactory(loadMetadata, logManager);	16✔
61	}	16✔
62
63	public virtual ExitCodeType Run(GracefulCancellationToken loadCancellationToken, object payload = null)
64	{
65	PerformPreExecutionChecks();	16✔
66
67	// create job
68	var job = JobProvider.Create(_repositoryLocator, DataLoadEventListener, _configuration);	16✔
69
70	// if job is null, there are no more jobs to submit
71	if (job == null)	16!
72	return ExitCodeType.OperationNotRequired;	×
73
74	job.Payload = payload;	16✔
75	job.PersistentRaw = Rdmp.Core.Curation.Data.DataLoad.LoadMetadata.UsesPersistentRaw(LoadMetadata);	16✔
76
77	return LoadExecution.Run(job, loadCancellationToken);	16✔
78	}
79
80	private void PerformPreExecutionChecks()
81	{
82	try
83	{
84	DataLoadEventListener.OnNotify(this,	16✔
85	new NotifyEventArgs(ProgressEventType.Information, "Performing pre-execution checks"));	16✔
86	var thrower = ThrowImmediatelyCheckNotifier.Quiet;	16✔
87	_preExecutionChecker.Check(thrower);	16✔
88	}	10✔
89	catch (Exception e)	6✔
90	{
91	Exception = e;	6✔
92	ExitCode = ExitCodeType.Error;	6✔
93	}	6✔
94	}	16✔
95	}

HicServices / RDMP / 6245535001

Source File Press 'n' to go to next uncovered line, 'b' for previous

Source File
Press 'n' to go to next uncovered line, 'b' for previous