Skip to content

Commit ba2b66a

Browse files
alex-kulakovalex-kulakov
committed
Argument validation via standard mechanism instead of ArgumentValidator
also null check (??) applied if possible also addes some missing validation
1 parent 21df864 commit ba2b66a

323 files changed

Lines changed: 1404 additions & 1570 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎Extensions/Xtensive.Orm.Localization/Configuration/LocalizationConfiguration.cs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -140,7 +140,7 @@ private static LocalizationConfiguration GetConfigurationFromSection(Configurati
140140
/// <returns>Loaded configuration or default configuration if loading failed for some reason.</returns>
141141
public static LocalizationConfiguration Load(IConfiguration configuration, string sectionName = null)
142142
{
143-
ArgumentValidator.EnsureArgumentNotNull(configuration, nameof(configuration));
143+
ArgumentNullException.ThrowIfNull(configuration);
144144

145145
if (configuration is IConfigurationRoot configurationRoot) {
146146
return new LocalizationConfigurationReader().Read(configurationRoot, sectionName ?? DefaultSectionName);
@@ -161,7 +161,7 @@ public static LocalizationConfiguration Load(IConfiguration configuration, strin
161161
/// <returns>Loaded configuration or default configuration if loading failed for some reason.</returns>
162162
public static LocalizationConfiguration Load(IConfigurationSection configurationSection)
163163
{
164-
ArgumentValidator.EnsureArgumentNotNull(configurationSection, nameof(configurationSection));
164+
ArgumentNullException.ThrowIfNull(configurationSection);
165165

166166
return new LocalizationConfigurationReader().Read(configurationSection);
167167
}
@@ -175,7 +175,7 @@ public static LocalizationConfiguration Load(IConfigurationSection configuration
175175
/// <returns>Loaded configuration or default configuration if loading failed for some reason.</returns>
176176
public static LocalizationConfiguration Load(IConfigurationRoot configurationRoot, string sectionName = null)
177177
{
178-
ArgumentValidator.EnsureArgumentNotNull(configurationRoot, nameof(configurationRoot));
178+
ArgumentNullException.ThrowIfNull(configurationRoot);
179179

180180
return new LocalizationConfigurationReader().Read(configurationRoot, sectionName ?? DefaultSectionName);
181181
}

‎Extensions/Xtensive.Orm.Localization/Internals/TypeLocalizationMap.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ internal class TypeLocalizationMap
2222

2323
public static void Initialize(Domain domain)
2424
{
25-
ArgumentValidator.EnsureArgumentNotNull(domain, nameof(domain));
25+
ArgumentNullException.ThrowIfNull(domain);
2626

2727
var existing = domain.Extensions.Get<TypeLocalizationMap>();
2828
if (existing != null) {

‎Extensions/Xtensive.Orm.Localization/LocalizationContext.cs‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -77,8 +77,7 @@ public LocalizationContext(CultureInfo culture)
7777
/// <exception cref="ArgumentNullException"/>
7878
public LocalizationContext(CultureInfo culture, LocalizationPolicy policy)
7979
{
80-
ArgumentValidator.EnsureArgumentNotNull(culture, "culture");
81-
Culture = culture;
80+
Culture = culture ?? throw new ArgumentNullException(nameof(culture));
8281
CultureName = culture.Name;
8382
Policy = policy;
8483
}

‎Extensions/Xtensive.Orm.Reprocessing/Configuration/ReprocessingConfiguration.cs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,7 @@ private static ReprocessingConfiguration GetConfigurationFromSection(Configurati
128128
/// <returns>Loaded configuration or configuration with default settings.</returns>
129129
public static ReprocessingConfiguration Load(IConfiguration configuration, string sectionName = null)
130130
{
131-
ArgumentValidator.EnsureArgumentNotNull(configuration, nameof(configuration));
131+
ArgumentNullException.ThrowIfNull(configuration);
132132

133133
if (configuration is IConfigurationRoot configurationRoot) {
134134
return new ReprocessingConfigurationReader().Read(configurationRoot, sectionName ?? DefaultSectionName);
@@ -149,7 +149,7 @@ public static ReprocessingConfiguration Load(IConfiguration configuration, strin
149149
/// <returns>Loaded configuration or configuration with default settings.</returns>
150150
public static ReprocessingConfiguration Load(IConfigurationRoot configurationRoot, string sectionName = null)
151151
{
152-
ArgumentValidator.EnsureArgumentNotNull(configurationRoot, nameof(configurationRoot));
152+
ArgumentNullException.ThrowIfNull(configurationRoot);
153153

154154
return new ReprocessingConfigurationReader().Read(configurationRoot, sectionName ?? DefaultSectionName);
155155
}
@@ -161,7 +161,7 @@ public static ReprocessingConfiguration Load(IConfigurationRoot configurationRoo
161161
/// <returns>Loaded configuration or configuration with default settings.</returns>
162162
public static ReprocessingConfiguration Load(IConfigurationSection configurationSection)
163163
{
164-
ArgumentValidator.EnsureArgumentNotNull(configurationSection, nameof(configurationSection));
164+
ArgumentNullException.ThrowIfNull(configurationSection);
165165

166166
return new ReprocessingConfigurationReader().Read(configurationSection);
167167
}

‎Extensions/Xtensive.Orm.Security/Configuration/SecurityConfiguration.cs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -140,7 +140,7 @@ private static SecurityConfiguration GetConfigurationFromSection(ConfigurationSe
140140
/// <returns>Loaded configuration or configuration with default settings.</returns>
141141
public static SecurityConfiguration Load(IConfiguration configuration, string sectionName = null)
142142
{
143-
ArgumentValidator.EnsureArgumentNotNull(configuration, nameof(configuration));
143+
ArgumentNullException.ThrowIfNull(configuration);
144144

145145
if (configuration is IConfigurationRoot configurationRoot) {
146146
return Load(configurationRoot, sectionName);
@@ -161,7 +161,7 @@ public static SecurityConfiguration Load(IConfiguration configuration, string se
161161
/// <returns>Loaded configuration or configuration with default settings.</returns>
162162
public static SecurityConfiguration Load(IConfigurationRoot configurationRoot, string sectionName = null)
163163
{
164-
ArgumentValidator.EnsureArgumentNotNull(configurationRoot, nameof(configurationRoot));
164+
ArgumentNullException.ThrowIfNull(configurationRoot);
165165

166166
var configuration = new NamelessFormatSecurityConfigurationReader().Read(configurationRoot, sectionName ?? DefaultSectionName);
167167
if (configuration != null) {
@@ -179,7 +179,7 @@ public static SecurityConfiguration Load(IConfigurationRoot configurationRoot, s
179179
/// <returns>Loaded configuration or configuration with default settings.</returns>
180180
public static SecurityConfiguration Load(IConfigurationSection configurationSection)
181181
{
182-
ArgumentValidator.EnsureArgumentNotNull(configurationSection, nameof(configurationSection));
182+
ArgumentNullException.ThrowIfNull(configurationSection);
183183

184184
var configuration = new NamelessFormatSecurityConfigurationReader().Read(configurationSection);
185185
if (configuration != null) {

‎Extensions/Xtensive.Orm.Security/ImpersonationContext.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
using System;
1+
using System;
22
using Xtensive.Core;
33

44
namespace Xtensive.Orm.Security
@@ -63,7 +63,7 @@ protected virtual void Dispose(bool disposing)
6363
public ImpersonationContext(IPrincipal principal, ImpersonationContext outerContext)
6464
: base(principal.Session)
6565
{
66-
ArgumentValidator.EnsureArgumentNotNull(principal, "principal");
66+
ArgumentNullException.ThrowIfNull(principal);
6767

6868
this.outerContext = outerContext;
6969
Principal = principal;

‎Extensions/Xtensive.Orm.Security/Services/GenericAuthenticationService.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ public class GenericAuthenticationService : SessionBound, IAuthenticationService
2222
/// <inheritdoc/>
2323
public IPrincipal Authenticate(IIdentity identity, params object[] args)
2424
{
25-
ArgumentValidator.EnsureArgumentNotNull(identity, "identity");
25+
ArgumentNullException.ThrowIfNull(identity);
2626
ArgumentValidator.EnsureArgumentNotNullOrEmpty(identity.Name, "identity.Name");
2727

2828
return Authenticate(identity.Name, args);

‎Extensions/Xtensive.Orm.Security/SessionExtensions.cs‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ public static SecurityConfiguration GetSecurityConfiguration(this Session sessio
4545
/// <returns><see cref="ImpersonationContext"/> instance.</returns>
4646
public static ImpersonationContext GetImpersonationContext(this Session session)
4747
{
48-
ArgumentValidator.EnsureArgumentNotNull(session, "session");
48+
ArgumentNullException.ThrowIfNull(session);
4949

5050
return session.Extensions.Get<ImpersonationContext>();
5151
}
@@ -58,8 +58,8 @@ public static ImpersonationContext GetImpersonationContext(this Session session)
5858
/// <returns><see cref="ImpersonationContext"/> instance.</returns>
5959
public static ImpersonationContext Impersonate(this Session session, IPrincipal principal)
6060
{
61-
ArgumentValidator.EnsureArgumentNotNull(session, "session");
62-
ArgumentValidator.EnsureArgumentNotNull(principal, "principal");
61+
ArgumentNullException.ThrowIfNull(session);
62+
ArgumentNullException.ThrowIfNull(principal);
6363

6464
var currentContext = session.GetImpersonationContext();
6565

@@ -101,23 +101,23 @@ public static IPrincipal Authenticate(this Session session, string name, params
101101

102102
private static void ClearImpersonationContext(this Session session)
103103
{
104-
ArgumentValidator.EnsureArgumentNotNull(session, "session");
104+
ArgumentNullException.ThrowIfNull(session);
105105

106106
session.Extensions.Set<ImpersonationContext>(null);
107107
}
108108

109109
private static void SetImpersonationContext(this Session session, ImpersonationContext context)
110110
{
111-
ArgumentValidator.EnsureArgumentNotNull(session, "session");
112-
ArgumentValidator.EnsureArgumentNotNull(context, "context");
111+
ArgumentNullException.ThrowIfNull(session);
112+
ArgumentNullException.ThrowIfNull(context);
113113

114114
session.Extensions.Set(context);
115115
}
116116

117117
internal static void UndoImpersonation(this Session session, ImpersonationContext innerContext, ImpersonationContext outerContext)
118118
{
119-
ArgumentValidator.EnsureArgumentNotNull(session, "session");
120-
ArgumentValidator.EnsureArgumentNotNull(innerContext, "innerContext");
119+
ArgumentNullException.ThrowIfNull(session);
120+
ArgumentNullException.ThrowIfNull(innerContext);
121121
// outerContext can be null
122122

123123
var currentContext = session.GetImpersonationContext();

‎Extensions/Xtensive.Orm.Tracking/Internals/TrackingStackFrame.cs‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
// Created by: Dmitri Maximov
55
// Created: 2012.05.16
66

7+
using System;
78
using System.Collections;
89
using System.Collections.Generic;
910
using Xtensive.Core;
@@ -18,7 +19,7 @@ namespace Xtensive.Orm.Tracking
1819

1920
public void Register(TrackingItem item)
2021
{
21-
ArgumentValidator.EnsureArgumentNotNull(item, "item");
22+
ArgumentNullException.ThrowIfNull(item);
2223

2324
var key = item.Key;
2425
if (!items.TryGetValue(key, out var existing)) {

‎Orm/Xtensive.Orm.Firebird/Sql.Drivers.Firebird/v2_5/Extractor.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ public override Task<Catalog> ExtractCatalogAsync(string catalogName, Cancellati
9696
public override Catalog ExtractSchemes(string catalogName, string[] schemaNames)
9797
{
9898
ArgumentValidator.EnsureArgumentNotNullOrEmpty(catalogName, nameof(catalogName));
99-
ArgumentValidator.EnsureArgumentNotNull(schemaNames, nameof(schemaNames));
99+
ArgumentNullException.ThrowIfNull(schemaNames);
100100

101101
var targetSchema = schemaNames.Length > 0 ? schemaNames[0] : null;
102102
var catalog = new Catalog(catalogName);
@@ -109,7 +109,7 @@ public override async Task<Catalog> ExtractSchemesAsync(
109109
string catalogName, string[] schemaNames, CancellationToken token = default)
110110
{
111111
ArgumentValidator.EnsureArgumentNotNullOrEmpty(catalogName, nameof(catalogName));
112-
ArgumentValidator.EnsureArgumentNotNull(schemaNames, nameof(schemaNames));
112+
ArgumentNullException.ThrowIfNull(schemaNames);
113113

114114
var targetSchema = schemaNames.Length > 0 ? schemaNames[0] : null;
115115
var catalog = new Catalog(catalogName);

0 commit comments

Comments
 (0)