Removed usage of obsoleted ArgumentNullOrEmptyException
This commit is contained in:
@@ -1,5 +1,4 @@
|
||||
using System;
|
||||
using Umbraco.Core.Exceptions;
|
||||
|
||||
namespace Umbraco.Web.Search
|
||||
{
|
||||
@@ -8,42 +7,47 @@ namespace Umbraco.Web.Search
|
||||
{
|
||||
public const int DefaultSortOrder = 1000;
|
||||
|
||||
/// <summary>
|
||||
/// This constructor defines both the angular service and method name to use
|
||||
/// </summary>
|
||||
/// <param name="serviceName"></param>
|
||||
/// <param name="methodName"></param>
|
||||
public SearchableTreeAttribute(string serviceName, string methodName) : this(serviceName, methodName, DefaultSortOrder) { }
|
||||
|
||||
/// <summary>
|
||||
/// This constructor defines both the angular service and method name to use and explicitly defines a sort order for the results
|
||||
/// </summary>
|
||||
/// <param name="serviceName"></param>
|
||||
/// <param name="methodName"></param>
|
||||
/// <param name="sortOrder"></param>
|
||||
public SearchableTreeAttribute(string serviceName, string methodName, int sortOrder)
|
||||
{
|
||||
if (string.IsNullOrWhiteSpace(serviceName)) throw new ArgumentNullOrEmptyException(nameof(serviceName));
|
||||
if (string.IsNullOrWhiteSpace(methodName)) throw new ArgumentNullOrEmptyException(nameof(methodName));
|
||||
MethodName = methodName;
|
||||
SortOrder = sortOrder;
|
||||
ServiceName = serviceName;
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// This constructor will assume that the method name equals `format(searchResult, appAlias, treeAlias)`
|
||||
/// </summary>
|
||||
/// <param name="serviceName"></param>
|
||||
public SearchableTreeAttribute(string serviceName)
|
||||
{
|
||||
if (string.IsNullOrWhiteSpace(serviceName)) throw new ArgumentNullOrEmptyException(nameof(serviceName));
|
||||
MethodName = "";
|
||||
ServiceName = serviceName;
|
||||
SortOrder = DefaultSortOrder;
|
||||
}
|
||||
public string ServiceName { get; }
|
||||
|
||||
public string MethodName { get; }
|
||||
public string ServiceName { get; }
|
||||
|
||||
public int SortOrder { get; }
|
||||
|
||||
/// <summary>
|
||||
/// This constructor will assume that the method name equals `format(searchResult, appAlias, treeAlias)`.
|
||||
/// </summary>
|
||||
/// <param name="serviceName">Name of the service.</param>
|
||||
public SearchableTreeAttribute(string serviceName)
|
||||
: this(serviceName, string.Empty)
|
||||
{ }
|
||||
|
||||
/// <summary>
|
||||
/// This constructor defines both the Angular service and method name to use.
|
||||
/// </summary>
|
||||
/// <param name="serviceName">Name of the service.</param>
|
||||
/// <param name="methodName">Name of the method.</param>
|
||||
public SearchableTreeAttribute(string serviceName, string methodName)
|
||||
: this(serviceName, methodName, DefaultSortOrder)
|
||||
{ }
|
||||
|
||||
/// <summary>
|
||||
/// This constructor defines both the Angular service and method name to use and explicitly defines a sort order for the results
|
||||
/// </summary>
|
||||
/// <param name="serviceName">Name of the service.</param>
|
||||
/// <param name="methodName">Name of the method.</param>
|
||||
/// <param name="sortOrder">The sort order.</param>
|
||||
/// <exception cref="ArgumentNullException">serviceName
|
||||
/// or
|
||||
/// methodName</exception>
|
||||
/// <exception cref="ArgumentException">Value can't be empty or consist only of white-space characters. - serviceName</exception>
|
||||
public SearchableTreeAttribute(string serviceName, string methodName, int sortOrder)
|
||||
{
|
||||
if (serviceName == null) throw new ArgumentNullException(nameof(serviceName));
|
||||
if (string.IsNullOrWhiteSpace(serviceName)) throw new ArgumentException("Value can't be empty or consist only of white-space characters.", nameof(serviceName));
|
||||
|
||||
ServiceName = serviceName;
|
||||
MethodName = methodName ?? throw new ArgumentNullException(nameof(methodName));
|
||||
SortOrder = sortOrder;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user