Spring/spring-net
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Use standard ILogger name instead of alias (#271)

Browse Source
This commit is contained in:
Marko Lahma
2025-03-28 22:52:53 +02:00
committed by GitHub
parent e4e7756c11
commit 07049eb630
212 changed files with 246 additions and 381 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/Directory.Build.props
View File

@@ -47,10 +47,6 @@
</PropertyGroup>
<ItemGroup>
<Using Include="Microsoft.Extensions.Logging.ILogger" Alias="ILog" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="ConfigureAwaitChecker.Analyzer" PrivateAssets="All" />
</ItemGroup>

2
src/Spring/Spring.Aop/Aop/Framework/Adapter/ThrowsAdviceInterceptor.cs
View File

@@ -106,7 +106,7 @@ namespace Spring.Aop.Framework.Adapter
[Serializable]
public sealed class ThrowsAdviceInterceptor : IMethodInterceptor
{
private static readonly ILog log = LogManager.GetLogger(typeof(ThrowsAdviceInterceptor));
private static readonly ILogger<ThrowsAdviceInterceptor> log = LogManager.GetLogger<ThrowsAdviceInterceptor>();
private const string SpecialThrowingMethodName = "AfterThrowing";

9
src/Spring/Spring.Aop/Aop/Framework/AutoProxy/AbstractAdvisorAutoProxyCreator.cs
View File

@@ -48,17 +48,8 @@ namespace Spring.Aop.Framework.AutoProxy
/// <author>Erich Eichinger</author>
public abstract class AbstractAdvisorAutoProxyCreator : AbstractAutoProxyCreator
{
private readonly ILog Log;
private IAdvisorRetrievalHelper _advisorRetrievalHelper;
/// <summary>
/// Initialize
/// </summary>
protected AbstractAdvisorAutoProxyCreator()
{
Log = LogManager.GetLogger(this.GetType());
}
/// <summary>
/// We override this method to ensure that all candidate advisors are materialized
/// under a stack trace including this object. Otherwise, the dependencies won't

2
src/Spring/Spring.Aop/Aop/Framework/AutoProxy/AbstractAutoProxyCreator.cs
View File

@@ -66,7 +66,7 @@ namespace Spring.Aop.Framework.AutoProxy
/// <summary>
/// The logger for this class hierarchy.
/// </summary>
protected readonly ILog logger;
protected readonly ILogger logger;
/// <summary>
/// Convenience constant for subclasses: Return value for "do not proxy".

2
src/Spring/Spring.Aop/Aop/Framework/AutoProxy/ObjectFactoryAdvisorRetrievalHelper.cs
View File

@@ -32,7 +32,7 @@ namespace Spring.Aop.Framework.AutoProxy
/// <author>Erich Eichinger</author>
public class ObjectFactoryAdvisorRetrievalHelper : IAdvisorRetrievalHelper
{
private readonly ILog _log;
private readonly ILogger _log;
private readonly IConfigurableListableObjectFactory _objectFactory;
private List<string> _cachedObjectNames;

2
src/Spring/Spring.Aop/Aop/Framework/AutoProxy/Target/AbstractPrototypeTargetSourceCreator.cs
View File

@@ -37,7 +37,7 @@ namespace Spring.Aop.Framework.AutoProxy.Target
/// <summary>
/// The logger
/// </summary>
protected readonly ILog logger = LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType);
protected readonly ILogger logger = LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType);
#region ITargetSourceCreator Members

4
src/Spring/Spring.Aop/Aop/Framework/DynamicProxy/CachedAopProxyFactory.cs
View File

@@ -49,9 +49,9 @@ namespace Spring.Aop.Framework.DynamicProxy
public class CachedAopProxyFactory : DefaultAopProxyFactory
{
/// <summary>
/// The shared <see cref="ILog"/> instance for this class.
/// The shared <see cref="ILogger"/> instance for this class.
/// </summary>
private static readonly ILog logger = LogManager.GetLogger(typeof(CachedAopProxyFactory));
private static readonly ILogger<CachedAopProxyFactory> logger = LogManager.GetLogger<CachedAopProxyFactory>();
private static readonly Hashtable typeCache = new Hashtable();

4
src/Spring/Spring.Aop/Aop/Framework/ProxyFactoryObject.cs
View File

@@ -87,9 +87,9 @@ namespace Spring.Aop.Framework
: AdvisedSupport, IFactoryObject, IObjectFactoryAware
{
/// <summary>
/// The <see cref="ILog"/> instance for this class.
/// The <see cref="ILogger"/> instance for this class.
/// </summary>
private static readonly ILog logger = LogManager.GetLogger<ProxyFactoryObject>();
private static readonly ILogger<ProxyFactoryObject> logger = LogManager.GetLogger<ProxyFactoryObject>();
/// <summary>
/// Is the object managed by this factory a singleton or a prototype?

2
src/Spring/Spring.Aop/Aop/Support/SdkRegularExpressionMethodPointcut.cs
View File

@@ -40,7 +40,7 @@ namespace Spring.Aop.Support
public class SdkRegularExpressionMethodPointcut : AbstractRegularExpressionMethodPointcut
{
[NonSerialized]
private static readonly ILog _logger = LogManager.GetLogger(typeof(SdkRegularExpressionMethodPointcut));
private static readonly ILogger<SdkRegularExpressionMethodPointcut> _logger = LogManager.GetLogger<SdkRegularExpressionMethodPointcut>();
private Regex[] _compiledPatterns = new Regex[0];
private RegexOptions _defaultOptions = RegexOptions.None;

4
src/Spring/Spring.Aop/Aop/Target/AbstractPrototypeTargetSource.cs
View File

@@ -238,9 +238,9 @@ namespace Spring.Aop.Target
}
/// <summary>
/// The shared <see cref="ILog"/> instance for this class (and derived classes).
/// The shared <see cref="ILogger"/> instance for this class (and derived classes).
/// </summary>
protected readonly ILog logger = LogManager.GetLogger(typeof (AbstractPrototypeTargetSource));
protected readonly ILogger<AbstractPrototypeTargetSource> logger = LogManager.GetLogger<AbstractPrototypeTargetSource>();
private String _targetObjectName;
private IObjectFactory _owningObjectFactory;

2
src/Spring/Spring.Aop/Aspects/AbstractExceptionHandler.cs
View File

@@ -35,7 +35,7 @@ namespace Spring.Aspects
/// <summary>
/// The logging instance
/// </summary>
protected readonly ILog log;
protected readonly ILogger log;
private IList sourceExceptionNames = new ArrayList();
private IList sourceExceptionTypes = new ArrayList();

5
src/Spring/Spring.Aop/Aspects/Cache/BaseCacheAdvice.cs
View File

@@ -21,8 +21,7 @@
#region Imports
using System.Reflection;
using Microsoft.Extensions.Logging;
using Spring.Caching;
using Spring.Context;
using Spring.Expressions;
@@ -41,7 +40,7 @@ namespace Spring.Aspects.Cache
/// <summary>
/// Shared logger instance
/// </summary>
protected readonly ILog logger;
protected readonly ILogger logger;
private IApplicationContext applicationContext;

2
src/Spring/Spring.Aop/Aspects/Exceptions/ExceptionHandlerAdvice.cs
View File

@@ -74,7 +74,7 @@ namespace Spring.Aspects.Exceptions
/// <summary>
/// Log instance available to subclasses
/// </summary>
protected static ILog log = LogManager.GetLogger(typeof(ExceptionHandlerAdvice));
protected static ILogger<ExceptionHandlerAdvice> log = LogManager.GetLogger<ExceptionHandlerAdvice>();
private IList exceptionHandlers = new ArrayList();

2
src/Spring/Spring.Aop/Aspects/Exceptions/LogExceptionHandler.cs
View File

@@ -133,7 +133,7 @@ namespace Spring.Aspects.Exceptions
public override object HandleException(IDictionary<string, object> callContextDictionary)
{
//TODO log name is targettype.
ILog adviceLogger = LogManager.GetLogger(logName);
ILogger adviceLogger = LogManager.GetLogger(logName);
callContextDictionary.Add("log", adviceLogger);
try
{

14
src/Spring/Spring.Aop/Aspects/Logging/AbstractLoggingAdvice.cs
View File

@@ -42,7 +42,7 @@ namespace Spring.Aspects.Logging
/// The default <code>ILog</code> instance used to write logging messages.
/// </summary>
[NonSerialized]
protected ILog defaultLogger;
protected ILogger defaultLogger;
/// <summary>
/// The name of the logger instance to use for obtaining from <see cref="LogManager.GetLogger(string)"/>.
@@ -69,7 +69,7 @@ namespace Spring.Aspects.Logging
/// <summary>
/// Creates a new advice instance using the given logger by default.
/// </summary>
protected AbstractLoggingAdvice(ILog defaultLogger)
protected AbstractLoggingAdvice(ILogger defaultLogger)
{
this.defaultLogger = defaultLogger;
}
@@ -163,7 +163,7 @@ namespace Spring.Aspects.Logging
public object Invoke(IMethodInvocation invocation)
{
object o = invocation.This;
ILog log = GetLoggerForInvocation(invocation);
ILogger log = GetLoggerForInvocation(invocation);
if (IsInterceptorEnabled(invocation, log))
{
return InvokeUnderLog(invocation, log);
@@ -187,7 +187,7 @@ namespace Spring.Aspects.Logging
/// <returns>
/// <c>true</c> if [is interceptor enabled] [the specified invocation]; otherwise, <c>false</c>.
/// </returns>
protected virtual bool IsInterceptorEnabled(IMethodInvocation invocation, ILog log)
protected virtual bool IsInterceptorEnabled(IMethodInvocation invocation, ILogger log)
{
return IsLogEnabled(log);
}
@@ -203,7 +203,7 @@ namespace Spring.Aspects.Logging
/// <returns>
/// <c>true</c> if log is for a given log level; otherwise, <c>false</c>.
/// </returns>
protected virtual bool IsLogEnabled(ILog log)
protected virtual bool IsLogEnabled(ILogger log)
{
return log.IsEnabled(LogLevel.Trace);
}
@@ -230,7 +230,7 @@ namespace Spring.Aspects.Logging
/// If any of the interceptors in the chain or the target object itself
/// throws an exception.
/// </exception>
protected abstract object InvokeUnderLog(IMethodInvocation invocation, ILog log);
protected abstract object InvokeUnderLog(IMethodInvocation invocation, ILogger log);
/// <summary>
@@ -243,7 +243,7 @@ namespace Spring.Aspects.Logging
/// </remarks>
/// <param name="invocation">The method invocation being logged.</param>
/// <returns>The ILog instance to use.</returns>
protected virtual ILog GetLoggerForInvocation(IMethodInvocation invocation)
protected virtual ILogger GetLoggerForInvocation(IMethodInvocation invocation)
{
if (defaultLogger != null)
{

8
src/Spring/Spring.Aop/Aspects/Logging/SimpleLoggingAdvice.cs
View File

@@ -94,7 +94,7 @@ namespace Spring.Aspects.Logging
/// Initializes a new instance of the <see cref="SimpleLoggingAdvice"/> class.
/// </summary>
/// <param name="defaultLogger">the default logger to use</param>
public SimpleLoggingAdvice(ILog defaultLogger)
public SimpleLoggingAdvice(ILogger defaultLogger)
: base(defaultLogger)
{}
@@ -189,7 +189,7 @@ namespace Spring.Aspects.Logging
/// If any of the interceptors in the chain or the target object itself
/// throws an exception.
/// </exception>
protected override object InvokeUnderLog(IMethodInvocation invocation, ILog log)
protected override object InvokeUnderLog(IMethodInvocation invocation, ILogger log)
{
object returnValue = null;
bool exitThroughException = false;
@@ -234,7 +234,7 @@ namespace Spring.Aspects.Logging
/// Default is true when the trace level is enabled. Subclasses may override this
/// to change the level at which logging occurs, or return true to ignore level
/// checks.</remarks>
protected override bool IsLogEnabled(ILog log)
protected override bool IsLogEnabled(ILogger log)
{
switch (LogLevel)
{
@@ -413,7 +413,7 @@ namespace Spring.Aspects.Logging
}
}
private void WriteToLog(LogLevel logLevel, ILog log, string text, Exception e)
private void WriteToLog(LogLevel logLevel, ILogger log, string text, Exception e)
{
switch (logLevel)
{

2
src/Spring/Spring.Aop/Aspects/RetryAdvice.cs
View File

@@ -43,7 +43,7 @@ namespace Spring.Aspects
///</summary>
public delegate void SleepHandler(TimeSpan duration);
private static readonly ILog log;
private static readonly ILogger log;
private static readonly TimeSpanConverter timeSpanConverter;
static RetryAdvice()

2
src/Spring/Spring.Core/Context/Attributes/AssemblyTypeScanner.cs
View File

@@ -35,7 +35,7 @@ namespace Spring.Context.Attributes
/// <summary>
/// Logger Instance.
/// </summary>
protected static readonly ILog Logger = LogManager.GetLogger<AssemblyTypeScanner>();
protected static readonly ILogger<AssemblyTypeScanner> Logger = LogManager.GetLogger<AssemblyTypeScanner>();
/// <summary>
/// Names of Assemblies to exclude from being loaded for scanning.

2
src/Spring/Spring.Core/Context/Attributes/AssemblyTypeSource.cs
View File

@@ -34,7 +34,7 @@ namespace Spring.Context.Attributes
/// <summary>
/// Logger Instance.
/// </summary>
protected static readonly ILog Logger = LogManager.GetLogger<AssemblyTypeSource>();
protected static readonly ILogger<AssemblyTypeSource> Logger = LogManager.GetLogger<AssemblyTypeSource>();
private readonly Assembly _assembly;

2
src/Spring/Spring.Core/Context/Attributes/ConfigurationClassEnhancer.cs
View File

@@ -85,7 +85,7 @@ namespace Spring.Context.Attributes
{
#region Logging
private static readonly ILog Logger = LogManager.GetLogger<ConfigurationClassInterceptor>();
private static readonly ILogger<ConfigurationClassInterceptor> Logger = LogManager.GetLogger<ConfigurationClassInterceptor>();
#endregion

2
src/Spring/Spring.Core/Context/Attributes/ConfigurationClassObjectDefinitionReader.cs
View File

@@ -37,7 +37,7 @@ namespace Spring.Context.Attributes
/// </summary>
public class ConfigurationClassObjectDefinitionReader
{
private static readonly ILog Logger = LogManager.GetLogger<ConfigurationClassObjectDefinitionReader>();
private static readonly ILogger<ConfigurationClassObjectDefinitionReader> Logger = LogManager.GetLogger<ConfigurationClassObjectDefinitionReader>();
private IProblemReporter _problemReporter;

2
src/Spring/Spring.Core/Context/Attributes/ConfigurationClassPostProcessor.cs
View File

@@ -33,7 +33,7 @@ namespace Spring.Context.Attributes
/// </summary>
public class ConfigurationClassPostProcessor : IObjectDefinitionRegistryPostProcessor, IOrdered
{
private static readonly ILog Logger = LogManager.GetLogger<ConfigurationClassPostProcessor>();
private static readonly ILogger<ConfigurationClassPostProcessor> Logger = LogManager.GetLogger<ConfigurationClassPostProcessor>();
private bool _postProcessObjectDefinitionRegistryCalled;

2
src/Spring/Spring.Core/Context/Attributes/ScannedGenericObjectDefinition.cs
View File

@@ -34,7 +34,7 @@ namespace Spring.Context.Attributes
/// </summary>
public class ScannedGenericObjectDefinition : GenericObjectDefinition
{
private static readonly ILog Log = LogManager.GetLogger<ScannedGenericObjectDefinition>();
private static readonly ILogger<ScannedGenericObjectDefinition> Log = LogManager.GetLogger<ScannedGenericObjectDefinition>();
/// <summary>
/// Name provided by the Component Attribute

2
src/Spring/Spring.Core/Context/Attributes/TypeFilters/AbstractLoadTypeFilter.cs
View File

@@ -28,7 +28,7 @@ namespace Spring.Context.Attributes.TypeFilters
/// </summary>
public abstract class AbstractLoadTypeFilter : ITypeFilter
{
private static readonly ILog Logger = LogManager.GetLogger<AbstractLoadTypeFilter>();
private static readonly ILogger<AbstractLoadTypeFilter> Logger = LogManager.GetLogger<AbstractLoadTypeFilter>();
/// <summary>

2
src/Spring/Spring.Core/Context/Attributes/TypeFilters/CustomTypeFactory.cs
View File

@@ -30,7 +30,7 @@ namespace Spring.Context.Attributes.TypeFilters
/// </summary>
public static class CustomTypeFactory
{
private static readonly ILog Logger = LogManager.GetLogger(typeof(CustomTypeFactory).FullName);
private static readonly ILogger Logger = LogManager.GetLogger(typeof(CustomTypeFactory).FullName);
/// <summary>
/// Creates a new instance of given type filter type string

2
src/Spring/Spring.Core/Context/Config/ComponentScanObjectDefinitionParser.cs
View File

@@ -34,7 +34,7 @@ namespace Spring.Context.Config
/// </summary>
public class ComponentScanObjectDefinitionParser : IObjectDefinitionParser
{
private static readonly ILog Logger = LogManager.GetLogger<ComponentScanObjectDefinitionParser>();
private static readonly ILogger<ComponentScanObjectDefinitionParser> Logger = LogManager.GetLogger<ComponentScanObjectDefinitionParser>();
private const string ATTRIBUTE_CONFIG_ATTRIBUTE = "attribute-config";

6
src/Spring/Spring.Core/Context/Support/AbstractApplicationContext.cs
View File

@@ -107,9 +107,9 @@ namespace Spring.Context.Support
public static readonly string EventRegistryObjectName = "eventRegistry";
/// <summary>
/// The <see cref="ILog"/> instance for this class.
/// The <see cref="ILogger"/> instance for this class.
/// </summary>
protected readonly ILog log;
protected readonly ILogger log;
/// <summary>
/// The <see cref="Spring.Context.IMessageSource"/> instance we delegate
@@ -2352,7 +2352,7 @@ namespace Spring.Context.Support
private sealed class ObjectPostProcessorChecker : IObjectPostProcessor, IOrdered
{
private static readonly ILog log = LogManager.GetLogger<ObjectPostProcessorChecker>();
private static readonly ILogger<ObjectPostProcessorChecker> log = LogManager.GetLogger<ObjectPostProcessorChecker>();
private int _objectPostProcessorTargetCount;
private IConfigurableListableObjectFactory _objectFactory;

3
src/Spring/Spring.Core/Context/Support/AbstractMessageSource.cs
View File

@@ -19,6 +19,7 @@
#endregion
using System.Globalization;
using Microsoft.Extensions.Logging;
namespace Spring.Context.Support
{
@@ -60,7 +61,7 @@ namespace Spring.Context.Support
/// <summary>
/// holds the logger instance shared with subclasses.
/// </summary>
protected readonly ILog log;
protected readonly ILogger log;
private IMessageSource parentMessageSource;
private bool useCodeAsDefaultMessage = false;

2
src/Spring/Spring.Core/Context/Support/ContextHandler.cs
View File

@@ -170,7 +170,7 @@ namespace Spring.Context.Support
/// <seealso cref="ContextRegistry"/>
public class ContextHandler : IConfigurationSectionHandler
{
private static readonly ILog Log = LogManager.GetLogger(typeof(ContextHandler));
private static readonly ILogger<ContextHandler> Log = LogManager.GetLogger<ContextHandler>();
/// <summary>
/// The <see cref="System.Type"/> of <see cref="Spring.Context.IApplicationContext"/>

4
src/Spring/Spring.Core/Context/Support/ContextRegistry.cs
View File

@@ -45,9 +45,9 @@ namespace Spring.Context.Support
public sealed class ContextRegistry
{
/// <summary>
/// The shared <see cref="ILog"/> instance for this class (and derived classes).
/// The shared <see cref="ILogger"/> instance for this class (and derived classes).
/// </summary>
private static readonly ILog log = LogManager.GetLogger(typeof(ContextRegistry));
private static readonly ILogger<ContextRegistry> log = LogManager.GetLogger<ContextRegistry>();
private static readonly object syncRoot = new Object();
private static readonly ContextRegistry instance = new ContextRegistry();

2
src/Spring/Spring.Core/Core/IO/AssemblyResource.cs
View File

@@ -53,7 +53,7 @@ namespace Spring.Core.IO
private string _fullResourceName;
private string _resourceNamespace;
private string _resourceAssemblyName;
private static readonly ILog log = LogManager.GetLogger(typeof(AssemblyResource));
private static readonly ILogger<AssemblyResource> log = LogManager.GetLogger<AssemblyResource>();
#endregion

2
src/Spring/Spring.Core/Core/IO/ResourceConverter.cs
View File

@@ -64,7 +64,7 @@ namespace Spring.Core.IO
/// <seealso cref="System.ComponentModel.TypeConverter"/>
public class ResourceConverter : TypeConverter
{
private static readonly ILog _log = LogManager.GetLogger(typeof (ResourceConverter));
private static readonly ILogger<ResourceConverter> _log = LogManager.GetLogger<ResourceConverter>();
private IResourceLoader _resourceLoader;
#region Constructor (s) / Destructor

2
src/Spring/Spring.Core/DataBinding/AbstractSimpleBinding.cs
View File

@@ -13,7 +13,7 @@ namespace Spring.DataBinding
{
#region Fields
private readonly ILog log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
private readonly ILogger log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
private IFormatter formatter;
#endregion

2
src/Spring/Spring.Core/Globalization/Localizers/ResourceSetLocalizer.cs
View File

@@ -44,7 +44,7 @@ namespace Spring.Globalization.Localizers
/// <author>Aleksandar Seovic</author>
public class ResourceSetLocalizer : AbstractLocalizer
{
private static readonly ILog log = LogManager.GetLogger(typeof(ResourceSetLocalizer));
private static readonly ILogger<ResourceSetLocalizer> log = LogManager.GetLogger<ResourceSetLocalizer>();
private static readonly IList ignoreList =
new string[] {"$this.DefaultModifiers", "$this.TrayAutoArrange", "$this.TrayLargeIcon"};

2
src/Spring/Spring.Core/Objects/Factory/Attributes/AutowiredAttributeObjectPostProcessor.cs
View File

@@ -65,7 +65,7 @@ namespace Spring.Objects.Factory.Attributes
public class AutowiredAttributeObjectPostProcessor
: InstantiationAwareObjectPostProcessorAdapter, IMergedObjectDefinitionPostProcessor, IObjectFactoryAware, IOrdered
{
private static readonly ILog logger = LogManager.GetLogger<AutowiredAttributeObjectPostProcessor>();
private static readonly ILogger<AutowiredAttributeObjectPostProcessor> logger = LogManager.GetLogger<AutowiredAttributeObjectPostProcessor>();
private IConfigurableListableObjectFactory objectFactory;

2
src/Spring/Spring.Core/Objects/Factory/Attributes/InitDestroyAttributeObjectPostProcessor.cs
View File

@@ -38,7 +38,7 @@ namespace Spring.Objects.Factory.Attributes
/// </summary>
public class InitDestroyAttributeObjectPostProcessor : IDestructionAwareObjectPostProcessor, IObjectFactoryAware, IOrdered
{
private static readonly ILog logger = LogManager.GetLogger<InitDestroyAttributeObjectPostProcessor>();
private static readonly ILogger<InitDestroyAttributeObjectPostProcessor> logger = LogManager.GetLogger<InitDestroyAttributeObjectPostProcessor>();
private IConfigurableListableObjectFactory objectFactory;
private readonly IDictionary<string, LifecycleLifecycleMetadata> lifecycleMetadataCache;

2
src/Spring/Spring.Core/Objects/Factory/Attributes/InjectionMetadata.cs
View File

@@ -30,7 +30,7 @@ namespace Spring.Objects.Factory.Attributes
/// </summary>
public class InjectionMetadata
{
private static readonly ILog Logger = LogManager.GetLogger<InjectionMetadata>();
private static readonly ILogger<InjectionMetadata> Logger = LogManager.GetLogger<InjectionMetadata>();
private readonly Type targetType;
private readonly IList<InjectedElement> _injectedElements;

5
src/Spring/Spring.Core/Objects/Factory/Config/ConfigurationReader.cs
View File

@@ -23,8 +23,7 @@ using System.Configuration;
using System.Reflection;
using System.Runtime.InteropServices;
using System.Xml;
using Microsoft.Extensions.Logging;
using Spring.Core.IO;
using Spring.Core.TypeResolution;
using Spring.Util;
@@ -52,7 +51,7 @@ namespace Spring.Objects.Factory.Config
private const string ConfigSectionElement = "section";
private const string ConfigSectionNameAttribute = "name";
private static readonly ILog _log = LogManager.GetLogger(typeof(ConfigurationReader));
private static readonly ILogger<ConfigurationReader> _log = LogManager.GetLogger<ConfigurationReader>();
/// <summary>
/// Initializes the type members

15
src/Spring/Spring.Core/Objects/Factory/Config/LogFactoryObject.cs
View File

@@ -18,17 +18,18 @@
#endregion
using Microsoft.Extensions.Logging;
using Spring.Util;
namespace Spring.Objects.Factory.Config
{
/// <summary>
/// <see cref="Spring.Objects.Factory.IFactoryObject"/> implementation that
/// creates instances of the <see cref="ILog"/> class.
/// creates instances of the <see cref="ILogger"/> class.
/// </summary>
/// <remarks>
/// <p>
/// Typically used for retrieving shared <see cref="ILog"/>
/// Typically used for retrieving shared <see cref="ILogger"/>
/// instances for common topics (such as the 'DAL', 'BLL', etc). The
/// <see cref="LogFactoryObject.LogName"/>
/// property determines the name of the
@@ -57,7 +58,7 @@ namespace Spring.Objects.Factory.Config
/// class.
/// </summary>
/// <param name="logName">
/// The name of the <see cref="ILog"/> instance served up by
/// The name of the <see cref="ILogger"/> instance served up by
/// this factory.
/// </param>
/// <exception cref="System.ArgumentNullException">
@@ -72,11 +73,11 @@ namespace Spring.Objects.Factory.Config
#endregion
/// <summary>
/// The name of the <see cref="ILog"/> instance served up by
/// The name of the <see cref="ILogger"/> instance served up by
/// this factory.
/// </summary>
/// <value>
/// The name of the <see cref="ILog"/> instance served up by
/// The name of the <see cref="ILogger"/> instance served up by
/// this factory.
/// </value>
/// <exception cref="System.ArgumentNullException">
@@ -120,7 +121,7 @@ namespace Spring.Objects.Factory.Config
/// <seealso cref="Spring.Objects.Factory.IFactoryObject.ObjectType"/>
public Type ObjectType
{
get { return typeof(ILog); }
get { return typeof(ILogger); }
}
/// <summary>
@@ -158,7 +159,7 @@ namespace Spring.Objects.Factory.Config
}
}
private ILog log;
private ILogger log;
private string logName;
}
}

2
src/Spring/Spring.Core/Objects/Factory/Config/PropertyOverrideConfigurer.cs
View File

@@ -103,7 +103,7 @@ namespace Spring.Objects.Factory.Config
[Serializable]
public class PropertyOverrideConfigurer : PropertyResourceConfigurer
{
private static readonly ILog _logger = LogManager.GetLogger(typeof (PropertyOverrideConfigurer));
private static readonly ILogger<PropertyOverrideConfigurer> _logger = LogManager.GetLogger<PropertyOverrideConfigurer>();
/// <summary>
/// Apply the given properties to the supplied

2
src/Spring/Spring.Core/Objects/Factory/Config/PropertyPlaceholderConfigurer.cs
View File

@@ -146,7 +146,7 @@ namespace Spring.Objects.Factory.Config
public static readonly string DefaultPlaceholderSuffix = "}";
private readonly ILog logger;
private readonly ILogger logger;
private bool ignoreUnresolvablePlaceholders = false;

2
src/Spring/Spring.Core/Objects/Factory/Config/PropertyResourceConfigurer.cs
View File

@@ -76,7 +76,7 @@ namespace Spring.Objects.Factory.Config
#region Fields
private readonly ILog _log;
private readonly ILogger _log;
private int _order = Int32.MaxValue; // default: same as non-Ordered
private NameValueCollection _defaultProperties;

3
src/Spring/Spring.Core/Objects/Factory/Config/SharedStateAwareProcessor.cs
View File

@@ -19,7 +19,6 @@
#endregion
using System.Collections;
using Spring.Core;
using Spring.Util;
@@ -30,8 +29,6 @@ namespace Spring.Objects.Factory.Config
/// </summary>
public class SharedStateAwareProcessor : IObjectPostProcessor, IOrdered
{
// holds the logger for this processor instance
private readonly ILog Log = LogManager.GetLogger( typeof( SharedStateAwareProcessor ) );
// holds a list of ISharedStateProvider instances (if any)
private ISharedStateFactory[] _sharedStateFactories = new ISharedStateFactory[0];
// holds prio

2
src/Spring/Spring.Core/Objects/Factory/Config/VariablePlaceholderConfigurer.cs
View File

@@ -253,7 +253,7 @@ namespace Spring.Objects.Factory.Config
private class TextProcessor
{
private readonly ILog logger = LogManager.GetLogger(typeof(TextProcessor));
private readonly ILogger<TextProcessor> logger = LogManager.GetLogger<TextProcessor>();
private readonly VariablePlaceholderConfigurer owner;
private readonly IVariableSource variableSource;

4
src/Spring/Spring.Core/Objects/Factory/Parsing/FailFastProblemReporter.cs
View File

@@ -24,9 +24,9 @@ namespace Spring.Objects.Factory.Parsing
{
public class FailFastProblemReporter : IProblemReporter
{
private static readonly ILog _logger = LogManager.GetLogger(typeof(FailFastProblemReporter));
private static readonly ILogger<FailFastProblemReporter> _logger = LogManager.GetLogger<FailFastProblemReporter>();
public ILog Logger
public ILogger Logger
{
get { return _logger; }
}

4
src/Spring/Spring.Core/Objects/Factory/Support/AbstractObjectDefinitionReader.cs
View File

@@ -39,9 +39,9 @@ namespace Spring.Objects.Factory.Support
#region Constants
/// <summary>
/// The <see cref="ILog"/> instance for this class (and derived classes).
/// The <see cref="ILogger"/> instance for this class (and derived classes).
/// </summary>
protected readonly ILog log;
protected readonly ILogger log;
#endregion

4
src/Spring/Spring.Core/Objects/Factory/Support/AbstractObjectFactory.cs
View File

@@ -63,9 +63,9 @@ namespace Spring.Objects.Factory.Support
private static readonly object EmptyObject = new object();
/// <summary>
/// The <see cref="ILog"/> instance for this class.
/// The <see cref="ILogger"/> instance for this class.
/// </summary>
[NonSerialized] protected ILog log;
[NonSerialized] protected ILogger log;
/// <summary>
/// Cache of singleton objects created by <see cref="IFactoryObject"/>s: FactoryObject name -> product

2
src/Spring/Spring.Core/Objects/Factory/Support/ConstructorResolver.cs
View File

@@ -37,7 +37,7 @@ namespace Spring.Objects.Factory.Support
/// <author>Mark Pollack</author>
public class ConstructorResolver
{
private readonly ILog log = LogManager.GetLogger(typeof(ConstructorResolver));
private readonly ILogger<ConstructorResolver> log = LogManager.GetLogger<ConstructorResolver>();
private readonly AbstractObjectFactory objectFactory;

2
src/Spring/Spring.Core/Objects/Factory/Support/DisposableObjectAdapter.cs
View File

@@ -7,7 +7,7 @@ namespace Spring.Objects.Factory.Support
{
public class DisposableObjectAdapter : IDisposable
{
private readonly ILog logger = LogManager.GetLogger(typeof(DisposableObjectAdapter));
private readonly ILogger<DisposableObjectAdapter> logger = LogManager.GetLogger<DisposableObjectAdapter>();
private object instance;

2
src/Spring/Spring.Core/Objects/Factory/Support/ObjectDefinitionValueResolver.cs
View File

@@ -36,7 +36,7 @@ namespace Spring.Objects.Factory.Support
/// <author>Mark Pollack (.NET)</author>
public class ObjectDefinitionValueResolver
{
private readonly ILog log;
private readonly ILogger log;
private readonly AbstractObjectFactory objectFactory;

5
src/Spring/Spring.Core/Objects/Factory/Support/SimpleInstantiationStrategy.cs
View File

@@ -43,10 +43,9 @@ namespace Spring.Objects.Factory.Support
public class SimpleInstantiationStrategy : IInstantiationStrategy
{
/// <summary>
/// The shared <see cref="ILog"/> instance for this class (and derived classes).
/// The shared <see cref="ILogger"/> instance for this class (and derived classes).
/// </summary>
protected static readonly ILog log =
LogManager.GetLogger(typeof(SimpleInstantiationStrategy));
protected static readonly ILogger<SimpleInstantiationStrategy> log = LogManager.GetLogger<SimpleInstantiationStrategy>();
/// <summary>
/// Instantiate an instance of the object described by the supplied

5
src/Spring/Spring.Core/Objects/Factory/Xml/DefaultObjectDefinitionDocumentReader.cs
View File

@@ -38,10 +38,9 @@ namespace Spring.Objects.Factory.Xml
public class DefaultObjectDefinitionDocumentReader : IObjectDefinitionDocumentReader
{
/// <summary>
/// The shared <see cref="ILog"/> instance for this class (and derived classes).
/// The shared <see cref="ILogger"/> instance for this class (and derived classes).
/// </summary>
protected static readonly ILog log =
LogManager.GetLogger(typeof(DefaultObjectDefinitionDocumentReader));
protected static readonly ILogger<DefaultObjectDefinitionDocumentReader> log = LogManager.GetLogger<DefaultObjectDefinitionDocumentReader>();
private XmlReaderContext readerContext;

4
src/Spring/Spring.Core/Objects/Factory/Xml/ObjectDefinitionParserHelper.cs
View File

@@ -41,9 +41,9 @@ namespace Spring.Objects.Factory.Xml
#region Fields
/// <summary>
/// The shared <see cref="ILog"/> instance for this class (and derived classes).
/// The shared <see cref="ILogger"/> instance for this class (and derived classes).
/// </summary>
protected readonly ILog log;
protected readonly ILogger log;
private DocumentDefaultsDefinition defaults;

5
src/Spring/Spring.Core/Objects/Factory/Xml/ObjectsNamespaceParser.cs
View File

@@ -68,10 +68,9 @@ namespace Spring.Objects.Factory.Xml
public const string Namespace = "http://www.springframework.net";
/// <summary>
/// The shared <see cref="ILog"/> instance for this class (and derived classes).
/// The shared <see cref="ILogger"/> instance for this class (and derived classes).
/// </summary>
protected static readonly ILog log =
LogManager.GetLogger(typeof(ObjectsNamespaceParser));
protected static readonly ILogger<ObjectsNamespaceParser> log = LogManager.GetLogger<ObjectsNamespaceParser>();
#region IXmlObjectDefinitionParser Members

2
src/Spring/Spring.Core/Objects/ObjectWrapper.cs
View File

@@ -49,7 +49,7 @@ namespace Spring.Objects
[Serializable]
public class ObjectWrapper : IObjectWrapper
{
private static readonly ILog Log = LogManager.GetLogger(typeof(ObjectWrapper));
private static readonly ILogger<ObjectWrapper> Log = LogManager.GetLogger<ObjectWrapper>();
/// <summary>The wrapped object.</summary>
private object wrappedObject;

3
src/Spring/Spring.Core/Objects/Support/AutoWiringEventHandlerValue.cs
View File

@@ -41,8 +41,7 @@ namespace Spring.Objects.Support
private const string DefaultMethodName = DefaultMethodPrefix + EventNamePlaceHolder;
private static readonly ILog log
= LogManager.GetLogger(typeof (AutoWiringEventHandlerValue));
private static readonly ILogger<AutoWiringEventHandlerValue> log = LogManager.GetLogger<AutoWiringEventHandlerValue>();
#endregion

3
src/Spring/Spring.Core/Objects/Support/PropertyComparator.cs
View File

@@ -35,8 +35,7 @@ namespace Spring.Objects.Support
/// <author>Simon White (.NET)</author>
public class PropertyComparator : IComparer
{
private static readonly ILog logger
= LogManager.GetLogger(typeof (PropertyComparator));
private static readonly ILogger<PropertyComparator> logger = LogManager.GetLogger<PropertyComparator>();
private ISortDefinition sortDefinition;
private readonly IDictionary cachedObjectWrappers = new Hashtable();

5
src/Spring/Spring.Core/Proxy/AbstractProxyTypeBuilder.cs
View File

@@ -24,6 +24,7 @@ using System.Collections;
using System.Reflection;
using System.Reflection.Emit;
using System.Runtime.Serialization;
using Microsoft.Extensions.Logging;
using Spring.Core.TypeResolution;
using Spring.Util;
@@ -50,9 +51,9 @@ namespace Spring.Proxy
#region Fields
/// <summary>
/// The shared <see cref="ILog"/> instance for this class (and derived classes).
/// The shared <see cref="ILogger"/> instance for this class (and derived classes).
/// </summary>
protected static readonly ILog log = LogManager.GetLogger(typeof(AbstractProxyTypeBuilder));
protected static readonly ILogger<AbstractProxyTypeBuilder> log = LogManager.GetLogger<AbstractProxyTypeBuilder>();
private const string DEFAULT_PROXY_TYPE_NAME = "Proxy";

4
src/Spring/Spring.Core/Reflection/Dynamic/DynamicProperty.cs
View File

@@ -19,8 +19,6 @@
#endregion
using System.Reflection;
using Spring.Util;
namespace Spring.Reflection.Dynamic
@@ -93,8 +91,6 @@ namespace Spring.Reflection.Dynamic
/// </remarks>
public class SafeProperty : IDynamicProperty
{
private static readonly ILog Log = LogManager.GetLogger(typeof(SafeProperty));
private readonly PropertyInfo propertyInfo;
#region Cache

2
src/Spring/Spring.Core/Util/EventUtils.cs
View File

@@ -70,7 +70,7 @@ namespace Spring.Util
}
}
protected readonly ILog Log;
protected readonly ILogger Log;
/// <summary>
/// Create a new EventRaiser instance

4
src/Spring/Spring.Core/Util/ObjectUtils.cs
View File

@@ -41,9 +41,9 @@ namespace Spring.Util
public sealed class ObjectUtils
{
/// <summary>
/// The <see cref="ILog"/> instance for this class.
/// The <see cref="ILogger"/> instance for this class.
/// </summary>
private static readonly ILog log = LogManager.GetLogger(typeof(ObjectUtils));
private static readonly ILogger<ObjectUtils> log = LogManager.GetLogger<ObjectUtils>();
/// <summary>
/// An empty object array.

2
src/Spring/Spring.Core/Validation/Actions/ExceptionAction.cs
View File

@@ -25,7 +25,7 @@ namespace Spring.Validation.Actions
{
public class ExceptionAction : BaseValidationAction
{
private static readonly ILog log = LogManager.GetLogger(typeof(ExceptionAction));
private static readonly ILogger<ExceptionAction> log = LogManager.GetLogger<ExceptionAction>();
private IExpression throwsExpression;
/// <summary>

2
src/Spring/Spring.Data.NHibernate5/Data/NHibernate/Bytecode/ProxyFactory.cs
View File

@@ -29,7 +29,7 @@ namespace Spring.Data.NHibernate.Bytecode
/// <author>Erich Eichinger</author>
public class ProxyFactory : AbstractProxyFactory
{
private static readonly ILog log = LogManager.GetLogger(typeof(ProxyFactory));
private static readonly ILogger<ProxyFactory> log = LogManager.GetLogger<ProxyFactory>();
[Serializable]
private class SerializableProxyFactory : global::Spring.Aop.Framework.ProxyFactory

4
src/Spring/Spring.Data.NHibernate5/Data/NHibernate/HibernateAccessor.cs
View File

@@ -45,9 +45,9 @@ namespace Spring.Data.NHibernate
private Type criteriaType;
/// <summary>
/// The <see cref="ILog"/> instance for this class.
/// The <see cref="ILogger"/> instance for this class.
/// </summary>
private readonly ILog log = LogManager.GetLogger(typeof (HibernateAccessor));
private readonly ILogger<HibernateAccessor> log = LogManager.GetLogger<HibernateAccessor>();
/// <summary>
/// Initializes a new instance of the <see cref="HibernateAccessor"/> class.

4
src/Spring/Spring.Data.NHibernate5/Data/NHibernate/HibernateTemplate.cs
View File

@@ -66,9 +66,9 @@ namespace Spring.Data.NHibernate
public class HibernateTemplate : HibernateAccessor, IHibernateOperations
{
/// <summary>
/// The <see cref="ILog"/> instance for this class.
/// The <see cref="ILogger"/> instance for this class.
/// </summary>
private readonly ILog log = LogManager.GetLogger(typeof (HibernateTemplate));
private readonly ILogger<HibernateTemplate> log = LogManager.GetLogger<HibernateTemplate>();
private bool checkWriteOperations = true;

5
src/Spring/Spring.Data.NHibernate5/Data/NHibernate/LocalSessionFactoryObject.cs
View File

@@ -109,10 +109,9 @@ namespace Spring.Data.NHibernate
private IBytecodeProvider bytecodeProvider;
/// <summary>
/// The shared <see cref="ILog"/> instance for this class (and derived classes).
/// The shared <see cref="ILogger"/> instance for this class (and derived classes).
/// </summary>
protected static readonly ILog log =
LogManager.GetLogger(typeof (LocalSessionFactoryObject));
protected static readonly ILogger<LocalSessionFactoryObject> log = LogManager.GetLogger<LocalSessionFactoryObject>();
/// <summary>
/// Initializes a new instance of the <see cref="LocalSessionFactoryObject"/> class.

4
src/Spring/Spring.Data.NHibernate5/Data/NHibernate/SessionFactoryUtils.cs
View File

@@ -41,9 +41,9 @@ namespace Spring.Data.NHibernate
public abstract class SessionFactoryUtils
{
/// <summary>
/// The <see cref="ILog"/> instance for this class.
/// The <see cref="ILogger"/> instance for this class.
/// </summary>
private static readonly ILog log = LogManager.GetLogger(typeof(SessionFactoryUtils));
private static readonly ILogger<SessionFactoryUtils> log = LogManager.GetLogger<SessionFactoryUtils>();
/// <summary>
/// The ordering value for synchronizaiton this session resources.

2
src/Spring/Spring.Data.NHibernate5/Data/NHibernate/SessionHolder.cs
View File

@@ -49,7 +49,7 @@ namespace Spring.Data.NHibernate
//needed to see if we actually assigned the enum value...
private bool assignedPreviousFlushMode = false;
private static readonly ILog log = LogManager.GetLogger(typeof (SessionHolder));
private static readonly ILogger<SessionHolder> log = LogManager.GetLogger<SessionHolder>();
/// <summary>
/// May be used by derived classes to create an empty SessionHolder.

4
src/Spring/Spring.Data.NHibernate5/Data/NHibernate/SpringSessionSynchronization.cs
View File

@@ -30,9 +30,9 @@ namespace Spring.Data.NHibernate
public class SpringSessionSynchronization : TransactionSynchronizationAdapter, IOrdered
{
/// <summary>
/// The <see cref="ILog"/> instance for this class.
/// The <see cref="ILogger"/> instance for this class.
/// </summary>
private readonly ILog log = LogManager.GetLogger(typeof(SpringSessionSynchronization));
private readonly ILogger<SpringSessionSynchronization> log = LogManager.GetLogger<SpringSessionSynchronization>();
private readonly SessionHolder sessionHolder;

4
src/Spring/Spring.Data.NHibernate5/Data/NHibernate/Support/SessionScope.cs
View File

@@ -57,7 +57,7 @@ namespace Spring.Data.NHibernate.Support
/// <summary>
/// The logging instance.
/// </summary>
protected readonly ILog log = LogManager.GetLogger(MethodInfo.GetCurrentMethod().DeclaringType);
protected readonly ILogger log = LogManager.GetLogger(MethodInfo.GetCurrentMethod().DeclaringType);
private readonly SessionScopeSettings settings;
@@ -415,7 +415,7 @@ namespace Spring.Data.NHibernate.Support
/// </remarks>
private class LazySessionHolder : SessionHolder
{
private readonly ILog log = LogManager.GetLogger(typeof(LazySessionHolder));
private readonly ILogger<LazySessionHolder> log = LogManager.GetLogger<LazySessionHolder>();
private SessionScope owner;
private ISession session;

6
src/Spring/Spring.Data/Dao/Support/DaoSupport.cs
View File

@@ -18,6 +18,7 @@
#endregion
using Microsoft.Extensions.Logging;
using Spring.Objects.Factory;
namespace Spring.Dao.Support
@@ -39,10 +40,9 @@ namespace Spring.Dao.Support
#region Constants
/// <summary>
/// The shared <see cref="ILog"/> instance for this class (and derived classes).
/// The shared <see cref="ILogger"/> instance for this class (and derived classes).
/// </summary>
protected static readonly ILog log =
LogManager.GetLogger(typeof (DaoSupport));
protected static readonly ILogger log = LogManager.GetLogger(typeof (DaoSupport));
#endregion

14
src/Spring/Spring.Data/Data/Common/DbParametersBuilder.cs
View File

@@ -39,16 +39,6 @@ namespace Spring.Data.Common
#endregion
#region Constants
/// <summary>
/// The shared log instance for this class (and derived classes).
/// </summary>
protected static readonly ILog log =
LogManager.GetLogger(typeof (DbParametersBuilder));
#endregion
#region Constructor (s)
/// <summary>
@@ -62,10 +52,6 @@ namespace Spring.Data.Common
#endregion
#region Properties
#endregion
#region Methods
public IDbParameter Create()

3
src/Spring/Spring.Data/Data/Common/DbProviderConfigurer.cs
View File

@@ -18,6 +18,7 @@
#endregion
using Microsoft.Extensions.Logging;
using Spring.Core;
using Spring.Core.IO;
using Spring.Objects.Factory.Config;
@@ -32,7 +33,7 @@ namespace Spring.Data.Common
{
#region Fields
private static readonly ILog log = LogManager.GetLogger(typeof(DbProviderConfigurer));
private static readonly ILogger<DbProviderConfigurer> log = LogManager.GetLogger<DbProviderConfigurer>();
private int order = Int32.MinValue;

2
src/Spring/Spring.Data/Data/Common/DbProviderFactory.cs
View File

@@ -38,7 +38,7 @@ namespace Spring.Data.Common
/// <summary>
/// The shared log instance for this class (and derived classes).
/// </summary>
protected static ILog log = LogManager.GetLogger(typeof(DbProviderFactory));
protected static ILogger<DbProviderFactory> log = LogManager.GetLogger<DbProviderFactory>();
private static readonly string DBPROVIDER_DEFAULT_RESOURCE_NAME =
"assembly://" + typeof(DbProviderFactory).Assembly.FullName + "/Spring.Data.Common/dbproviders.xml";

11
src/Spring/Spring.Data/Data/Common/ErrorCodes.cs
View File

@@ -18,7 +18,6 @@
#endregion
namespace Spring.Data.Common
{
/// <summary>
@@ -58,16 +57,6 @@ namespace Spring.Data.Common
// CustomErrorCodesTranslation[] customTranslations;
#endregion
#region Constants
/// <summary>
/// The shared log instance for this class (and derived classes).
/// </summary>
protected static readonly ILog log =
LogManager.GetLogger(typeof (ErrorCodes));
#endregion
#region Constructor (s)
/// <summary>
/// Initializes a new instance of the <see cref="ErrorCodes"/> class.

2
src/Spring/Spring.Data/Data/Common/MultiDelegatingDbProvider.cs
View File

@@ -50,7 +50,7 @@ namespace Spring.Data.Common
#region Logging Definition
private static readonly ILog LOG = LogManager.GetLogger(typeof(MultiDelegatingDbProvider));
private static readonly ILogger<MultiDelegatingDbProvider> LOG = LogManager.GetLogger<MultiDelegatingDbProvider>();
#endregion

2
src/Spring/Spring.Data/Data/Core/AdoPlatformTransactionManager.cs
View File

@@ -40,7 +40,7 @@ namespace Spring.Data.Core
#region Logging Definition
private static readonly ILog LOG = LogManager.GetLogger(typeof (AdoPlatformTransactionManager));
private static readonly ILogger LOG = LogManager.GetLogger(typeof (AdoPlatformTransactionManager));
#endregion

2
src/Spring/Spring.Data/Data/Core/AdoTemplate.cs
View File

@@ -41,7 +41,7 @@ namespace Spring.Data.Core
{
#region Logging Definition
private static readonly ILog LOG = LogManager.GetLogger(typeof(AdoTemplate));
private static readonly ILogger<AdoTemplate> LOG = LogManager.GetLogger<AdoTemplate>();
#endregion

2
src/Spring/Spring.Data/Data/Generic/AdoTemplate.cs
View File

@@ -41,7 +41,7 @@ namespace Spring.Data.Generic
#region Logging Definition
private static readonly ILog LOG = LogManager.GetLogger(typeof(AdoTemplate));
private static readonly ILogger<AdoTemplate> LOG = LogManager.GetLogger<AdoTemplate>();
#endregion

2
src/Spring/Spring.Data/Data/Objects/AbstractAdoOperation.cs
View File

@@ -36,7 +36,7 @@ namespace Spring.Data.Objects
{
#region Logging Definition
protected readonly ILog log = LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType);
protected readonly ILogger log = LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType);
#endregion

10
src/Spring/Spring.Data/Data/Support/AdoTransactionObjectSupport.cs
View File

@@ -43,16 +43,6 @@ namespace Spring.Data.Support
#endregion
#region Constants
/// <summary>
/// The shared log instance for this class (and derived classes).
/// </summary>
protected static readonly ILog log =
LogManager.GetLogger(typeof (AdoTransactionObjectSupport));
#endregion
#region Properties
public ConnectionHolder ConnectionHolder

2
src/Spring/Spring.Data/Data/Support/AdoUtils.cs
View File

@@ -10,7 +10,7 @@ namespace Spring.Data.Support
{
#region Logging
private static readonly ILog LOG = LogManager.GetLogger(typeof (AdoUtils));
private static readonly ILogger LOG = LogManager.GetLogger(typeof (AdoUtils));
#endregion

2
src/Spring/Spring.Data/Data/Support/ConnectionUtils.cs
View File

@@ -33,7 +33,7 @@ namespace Spring.Data.Support
{
#region Logging
private static readonly ILog LOG = LogManager.GetLogger(typeof(ConnectionUtils));
private static readonly ILogger<ConnectionUtils> LOG = LogManager.GetLogger<ConnectionUtils>();
#endregion

3
src/Spring/Spring.Data/Data/Support/ErrorCodeExceptionTranslator.cs
View File

@@ -50,8 +50,7 @@ namespace Spring.Data.Support
/// <summary>
/// The shared log instance for this class (and derived classes).
/// </summary>
protected static readonly ILog log =
LogManager.GetLogger(typeof (ErrorCodeExceptionTranslator));
protected static readonly ILogger log = LogManager.GetLogger(typeof (ErrorCodeExceptionTranslator));
#endregion

4
src/Spring/Spring.Data/Data/Support/ParameterUtils.cs
View File

@@ -20,6 +20,7 @@
using System.Collections;
using System.Data;
using Microsoft.Extensions.Logging;
using Spring.Data.Common;
namespace Spring.Data.Support
@@ -39,8 +40,7 @@ namespace Spring.Data.Support
/// <summary>
/// The shared log instance for this class (and derived classes).
/// </summary>
protected static readonly ILog log =
LogManager.GetLogger(typeof (ParameterUtils));
protected static readonly ILogger log = LogManager.GetLogger(typeof (ParameterUtils));
#endregion

3
src/Spring/Spring.Data/Data/Support/TypedDataSetUtils.cs
View File

@@ -63,8 +63,7 @@ namespace Spring.Data.Support
/// </remarks>
public abstract class TypedDataSetUtils
{
private static readonly ILog LOG = LogManager.GetLogger(typeof (TypedDataSetUtils));
private static readonly ILogger LOG = LogManager.GetLogger(typeof (TypedDataSetUtils));
/// <summary>
/// Applies the connection and tx to the provided typed dataset. The connection and transaction

2
src/Spring/Spring.Data/Transaction/Interceptor/MethodMapTransactionAttributeSource.cs
View File

@@ -41,7 +41,7 @@ namespace Spring.Transaction.Interceptor
#region Logging Definition
private static readonly ILog LOG = LogManager.GetLogger(typeof (MethodMapTransactionAttributeSource));
private static readonly ILogger LOG = LogManager.GetLogger(typeof (MethodMapTransactionAttributeSource));
#endregion

2
src/Spring/Spring.Data/Transaction/Interceptor/NameMatchTransactionAttributeSource.cs
View File

@@ -39,7 +39,7 @@ namespace Spring.Transaction.Interceptor
/// Logger available to subclasses, static for optimal serialization
/// </summary>
[NonSerialized()]
protected static readonly ILog log = LogManager.GetLogger(typeof(NameMatchTransactionAttributeSource));
protected static readonly ILogger<NameMatchTransactionAttributeSource> log = LogManager.GetLogger<NameMatchTransactionAttributeSource>();
/// <summary>
/// Keys are method names; values are ITransactionAttributes

2
src/Spring/Spring.Data/Transaction/Interceptor/TransactionAspectSupport.cs
View File

@@ -160,7 +160,7 @@ namespace Spring.Transaction.Interceptor
#region Logging Definition
[NonSerialized]
protected ILog log = LogManager.GetLogger(typeof (TransactionAspectSupport));
protected ILogger log = LogManager.GetLogger(typeof (TransactionAspectSupport));
#endregion

2
src/Spring/Spring.Data/Transaction/Support/AbstractPlatformTransactionManager.cs
View File

@@ -129,7 +129,7 @@ namespace Spring.Transaction.Support
#region Logging Definition
[NonSerialized()]
protected readonly ILog log;
protected readonly ILogger log;
#endregion

2
src/Spring/Spring.Data/Transaction/Support/TransactionSynchronizationManager.cs
View File

@@ -67,7 +67,7 @@ namespace Spring.Transaction.Support
{
#region Logging
private static readonly ILog LOG = LogManager.GetLogger(typeof (TransactionSynchronizationManager));
private static readonly ILogger LOG = LogManager.GetLogger(typeof (TransactionSynchronizationManager));
#endregion

2
src/Spring/Spring.Data/Transaction/Support/TransactionTemplate.cs
View File

@@ -60,7 +60,7 @@ namespace Spring.Transaction.Support
#region Logging Definition
protected readonly ILog log = LogManager.GetLogger(typeof(TransactionTemplate));
protected readonly ILogger<TransactionTemplate> log = LogManager.GetLogger<TransactionTemplate>();
#endregion
/// <summary>

2
src/Spring/Spring.Messaging.Ems/Messaging/Ems/Common/EmsConnection.cs
View File

@@ -29,7 +29,7 @@ namespace Spring.Messaging.Ems.Common
{
#region Logging
private readonly ILog logger = LogManager.GetLogger(typeof(EmsConnection));
private readonly ILogger<EmsConnection> logger = LogManager.GetLogger<EmsConnection>();
#endregion

2
src/Spring/Spring.Messaging.Ems/Messaging/Ems/Connections/CachedSession.cs
View File

@@ -39,7 +39,7 @@ namespace Spring.Messaging.Ems.Connections
{
#region Logging Definition
private static readonly ILog LOG = LogManager.GetLogger(typeof(CachedSession));
private static readonly ILogger<CachedSession> LOG = LogManager.GetLogger<CachedSession>();
#endregion

2
src/Spring/Spring.Messaging.Ems/Messaging/Ems/Connections/ConnectionFactoryUtils.cs
View File

@@ -35,7 +35,7 @@ namespace Spring.Messaging.Ems.Connections
{
#region Logging
private static readonly ILog LOG = LogManager.GetLogger(typeof(ConnectionFactoryUtils));
private static readonly ILogger<ConnectionFactoryUtils> LOG = LogManager.GetLogger<ConnectionFactoryUtils>();
#endregion

2
src/Spring/Spring.Messaging.Ems/Messaging/Ems/Connections/EmsResourceHolder.cs
View File

@@ -40,7 +40,7 @@ namespace Spring.Messaging.Ems.Connections
{
#region Logging
private static readonly ILog logger = LogManager.GetLogger(typeof(EmsResourceHolder));
private static readonly ILogger<EmsResourceHolder> logger = LogManager.GetLogger<EmsResourceHolder>();
#endregion

2
src/Spring/Spring.Messaging.Ems/Messaging/Ems/Connections/EmsTransactionManager.cs
View File

@@ -55,7 +55,7 @@ namespace Spring.Messaging.Ems.Connections
#region Logging Definition
private static readonly ILog LOG = LogManager.GetLogger(typeof(EmsTransactionManager));
private static readonly ILogger<EmsTransactionManager> LOG = LogManager.GetLogger<EmsTransactionManager>();
#endregion

2
src/Spring/Spring.Messaging.Ems/Messaging/Ems/Core/EmsGatewaySupport.cs
View File

@@ -38,7 +38,7 @@ namespace Spring.Messaging.Ems.Core
#region Logging
private readonly ILog logger = LogManager.GetLogger(typeof(EmsGatewaySupport));
private readonly ILogger<EmsGatewaySupport> logger = LogManager.GetLogger<EmsGatewaySupport>();
#endregion

2
src/Spring/Spring.Messaging.Ems/Messaging/Ems/Core/EmsTemplate.cs
View File

@@ -51,7 +51,7 @@ namespace Spring.Messaging.Ems.Core
{
#region Logging
private readonly ILog logger = LogManager.GetLogger(typeof(EmsTemplate));
private readonly ILogger<EmsTemplate> logger = LogManager.GetLogger<EmsTemplate>();
#endregion

2
src/Spring/Spring.Messaging.Ems/Messaging/Ems/Listener/AbstractListenerContainer.cs
View File

@@ -48,7 +48,7 @@ namespace Spring.Messaging.Ems.Listener
{
#region Logging
private readonly ILog logger = LogManager.GetLogger(typeof(AbstractListenerContainer));
private readonly ILogger<AbstractListenerContainer> logger = LogManager.GetLogger<AbstractListenerContainer>();
#endregion

Some files were not shown because too many files have changed in this diff Show More