Skip to content

Commit aeb639f

Browse files
committed
Minor changes in main project
1 parent b5ad889 commit aeb639f

5 files changed

Lines changed: 56 additions & 17 deletions

File tree

Orm/Xtensive.Orm/Orm/Configuration/DomainConfiguration.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -877,7 +877,7 @@ private static DomainConfiguration LoadConfigurationFromSection(ConfigurationSec
877877
/// </summary>
878878
/// <param name="configurationSection">Root configuration section where domain configurations are placed</param>
879879
/// <param name="name">Name of the <see cref="Domain"/>.</param>
880-
/// <returns></returns>
880+
/// <returns>Domain configuration.</returns>
881881
/// <exception cref="InvalidOperationException">The "domains" section is not found or domain with requested name is not found.</exception>
882882
public static DomainConfiguration Load(IConfigurationSection configurationSection, string name)
883883
{

Orm/Xtensive.Orm/Orm/Configuration/Internals/ConfigurationSectionExtensions.cs

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
1-
using System;
1+
// Copyright (C) 2024 Xtensive LLC.
2+
// This code is distributed under MIT license terms.
3+
// See the License.txt file in the project root for more information.
4+
25
using System.Collections.Generic;
36
using System.Linq;
4-
using System.Text;
5-
using System.Threading.Tasks;
67
using Microsoft.Extensions.Configuration;
78
using Xtensive.Collections;
89

Orm/Xtensive.Orm/Orm/Configuration/LoggingConfiguration.cs

Lines changed: 29 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,9 @@
77
using System;
88
using System.Collections.Generic;
99
using System.Configuration;
10+
using Microsoft.Extensions.Configuration;
1011
using Xtensive.Core;
12+
using Xtensive.Orm.Configuration.Internals;
1113
using ConfigurationSection = Xtensive.Orm.Configuration.Elements.ConfigurationSection;
1214

1315
namespace Xtensive.Orm.Configuration
@@ -43,7 +45,7 @@ public static LoggingConfiguration Load()
4345
/// <returns>Loaded configuration.</returns>
4446
public static LoggingConfiguration Load(string sectionName)
4547
{
46-
ArgumentValidator.EnsureArgumentNotNullOrEmpty(sectionName, "sectionName");
48+
ArgumentValidator.EnsureArgumentNotNullOrEmpty(sectionName, nameof(sectionName));
4749

4850
var section = (ConfigurationSection)ConfigurationManager.GetSection(sectionName);
4951
if (section==null)
@@ -70,8 +72,8 @@ public static LoggingConfiguration Load(System.Configuration.Configuration confi
7072
/// <returns>Loaded configuration.</returns>
7173
public static LoggingConfiguration Load(System.Configuration.Configuration configuration, string sectionName)
7274
{
73-
ArgumentValidator.EnsureArgumentNotNull(configuration, "configuration");
74-
ArgumentValidator.EnsureArgumentNotNullOrEmpty(sectionName, "sectionName");
75+
ArgumentValidator.EnsureArgumentNotNull(configuration, nameof(configuration));
76+
ArgumentValidator.EnsureArgumentNotNullOrEmpty(sectionName, nameof(sectionName));
7577

7678
var section = (ConfigurationSection) configuration.GetSection(sectionName);
7779
if (section==null)
@@ -80,12 +82,36 @@ public static LoggingConfiguration Load(System.Configuration.Configuration confi
8082
return loggingConfiguration;
8183
}
8284

85+
/// <summary>
86+
/// Loads logging configuration from the specified configuration section.
87+
/// </summary>
88+
/// <param name="configurationSection">Root configuration section where logging configuration is placed.</param>
89+
/// <returns>Logging configuration.</returns>
90+
/// <exception cref="InvalidOperationException">The logging section is not found.</exception>
8391
public static LoggingConfiguration Load(IConfigurationSection configurationSection)
8492
{
8593
return new LoggingConfigurationReader().Read(configurationSection);
8694
}
8795

96+
/// <summary>
97+
/// Loads logging configuration from default section.
98+
/// </summary>
99+
/// <param name="configurationRoot">Root of configuration.</param>
100+
/// <returns>Read configuration.</returns>
101+
/// <exception cref="InvalidOperationException">The logging section is not found.</exception>
102+
public static LoggingConfiguration Load(IConfigurationRoot configurationRoot)
103+
{
88104
return new LoggingConfigurationReader().Read(configurationRoot);
105+
}
106+
107+
/// <summary>
108+
/// Loads logging configuration from specific section.
109+
/// </summary>
110+
/// <param name="configurationRoot">Root of configuration.</param>
111+
/// <param name="sectionName">Section name where logging configuration is defined.</param>
112+
/// <returns>Read configuration.</returns>
113+
/// <exception cref="InvalidOperationException">The logging section is not found.</exception>
114+
public static LoggingConfiguration Load(IConfigurationRoot configurationRoot, string sectionName)
89115
{
90116
return new LoggingConfigurationReader().Read(configurationRoot, sectionName);
91117
}

Orm/Xtensive.Orm/Orm/Configuration/Options/DomainConfigurationOptions.cs

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -301,19 +301,11 @@ public DomainConfiguration ToNative(IDictionary<string, string> connectionString
301301
}
302302
}
303303

304-
foreach (var element in Sessions)
304+
foreach (var element in Sessions) {
305305
config.Sessions.Add(element.Value.ToNative(connectionStrings));
306+
}
306307

307308
return config;
308309
}
309-
310-
private static T ParseEnum<T>(string value)
311-
where T : struct
312-
{
313-
if (!Enum.TryParse<T>(value, true, out var result)) {
314-
throw new ArgumentException($"Can't parse given value '{value}' to enum type '{typeof(T).FullName}'");
315-
}
316-
return result;
317-
}
318310
}
319311
}

Orm/Xtensive.Orm/Orm/Configuration/Options/IgnoreRuleOptions.cs

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,17 +13,37 @@ internal sealed class IgnoreRuleOptions : IIdentifyableOptions,
1313
IValidatableOptions,
1414
IToNativeConvertable<IgnoreRule>
1515
{
16+
/// <inheritdoc/>
1617
public object Identifier =>
1718
(Database ?? string.Empty,
1819
Schema ?? string.Empty,
1920
Table ?? string.Empty,
2021
Column ?? string.Empty,
2122
Index ?? string.Empty);
2223

24+
/// <summary>
25+
/// Database part of the rule
26+
/// </summary>
2327
public string Database { get; set; }
28+
29+
/// <summary>
30+
/// Schema part of the rule.
31+
/// </summary>
2432
public string Schema { get; set; }
33+
34+
/// <summary>
35+
/// Table part of the rule.
36+
/// </summary>
2537
public string Table { get; set; }
38+
39+
/// <summary>
40+
/// Column part of the rule.
41+
/// </summary>
2642
public string Column { get; set; }
43+
44+
/// <summary>
45+
/// Index part of the rule.
46+
/// </summary>
2747
public string Index { get; set; }
2848

2949
/// <inheritdoc />

0 commit comments

Comments
 (0)