Skip to content

Commit c23c81e

Browse files
committed
Rse.Providers.Provider validates header and sources for not having nulls
+ some warnings resolved
1 parent 18a8a60 commit c23c81e

1 file changed

Lines changed: 11 additions & 12 deletions

File tree

Orm/Xtensive.Orm/Orm/Rse/Providers/Provider.cs

Lines changed: 11 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -63,19 +63,19 @@ private void AppendBodyTo(StringBuilder sb, int indent)
6363

6464
private void AppendTitleTo(StringBuilder sb, int indent)
6565
{
66-
sb.Append(TitleToString().Indent(indent))
66+
_ = sb.Append(TitleToString().Indent(indent))
6767
.AppendLine();
6868
}
6969

7070
private string TitleToString()
7171
{
7272
var sb = new StringBuilder();
73-
string providerName = GetType().GetShortName().TryCutSuffix(ToString_ProviderTypeSuffix);
74-
string parameters = ParametersToString();
73+
var providerName = GetType().GetShortName().TryCutSuffix(ToString_ProviderTypeSuffix);
74+
var parametersAsString = ParametersToString();
7575

76-
sb.Append(providerName);
77-
if (!parameters.IsNullOrEmpty()) {
78-
sb.AppendFormat(ToString_Parameters, parameters);
76+
_ = sb.Append(providerName);
77+
if (!parametersAsString.IsNullOrEmpty()) {
78+
_ = sb.AppendFormat(ToString_Parameters, parametersAsString);
7979
}
8080
return sb.ToString();
8181
}
@@ -85,10 +85,7 @@ private string TitleToString()
8585
/// for the <see cref="ToString"/> method.
8686
/// </summary>
8787
/// <returns>Provider parameters as a single line string.</returns>
88-
protected virtual string ParametersToString()
89-
{
90-
return string.Empty;
91-
}
88+
protected virtual string ParametersToString() => string.Empty;
9289

9390
#endregion
9491

@@ -104,8 +101,10 @@ protected virtual string ParametersToString()
104101
protected Provider(ProviderType type, RecordSetHeader header, Provider[] sources)
105102
{
106103
Type = type;
107-
Header = header;
108-
Sources = sources;
104+
Header = header ?? throw new ArgumentNullException(nameof(header));
105+
Sources = (sources.Any(p => p is null))
106+
? throw new ArgumentNullException(nameof(header))
107+
: sources;
109108
}
110109
}
111110
}

0 commit comments

Comments
 (0)