Skip to content

Commit 9defeaf

Browse files
committed
fixed CA1812:AvoidUninstantiatedInternalClasses
1 parent 3aed7cb commit 9defeaf

Some content is hidden

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

46 files changed

+143
-133
lines changed

src/log4net.Tests/Appender/AdoNet/Log4NetConnection.cs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,11 @@
2121

2222
using System;
2323
using System.Data;
24+
using System.Diagnostics.CodeAnalysis;
2425

2526
namespace log4net.Tests.Appender.AdoNet;
2627

28+
[SuppressMessage("Microsoft.Performance", "CA1812:AvoidUninstantiatedInternalClasses", Justification = "Reflection")]
2729
internal sealed class Log4NetConnection : IDbConnection
2830
{
2931
private bool _open;

src/log4net.Tests/Layout/PatternLayoutTest.cs

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@
3030
using log4net.Util;
3131

3232
using NUnit.Framework;
33+
using System.Diagnostics.CodeAnalysis;
3334

3435
namespace log4net.Tests.Layout;
3536

@@ -310,6 +311,7 @@ public void NamedPatternConverterWithPrecision2ShouldStripLessLeadingStuffIfPres
310311
/// <summary>
311312
/// Converter to include event message
312313
/// </summary>
314+
[SuppressMessage("Microsoft.Performance", "CA1812:AvoidUninstantiatedInternalClasses", Justification = "Reflection")]
313315
private sealed class TestMessagePatternConverter : PatternLayoutConverter
314316
{
315317
/// <summary>
@@ -341,6 +343,7 @@ public void TestExceptionPattern()
341343
stringAppender.Reset();
342344
}
343345

346+
[SuppressMessage("Microsoft.Performance", "CA1812:AvoidUninstantiatedInternalClasses", Justification = "Reflection")]
344347
private sealed class MessageAsNamePatternConverter : NamedPatternConverter
345348
{
346349
protected override string GetFullyQualifiedName(LoggingEvent loggingEvent) => loggingEvent.MessageObject?.ToString() ?? string.Empty;

src/log4net/Appender/RollingFileAppender.DateTime.cs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
#endregion
1919

2020
using System;
21+
using System.Diagnostics.CodeAnalysis;
2122

2223
namespace log4net.Appender;
2324

@@ -65,6 +66,7 @@ private sealed class LocalDateTime : IDateTime
6566
/// <summary>
6667
/// Implementation of <see cref="IDateTime"/> that returns the current time as the coordinated universal time (UTC).
6768
/// </summary>
69+
[SuppressMessage("Microsoft.Performance", "CA1812:AvoidUninstantiatedInternalClasses", Justification = "Reflection")]
6870
private sealed class UniversalDateTime : IDateTime
6971
{
7072
/// <summary>

src/log4net/Config/XmlConfigurator.cs

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -137,10 +137,8 @@ private static void InternalConfigure(ILoggerRepository repository)
137137
/// </para>
138138
/// </remarks>
139139
/// <seealso cref="Log4NetConfigurationSectionHandler"/>
140-
public static ICollection Configure()
141-
{
142-
return Configure(LogManager.GetRepository(Assembly.GetCallingAssembly()));
143-
}
140+
public static ICollection Configure()
141+
=> Configure(LogManager.GetRepository(Assembly.GetCallingAssembly()));
144142

145143
/// <summary>
146144
/// Configures log4net using a <c>log4net</c> element

src/log4net/Layout/Pattern/AppDomainPatternConverter.cs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
//
1818
#endregion
1919

20+
using System.Diagnostics.CodeAnalysis;
2021
using System.IO;
2122

2223
using log4net.Core;
@@ -33,6 +34,7 @@ namespace log4net.Layout.Pattern;
3334
/// </remarks>
3435
/// <author>Daniel Cazzulino</author>
3536
/// <author>Nicko Cadell</author>
37+
[SuppressMessage("Microsoft.Performance", "CA1812:AvoidUninstantiatedInternalClasses", Justification = "Reflection")]
3638
internal sealed class AppDomainPatternConverter : PatternLayoutConverter
3739
{
3840
/// <summary>
@@ -45,8 +47,6 @@ internal sealed class AppDomainPatternConverter : PatternLayoutConverter
4547
/// Writes the <see cref="LoggingEvent.Domain"/> to the output <paramref name="writer"/>.
4648
/// </para>
4749
/// </remarks>
48-
protected override void Convert(TextWriter writer, LoggingEvent loggingEvent)
49-
{
50-
writer.Write(loggingEvent.Domain);
51-
}
50+
protected override void Convert(TextWriter writer, LoggingEvent loggingEvent)
51+
=> writer.Write(loggingEvent.Domain);
5252
}

src/log4net/Layout/Pattern/AspNetCachePatternConverter.cs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
//
1919
#endregion
2020

21+
using System.Diagnostics.CodeAnalysis;
2122
using System.IO;
2223
using System.Web;
2324
using log4net.Core;
@@ -34,6 +35,7 @@ namespace log4net.Layout.Pattern;
3435
/// </para>
3536
/// </remarks>
3637
/// <author>Ron Grabowski</author>
38+
[SuppressMessage("Microsoft.Performance", "CA1812:AvoidUninstantiatedInternalClasses", Justification = "Reflection")]
3739
internal sealed class AspNetCachePatternConverter : AspNetPatternLayoutConverter
3840
{
3941
/// <summary>

src/log4net/Layout/Pattern/AspNetContextPatternConverter.cs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
//
1919
#endregion
2020

21+
using System.Diagnostics.CodeAnalysis;
2122
using System.IO;
2223
using System.Web;
2324
using log4net.Core;
@@ -33,6 +34,7 @@ namespace log4net.Layout.Pattern;
3334
/// </para>
3435
/// </remarks>
3536
/// <author>Ron Grabowski</author>
37+
[SuppressMessage("Microsoft.Performance", "CA1812:AvoidUninstantiatedInternalClasses", Justification = "Reflection")]
3638
internal sealed class AspNetContextPatternConverter : AspNetPatternLayoutConverter
3739
{
3840
/// <summary>

src/log4net/Layout/Pattern/AspNetRequestPatternConverter.cs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
//
1919
#endregion
2020

21+
using System.Diagnostics.CodeAnalysis;
2122
using System.IO;
2223
using System.Web;
2324
using log4net.Core;
@@ -34,6 +35,7 @@ namespace log4net.Layout.Pattern;
3435
/// </para>
3536
/// </remarks>
3637
/// <author>Ron Grabowski</author>
38+
[SuppressMessage("Microsoft.Performance", "CA1812:AvoidUninstantiatedInternalClasses", Justification = "Reflection")]
3739
internal sealed class AspNetRequestPatternConverter : AspNetPatternLayoutConverter
3840
{
3941
/// <summary>

src/log4net/Layout/Pattern/AspNetSessionPatternConverter.cs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
//
1919
#endregion
2020

21+
using System.Diagnostics.CodeAnalysis;
2122
using System.IO;
2223
using System.Web;
2324
using log4net.Core;
@@ -34,6 +35,7 @@ namespace log4net.Layout.Pattern;
3435
/// </para>
3536
/// </remarks>
3637
/// <author>Ron Grabowski</author>
38+
[SuppressMessage("Microsoft.Performance", "CA1812:AvoidUninstantiatedInternalClasses", Justification = "Reflection")]
3739
internal sealed class AspNetSessionPatternConverter : AspNetPatternLayoutConverter
3840
{
3941
/// <summary>

src/log4net/Layout/Pattern/DatePatternConverter.cs

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -155,20 +155,13 @@ protected override void Convert(TextWriter writer, LoggingEvent loggingEvent)
155155
{
156156
try
157157
{
158-
m_dateFormatter!.FormatDate(loggingEvent.TimeStamp, writer);
158+
m_dateFormatter.EnsureNotNull().FormatDate(loggingEvent.TimeStamp, writer);
159159
}
160160
catch (Exception e) when (!e.IsFatal())
161161
{
162162
LogLog.Error(_declaringType, "Error occurred while converting date.", e);
163163
}
164164
}
165165

166-
/// <summary>
167-
/// The fully qualified type of the DatePatternConverter class.
168-
/// </summary>
169-
/// <remarks>
170-
/// Used by the internal logger to record the Type of the
171-
/// log message.
172-
/// </remarks>
173166
private static readonly Type _declaringType = typeof(DatePatternConverter);
174167
}

0 commit comments

Comments
 (0)