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

71.05

/Rdmp.Core/DataLoad/Modules/DataProvider/WebServiceConfiguration.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 System.IO;
using System.Text;
using System.Xml;
using System.Xml.Serialization;
using Rdmp.Core.Curation.Data;
using Rdmp.Core.Curation.Data.DataLoad;
using Rdmp.Core.Repositories;

namespace Rdmp.Core.DataLoad.Modules.DataProvider;

/// <summary>
/// Describes a website / webservice endpoint which can be accessed with an optional username / password.  Use this Type when you need a [DemandsInitialization]
/// property on a component (e.g. IAttacher) which is a remote website/webservice.
/// </summary>
public class WebServiceConfiguration : EncryptedPasswordHost, ICustomUIDrivenClass
{
    private ICatalogueRepository _repository;

    /// <summary>
    /// For XML Serialization
    /// </summary>
    private WebServiceConfiguration()
    {
    }

    public WebServiceConfiguration(ICatalogueRepository repository) : base(repository)
    {
        _repository = repository;
    }

    public string Endpoint { get; set; }
    public string Username { get; set; }

    //[Obsolete]
    //public string EndpointName { get; set; }

    public int MaxBufferSize { get; set; }
    public int MaxReceivedMessageSize { get; set; }

    public void RestoreStateFrom(string value)
    {
        if (string.IsNullOrWhiteSpace(value))
            return;

        var deserializer = new XmlSerializer(typeof(WebServiceConfiguration));
        try
        {
            var deserialized = (WebServiceConfiguration)deserializer.Deserialize(new StringReader(value));
            deserialized.SetRepository(_repository);

            Endpoint = deserialized.Endpoint;
            Username = deserialized.Username;
            Password = deserialized.Password;
            MaxBufferSize = deserialized.MaxBufferSize;
            MaxReceivedMessageSize = deserialized.MaxReceivedMessageSize;
        }
        catch (Exception e)
        {
            throw new Exception($"Deserialisation failed: {value}", e);
        }
    }

    public string SaveStateToString()
    {
        var sb = new StringBuilder();

        var serializer = new XmlSerializer(GetType());

        using (var sw = XmlWriter.Create(sb, new XmlWriterSettings { Indent = true }))
        {
            serializer.Serialize(sw, this);
        }

        return sb.ToString();
    }

    public bool IsValid() =>
        !string.IsNullOrWhiteSpace(Endpoint) &&
        !string.IsNullOrWhiteSpace(Username) &&
        !string.IsNullOrWhiteSpace(Password);
}

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 System.IO;
9	using System.Text;
10	using System.Xml;
11	using System.Xml.Serialization;
12	using Rdmp.Core.Curation.Data;
13	using Rdmp.Core.Curation.Data.DataLoad;
14	using Rdmp.Core.Repositories;
15
16	namespace Rdmp.Core.DataLoad.Modules.DataProvider;
17
18	/// <summary>
19	/// Describes a website / webservice endpoint which can be accessed with an optional username / password. Use this Type when you need a [DemandsInitialization]
20	/// property on a component (e.g. IAttacher) which is a remote website/webservice.
21	/// </summary>
22	public class WebServiceConfiguration : EncryptedPasswordHost, ICustomUIDrivenClass
23	{
24	private ICatalogueRepository _repository;
25
26	/// <summary>
27	/// For XML Serialization
28	/// </summary>
29	private WebServiceConfiguration()	2✔
30	{
31	}	2✔
32
33	public WebServiceConfiguration(ICatalogueRepository repository) : base(repository)	2✔
34	{
35	_repository = repository;	2✔
36	}	2✔
37
38	public string Endpoint { get; set; }	6✔
39	public string Username { get; set; }	10✔
40
41	//[Obsolete]
42	//public string EndpointName { get; set; }
43
44	public int MaxBufferSize { get; set; }	8✔
45	public int MaxReceivedMessageSize { get; set; }	8✔
46
47	public void RestoreStateFrom(string value)
48	{
49	if (string.IsNullOrWhiteSpace(value))	2!
50	return;	×
51
52	var deserializer = new XmlSerializer(typeof(WebServiceConfiguration));	2✔
53	try
54	{
55	var deserialized = (WebServiceConfiguration)deserializer.Deserialize(new StringReader(value));	2✔
56	deserialized.SetRepository(_repository);	2✔
57
58	Endpoint = deserialized.Endpoint;	2✔
59	Username = deserialized.Username;	2✔
60	Password = deserialized.Password;	2✔
61	MaxBufferSize = deserialized.MaxBufferSize;	2✔
62	MaxReceivedMessageSize = deserialized.MaxReceivedMessageSize;	2✔
63	}	2✔
64	catch (Exception e)	×
65	{
66	throw new Exception($"Deserialisation failed: {value}", e);	×
67	}
68	}	2✔
69
70	public string SaveStateToString()
71	{
72	var sb = new StringBuilder();	2✔
73
74	var serializer = new XmlSerializer(GetType());	2✔
75
76	using (var sw = XmlWriter.Create(sb, new XmlWriterSettings { Indent = true }))	2✔
77	{
78	serializer.Serialize(sw, this);	2✔
79	}	2✔
80
81	return sb.ToString();	2✔
82	}
83
84	public bool IsValid() =>
85	!string.IsNullOrWhiteSpace(Endpoint) &&	×
86	!string.IsNullOrWhiteSpace(Username) &&	×
87	!string.IsNullOrWhiteSpace(Password);	×
88	}

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