Skip to content

Commit 6cc7960

Browse files
ckadlubackadluba
authored
Merge pull request #244 from ckadluba/refactoring-cleanup-tests
Refactoring, cleanup and tests
2 parents dc4ea1c + b7a9f29 commit 6cc7960

32 files changed

+591
-317
lines changed

‎sample/AppConfigDemo/AppConfigDemo.csproj

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,6 @@
6767
</ItemGroup>
6868
<ItemGroup>
6969
<Compile Include="Program.cs" />
70-
<Compile Include="Properties\AssemblyInfo.cs" />
7170
</ItemGroup>
7271
<ItemGroup>
7372
<None Include="App.config" />
@@ -79,5 +78,8 @@
7978
<Name>Serilog.Sinks.MSSqlServer</Name>
8079
</ProjectReference>
8180
</ItemGroup>
81+
<ItemGroup>
82+
<Folder Include="Properties\" />
83+
</ItemGroup>
8284
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
8385
</Project>

‎sample/AppConfigDemo/Program.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
namespace AppConfigDemo
88
{
9-
public class Program
9+
public static class Program
1010
{
1111
const string _connectionString = "Server=localhost;Database=LogTest;Integrated Security=SSPI;";
1212
const string _schemaName = "dbo";

‎sample/AppConfigDemo/Properties/AssemblyInfo.cs

Lines changed: 0 additions & 36 deletions
This file was deleted.

‎sample/CustomLogEventFormatterDemo/Program.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
namespace CustomLogEventFormatterDemo
77
{
8-
public class Program
8+
public static class Program
99
{
1010
const string _connectionString = "Server=localhost;Database=LogTest;Integrated Security=SSPI;";
1111
const string _schemaName = "dbo";

‎sample/WorkerServiceDemo/Program.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
namespace WorkerServiceDemo
66
{
7-
public class Program
7+
public static class Program
88
{
99
public static void Main(string[] args)
1010
{

‎src/Serilog.Sinks.MSSqlServer/Configuration/Extensions/Microsoft.Extensions.Configuration/LoggerConfigurationMSSqlServerExtensions.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -117,8 +117,8 @@ public static LoggerConfiguration MSSqlServer(
117117
if (loggerAuditSinkConfiguration == null)
118118
throw new ArgumentNullException(nameof(loggerAuditSinkConfiguration));
119119

120-
var connectionStr = ApplyMicrosoftExtensionsConfiguration.GetConnectionString(connectionString, appConfiguration);
121-
var colOpts = ApplyMicrosoftExtensionsConfiguration.ConfigureColumnOptions(columnOptions, columnOptionsSection);
120+
connectionString = ApplyMicrosoftExtensionsConfiguration.GetConnectionString(connectionString, appConfiguration);
121+
columnOptions = ApplyMicrosoftExtensionsConfiguration.ConfigureColumnOptions(columnOptions, columnOptionsSection);
122122

123123
return loggerAuditSinkConfiguration.Sink(
124124
new MSSqlServerAuditSink(

‎src/Serilog.Sinks.MSSqlServer/Configuration/Implementations/Microsoft.Extensions.Configuration/MicrosoftExtensionsColumnOptionsProvider.cs

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,16 @@ public ColumnOptions ConfigureColumnOptions(ColumnOptions columnOptions, IConfig
2525
return columnOptions;
2626
}
2727

28+
private static void SetCommonColumnOptions(IConfigurationSection section, SqlColumn target)
29+
{
30+
// Standard Columns are subclasses of the SqlColumn class
31+
SetProperty.IfNotNullOrEmpty<string>(section["columnName"], (val) => target.ColumnName = val);
32+
SetProperty.IfNotNull<string>(section["dataType"], (val) => target.SetDataTypeFromConfigString(val));
33+
SetProperty.IfNotNull<bool>(section["allowNull"], (val) => target.AllowNull = val);
34+
SetProperty.IfNotNull<int>(section["dataLength"], (val) => target.DataLength = val);
35+
SetProperty.IfNotNull<bool>(section["nonClusteredIndex"], (val) => target.NonClusteredIndex = val);
36+
}
37+
2838
private void AddRemoveStandardColumns(IConfigurationSection config, ColumnOptions columnOptions)
2939
{
3040
// add standard columns
@@ -138,16 +148,6 @@ private void ReadStandardColumns(IConfigurationSection config, ColumnOptions col
138148
SetCommonColumnOptions(section, columnOptions.MessageTemplate);
139149
}
140150

141-
private void SetCommonColumnOptions(IConfigurationSection section, SqlColumn target)
142-
{
143-
// Standard Columns are subclasses of the SqlColumn class
144-
SetProperty.IfNotNullOrEmpty<string>(section["columnName"], (val) => target.ColumnName = val);
145-
SetProperty.IfNotNull<string>(section["dataType"], (val) => target.SetDataTypeFromConfigString(val));
146-
SetProperty.IfNotNull<bool>(section["allowNull"], (val) => target.AllowNull = val);
147-
SetProperty.IfNotNull<int>(section["dataLength"], (val) => target.DataLength = val);
148-
SetProperty.IfNotNull<bool>(section["nonClusteredIndex"], (val) => target.NonClusteredIndex = val);
149-
}
150-
151151
private void ReadMiscColumnOptions(IConfigurationSection config, ColumnOptions columnOptions)
152152
{
153153
SetProperty.IfNotNull<bool>(config["disableTriggers"], (val) => columnOptions.DisableTriggers = val);

‎src/Serilog.Sinks.MSSqlServer/Configuration/Implementations/System.Configuration/ColumnConfig.cs

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -36,55 +36,55 @@ public ColumnConfig(string columnName, string dataType)
3636
[ConfigurationProperty("ColumnName", IsRequired = true, IsKey = true)]
3737
public virtual string ColumnName
3838
{
39-
get { return (string)this["ColumnName"]; }
40-
set { this["ColumnName"] = value; }
39+
get { return (string)this[nameof(ColumnName)]; }
40+
set { this[nameof(ColumnName)] = value; }
4141
}
4242

4343
[ConfigurationProperty("DataType")]
4444
public string DataType
4545
{
46-
get { return (string)this["DataType"]; }
47-
set { this["DataType"] = value; }
46+
get { return (string)this[nameof(DataType)]; }
47+
set { this[nameof(DataType)] = value; }
4848
}
4949

5050
[ConfigurationProperty("DataLength")]
5151
public string DataLength
5252
{
53-
get { return (string)this["DataLength"]; }
54-
set { this["DataLength"] = value; }
53+
get { return (string)this[nameof(DataLength)]; }
54+
set { this[nameof(DataLength)] = value; }
5555
}
5656

5757
[ConfigurationProperty("AllowNull")]
5858
public string AllowNull
5959
{
60-
get { return (string)this["AllowNull"]; }
61-
set { this["AllowNull"] = value; }
60+
get { return (string)this[nameof(AllowNull)]; }
61+
set { this[nameof(AllowNull)] = value; }
6262
}
6363

6464
[ConfigurationProperty("NonClusteredIndex")]
6565
public string NonClusteredIndex
6666
{
67-
get { return (string)this["NonClusteredIndex"]; }
68-
set { this["NonClusteredIndex"] = value; }
67+
get { return (string)this[nameof(NonClusteredIndex)]; }
68+
set { this[nameof(NonClusteredIndex)] = value; }
6969
}
7070

7171
internal SqlColumn AsSqlColumn()
7272
{
7373
var sqlColumn = new SqlColumn();
7474

7575
// inheritors can override IsRequired; config might not change the names of Standard Columns
76-
SetProperty.IfProvidedNotEmpty<string>(this, "ColumnName", (val) => sqlColumn.ColumnName = val);
76+
SetProperty.IfProvidedNotEmpty<string>(this, nameof(ColumnName), (val) => sqlColumn.ColumnName = val);
7777

78-
SetProperty.IfProvidedNotEmpty<string>(this, "DataType", (val) => sqlColumn.SetDataTypeFromConfigString(val));
78+
SetProperty.IfProvidedNotEmpty<string>(this, nameof(DataType), (val) => sqlColumn.SetDataTypeFromConfigString(val));
7979

80-
SetProperty.IfProvided<int>(this, "DataLength", (val) => sqlColumn.DataLength = val);
80+
SetProperty.IfProvided<int>(this, nameof(DataLength), (val) => sqlColumn.DataLength = val);
8181

8282
if (sqlColumn.DataLength == 0 && SqlDataTypes.DataLengthRequired.Contains(sqlColumn.DataType))
83-
throw new ArgumentException($"SQL column {sqlColumn.ColumnName} of data type {sqlColumn.DataType.ToString()} requires a non-zero DataLength property.");
83+
throw new ArgumentException($"SQL column {ColumnName} of data type {sqlColumn.DataType} requires a non-zero DataLength property.");
8484

85-
SetProperty.IfProvided<bool>(this, "AllowNull", (val) => sqlColumn.AllowNull = val);
85+
SetProperty.IfProvided<bool>(this, nameof(AllowNull), (val) => sqlColumn.AllowNull = val);
8686

87-
SetProperty.IfProvided<bool>(this, "NonClusteredIndex", (val) => sqlColumn.NonClusteredIndex = val);
87+
SetProperty.IfProvided<bool>(this, nameof(NonClusteredIndex), (val) => sqlColumn.NonClusteredIndex = val);
8888

8989
return sqlColumn;
9090
}

‎src/Serilog.Sinks.MSSqlServer/Configuration/Implementations/System.Configuration/MSSqlServerConfigurationSection.cs

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -34,94 +34,94 @@ public static MSSqlServerConfigurationSection Settings
3434

3535
public MSSqlServerConfigurationSection()
3636
{
37-
base["Level"] = new StandardColumnConfigLevel();
37+
base[nameof(Level)] = new StandardColumnConfigLevel();
3838
}
3939

4040
[ConfigurationProperty("DisableTriggers")]
4141
public string DisableTriggers
4242
{
43-
get => (string)base["DisableTriggers"];
43+
get => (string)base[nameof(DisableTriggers)];
4444
set
4545
{
46-
base["DisableTriggers"] = value;
46+
base[nameof(DisableTriggers)] = value;
4747
}
4848
}
4949

5050
[ConfigurationProperty("ClusteredColumnstoreIndex")]
5151
public string ClusteredColumnstoreIndex
5252
{
53-
get => (string)base["ClusteredColumnstoreIndex"];
53+
get => (string)base[nameof(ClusteredColumnstoreIndex)];
5454
set
5555
{
56-
base["ClusteredColumnstoreIndex"] = value;
56+
base[nameof(ClusteredColumnstoreIndex)] = value;
5757
}
5858
}
5959

6060
[ConfigurationProperty("PrimaryKeyColumnName")]
6161
public string PrimaryKeyColumnName
6262
{
63-
get => (string)base["PrimaryKeyColumnName"];
63+
get => (string)base[nameof(PrimaryKeyColumnName)];
6464
set
6565
{
66-
base["PrimaryKeyColumnName"] = value;
66+
base[nameof(PrimaryKeyColumnName)] = value;
6767
}
6868
}
6969

7070
[ConfigurationProperty("AddStandardColumns", IsDefaultCollection = false)]
7171
[ConfigurationCollection(typeof(StandardColumnCollection), AddItemName = "add")]
7272
public StandardColumnCollection AddStandardColumns
7373
{
74-
get => (StandardColumnCollection)base["AddStandardColumns"];
74+
get => (StandardColumnCollection)base[nameof(AddStandardColumns)];
7575
}
7676

7777
[ConfigurationProperty("RemoveStandardColumns", IsDefaultCollection = false)]
7878
[ConfigurationCollection(typeof(StandardColumnCollection), AddItemName = "remove")]
7979
public StandardColumnCollection RemoveStandardColumns
8080
{
81-
get => (StandardColumnCollection)base["RemoveStandardColumns"];
81+
get => (StandardColumnCollection)base[nameof(RemoveStandardColumns)];
8282
}
8383

8484
[ConfigurationProperty("Columns", IsDefaultCollection = false)]
8585
[ConfigurationCollection(typeof(ColumnCollection), AddItemName = "add")]
8686
public ColumnCollection Columns
8787
{
88-
get => (ColumnCollection)base["Columns"];
88+
get => (ColumnCollection)base[nameof(Columns)];
8989
}
9090

9191
[ConfigurationProperty("Exception")]
9292
public StandardColumnConfigException Exception
9393
{
94-
get => (StandardColumnConfigException)base["Exception"];
94+
get => (StandardColumnConfigException)base[nameof(Exception)];
9595
}
9696

9797
[ConfigurationProperty("Id")]
9898
public StandardColumnConfigId Id
9999
{
100-
get => (StandardColumnConfigId)base["Id"];
100+
get => (StandardColumnConfigId)base[nameof(Id)];
101101
}
102102

103103
[ConfigurationProperty("Level")]
104104
public StandardColumnConfigLevel Level
105105
{
106-
get => (StandardColumnConfigLevel)base["Level"];
106+
get => (StandardColumnConfigLevel)base[nameof(Level)];
107107
}
108108

109109
[ConfigurationProperty("LogEvent")]
110110
public StandardColumnConfigLogEvent LogEvent
111111
{
112-
get => (StandardColumnConfigLogEvent)base["LogEvent"];
112+
get => (StandardColumnConfigLogEvent)base[nameof(LogEvent)];
113113
}
114114

115115
[ConfigurationProperty("Message")]
116116
public StandardColumnConfigMessage Message
117117
{
118-
get => (StandardColumnConfigMessage)base["Message"];
118+
get => (StandardColumnConfigMessage)base[nameof(Message)];
119119
}
120120

121121
[ConfigurationProperty("MessageTemplate")]
122122
public StandardColumnConfigMessageTemplate MessageTemplate
123123
{
124-
get => (StandardColumnConfigMessageTemplate)base["MessageTemplate"];
124+
get => (StandardColumnConfigMessageTemplate)base[nameof(MessageTemplate)];
125125
}
126126

127127
// Name changed to avoid conflict with Properties in ConfigurationElement base class
@@ -134,7 +134,7 @@ public StandardColumnConfigProperties PropertiesColumn
134134
[ConfigurationProperty("TimeStamp")]
135135
public StandardColumnConfigTimeStamp TimeStamp
136136
{
137-
get => (StandardColumnConfigTimeStamp)base["TimeStamp"];
137+
get => (StandardColumnConfigTimeStamp)base[nameof(TimeStamp)];
138138
}
139139
}
140140
}

‎src/Serilog.Sinks.MSSqlServer/Configuration/Implementations/System.Configuration/StandardColumnConfig.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@ public StandardColumnConfig()
1313
[ConfigurationProperty("Name", IsRequired = true, IsKey = true)]
1414
public string Name
1515
{
16-
get { return (string)this["Name"]; }
17-
set { this["Name"] = value; }
16+
get { return (string)this[nameof(Name)]; }
17+
set { this[nameof(Name)] = value; }
1818
}
1919
}
2020
}

0 commit comments

Comments
 (0)